diff --git a/source/behaviour/animation_controllers/1.10.0/animation_controller.json b/source/behaviour/animation_controllers/1.10.0/animation_controller.json
index 76f4a35e..14d3dee5 100644
--- a/source/behaviour/animation_controllers/1.10.0/animation_controller.json
+++ b/source/behaviour/animation_controllers/1.10.0/animation_controller.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.animation_controller.1.10.0",
   "type": "object",
-  "title": "The minecraft behaviourpack animation controller 1.10.0",
+  "title": "Animation Controller 1.10.0",
   "description": "TODO description",
   "definitions": {
     "animationspec": {
@@ -31,7 +31,7 @@
       "properties": {
         "bind_to_actor": {
           "type": "boolean",
-          "title": "Bind to actor",
+          "title": "Bind To Actor",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         },
         "effect": {
@@ -46,7 +46,7 @@
         },
         "pre_effect_script": {
           "type": "string",
-          "title": "Pre effect script",
+          "title": "Pre Effect Script",
           "description": "A molang script that will be run when the particle emitter is initialized"
         }
       }
@@ -66,14 +66,14 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "pattern": "^1.10.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animation_controllers": {
       "type": "object",
-      "title": "The animation controllers schema",
+      "title": "Animation Controllers",
       "description": "The animation controllers schema for 1.10.0",
       "propertyNames": {
         "pattern": "^controller\\.animation\\.[a-z\\.]+"
@@ -81,13 +81,13 @@
       "additionalProperties": {
         "additionalProperties": false,
         "type": "object",
-        "title": "A animation controller",
+        "title": "Animation Controller",
         "description": "A single animation controller 1.10.0",
         "required": ["states"],
         "minProperties": 1,
         "properties": {
           "states": {
-            "title": "The states definition",
+            "title": "States ",
             "description": "The states of this animation controller",
             "propertyNames": {
               "pattern": "[a-z\\.]+"
@@ -95,12 +95,12 @@
             "minProperties": 1,
             "additionalProperties": {
               "additionalProperties": false,
-              "title": "Animation state",
+              "title": "Animation State",
               "description": "Animation state",
               "type": "object",
               "properties": {
                 "animations": {
-                  "title": "Animations definition",
+                  "title": "Animations ",
                   "description": "The animations definition for 1.10.0",
                   "type": "array",
                   "items": {
@@ -112,13 +112,15 @@
                 "on_entry": {
                   "type": "array",
                   "description": "Events, commands or transitions to preform on entry of this state",
-                  "title": "On entry",
-                  "items": { "$ref": "#/definitions/commands" }
+                  "title": "On Entry",
+                  "items": {
+                    "$ref": "#/definitions/commands"
+                  }
                 },
                 "on_exit": {
                   "type": "array",
                   "description": "Events, commands or transitions to preform on exit of this state",
-                  "title": "On exit",
+                  "title": "On Exit",
                   "items": {
                     "$ref": "#/definitions/commands"
                   }
diff --git a/source/behaviour/animation_controllers/1.8.0/animation_controller.json b/source/behaviour/animation_controllers/1.8.0/animation_controller.json
index 9f7a690c..5807943e 100644
--- a/source/behaviour/animation_controllers/1.8.0/animation_controller.json
+++ b/source/behaviour/animation_controllers/1.8.0/animation_controller.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.animation_controller.1.8.0",
   "type": "object",
-  "title": "The minecraft behaviourpack animation controller 1.8.0",
+  "title": "Animation Controller 1.8.0",
   "description": "TODO description",
   "definitions": {
     "animationspec": {
@@ -31,7 +31,7 @@
       "properties": {
         "bind_to_actor": {
           "type": "boolean",
-          "title": "Bind to actor",
+          "title": "Bind To Actor",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         },
         "effect": {
@@ -46,7 +46,7 @@
         },
         "pre_effect_script": {
           "type": "string",
-          "title": "Pre effect script",
+          "title": "Pre Effect Script",
           "description": "A molang script that will be run when the particle emitter is initialized"
         }
       }
@@ -55,9 +55,18 @@
       "type": "string",
       "description": "The event or commands to execute",
       "oneOf": [
-        { "pattern": "^@s .+$", "title": "Event" },
-        { "pattern": "^/.+$", "title": "Command" },
-        { "pattern": "^.+;$", "title": "Molang" }
+        {
+          "pattern": "^@s .+$",
+          "title": "Event"
+        },
+        {
+          "pattern": "^/.+$",
+          "title": "Command"
+        },
+        {
+          "pattern": "^.+;$",
+          "title": "Molang"
+        }
       ]
     }
   },
@@ -65,14 +74,14 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animation_controllers": {
       "type": "object",
-      "title": "The animation controllers schema",
+      "title": "Animation Controllers Schema",
       "description": "The animation controllers schema for 1.8.0",
       "propertyNames": {
         "pattern": "^controller\\.animation\\.[a-z\\.]+"
@@ -80,13 +89,13 @@
       "additionalProperties": {
         "additionalProperties": false,
         "type": "object",
-        "title": "A animation controller",
+        "title": "A Animation Controller",
         "description": "A single animation controller 1.8.0",
         "required": ["states"],
         "minProperties": 1,
         "properties": {
           "states": {
-            "title": "The states definition",
+            "title": "States ",
             "description": "The states of this animation controller",
             "propertyNames": {
               "pattern": "[a-z\\.]+"
@@ -94,12 +103,12 @@
             "minProperties": 1,
             "additionalProperties": {
               "additionalProperties": false,
-              "title": "Animation state",
+              "title": "Animation State",
               "description": "Animation state",
               "type": "object",
               "properties": {
                 "animations": {
-                  "title": "Animations definition",
+                  "title": "Animations ",
                   "description": "The animations definition for 1.8.0",
                   "type": "array",
                   "items": {
@@ -123,7 +132,7 @@
                   }
                 },
                 "transitions": {
-                  "title": "Transition definition",
+                  "title": "Transition ",
                   "description": "The transition definition for 1.8.0",
                   "minProperties": 1,
                   "type": "array",
diff --git a/source/behaviour/animation_controllers/animation_controller.json b/source/behaviour/animation_controllers/animation_controller.json
index e091c2ef..12b74ee0 100644
--- a/source/behaviour/animation_controllers/animation_controller.json
+++ b/source/behaviour/animation_controllers/animation_controller.json
@@ -5,26 +5,12 @@
     {
       "format_version": "1.10.0",
       "animation_controllers": {
-        "controller.animation.example": {
-          "initial_state": "default",
-          "states": {
-            "default": {
-              "transitions": [{ "state_1": "query.is_baby" }]
-            },
-            "state_1": {}
-          }
-        }
+        "controller.animation.example": { "initial_state": "default", "states": { "default": { "transitions": [{ "state_1": "query.is_baby" }] }, "state_1": {} } }
       }
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/animation_controller.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/animation_controller.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/animation_controller.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/animation_controller.json" } }
   ]
 }
diff --git a/source/behaviour/animations/1.10.0/animations.json b/source/behaviour/animations/1.10.0/animations.json
index 9ecfe860..feba5deb 100644
--- a/source/behaviour/animations/1.10.0/animations.json
+++ b/source/behaviour/animations/1.10.0/animations.json
@@ -2,26 +2,20 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.10.0.animations",
   "type": "object",
-  "title": "The minecraft behaviourpack animation 1.10.0",
+  "title": "Animation 1.10.0",
   "description": "TODO description",
   "required": ["format_version", "animations"],
   "definitions": {
     "animationspec": {
       "anyOf": [
-        {
-          "title": "Animation Specification",
-          "description": "A single string that specifies which animation there are",
-          "type": "string"
-        },
+        { "title": "Animation Specification", "description": "A single string that specifies which animation there are", "type": "string" },
         {
           "type": "object",
           "title": "Animation Specification",
           "description": "A object specification on how to transition",
           "maxProperties": 1,
           "minProperties": 1,
-          "additionalProperties": {
-            "$ref": "../../../molang/1.8.0/string.json"
-          }
+          "additionalProperties": { "$ref": "../../../molang/1.8.0/string.json" }
         }
       ]
     },
@@ -34,72 +28,42 @@
           "type": "boolean",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         },
-        "effect": {
-          "type": "string",
-          "description": "The name of a particle effect that should be played"
-        },
-        "locator": {
-          "type": "string",
-          "description": "The name of a locator on the actor where the effect should be located"
-        },
-        "pre_effect_script": {
-          "type": "string",
-          "description": "A molang script that will be run when the particle emitter is initialized"
-        }
+        "effect": { "type": "string", "description": "The name of a particle effect that should be played" },
+        "locator": { "type": "string", "description": "The name of a locator on the actor where the effect should be located" },
+        "pre_effect_script": { "type": "string", "description": "A molang script that will be run when the particle emitter is initialized" }
       }
     },
-    "commands": {
-      "type": "string",
-      "description": "The event or commands to execute"
-    }
+    "commands": { "type": "string", "description": "The event or commands to execute" }
   },
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "pattern": "^1.10.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animations": {
-      "title": "Animations schema",
+      "title": "Animations Schema",
       "description": "The animation 1.10.0 specification",
       "type": "object",
-      "propertyNames": {
-        "pattern": "^animation\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^animation\\.[a-z\\.]+" },
       "additionalProperties": {
         "type": "object",
         "additionalProperties": false,
         "description": "TODO description: additionalItems",
-        "title": "Animation specification",
+        "title": "Animation ",
         "properties": {
-          "animation_length": {
-            "type": "number",
-            "description": "TODO description: animation length",
-            "title": "Animation Length"
-          },
-          "loop": {
-            "type": "boolean",
-            "description": "TODO description: loop",
-            "title": "Loop"
-          },
+          "animation_length": { "type": "number", "description": "TODO description: animation length", "title": "Animation Length" },
+          "loop": { "type": "boolean", "description": "TODO description: loop", "title": "Loop" },
           "timeline": {
             "title": "Timeline",
             "description": "The time line",
             "type": "object",
-            "propertyNames": {
-              "pattern": "^(\\d+.\\d+|\\d+)$"
-            },
+            "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$" },
             "additionalProperties": {
               "oneOf": [
                 { "type": "string", "$ref": "#/definitions/commands" },
-                {
-                  "type": "array",
-                  "title": "Collection timelime items",
-                  "items": {
-                    "$ref": "#/definitions/commands"
-                  }
-                }
+                { "type": "array", "title": "Collection Timelime Items", "items": { "$ref": "#/definitions/commands" } }
               ]
             }
           }
diff --git a/source/behaviour/animations/1.8.0/animations.json b/source/behaviour/animations/1.8.0/animations.json
index 62b23256..b5b4e9fc 100644
--- a/source/behaviour/animations/1.8.0/animations.json
+++ b/source/behaviour/animations/1.8.0/animations.json
@@ -2,26 +2,20 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.8.0.animations",
   "type": "object",
-  "title": "The minecraft behaviourpack animation 1.8.0",
+  "title": "Animation 1.8.0",
   "description": "TODO description",
   "required": ["format_version", "animations"],
   "definitions": {
     "animationspec": {
       "anyOf": [
-        {
-          "title": "Animation Specification",
-          "description": "A single string that specifies which animation there are",
-          "type": "string"
-        },
+        { "title": "Animation Specification", "description": "A single string that specifies which animation there are", "type": "string" },
         {
           "type": "object",
           "title": "Animation Specification",
           "description": "A object specification on how to transition",
           "maxProperties": 1,
           "minProperties": 1,
-          "additionalProperties": {
-            "$ref": "../../../molang/1.8.0/string.json"
-          }
+          "additionalProperties": { "$ref": "../../../molang/1.8.0/string.json" }
         }
       ]
     },
@@ -34,75 +28,40 @@
           "type": "boolean",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         },
-        "effect": {
-          "type": "string",
-          "description": "The name of a particle effect that should be played"
-        },
-        "locator": {
-          "type": "string",
-          "description": "The name of a locator on the actor where the effect should be located"
-        },
-        "pre_effect_script": {
-          "type": "string",
-          "description": "A molang script that will be run when the particle emitter is initialized"
-        }
+        "effect": { "type": "string", "description": "The name of a particle effect that should be played" },
+        "locator": { "type": "string", "description": "The name of a locator on the actor where the effect should be located" },
+        "pre_effect_script": { "type": "string", "description": "A molang script that will be run when the particle emitter is initialized" }
       }
     },
-    "commands": {
-      "type": "string",
-      "description": "The event or commands to execute"
-    }
+    "commands": { "type": "string", "description": "The event or commands to execute" }
   },
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animations": {
-      "title": "Animations schema",
+      "title": "Animations Schema",
       "description": "The animation 1.8.0 specification",
       "type": "object",
-      "propertyNames": {
-        "pattern": "^animation\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^animation\\.[a-z\\.]+" },
       "additionalProperties": {
         "type": "object",
         "additionalProperties": false,
         "description": "TODO description: additionalItems",
-        "title": "Animation specification",
+        "title": "Animation ",
         "properties": {
-          "animation_length": {
-            "type": "number",
-            "description": "TODO description: animation length",
-            "title": "Animation Length"
-          },
-          "loop": {
-            "type": "boolean",
-            "description": "TODO description: loop",
-            "title": "Loop"
-          },
+          "animation_length": { "type": "number", "description": "TODO description: animation length", "title": "Animation Length" },
+          "loop": { "type": "boolean", "description": "TODO description: loop", "title": "Loop" },
           "timeline": {
             "title": "Timeline",
             "description": "The time line",
             "type": "object",
-            "propertyNames": {
-              "pattern": "^(\\d+.\\d+|\\d+)$"
-            },
+            "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$" },
             "additionalProperties": {
-              "oneOf": [
-                {
-                  "$ref": "#/definitions/commands"
-                },
-                {
-                  "type": "array",
-                  "title": "Collection timelime items",
-                  "items": {
-                    "$ref": "#/definitions/commands"
-                  }
-                }
-              ]
+              "oneOf": [{ "$ref": "#/definitions/commands" }, { "type": "array", "title": "Collection Timelime Items", "items": { "$ref": "#/definitions/commands" } }]
             }
           }
         }
diff --git a/source/behaviour/animations/animations.json b/source/behaviour/animations/animations.json
index 1e2b46d8..ba93d08a 100644
--- a/source/behaviour/animations/animations.json
+++ b/source/behaviour/animations/animations.json
@@ -1,22 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.animations",
-  "examples": [
-    {
-      "format_version": "1.10.0",
-      "animations": {
-        "animation.example": {}
-      }
-    }
-  ],
+  "examples": [{ "format_version": "1.10.0", "animations": { "animation.example": {} } }],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/animations.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/animations.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/animations.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/animations.json" } }
   ]
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.capped_surface.json b/source/behaviour/biomes/1.12.0/components/minecraft.capped_surface.json
index 31d47d53..4a1eaaff 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.capped_surface.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.capped_surface.json
@@ -1,46 +1,34 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.capped_surface",
-  "title": "Capped surface",
+  "title": "Capped Surface",
   "description": "Generates surface on blocks with non-solid blocks above or below.",
   "type": "object",
   "additionalProperties": false,
   "required": ["floor_materials", "ceiling_materials", "sea_material", "foundation_material"],
   "properties": {
     "ceiling_materials": {
-      "title": "Ceiling materials",
+      "title": "Ceiling Materials",
       "description": "Materials used for the surface ceiling.",
       "minItems": 1,
       "items": {
-        "title": "Block reference",
+        "title": "Block Reference",
         "description": "UNDOCUMENTATED",
         "type": "string"
       }
     },
     "floor_materials": {
-      "title": "Floor materials",
+      "title": "Floor Materials",
       "description": "Materials used for the surface floor.",
       "minItems": 1,
       "items": {
-        "title": "Block reference",
+        "title": "Block Reference",
         "description": "UNDOCUMENTATED",
         "type": "string"
       }
     },
-    "sea_material": {
-      "title": "Sea material",
-      "description": "Material used to replace air blocks below sea level.",
-      "type": "string"
-    },
-    "foundation_material": {
-      "title": "Foundation material",
-      "description": "Material used to repalce solid blocks that are not surface blocks.",
-      "type": "string"
-    },
-    "beach_material": {
-      "title": "Beach material",
-      "description": "Material used to decorate surface near sea level.",
-      "type": "string"
-    }
+    "sea_material": { "title": "Sea Material", "description": "Material used to replace air blocks below sea level.", "type": "string" },
+    "foundation_material": { "title": "Foundation Material", "description": "Material used to repalce solid blocks that are not surface blocks.", "type": "string" },
+    "beach_material": { "title": "Beach Material", "description": "Material used to decorate surface near sea level.", "type": "string" }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.climate.json b/source/behaviour/biomes/1.12.0/components/minecraft.climate.json
index 9a148e91..55c9aa82 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.climate.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.climate.json
@@ -8,41 +8,24 @@
   "maxProperties": 7,
   "additionalProperties": false,
   "properties": {
-    "temperature": {
-      "title": "Temperature",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "downfall": {
-      "title": "Downfall",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "red_spores": {
-      "title": "Red spores",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "blue_spores": {
-      "title": "Blue spores",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "ash": {
-      "title": "Ash",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "white_ash": {
-      "title": "White ash",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
+    "temperature": { "title": "Temperature", "description": "UNDOCUMENATED", "type": "number" },
+    "downfall": { "title": "Downfall", "description": "UNDOCUMENATED", "type": "number" },
+    "red_spores": { "title": "Red Spores", "description": "UNDOCUMENATED", "type": "number" },
+    "blue_spores": { "title": "Blue Spores", "description": "UNDOCUMENATED", "type": "number" },
+    "ash": { "title": "Ash", "description": "UNDOCUMENATED", "type": "number" },
+    "white_ash": { "title": "White Ash", "description": "UNDOCUMENATED", "type": "number" },
     "snow_accumulation": {
-      "title": "Snow accumulation",
+      "title": "Snow Accumulation",
       "description": "UNDOCUMENATED",
       "type": "array",
-      "items": [{ "type": "number" }, { "type": "number" }]
+      "items": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "number"
+        }
+      ]
     }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.forced_features.json b/source/behaviour/biomes/1.12.0/components/minecraft.forced_features.json
index 7785547a..090876c6 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.forced_features.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.forced_features.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.forced_features",
-  "title": "Forced features",
+  "title": "Forced Features",
   "description": "Force specific decorative features (trees, plants, etc.) to appear in this Biome, regardless of normal decoration rules.",
   "type": "object",
   "minProperties": 0,
@@ -37,25 +37,25 @@
               "type": "array",
               "items": [
                 {
-                  "title": "Lower bound",
+                  "title": "Lower Bound",
                   "description": "Lower bound (inclusive) of the scatter range, as an offset from the input point to scatter around",
                   "$ref": "../../../../molang/1.8.0/number.json"
                 },
                 {
-                  "title": "Upper bound",
+                  "title": "Upper Bound",
                   "description": "Upper bound (inclusive) of the scatter range, as an offset from the input point to scatter around",
                   "$ref": "../../../../molang/1.8.0/number.json"
                 }
               ]
             },
             "grid_offset": {
-              "title": "Step size",
+              "title": "Step Size",
               "description": "When the distribution type is grid, defines the offset along this axis",
               "type": "integer",
               "minimum": 0
             },
             "step_size": {
-              "title": "Step size",
+              "title": "Step Size",
               "description": "When the distribution type is grid, defines the distance between steps along this axis",
               "type": "integer",
               "minimum": 1
@@ -71,7 +71,7 @@
       "required": ["iterations", "places_feature", "identifier"],
       "properties": {
         "coordinate_eval_order": {
-          "title": "Coordinate eval order",
+          "title": "Coordinate Eval Order",
           "description": "The order in which coordinates will be evaluated. Should be used when a coordinate depends on another. If omitted, defaults to 'xzy'.",
           "type": "string",
           "enum": ["xyz", "xzy", "yxz", "yzx", "zxy", "zyx"]
@@ -87,12 +87,12 @@
           "$ref": "../../../../molang/1.8.0/number.json"
         },
         "places_feature": {
-          "title": "Places feature",
+          "title": "Places Feature",
           "description": "UNDOCUMANTED",
           "type": "string"
         },
         "scatter_chance": {
-          "title": "Scatter chance",
+          "title": "Scatter Chance",
           "oneOf": [
             {
               "type": "object",
@@ -124,78 +124,109 @@
             }
           ]
         },
-        "x": { "title": "X", "$ref": "#/definitions/coordinate" },
-        "y": { "title": "X", "$ref": "#/definitions/coordinate" },
-        "z": { "title": "X", "$ref": "#/definitions/coordinate" }
+        "x": {
+          "title": "X",
+          "$ref": "#/definitions/coordinate"
+        },
+        "y": {
+          "title": "X",
+          "$ref": "#/definitions/coordinate"
+        },
+        "z": {
+          "title": "X",
+          "$ref": "#/definitions/coordinate"
+        }
       }
     }
   },
   "properties": {
     "after_sky_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "after_surface_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "after_underground_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "before_sky_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "before_surface_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "before_underground_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "final_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "first_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "surface_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "sky_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     },
     "underground_pass": {
-      "title": "First pass",
+      "title": "First Pass",
       "description": "UNDOCUMENTED",
       "type": "array",
-      "items": { "$ref": "#/defintions/iteration" }
+      "items": {
+        "$ref": "#/defintions/iteration"
+      }
     }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.frozen_ocean_surface.json b/source/behaviour/biomes/1.12.0/components/minecraft.frozen_ocean_surface.json
index c2ebd349..c1f07815 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.frozen_ocean_surface.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.frozen_ocean_surface.json
@@ -1,42 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.frozen_ocean_surface",
-  "title": "Frozen ocean surface",
+  "title": "Frozen Ocean Surface",
   "description": "Similar to overworld_surface. Adds icebergs.",
   "type": "object",
   "minProperties": 0,
   "maxProperties": 6,
   "additionalProperties": false,
   "properties": {
-    "top_material": {
-      "title": "Top material",
-      "description": "Controls the block type used for the surface of this biome.",
-      "string": "string"
-    },
-    "mid_material": {
-      "title": "Mid material",
-      "description": "Controls the block type used in a layer below the surface of this biome.",
-      "string": "string"
-    },
-    "sea_floor_material": {
-      "title": "Sea floor material",
-      "description": "Controls the block type used as a floor for bodies of water in this biome.",
-      "string": "boostringlean"
-    },
-    "foundation_material": {
-      "title": "Foundation material",
-      "description": "Controls the block type used deep underground in this biome.",
-      "string": "string"
-    },
-    "sea_material": {
-      "title": "Sea material",
-      "description": "Controls the block type used for the bodies of water in this biome.",
-      "string": "string"
-    },
-    "sea_floor_depth": {
-      "title": "Sea floor depth",
-      "description": "Controls how deep below the world water level the floor should occur.",
-      "type": "integer"
-    }
+    "top_material": { "title": "Top Material", "description": "Controls the block type used for the surface of this biome.", "string": "string" },
+    "mid_material": { "title": "Mid Material", "description": "Controls the block type used in a layer below the surface of this biome.", "string": "string" },
+    "sea_floor_material": { "title": "Sea Floor Material", "description": "Controls the block type used as a floor for bodies of water in this biome.", "string": "boostringlean" },
+    "foundation_material": { "title": "Foundation Material", "description": "Controls the block type used deep underground in this biome.", "string": "string" },
+    "sea_material": { "title": "Sea Material", "description": "Controls the block type used for the bodies of water in this biome.", "string": "string" },
+    "sea_floor_depth": { "title": "Sea Floor Depth", "description": "Controls how deep below the world water level the floor should occur.", "type": "integer" }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.ignore_automatic_features.json b/source/behaviour/biomes/1.12.0/components/minecraft.ignore_automatic_features.json
index d26392e2..875f88b2 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.ignore_automatic_features.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.ignore_automatic_features.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.ignore_automatic_features",
-  "title": "Ignore automatic features",
+  "title": "Ignore Automatic Features",
   "description": "No features will be automatically attached to this Biome, only features specified in the minecraft:forced_features component will appear.",
   "type": "object",
   "additionalProperties": false,
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.legacy_world_generation_rules.json b/source/behaviour/biomes/1.12.0/components/minecraft.legacy_world_generation_rules.json
index 23c8b784..3919a502 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.legacy_world_generation_rules.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.legacy_world_generation_rules.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.legacy_world_generation_rules",
-  "title": "Legacy world generation rules",
+  "title": "Legacy World Generation Rules",
   "description": "Additional world generation control applicable only to legacy limited worlds.",
   "type": "object",
   "additionalProperties": false,
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.mesa_surface.json b/source/behaviour/biomes/1.12.0/components/minecraft.mesa_surface.json
index e8b8412a..a6b95838 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.mesa_surface.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.mesa_surface.json
@@ -1,62 +1,22 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.mesa_surface",
-  "title": "Mesa surface",
+  "title": "Mesa Surface",
   "description": "Similar to overworld_surface.  Adds colored strata and optional pillars.",
   "type": "object",
   "minProperties": 0,
   "maxProperties": 10,
   "additionalProperties": false,
   "properties": {
-    "top_material": {
-      "title": "Top material",
-      "description": "Controls the block type used for the surface of this biome.",
-      "string": "string"
-    },
-    "mid_material": {
-      "title": "Mid material",
-      "description": "Controls the block type used in a layer below the surface of this biome.",
-      "string": "string"
-    },
-    "sea_floor_material": {
-      "title": "Sea floor material",
-      "description": "Controls the block type used as a floor for bodies of water in this biome.",
-      "string": "boostringlean"
-    },
-    "foundation_material": {
-      "title": "Foundation material",
-      "description": "Controls the block type used deep underground in this biome.",
-      "string": "string"
-    },
-    "sea_material": {
-      "title": "Sea material",
-      "description": "Controls the block type used for the bodies of water in this biome.",
-      "string": "string"
-    },
-    "sea_floor_depth": {
-      "title": "Sea floor depth",
-      "description": "Controls how deep below the world water level the floor should occur.",
-      "type": "integer"
-    },
-    "clay_material": {
-      "title": "Clay material",
-      "description": "UNDOCUMENTATED",
-      "type": "string"
-    },
-    "hard_clay_material": {
-      "title": "Hard clay material",
-      "description": "UNDOCUMENTATED",
-      "type": "string"
-    },
-    "bryce_pillars": {
-      "title": "Bryce pillars",
-      "description": "UNDOCUMENTATED",
-      "type": "boolean"
-    },
-    "has_forest": {
-      "title": "Has forest",
-      "description": "UNDOCUMENTATED",
-      "type": "boolean"
-    }
+    "top_material": { "title": "Top Material", "description": "Controls the block type used for the surface of this biome.", "string": "string" },
+    "mid_material": { "title": "Mid Material", "description": "Controls the block type used in a layer below the surface of this biome.", "string": "string" },
+    "sea_floor_material": { "title": "Sea Floor Material", "description": "Controls the block type used as a floor for bodies of water in this biome.", "string": "boostringlean" },
+    "foundation_material": { "title": "Foundation Material", "description": "Controls the block type used deep underground in this biome.", "string": "string" },
+    "sea_material": { "title": "Sea Material", "description": "Controls the block type used for the bodies of water in this biome.", "string": "string" },
+    "sea_floor_depth": { "title": "Sea Floor Depth", "description": "Controls how deep below the world water level the floor should occur.", "type": "integer" },
+    "clay_material": { "title": "Clay Material", "description": "UNDOCUMENTATED", "type": "string" },
+    "hard_clay_material": { "title": "Hard Clay Material", "description": "UNDOCUMENTATED", "type": "string" },
+    "bryce_pillars": { "title": "Bryce Pillars", "description": "UNDOCUMENTATED", "type": "boolean" },
+    "has_forest": { "title": "Has Forest", "description": "UNDOCUMENTATED", "type": "boolean" }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.nether_generation_rules.json b/source/behaviour/biomes/1.12.0/components/minecraft.nether_generation_rules.json
index 09ad3916..a01e5356 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.nether_generation_rules.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.nether_generation_rules.json
@@ -1,35 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.nether_generation_rules",
-  "title": "Nether generation rules",
+  "title": "Nether Generation Rules",
   "description": "Controls how this biome is instantiated (and then potentially modified) during world generation of the nether.",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "target_temperature": {
-      "title": "Target temperature",
-      "description": "Temperature with which this biome should selected, relative to other biomes.",
-      "type": "number"
-    },
-    "target_humidity": {
-      "title": "Target humidity",
-      "description": "Humidity with which this biome should selected, relative to other biomes.",
-      "type": "number"
-    },
-    "target_altitude": {
-      "title": "Target altitude",
-      "description": "Altitude with which this biome should selected, relative to other biomes.",
-      "type": "number"
-    },
-    "target_weirdness": {
-      "title": "Target weirdness",
-      "description": "Weirdness with which this biome should selected, relative to other biomes.",
-      "type": "number"
-    },
-    "weight": {
-      "title": "Weight",
-      "description": "Weight with which this biome should selected, relative to other biomes.",
-      "type": "number"
-    }
+    "target_temperature": { "title": "Target Temperature", "description": "Temperature with which this biome should selected, relative to other biomes.", "type": "number" },
+    "target_humidity": { "title": "Target Humidity", "description": "Humidity with which this biome should selected, relative to other biomes.", "type": "number" },
+    "target_altitude": { "title": "Target Altitude", "description": "Altitude with which this biome should selected, relative to other biomes.", "type": "number" },
+    "target_weirdness": { "title": "Target Weirdness", "description": "Weirdness with which this biome should selected, relative to other biomes.", "type": "number" },
+    "weight": { "title": "Weight", "description": "Weight with which this biome should selected, relative to other biomes.", "type": "number" }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.nether_surface.json b/source/behaviour/biomes/1.12.0/components/minecraft.nether_surface.json
index 9848114d..53cbf959 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.nether_surface.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.nether_surface.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.nether_surface",
-  "title": "Nether surface",
+  "title": "Nether Surface",
   "description": "Use default Minecraft Nether terrain generation.",
   "type": "object",
   "additionalProperties": false,
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.overworld_generation_rules.json b/source/behaviour/biomes/1.12.0/components/minecraft.overworld_generation_rules.json
index ca29d691..104979ef 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.overworld_generation_rules.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.overworld_generation_rules.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.overworld_generation_rules",
-  "title": "Overworld generation rules",
+  "title": "Overworld Generation Rules",
   "description": "Control how this biome is instantiated (and then potentially modified) during world generation of the overworld.",
   "type": "object",
   "additionalProperties": false,
@@ -10,7 +10,7 @@
       "oneOf": [
         {
           "type": "string",
-          "title": "Block reference",
+          "title": "Block Reference",
           "description": "UNDOCUMENTATED"
         },
         {
@@ -22,14 +22,14 @@
               {
                 "type": "string",
                 "description": "UNDOCUMENTATED",
-                "title": "Block reference"
+                "title": "Block Reference"
               },
               {
                 "type": "array",
                 "description": "UNDOCUMENTATED",
                 "items": [
                   {
-                    "title": "Biome reference",
+                    "title": "Biome Reference",
                     "description": "UNDOCUMENTATED",
                     "type": "string"
                   },
@@ -47,28 +47,12 @@
     }
   },
   "properties": {
-    "hills_transformation": {
-      "title": "Hills transformation",
-      "description": "UNDOCUMENTATED",
-      "$ref": "#/definitions/transformation"
-    },
-    "mutate_transformation": {
-      "title": "Mutate transformation",
-      "description": "UNDOCUMENTATED",
-      "$ref": "#/definitions/transformation"
-    },
-    "river_transformation": {
-      "title": "River transformation",
-      "description": "UNDOCUMENTATED",
-      "$ref": "#/definitions/transformation"
-    },
-    "shore_transformation": {
-      "title": "Shore transformation",
-      "description": "UNDOCUMENTATED",
-      "$ref": "#/definitions/transformation"
-    },
+    "hills_transformation": { "title": "Hills Transformation", "description": "UNDOCUMENTATED", "$ref": "#/definitions/transformation" },
+    "mutate_transformation": { "title": "Mutate Transformation", "description": "UNDOCUMENTATED", "$ref": "#/definitions/transformation" },
+    "river_transformation": { "title": "River Transformation", "description": "UNDOCUMENTATED", "$ref": "#/definitions/transformation" },
+    "shore_transformation": { "title": "Shore Transformation", "description": "UNDOCUMENTATED", "$ref": "#/definitions/transformation" },
     "generate_for_climates": {
-      "title": "Generate for climates",
+      "title": "Generate For Climates",
       "description": "Controls the world generation climate categories that this biome can spawn for.  A single biome can be associated with multiple categories with different weightings.",
       "type": "array",
       "items": {
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.overworld_height.json b/source/behaviour/biomes/1.12.0/components/minecraft.overworld_height.json
index 6a7771ea..f508704c 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.overworld_height.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.overworld_height.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.overworld_height",
-  "title": "Overworld height",
+  "title": "Overworld Height",
   "description": "Noise parameters used to drive terrain height in the Overworld.",
   "type": "object",
   "minProperties": 0,
@@ -9,13 +9,20 @@
   "additionalProperties": false,
   "properties": {
     "noise_params": {
-      "title": "Noise params",
+      "title": "Noise Params",
       "description": "UNDOCUMENATED",
       "type": "array",
-      "items": [{ "type": "number" }, { "type": "number" }]
+      "items": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "number"
+        }
+      ]
     },
     "noise_type": {
-      "title": "Noise type",
+      "title": "Noise Type",
       "description": "UNDOCUMENATED",
       "type": "string",
       "enum": [
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.surface_material_adjustments.json b/source/behaviour/biomes/1.12.0/components/minecraft.surface_material_adjustments.json
index 57a59991..96c3c6dd 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.surface_material_adjustments.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.surface_material_adjustments.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.surface_material_adjustments",
-  "title": "Surface material adjustments",
+  "title": "Surface Material Adjustments",
   "description": "Specify fine-detail changes to blocks used in terrain generation (based on a noise function)",
   "type": "object",
   "additionalProperties": false,
@@ -16,12 +16,18 @@
         "additionalProperties": false,
         "properties": {
           "height_range": {
-            "title": "Height range",
+            "title": "Height Range",
             "description": "Defines a range of noise values [min, max] for which this adjustment should be applied.",
             "type": "array",
             "items": [
-              { "$ref": "../../../../molang/1.8.0/number.json", "title": "Min" },
-              { "$ref": "../../../../molang/1.8.0/number.json", "title": "Max" }
+              {
+                "$ref": "../../../../molang/1.8.0/number.json",
+                "title": "Min"
+              },
+              {
+                "$ref": "../../../../molang/1.8.0/number.json",
+                "title": "Max"
+              }
             ]
           },
           "materials": {
@@ -31,39 +37,47 @@
             "additionalProperties": false,
             "properties": {
               "top_material": {
-                "title": "Top material",
+                "title": "Top Material",
                 "description": "Controls the block type used for the surface of this biome when this adjustment is active.",
                 "type": "string"
               },
               "mid_material": {
-                "title": "Mid material",
+                "title": "Mid Material",
                 "description": "Controls the block type used in a layer below the surface of this biome when this adjustment is active.",
                 "type": "string"
               },
               "sea_floor_material": {
-                "title": "Sea floor material",
+                "title": "Sea Floor Material",
                 "description": "Controls the block type used as a floor for bodies of water in this biome when this adjustment is active.",
                 "type": "string"
               },
               "foundation_material": {
-                "title": "Top materials",
+                "title": "Top Materials",
                 "description": "Controls the block type used deep underground in this biome when this adjustment is active.",
                 "type": "string"
               },
               "sea_material": {
-                "title": "Top materials",
+                "title": "Top Materials",
                 "description": "Controls the block type used in the bodies of water in this biome when this adjustment is active.",
                 "type": "string"
               }
             }
           },
           "noise_range": {
-            "title": "Noise range",
+            "title": "Noise Range",
             "description": "Defines a range of noise values [min, max] for which this adjustment should be applied.",
             "type": "array",
             "items": [
-              { "minimum": -1, "maximum": 1, "title": "Min" },
-              { "minimum": -1, "maximum": 1, "title": "Max" }
+              {
+                "minimum": -1,
+                "maximum": 1,
+                "title": "Min"
+              },
+              {
+                "minimum": -1,
+                "maximum": 1,
+                "title": "Max"
+              }
             ]
           }
         }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.surface_parameters.json b/source/behaviour/biomes/1.12.0/components/minecraft.surface_parameters.json
index 98f3a347..08d4a2d3 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.surface_parameters.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.surface_parameters.json
@@ -1,42 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.surface_parameters",
-  "title": "Surface parameters",
+  "title": "Surface Parameters",
   "description": "Control the blocks used for the default Minecraft Overworld terrain generation.",
   "type": "object",
   "minProperties": 0,
   "maxProperties": 6,
   "additionalProperties": false,
   "properties": {
-    "top_material": {
-      "title": "Top material",
-      "description": "Controls the block type used for the surface of this biome.",
-      "string": "string"
-    },
-    "mid_material": {
-      "title": "Mid material",
-      "description": "Controls the block type used in a layer below the surface of this biome.",
-      "string": "string"
-    },
-    "sea_floor_material": {
-      "title": "Sea floor material",
-      "description": "Controls the block type used as a floor for bodies of water in this biome.",
-      "string": "boostringlean"
-    },
-    "foundation_material": {
-      "title": "Foundation material",
-      "description": "Controls the block type used deep underground in this biome.",
-      "string": "string"
-    },
-    "sea_material": {
-      "title": "Sea material",
-      "description": "Controls the block type used for the bodies of water in this biome.",
-      "string": "string"
-    },
-    "sea_floor_depth": {
-      "title": "Sea floor depth",
-      "description": "Controls how deep below the world water level the floor should occur.",
-      "type": "integer"
-    }
+    "top_material": { "title": "Top Material", "description": "Controls the block type used for the surface of this biome.", "string": "string" },
+    "mid_material": { "title": "Mid Material", "description": "Controls the block type used in a layer below the surface of this biome.", "string": "string" },
+    "sea_floor_material": { "title": "Sea Floor Material", "description": "Controls the block type used as a floor for bodies of water in this biome.", "string": "boostringlean" },
+    "foundation_material": { "title": "Foundation Material", "description": "Controls the block type used deep underground in this biome.", "string": "string" },
+    "sea_material": { "title": "Sea Material", "description": "Controls the block type used for the bodies of water in this biome.", "string": "string" },
+    "sea_floor_depth": { "title": "Sea Floor Depth", "description": "Controls how deep below the world water level the floor should occur.", "type": "integer" }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.swamp_surface.json b/source/behaviour/biomes/1.12.0/components/minecraft.swamp_surface.json
index 71cf39e3..43196b6b 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.swamp_surface.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.swamp_surface.json
@@ -1,42 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.swamp_surface",
-  "title": "Swamp surface",
+  "title": "Swamp Surface",
   "description": "Similar to overworld_surface. Adds swamp surface details.",
   "type": "object",
   "minProperties": 0,
   "maxProperties": 6,
   "additionalProperties": false,
   "properties": {
-    "top_material": {
-      "title": "Top material",
-      "description": "Controls the block type used for the surface of this biome.",
-      "string": "string"
-    },
-    "mid_material": {
-      "title": "Mid material",
-      "description": "Controls the block type used in a layer below the surface of this biome.",
-      "string": "string"
-    },
-    "sea_floor_material": {
-      "title": "Sea floor material",
-      "description": "Controls the block type used as a floor for bodies of water in this biome.",
-      "string": "boostringlean"
-    },
-    "foundation_material": {
-      "title": "Foundation material",
-      "description": "Controls the block type used deep underground in this biome.",
-      "string": "string"
-    },
-    "sea_material": {
-      "title": "Sea material",
-      "description": "Controls the block type used for the bodies of water in this biome.",
-      "string": "string"
-    },
-    "sea_floor_depth": {
-      "title": "Sea floor depth",
-      "description": "Controls how deep below the world water level the floor should occur.",
-      "type": "integer"
-    }
+    "top_material": { "title": "Top Material", "description": "Controls the block type used for the surface of this biome.", "string": "string" },
+    "mid_material": { "title": "Mid Material", "description": "Controls the block type used in a layer below the surface of this biome.", "string": "string" },
+    "sea_floor_material": { "title": "Sea Floor Material", "description": "Controls the block type used as a floor for bodies of water in this biome.", "string": "boostringlean" },
+    "foundation_material": { "title": "Foundation Material", "description": "Controls the block type used deep underground in this biome.", "string": "string" },
+    "sea_material": { "title": "Sea Material", "description": "Controls the block type used for the bodies of water in this biome.", "string": "string" },
+    "sea_floor_depth": { "title": "Sea Floor Depth", "description": "Controls how deep below the world water level the floor should occur.", "type": "integer" }
   }
 }
diff --git a/source/behaviour/biomes/1.12.0/components/minecraft.the_end_surface.json b/source/behaviour/biomes/1.12.0/components/minecraft.the_end_surface.json
index d9342c50..8a4a7290 100644
--- a/source/behaviour/biomes/1.12.0/components/minecraft.the_end_surface.json
+++ b/source/behaviour/biomes/1.12.0/components/minecraft.the_end_surface.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "minecraft.behavior.biomes.1.12.0.components.minecraft.the_end_surface",
-  "title": "The end surface",
+  "title": "End Surface",
   "description": "Use default Minecraft End terrain generation.",
   "type": "object",
   "additionalProperties": false,
diff --git a/source/behaviour/biomes/biomes.json b/source/behaviour/biomes/biomes.json
index 444af1a0..ddbc9a51 100644
--- a/source/behaviour/biomes/biomes.json
+++ b/source/behaviour/biomes/biomes.json
@@ -7,11 +7,6 @@
     "type": "object",
     "title": "Biome",
     "description": "A biome definition",
-    "allOf": [
-      {
-        "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } },
-        "then": { "$ref": "./1.12.0/biomes.json" }
-      }
-    ]
+    "allOf": [{ "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } }, "then": { "$ref": "./1.12.0/biomes.json" } }]
   }
 }
diff --git a/source/behaviour/blocks/1.10.0/blocks.json b/source/behaviour/blocks/1.10.0/blocks.json
index f57b20a3..b6d9e8f6 100644
--- a/source/behaviour/blocks/1.10.0/blocks.json
+++ b/source/behaviour/blocks/1.10.0/blocks.json
@@ -8,20 +8,20 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "const": "1.10.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:block": {
-      "title": "Block definitions",
+      "title": "Block Definitions",
       "description": "A custom block definition",
       "type": "object",
       "additionalProperties": false,
       "required": ["description", "components"],
       "properties": {
         "description": {
-          "title": "Block description",
+          "title": "Block Description",
           "description": "The description for this block",
           "type": "object",
           "additionalProperties": false,
@@ -37,19 +37,17 @@
               "type": "boolean",
               "default": false,
               "description": "If this block is experimental, it will only be registered if the world is marked as experimantal.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             },
             "register_to_creative_menu": {
               "type": "boolean",
               "default": false,
               "description": "Whether or not to register this block to the creative inventory menu.",
-              "title": "Register to creative menu"
+              "title": "Register To Creative Menu"
             }
           }
         },
-        "components": {
-          "$ref": "./components.json"
-        }
+        "components": { "$ref": "./components.json" }
       }
     }
   }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.block_light_absorption.json b/source/behaviour/blocks/1.10.0/components/minecraft.block_light_absorption.json
index b3efb569..8783ecda 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.block_light_absorption.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.block_light_absorption.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.block_light_absorption",
   "additionalProperties": false,
   "type": "integer",
-  "title": "Block light absorption 1.10.0",
+  "title": "Block Light Absorption 1.10.0",
   "description": "The amount of light this block will absorb.",
   "default": 0
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.block_light_emission.json b/source/behaviour/blocks/1.10.0/components/minecraft.block_light_emission.json
index bd18dc94..8503a5bc 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.block_light_emission.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.block_light_emission.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.block_light_emission",
   "additionalProperties": false,
   "type": "number",
-  "title": "Block light emission 1.10.0",
+  "title": "Block Light Emission 1.10.0",
   "description": "The amount of light this block will emit in a range [0.0, 1.0].",
   "minimum": 0,
   "maximum": 1,
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.breakonpush.json b/source/behaviour/blocks/1.10.0/components/minecraft.breakonpush.json
index 64fcad34..47fe9a32 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.breakonpush.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.breakonpush.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.breakonpush",
   "additionalProperties": false,
   "type": "boolean",
-  "title": "Break on push 1.10.0",
+  "title": "Break On Push 1.10.0",
   "description": "When pushed by a piston the block breaks."
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.destroy_time.json b/source/behaviour/blocks/1.10.0/components/minecraft.destroy_time.json
index a2cb0ca7..7028678a 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.destroy_time.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.destroy_time.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.destroy_time",
   "additionalProperties": false,
   "type": "number",
-  "title": "Destroy time 1.10.0",
+  "title": "Destroy Time 1.10.0",
   "description": "Sets the destroy time property for the block. Greater numbers result in greater mining times."
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.display_name.json b/source/behaviour/blocks/1.10.0/components/minecraft.display_name.json
index fab4dc4a..0d3ceab2 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.display_name.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.display_name.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.display_name",
   "additionalProperties": false,
   "type": "string",
-  "title": "Display name 1.10.0",
+  "title": "Display Name 1.10.0",
   "description": "Specifies the display name id for the block."
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.entity_collision.json b/source/behaviour/blocks/1.10.0/components/minecraft.entity_collision.json
index 77acd3a0..ada24420 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.entity_collision.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.entity_collision.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.entity_collision",
   "additionalProperties": false,
-  "title": "Entity collision 1.10.0",
+  "title": "Entity Collision 1.10.0",
   "description": "Can only be set to false, it disables the collision of the block with entities.",
   "oneOf": [
     { "type": "boolean", "const": false },
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.explosion_resistance.json b/source/behaviour/blocks/1.10.0/components/minecraft.explosion_resistance.json
index 1e81d731..177241fb 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.explosion_resistance.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.explosion_resistance.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.explosion_resistance",
   "additionalProperties": false,
   "type": "number",
-  "title": "Explosion resistance 1.10.0",
+  "title": "Explosion Resistance 1.10.0",
   "description": "Sets the explosion resistance for this block.",
   "default": 0.0
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.flammable.json b/source/behaviour/blocks/1.10.0/components/minecraft.flammable.json
index 66a80789..637415c3 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.flammable.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.flammable.json
@@ -7,17 +7,7 @@
   "description": "Describes the flammable properties for this block.",
   "additionalItems": false,
   "properties": {
-    "burn_odds": {
-      "type": "integer",
-      "default": 0,
-      "description": "How likely the block will be destroyed by flames when on fire.",
-      "title": "Burn odds"
-    },
-    "flame_odds": {
-      "type": "integer",
-      "default": 0,
-      "description": "How likely the block will catch flame when next to a fire.",
-      "title": "Flame odds"
-    }
+    "burn_odds": { "type": "integer", "default": 0, "description": "How likely the block will be destroyed by flames when on fire.", "title": "Burn Odds" },
+    "flame_odds": { "type": "integer", "default": 0, "description": "How likely the block will catch flame when next to a fire.", "title": "Flame Odds" }
   }
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.map_color.json b/source/behaviour/blocks/1.10.0/components/minecraft.map_color.json
index d530de78..ff4f9437 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.map_color.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.map_color.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.map_color",
   "additionalProperties": false,
   "type": "string",
-  "title": "Map color 1.10.0",
+  "title": "Map Color 1.10.0",
   "description": "A color represented as a hex value. This will be the color rendered to a map.",
   "format": "color-hex"
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.material_instances.json b/source/behaviour/blocks/1.10.0/components/minecraft.material_instances.json
index a19776e9..1126219b 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.material_instances.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.material_instances.json
@@ -2,44 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.material_instances",
   "type": "object",
-  "title": "Material instances 1.10.0",
+  "title": "Material Instances 1.10.0",
   "description": "Maps face or material_instance names in a geometry file to an actual material instance. Material instance can either be a full material instance or a name to another already defined instance",
   "definitions": {
     "material_instance": {
-      "title": "Material instance",
+      "title": "Material Instance",
       "description": "A single material instance",
       "additionalProperties": false,
       "properties": {
-        "ambient_occlusion": {
-          "title": "Ambient occlusion",
-          "type": "boolean",
-          "description": "UNDOCUMENTATED"
-        },
-        "face_dimming": {
-          "title": "Face dimming",
-          "type": "boolean",
-          "description": "UNDOCUMENTATED"
-        },
-        "render_method": {
-          "type": "string",
-          "title": "Render method",
-          "description": "TODO description",
-          "enum": ["blend", "opaque", "alpha_test"]
-        },
-        "texture": {
-          "type": "string",
-          "title": "Texture",
-          "description": "TODO description"
-        }
+        "ambient_occlusion": { "title": "Ambient Occlusion", "type": "boolean", "description": "UNDOCUMENTATED" },
+        "face_dimming": { "title": "Face Dimming", "type": "boolean", "description": "UNDOCUMENTATED" },
+        "render_method": { "type": "string", "title": "Render Method", "description": "TODO description", "enum": ["blend", "opaque", "alpha_test"] },
+        "texture": { "type": "string", "title": "Texture", "description": "TODO description" }
       }
     }
   },
-  "properties": {
-    "*": {
-      "$ref": "#/definitions/material_instance"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/material_instance"
-  }
+  "properties": { "*": { "$ref": "#/definitions/material_instance" } },
+  "additionalProperties": { "$ref": "#/definitions/material_instance" }
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.onlypistonpush.json b/source/behaviour/blocks/1.10.0/components/minecraft.onlypistonpush.json
index e9a67494..012b7fe7 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.onlypistonpush.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.onlypistonpush.json
@@ -2,6 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.onlypistonpush",
   "type": "boolean",
-  "title": "Only piston push 1.10.0",
+  "title": "Only Piston Push 1.10.0",
   "description": "Blocks with those components won't stick to stickyPistons"
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.pick_collision.json b/source/behaviour/blocks/1.10.0/components/minecraft.pick_collision.json
index 8a597325..a1ab5fb6 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.pick_collision.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.pick_collision.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.pick_collision",
-  "title": "Pick collision 1.10.0",
+  "title": "Pick Collision 1.10.0",
   "description": "Can only be set to false, it disables the collision of the block with entities",
   "oneOf": [
     { "type": "boolean", "const": false },
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.placement_filter.json b/source/behaviour/blocks/1.10.0/components/minecraft.placement_filter.json
index 67dd8fcf..57524d91 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.placement_filter.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.placement_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.placement_filter",
-  "title": "Placement filter 1.10.0",
+  "title": "Placement Filter 1.10.0",
   "description": "Sets rules for under what conditions the block can be placed/survive",
   "type": "object",
   "properties": {
@@ -15,20 +15,16 @@
         "description": "TODO",
         "properties": {
           "allowed_faces": {
-            "title": "Allowed faces",
+            "title": "Allowed Faces",
             "description": "List of any of the following strings: up, down, north, south, east, west, side, all",
             "type": "array",
             "items": { "type": "string", "enum": ["up", "down", "north", "south", "east", "west", "side", "all"] }
           },
           "block_filter": {
-            "title": "Block filter",
+            "title": "Block Filter",
             "description": "List of blocks (can use tags to specify them) that this block can be placed against in the allowed_faces direction",
             "type": "array",
-            "items": {
-              "type": "string",
-              "title": "Block identifier",
-              "description": "TODO"
-            }
+            "items": { "type": "string", "title": "Block Identifier", "description": "TODO" }
           }
         }
       }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.preventsjumping.json b/source/behaviour/blocks/1.10.0/components/minecraft.preventsjumping.json
index 9c35f579..19485bb1 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.preventsjumping.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.preventsjumping.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.preventsjumping",
-  "title": "Prevents jumping 1.10.0",
+  "title": "Prevents Jumping 1.10.0",
   "description": "This component makes it so actors can't jump when walking on this block",
   "type": "boolean"
 }
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.random_ticking.json b/source/behaviour/blocks/1.10.0/components/minecraft.random_ticking.json
index f8d3acb9..bc904452 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.random_ticking.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.random_ticking.json
@@ -1,32 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.random_ticking",
-  "title": "Random ticking 1.10.0",
+  "title": "Random Ticking 1.10.0",
   "description": "Describes the component that will trigger an even at a regular interval between two values",
   "type": "object",
   "additionalProperties": false,
   "properties": {
     "on_tick": {
-      "title": "On tick",
+      "title": "On Tick",
       "description": "Describes the component that will trigger an even at a regular interval between two values",
       "type": "string",
       "additionalProperties": false,
       "properties": {
-        "condition": {
-          "title": "Condition",
-          "type": "string",
-          "description": "The condition of event to be executed on the block. Molang"
-        },
-        "event": {
-          "title": "Event",
-          "type": "string",
-          "description": "The type of event executed on the block."
-        },
-        "range": {
-          "title": "Range",
-          "type": "array",
-          "items": [{ "type": "integer" }, { "type": "integer" }]
-        },
+        "condition": { "title": "Condition", "type": "string", "description": "The condition of event to be executed on the block. Molang" },
+        "event": { "title": "Event", "type": "string", "description": "The type of event executed on the block." },
+        "range": { "title": "Range", "type": "array", "items": [{ "type": "integer" }, { "type": "integer" }] },
         "target": {
           "title": "Target",
           "description": "The target of event executed on the block.",
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.ticking.json b/source/behaviour/blocks/1.10.0/components/minecraft.ticking.json
index 6d0ebd64..ca48fcb3 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.ticking.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.ticking.json
@@ -6,11 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "looping": {
-      "type": "boolean",
-      "title": "Looping",
-      "description": "Does the event loop"
-    },
+    "looping": { "type": "boolean", "title": "Looping", "description": "Does the event loop" },
     "range": {
       "title": "Range",
       "description": "The Range between which the component will trigger his event.",
@@ -21,16 +17,8 @@
       "type": "object",
       "title": "On Tick",
       "description": "Describes the component that will trigger an even at a regular interval between two values",
-      "condition": {
-        "title": "Condition",
-        "type": "string",
-        "description": "The condition of event to be executed on the block. Molang"
-      },
-      "event": {
-        "title": "Event",
-        "type": "string",
-        "description": "The type of event executed on the block."
-      },
+      "condition": { "title": "Condition", "type": "string", "description": "The condition of event to be executed on the block. Molang" },
+      "event": { "title": "Event", "type": "string", "description": "The type of event executed on the block." },
       "target": {
         "title": "Target",
         "description": "The target of event executed on the block.",
diff --git a/source/behaviour/blocks/1.10.0/components/minecraft.unit_cube.json b/source/behaviour/blocks/1.10.0/components/minecraft.unit_cube.json
index 5fe43c5c..f22e616f 100644
--- a/source/behaviour/blocks/1.10.0/components/minecraft.unit_cube.json
+++ b/source/behaviour/blocks/1.10.0/components/minecraft.unit_cube.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.10.0.minecraft.unit_cube",
-  "title": "Unit cube 1.10.0",
+  "title": "Unit Cube 1.10.0",
   "description": "Specifies that a unit cube is to be used with tessellation.",
   "type": "string"
 }
diff --git a/source/behaviour/blocks/1.12.0/blocks.json b/source/behaviour/blocks/1.12.0/blocks.json
index 503e269f..27d29af6 100644
--- a/source/behaviour/blocks/1.12.0/blocks.json
+++ b/source/behaviour/blocks/1.12.0/blocks.json
@@ -8,20 +8,20 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.12.0 format version",
+      "title": "1.12.0 Format Version",
       "type": "string",
       "const": "1.12.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:block": {
-      "title": "Block definitions",
+      "title": "Block Definitions",
       "description": "A custom block definition",
       "type": "object",
       "additionalProperties": false,
       "required": ["description", "components"],
       "properties": {
         "description": {
-          "title": "Block description",
+          "title": "Block Description",
           "description": "The description for this block",
           "type": "object",
           "additionalProperties": false,
@@ -37,19 +37,17 @@
               "type": "boolean",
               "default": false,
               "description": "If this block is experimental, it will only be registered if the world is marked as experimantal.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             },
             "register_to_creative_menu": {
               "type": "boolean",
               "default": false,
               "description": "Whether or not to register this block to the creative inventory menu.",
-              "title": "Register to creative menu"
+              "title": "Register To Creative Menu"
             }
           }
         },
-        "components": {
-          "$ref": "../1.10.0/components.json"
-        }
+        "components": { "$ref": "../1.10.0/components.json" }
       }
     }
   }
diff --git a/source/behaviour/blocks/1.16.0/blocks.json b/source/behaviour/blocks/1.16.0/blocks.json
index 8382c3c4..6b60def9 100644
--- a/source/behaviour/blocks/1.16.0/blocks.json
+++ b/source/behaviour/blocks/1.16.0/blocks.json
@@ -8,20 +8,20 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.16.0 format version",
+      "title": "1.16.0 Format Version",
       "type": "string",
       "const": "1.16.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:block": {
-      "title": "Block definitions",
+      "title": "Block Definitions",
       "description": "A custom block definition",
       "type": "object",
       "additionalProperties": false,
       "required": ["description", "components"],
       "properties": {
         "description": {
-          "title": "Block description",
+          "title": "Block Description",
           "description": "The description for this block",
           "type": "object",
           "additionalProperties": false,
@@ -37,20 +37,18 @@
               "type": "boolean",
               "default": false,
               "description": "If this block is experimental, it will only be registered if the world is marked as experimantal.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             },
             "register_to_creative_menu": {
               "type": "boolean",
               "default": false,
               "description": "Whether or not to register this block to the creative inventory menu.",
-              "title": "Register to creative menu"
+              "title": "Register To Creative Menu"
             },
             "properties": {
               "title": "Properties",
               "description": "UNDOCUMENATED",
-              "propertyNames": {
-                "pattern": "^([a-zA-Z0-9_]+:[a-zA-Z0-9_\\-]+)$"
-              },
+              "propertyNames": { "pattern": "^([a-zA-Z0-9_]+:[a-zA-Z0-9_\\-]+)$" },
               "additionalProperties": {
                 "title": "Property",
                 "description": "A block property",
@@ -58,7 +56,7 @@
                   {
                     "type": "array",
                     "items": {
-                      "title": "Property value",
+                      "title": "Property Value",
                       "description": "The value of this property",
                       "anyOf": [{ "type": "boolean" }, { "type": "number" }, { "type": "integer" }, { "type": "string" }]
                     }
@@ -69,9 +67,7 @@
             }
           }
         },
-        "components": {
-          "$ref": "../1.10.0/components.json"
-        }
+        "components": { "$ref": "../1.10.0/components.json" }
       }
     }
   }
diff --git a/source/behaviour/blocks/1.16.100/blocks.json b/source/behaviour/blocks/1.16.100/blocks.json
index b82561b1..b776a9bf 100644
--- a/source/behaviour/blocks/1.16.100/blocks.json
+++ b/source/behaviour/blocks/1.16.100/blocks.json
@@ -8,20 +8,20 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.16.100 format version",
+      "title": "1.16.100 Format Version",
       "type": "string",
       "const": "1.16.100",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:block": {
-      "title": "Block definitions",
+      "title": "Block Definitions",
       "description": "A custom block definition",
       "type": "object",
       "additionalProperties": false,
       "required": ["description", "components"],
       "properties": {
         "description": {
-          "title": "Block description",
+          "title": "Block Description",
           "description": "The description for this block",
           "type": "object",
           "additionalProperties": false,
@@ -37,20 +37,18 @@
               "type": "boolean",
               "default": false,
               "description": "If this block is experimental, it will only be registered if the world is marked as experimantal.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             },
             "register_to_creative_menu": {
               "type": "boolean",
               "default": false,
               "description": "Whether or not to register this block to the creative inventory menu.",
-              "title": "Register to creative menu"
+              "title": "Register To Creative Menu"
             },
             "properties": {
               "title": "Properties",
               "description": "UNDOCUMENATED",
-              "propertyNames": {
-                "pattern": "^([a-zA-Z0-9_]+:[a-zA-Z0-9_\\-]+)$"
-              },
+              "propertyNames": { "pattern": "^([a-zA-Z0-9_]+:[a-zA-Z0-9_\\-]+)$" },
               "additionalProperties": {
                 "title": "Property",
                 "description": "A block property",
@@ -58,7 +56,7 @@
                   {
                     "type": "array",
                     "items": {
-                      "title": "Property value",
+                      "title": "Property Value",
                       "description": "The value of this property",
                       "anyOf": [{ "type": "boolean" }, { "type": "number" }, { "type": "integer" }, { "type": "string" }]
                     }
@@ -81,7 +79,6 @@
             "minecraft:on_player_placing": { "$ref": "./components/minecraft.on_player_placing.json" },
             "minecraft:on_step_off": { "$ref": "./components/minecraft.on_step_off.json" },
             "minecraft:on_step_on": { "$ref": "./components/minecraft.on_step_on.json" },
-
             "minecraft:block_light_absorption": { "$ref": "./components/minecraft.block_light_absorption.json" },
             "minecraft:block_light_emission": { "$ref": "./components/minecraft.block_light_emission.json" },
             "minecraft:breakonpush": { "$ref": "./components/minecraft.breakonpush.json" },
@@ -107,9 +104,7 @@
             "minecraft:unwalkable": { "$ref": "./components/minecraft.unwalkable.json" }
           }
         },
-        "events": {
-          "$ref": "./events.json"
-        }
+        "events": { "$ref": "./events.json" }
       }
     }
   }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.block_light_absorption.json b/source/behaviour/blocks/1.16.100/components/minecraft.block_light_absorption.json
index 533fd957..11516e95 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.block_light_absorption.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.block_light_absorption.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.block_light_absorption",
   "additionalProperties": false,
   "type": "integer",
-  "title": "Block light absorption 1.16.100",
+  "title": "Block Light Absorption 1.16.100",
   "description": "The amount of light this block will absorb.",
   "default": 0
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.block_light_emission.json b/source/behaviour/blocks/1.16.100/components/minecraft.block_light_emission.json
index 1c0e58a0..aff31780 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.block_light_emission.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.block_light_emission.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.block_light_emission",
   "additionalProperties": false,
   "type": "number",
-  "title": "Block light emission 1.16.100",
+  "title": "Block Light Emission 1.16.100",
   "description": "The amount of light this block will emit in a range [0.0, 1.0].",
   "minimum": 0,
   "maximum": 1,
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.breakonpush.json b/source/behaviour/blocks/1.16.100/components/minecraft.breakonpush.json
index 8732e874..c26eeeed 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.breakonpush.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.breakonpush.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.breakonpush",
   "additionalProperties": false,
   "type": "boolean",
-  "title": "Break on push 1.16.100",
+  "title": "Break On Push 1.16.100",
   "description": "When pushed by a piston the block breaks."
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.destroy_time.json b/source/behaviour/blocks/1.16.100/components/minecraft.destroy_time.json
index e4afe23b..cfb5ce9f 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.destroy_time.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.destroy_time.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.destroy_time",
   "additionalProperties": false,
   "type": "number",
-  "title": "Destroy time 1.16.100",
+  "title": "Destroy Time 1.16.100",
   "description": "Sets the destroy time property for the block. Greater numbers result in greater mining times."
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.display_name.json b/source/behaviour/blocks/1.16.100/components/minecraft.display_name.json
index c1194635..bd0b7e6b 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.display_name.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.display_name.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.display_name",
   "additionalProperties": false,
   "type": "string",
-  "title": "Display name 1.16.100",
+  "title": "Display Name 1.16.100",
   "description": "Specifies the display name id for the block."
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.entity_collision.json b/source/behaviour/blocks/1.16.100/components/minecraft.entity_collision.json
index d2110cc1..3688d030 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.entity_collision.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.entity_collision.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.entity_collision",
   "additionalProperties": false,
-  "title": "Entity collision 1.16.100",
+  "title": "Entity Collision 1.16.100",
   "description": "Can only be set to false, it disables the collision of the block with entities.",
   "oneOf": [
     { "type": "boolean", "const": false },
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.explosion_resistance.json b/source/behaviour/blocks/1.16.100/components/minecraft.explosion_resistance.json
index af6f8cea..557003d6 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.explosion_resistance.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.explosion_resistance.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.explosion_resistance",
   "additionalProperties": false,
   "type": "number",
-  "title": "Explosion resistance 1.16.100",
+  "title": "Explosion Resistance 1.16.100",
   "description": "Sets the explosion resistance for this block.",
   "default": 0.0
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.flammable.json b/source/behaviour/blocks/1.16.100/components/minecraft.flammable.json
index 12f3c65d..812f9298 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.flammable.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.flammable.json
@@ -7,17 +7,7 @@
   "description": "Describes the flammable properties for this block.",
   "additionalItems": false,
   "properties": {
-    "burn_odds": {
-      "type": "integer",
-      "default": 0,
-      "description": "How likely the block will be destroyed by flames when on fire.",
-      "title": "Burn odds"
-    },
-    "flame_odds": {
-      "type": "integer",
-      "default": 0,
-      "description": "How likely the block will catch flame when next to a fire.",
-      "title": "Flame odds"
-    }
+    "burn_odds": { "type": "integer", "default": 0, "description": "How likely the block will be destroyed by flames when on fire.", "title": "Burn Odds" },
+    "flame_odds": { "type": "integer", "default": 0, "description": "How likely the block will catch flame when next to a fire.", "title": "Flame Odds" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.map_color.json b/source/behaviour/blocks/1.16.100/components/minecraft.map_color.json
index 94e3e537..6f680727 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.map_color.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.map_color.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.map_color",
   "additionalProperties": false,
   "type": "string",
-  "title": "Map color 1.16.100",
+  "title": "Map Color 1.16.100",
   "description": "A color represented as a hex value. This will be the color rendered to a map.",
   "format": "color-hex"
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.material_instances.json b/source/behaviour/blocks/1.16.100/components/minecraft.material_instances.json
index 381e5ba9..8d25426a 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.material_instances.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.material_instances.json
@@ -2,44 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.material_instances",
   "type": "object",
-  "title": "Material instances 1.16.100",
+  "title": "Material Instances 1.16.100",
   "description": "Maps face or material_instance names in a geometry file to an actual material instance. Material instance can either be a full material instance or a name to another already defined instance",
   "definitions": {
     "material_instance": {
-      "title": "Material instance",
+      "title": "Material Instance",
       "description": "A single material instance",
       "additionalProperties": false,
       "properties": {
-        "ambient_occlusion": {
-          "title": "Ambient occlusion",
-          "type": "boolean",
-          "description": "UNDOCUMENTATED"
-        },
-        "face_dimming": {
-          "title": "Face dimming",
-          "type": "boolean",
-          "description": "UNDOCUMENTATED"
-        },
-        "render_method": {
-          "type": "string",
-          "title": "Render method",
-          "description": "TODO description",
-          "enum": ["blend", "opaque", "alpha_test"]
-        },
-        "texture": {
-          "type": "string",
-          "title": "Texture",
-          "description": "TODO description"
-        }
+        "ambient_occlusion": { "title": "Ambient Occlusion", "type": "boolean", "description": "UNDOCUMENTATED" },
+        "face_dimming": { "title": "Face Dimming", "type": "boolean", "description": "UNDOCUMENTATED" },
+        "render_method": { "type": "string", "title": "Render Method", "description": "TODO description", "enum": ["blend", "opaque", "alpha_test"] },
+        "texture": { "type": "string", "title": "Texture", "description": "TODO description" }
       }
     }
   },
-  "properties": {
-    "*": {
-      "$ref": "#/definitions/material_instance"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/material_instance"
-  }
+  "properties": { "*": { "$ref": "#/definitions/material_instance" } },
+  "additionalProperties": { "$ref": "#/definitions/material_instance" }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_fall_on.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_fall_on.json
index 92926360..d1632f2c 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_fall_on.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_fall_on.json
@@ -2,32 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_fall_on",
   "type": "object",
-  "title": "On fall on",
+  "title": "On Fall On",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
     "min_fall_distance": {
       "type": "number",
       "default": 0,
       "description": "The minimum distance in blocks that an actor needs to fall to trigger this event.",
-      "title": "Min fall distance"
+      "title": "Min Fall Distance"
     },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_interact.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_interact.json
index 191ceaeb..a49a8fcf 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_interact.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_interact.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_interact",
   "type": "object",
-  "title": "On fall on",
+  "title": "On Fall On",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_placed.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_placed.json
index d42609e6..cfd3d1a5 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_placed.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_placed.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_placed",
   "type": "object",
-  "title": "On placed 1.16.100",
+  "title": "On Placed 1.16.100",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_player_destroyed.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_player_destroyed.json
index 61477b65..27a794c2 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_player_destroyed.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_player_destroyed.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_player_destroyed",
   "type": "object",
-  "title": "On player destroyed 1.16.100",
+  "title": "On Player Destroyed 1.16.100",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_player_placing.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_player_placing.json
index cec05068..f113a126 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_player_placing.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_player_placing.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_player_placing",
   "type": "object",
-  "title": "On player placing 1.16.100",
+  "title": "On Player Placing 1.16.100",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_step_off.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_step_off.json
index 81ccf3cc..f9b85fa7 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_step_off.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_step_off.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_step_off",
   "type": "object",
-  "title": "On step off 1.16.100",
+  "title": "On Step Off 1.16.100",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.on_step_on.json b/source/behaviour/blocks/1.16.100/components/minecraft.on_step_on.json
index bd1e448c..b3dfea88 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.on_step_on.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.on_step_on.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.on_step_on",
   "type": "object",
-  "title": "On step on 1.16.100",
+  "title": "On Step On 1.16.100",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.onlypistonpush.json b/source/behaviour/blocks/1.16.100/components/minecraft.onlypistonpush.json
index 72f6d0da..3af77514 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.onlypistonpush.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.onlypistonpush.json
@@ -2,6 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.onlypistonpush",
   "type": "boolean",
-  "title": "Only piston push 1.16.100",
+  "title": "Only Piston Push 1.16.100",
   "description": "Blocks with those components won't stick to stickyPistons"
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.pick_collision.json b/source/behaviour/blocks/1.16.100/components/minecraft.pick_collision.json
index dddc8007..3d1e0b25 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.pick_collision.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.pick_collision.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.pick_collision",
-  "title": "Pick collision 1.16.100",
+  "title": "Pick Collision 1.16.100",
   "description": "Can only be set to false, it disables the collision of the block with entities",
   "oneOf": [
     { "type": "boolean", "const": false },
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.placement_filter.json b/source/behaviour/blocks/1.16.100/components/minecraft.placement_filter.json
index 5163e194..1522c3be 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.placement_filter.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.placement_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.placement_filter",
-  "title": "Placement filter 1.16.100",
+  "title": "Placement Filter 1.16.100",
   "description": "Sets rules for under what conditions the block can be placed/survive",
   "type": "object",
   "properties": {
@@ -15,20 +15,16 @@
         "description": "TODO",
         "properties": {
           "allowed_faces": {
-            "title": "Allowed faces",
+            "title": "Allowed Faces",
             "description": "List of any of the following strings: up, down, north, south, east, west, side, all",
             "type": "array",
             "items": { "type": "string", "enum": ["up", "down", "north", "south", "east", "west", "side", "all"] }
           },
           "block_filter": {
-            "title": "Block filter",
+            "title": "Block Filter",
             "description": "List of blocks (can use tags to specify them) that this block can be placed against in the allowed_faces direction",
             "type": "array",
-            "items": {
-              "type": "string",
-              "title": "Block identifier",
-              "description": "TODO"
-            }
+            "items": { "type": "string", "title": "Block Identifier", "description": "TODO" }
           }
         }
       }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.preventsjumping.json b/source/behaviour/blocks/1.16.100/components/minecraft.preventsjumping.json
index f337ea8f..bfe7b9a3 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.preventsjumping.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.preventsjumping.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.preventsjumping",
-  "title": "Prevents jumping 1.16.100",
+  "title": "Prevents Jumping 1.16.100",
   "description": "This component makes it so actors can't jump when walking on this block",
   "type": "boolean"
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.random_ticking.json b/source/behaviour/blocks/1.16.100/components/minecraft.random_ticking.json
index 6f7ea250..63bf67a7 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.random_ticking.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.random_ticking.json
@@ -1,34 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.random_ticking",
-  "title": "Random ticking 1.16.100",
+  "title": "Random Ticking 1.16.100",
   "description": "Describes the component that will trigger an even at a regular interval between two values",
   "type": "object",
   "additionalProperties": false,
   "properties": {
     "on_tick": {
-      "title": "On tick",
+      "title": "On Tick",
       "description": "Describes the component that will trigger an even at a regular interval between two values",
       "type": "string",
       "additionalProperties": false,
       "properties": {
-        "condition": {
-          "title": "Condition",
-          "type": "string",
-          "default": "1",
-          "description": "The condition of event to be executed on the block. Molang"
-        },
-        "event": {
-          "title": "Event",
-          "type": "string",
-          "default": "set_block_property",
-          "description": "The type of event executed on the block."
-        },
-        "range": {
-          "title": "Range",
-          "type": "array",
-          "items": [{ "type": "integer" }, { "type": "integer" }]
-        },
+        "condition": { "title": "Condition", "type": "string", "default": "1", "description": "The condition of event to be executed on the block. Molang" },
+        "event": { "title": "Event", "type": "string", "default": "set_block_property", "description": "The type of event executed on the block." },
+        "range": { "title": "Range", "type": "array", "items": [{ "type": "integer" }, { "type": "integer" }] },
         "target": {
           "title": "Target",
           "description": "The target of event executed on the block.",
@@ -37,17 +23,7 @@
         }
       }
     },
-    "looping": {
-      "type": "boolean",
-      "default": true,
-      "description": "Does the event loop",
-      "title": "Looping"
-    },
-    "range": {
-      "type": "array",
-      "default": [10, 10],
-      "description": "The Range between which the component will trigger his event.",
-      "title": "Range"
-    }
+    "looping": { "type": "boolean", "default": true, "description": "Does the event loop", "title": "Looping" },
+    "range": { "type": "array", "default": [10, 10], "description": "The Range between which the component will trigger his event.", "title": "Range" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.ticking.json b/source/behaviour/blocks/1.16.100/components/minecraft.ticking.json
index 1b0e7f83..c9668b93 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.ticking.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.ticking.json
@@ -6,11 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "looping": {
-      "type": "boolean",
-      "title": "Looping",
-      "description": "Does the event loop"
-    },
+    "looping": { "type": "boolean", "title": "Looping", "description": "Does the event loop" },
     "range": {
       "title": "Range",
       "description": "The Range between which the component will trigger his event.",
@@ -21,16 +17,8 @@
       "type": "object",
       "title": "On Tick",
       "description": "Describes the component that will trigger an even at a regular interval between two values",
-      "condition": {
-        "title": "Condition",
-        "type": "string",
-        "description": "The condition of event to be executed on the block. Molang"
-      },
-      "event": {
-        "title": "Event",
-        "type": "string",
-        "description": "The type of event executed on the block."
-      },
+      "condition": { "title": "Condition", "type": "string", "description": "The condition of event to be executed on the block. Molang" },
+      "event": { "title": "Event", "type": "string", "description": "The type of event executed on the block." },
       "target": {
         "title": "Target",
         "description": "The target of event executed on the block.",
diff --git a/source/behaviour/blocks/1.16.100/components/minecraft.unit_cube.json b/source/behaviour/blocks/1.16.100/components/minecraft.unit_cube.json
index f87abe21..9b20fbb0 100644
--- a/source/behaviour/blocks/1.16.100/components/minecraft.unit_cube.json
+++ b/source/behaviour/blocks/1.16.100/components/minecraft.unit_cube.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.100.minecraft.unit_cube",
-  "title": "Unit cube 1.16.100",
+  "title": "Unit Cube 1.16.100",
   "description": "Specifies that a unit cube is to be used with tessellation.",
   "type": "string"
 }
diff --git a/source/behaviour/blocks/1.16.100/events.json b/source/behaviour/blocks/1.16.100/events.json
index f40ef216..ab2102c5 100644
--- a/source/behaviour/blocks/1.16.100/events.json
+++ b/source/behaviour/blocks/1.16.100/events.json
@@ -15,9 +15,7 @@
     "minecraft:ticking": { "$ref": "#/definitions/event_base" },
     "minecraft:random_ticking": { "$ref": "#/definitions/event_base" }
   },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
-  },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "definitions": {
     "event_base": {
       "title": "Event",
@@ -30,12 +28,7 @@
           "title": "Sequence",
           "description": "UNDOCUMENTATED",
           "type": "array",
-          "items": {
-            "title": "Sequence",
-            "description": "UNDOCUMENTATED",
-            "type": "object",
-            "$ref": "#/definitions/event_functions"
-          }
+          "items": { "title": "Sequence", "description": "UNDOCUMENTATED", "type": "object", "$ref": "#/definitions/event_functions" }
         },
         "randomize": {
           "title": "Randomize",
@@ -47,14 +40,7 @@
             "type": "object",
             "$ref": "#/definitions/event_functions",
             "required": ["weight"],
-            "properties": {
-              "weight": {
-                "title": "Weight",
-                "description": "UNDOCUMENTATED",
-                "type": "integer",
-                "minimum": 0
-              }
-            }
+            "properties": { "weight": { "title": "Weight", "description": "UNDOCUMENTATED", "type": "integer", "minimum": 0 } }
           }
         },
         "add_mob_effect": { "$ref": "./events/add_mob_effect.json" },
diff --git a/source/behaviour/blocks/1.16.100/events/add_mob_effect.json b/source/behaviour/blocks/1.16.100/events/add_mob_effect.json
index 15e7714a..fe252425 100644
--- a/source/behaviour/blocks/1.16.100/events/add_mob_effect.json
+++ b/source/behaviour/blocks/1.16.100/events/add_mob_effect.json
@@ -3,32 +3,12 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.add_mob_effect",
   "type": "object",
   "description": "Apply mob effect to target.",
-  "title": "Add mob effect",
+  "title": "Add Mob Effect",
   "additionalProperties": false,
   "properties": {
-    "amplifier": {
-      "type": "integer",
-      "default": 0,
-      "description": "The amplifier for the mob effect.",
-      "title": "Amplifier"
-    },
-    "duration": {
-      "type": "number",
-      "default": 0,
-      "description": "The duration of the mob effect.",
-      "title": "Duration"
-    },
-    "effect": {
-      "type": "string",
-      "default": "",
-      "description": "The mob effect to apply.",
-      "title": "Effect"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "amplifier": { "type": "integer", "default": 0, "description": "The amplifier for the mob effect.", "title": "Amplifier" },
+    "duration": { "type": "number", "default": 0, "description": "The duration of the mob effect.", "title": "Duration" },
+    "effect": { "type": "string", "default": "", "description": "The mob effect to apply.", "title": "Effect" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/damage.json b/source/behaviour/blocks/1.16.100/events/damage.json
index 6372570a..b724e4aa 100644
--- a/source/behaviour/blocks/1.16.100/events/damage.json
+++ b/source/behaviour/blocks/1.16.100/events/damage.json
@@ -6,23 +6,8 @@
   "title": "Damage",
   "additionalProperties": false,
   "properties": {
-    "amount": {
-      "type": "integer",
-      "default": 0,
-      "description": "The amount of damage to deal.",
-      "title": "Amount"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    },
-    "type": {
-      "type": "string",
-      "default": "",
-      "description": "The type of damage to deal.",
-      "title": "Type"
-    }
+    "amount": { "type": "integer", "default": 0, "description": "The amount of damage to deal.", "title": "Amount" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" },
+    "type": { "type": "string", "default": "", "description": "The type of damage to deal.", "title": "Type" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/decrement_stack.json b/source/behaviour/blocks/1.16.100/events/decrement_stack.json
index 9db960fb..45208dbb 100644
--- a/source/behaviour/blocks/1.16.100/events/decrement_stack.json
+++ b/source/behaviour/blocks/1.16.100/events/decrement_stack.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.decrement_stack",
   "type": "object",
   "description": "Decrement item stack.",
-  "title": "Decrement stack",
+  "title": "Decrement Stack",
   "additionalProperties": false,
   "properties": {}
 }
diff --git a/source/behaviour/blocks/1.16.100/events/die.json b/source/behaviour/blocks/1.16.100/events/die.json
index 4940cd4e..82f69c49 100644
--- a/source/behaviour/blocks/1.16.100/events/die.json
+++ b/source/behaviour/blocks/1.16.100/events/die.json
@@ -5,12 +5,5 @@
   "description": "Kill target. If target is self and this is run from a block then destroy the block.",
   "title": "Die",
   "additionalProperties": false,
-  "properties": {
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
-  }
+  "properties": { "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" } }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/play_effect.json b/source/behaviour/blocks/1.16.100/events/play_effect.json
index 725a7d4c..1be94599 100644
--- a/source/behaviour/blocks/1.16.100/events/play_effect.json
+++ b/source/behaviour/blocks/1.16.100/events/play_effect.json
@@ -3,26 +3,11 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.play_effect",
   "type": "object",
   "description": "Spawns a particle effect relative to target position.",
-  "title": "Play effect",
+  "title": "Play Effect",
   "additionalProperties": false,
   "properties": {
-    "data": {
-      "type": "integer",
-      "default": 0,
-      "description": "Particle data value.",
-      "title": "Data"
-    },
-    "effect": {
-      "type": "string",
-      "default": "",
-      "description": "The name of the particle effect to create.",
-      "title": "Effect"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "data": { "type": "integer", "default": 0, "description": "Particle data value.", "title": "Data" },
+    "effect": { "type": "string", "default": "", "description": "The name of the particle effect to create.", "title": "Effect" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/play_sound.json b/source/behaviour/blocks/1.16.100/events/play_sound.json
index 41ed1562..547aad04 100644
--- a/source/behaviour/blocks/1.16.100/events/play_sound.json
+++ b/source/behaviour/blocks/1.16.100/events/play_sound.json
@@ -6,17 +6,7 @@
   "title": "Playsound",
   "additionalProperties": false,
   "properties": {
-    "sound": {
-      "type": "string",
-      "default": "",
-      "description": "The name of the sound to play.",
-      "title": "Sound"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "sound": { "type": "string", "default": "", "description": "The name of the sound to play.", "title": "Sound" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/remove_mob_effect.json b/source/behaviour/blocks/1.16.100/events/remove_mob_effect.json
index 7020b6ae..0ef5c3a8 100644
--- a/source/behaviour/blocks/1.16.100/events/remove_mob_effect.json
+++ b/source/behaviour/blocks/1.16.100/events/remove_mob_effect.json
@@ -3,20 +3,10 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.remove_mob_effect",
   "type": "object",
   "description": "Removes mob effect from target.",
-  "title": "Remove mob effect",
+  "title": "Remove Mob Effect",
   "additionalProperties": false,
   "properties": {
-    "effect": {
-      "type": "string",
-      "default": "",
-      "description": "The mob effect to remove. Use 'all' to remove all mob effects from target.",
-      "title": "Effect"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "effect": { "type": "string", "default": "", "description": "The mob effect to remove. Use 'all' to remove all mob effects from target.", "title": "Effect" },
+    "target": { "type": "string", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/run_command.json b/source/behaviour/blocks/1.16.100/events/run_command.json
index 61331cb8..8dbff9ed 100644
--- a/source/behaviour/blocks/1.16.100/events/run_command.json
+++ b/source/behaviour/blocks/1.16.100/events/run_command.json
@@ -3,30 +3,15 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.run_command",
   "type": "object",
   "description": "Triggers a slash command or a list of slash commands.",
-  "title": "Run command",
+  "title": "Run Command",
   "additionalProperties": false,
   "properties": {
     "command": {
       "default": "",
       "description": "Slash command to run.",
       "title": "Command",
-      "oneof": [
-        { "type": "string" },
-        {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "title": "Command",
-            "description": "Slash command to run."
-          }
-        }
-      ]
+      "oneof": [{ "type": "string" }, { "type": "array", "items": { "type": "string", "title": "Command", "description": "Slash command to run." } }]
     },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "target": { "type": "string", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/set_block.json b/source/behaviour/blocks/1.16.100/events/set_block.json
index d6388280..e2e684e5 100644
--- a/source/behaviour/blocks/1.16.100/events/set_block.json
+++ b/source/behaviour/blocks/1.16.100/events/set_block.json
@@ -3,14 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.set_block",
   "type": "object",
   "description": "Sets this block to another block type.",
-  "title": "Set block",
+  "title": "Set Block",
   "additionalProperties": false,
-  "properties": {
-    "block_type": {
-      "type": "string",
-      "default": "",
-      "description": "The type of block to set.",
-      "title": "Block type"
-    }
-  }
+  "properties": { "block_type": { "type": "string", "default": "", "description": "The type of block to set.", "title": "Block Type" } }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/set_block_at_pos.json b/source/behaviour/blocks/1.16.100/events/set_block_at_pos.json
index 7e6f01d4..84c93714 100644
--- a/source/behaviour/blocks/1.16.100/events/set_block_at_pos.json
+++ b/source/behaviour/blocks/1.16.100/events/set_block_at_pos.json
@@ -3,25 +3,20 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.set_block_at_pos",
   "type": "object",
   "description": "Sets a block relative to this block to another block type.",
-  "title": "Set block at pos",
+  "title": "Set Block At Pos",
   "additionalProperties": false,
   "properties": {
     "block_offset": {
       "type": "array",
       "default": [0.0, 0.0, 0.0],
       "description": "The offset from the block's center.",
-      "title": "Block offset",
+      "title": "Block Offset",
       "items": [
         { "type": "number", "title": "X", "description": "The x offset from the block's center." },
         { "type": "number", "title": "Y", "description": "The y offset from the block's center." },
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "block_type": {
-      "type": "string",
-      "default": "",
-      "description": "The type of block to set.",
-      "title": "Block type"
-    }
+    "block_type": { "type": "string", "default": "", "description": "The type of block to set.", "title": "Block Type" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/set_block_property.json b/source/behaviour/blocks/1.16.100/events/set_block_property.json
index 133c7543..5874e807 100644
--- a/source/behaviour/blocks/1.16.100/events/set_block_property.json
+++ b/source/behaviour/blocks/1.16.100/events/set_block_property.json
@@ -3,13 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.set_block_property",
   "type": "object",
   "description": "Sets a block property on this block",
-  "title": "Set block property",
+  "title": "Set Block Property",
   "additionalProperties": false,
-  "properties": {
-    "property": {
-      "type": "string",
-      "description": "Block property to set on the block.",
-      "title": "Property"
-    }
-  }
+  "properties": { "property": { "type": "string", "description": "Block property to set on the block.", "title": "Property" } }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/spawn_loot.json b/source/behaviour/blocks/1.16.100/events/spawn_loot.json
index 1b634190..d5452be9 100644
--- a/source/behaviour/blocks/1.16.100/events/spawn_loot.json
+++ b/source/behaviour/blocks/1.16.100/events/spawn_loot.json
@@ -3,14 +3,8 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.spawn_loot",
   "type": "object",
   "description": "Spawn loot from block.",
-  "title": "Spawn loot",
+  "title": "Spawn Loot",
   "required": ["table"],
   "additionalProperties": false,
-  "properties": {
-    "table": {
-      "type": "string",
-      "description": "File path, relative to the Behavior Pack's path, to the loot table file.",
-      "title": "Table"
-    }
-  }
+  "properties": { "table": { "type": "string", "description": "File path, relative to the Behavior Pack's path, to the loot table file.", "title": "Table" } }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/teleport.json b/source/behaviour/blocks/1.16.100/events/teleport.json
index e0388fff..1bbd0dad 100644
--- a/source/behaviour/blocks/1.16.100/events/teleport.json
+++ b/source/behaviour/blocks/1.16.100/events/teleport.json
@@ -6,12 +6,7 @@
   "title": "Teleport",
   "additionalProperties": false,
   "properties": {
-    "avoid_water": {
-      "type": "boolean",
-      "default": true,
-      "description": "Determines if the teleport avoids putting the target in water.",
-      "title": "Avoid water"
-    },
+    "avoid_water": { "type": "boolean", "default": true, "description": "Determines if the teleport avoids putting the target in water.", "title": "Avoid Water" },
     "destination": {
       "default": [0.0, 0.0, 0.0],
       "description": "Origin destination of the teleport.",
@@ -22,27 +17,17 @@
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "land_on_block": {
-      "type": "boolean",
-      "default": true,
-      "description": "Determines if the teleport places the target on a block.",
-      "title": "Land on block"
-    },
+    "land_on_block": { "type": "boolean", "default": true, "description": "Determines if the teleport places the target on a block.", "title": "Land On Block" },
     "max_range": {
       "default": [8.0, 8.0, 8.0],
       "description": "Max range the target can teleport relative to the origin destination.",
-      "title": "Max range",
+      "title": "Max Range",
       "items": [
         { "type": "number", "title": "X", "description": "The x offset from the block's center." },
         { "type": "number", "title": "Y", "description": "The y offset from the block's center." },
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "target": { "type": "string", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.100/events/transform_item.json b/source/behaviour/blocks/1.16.100/events/transform_item.json
index a465a489..7fd33081 100644
--- a/source/behaviour/blocks/1.16.100/events/transform_item.json
+++ b/source/behaviour/blocks/1.16.100/events/transform_item.json
@@ -3,13 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.100.block.events.transform_item",
   "type": "object",
   "description": "Transforms item into another item.",
-  "title": "Transform item 1.16.100",
+  "title": "Transform Item 1.16.100",
   "additionalProperties": false,
-  "properties": {
-    "transform": {
-      "type": "string",
-      "description": "Name of the item it should transform into",
-      "title": "Transform"
-    }
-  }
+  "properties": { "transform": { "type": "string", "description": "Name of the item it should transform into", "title": "Transform" } }
 }
diff --git a/source/behaviour/blocks/1.16.200/blocks.json b/source/behaviour/blocks/1.16.200/blocks.json
index 79d80689..f45b7a14 100644
--- a/source/behaviour/blocks/1.16.200/blocks.json
+++ b/source/behaviour/blocks/1.16.200/blocks.json
@@ -8,20 +8,20 @@
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.16.200 format version",
+      "title": "1.16.200 Format Version",
       "type": "string",
       "const": "1.16.200",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:block": {
-      "title": "Block definitions",
+      "title": "Block Definitions",
       "description": "A custom block definition",
       "type": "object",
       "additionalProperties": false,
       "required": ["description", "components"],
       "properties": {
         "description": {
-          "title": "Block description",
+          "title": "Block Description",
           "description": "The description for this block",
           "type": "object",
           "additionalProperties": false,
@@ -37,20 +37,18 @@
               "type": "boolean",
               "default": false,
               "description": "If this block is experimental, it will only be registered if the world is marked as experimantal.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             },
             "register_to_creative_menu": {
               "type": "boolean",
               "default": false,
               "description": "Whether or not to register this block to the creative inventory menu.",
-              "title": "Register to creative menu"
+              "title": "Register To Creative Menu"
             },
             "properties": {
               "title": "Properties",
               "description": "UNDOCUMENATED",
-              "propertyNames": {
-                "pattern": "^([a-zA-Z0-9_]+:[a-zA-Z0-9_\\-]+)$"
-              },
+              "propertyNames": { "pattern": "^([a-zA-Z0-9_]+:[a-zA-Z0-9_\\-]+)$" },
               "additionalProperties": {
                 "title": "Property",
                 "description": "A block property",
@@ -58,7 +56,7 @@
                   {
                     "type": "array",
                     "items": {
-                      "title": "Property value",
+                      "title": "Property Value",
                       "description": "The value of this property",
                       "anyOf": [{ "type": "boolean" }, { "type": "number" }, { "type": "integer" }, { "type": "string" }]
                     }
@@ -81,7 +79,6 @@
             "minecraft:on_player_placing": { "$ref": "./components/minecraft.on_player_placing.json" },
             "minecraft:on_step_off": { "$ref": "./components/minecraft.on_step_off.json" },
             "minecraft:on_step_on": { "$ref": "./components/minecraft.on_step_on.json" },
-
             "minecraft:block_light_absorption": { "$ref": "./components/minecraft.block_light_absorption.json" },
             "minecraft:block_light_emission": { "$ref": "./components/minecraft.block_light_emission.json" },
             "minecraft:breakonpush": { "$ref": "./components/minecraft.breakonpush.json" },
@@ -107,9 +104,7 @@
             "minecraft:unwalkable": { "$ref": "./components/minecraft.unwalkable.json" }
           }
         },
-        "events": {
-          "$ref": "./events.json"
-        }
+        "events": { "$ref": "./events.json" }
       }
     }
   }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.block_light_absorption.json b/source/behaviour/blocks/1.16.200/components/minecraft.block_light_absorption.json
index d7620c70..dc517214 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.block_light_absorption.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.block_light_absorption.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.block_light_absorption",
   "additionalProperties": false,
   "type": "integer",
-  "title": "Block light absorption 1.16.200",
+  "title": "Block Light Absorption 1.16.200",
   "description": "The amount of light this block will absorb.",
   "default": 0
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.block_light_emission.json b/source/behaviour/blocks/1.16.200/components/minecraft.block_light_emission.json
index 0f1d8101..45e9b8ca 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.block_light_emission.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.block_light_emission.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.block_light_emission",
   "additionalProperties": false,
   "type": "number",
-  "title": "Block light emission 1.16.200",
+  "title": "Block Light Emission 1.16.200",
   "description": "The amount of light this block will emit in a range [0.0, 1.0].",
   "minimum": 0,
   "maximum": 1,
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.breakonpush.json b/source/behaviour/blocks/1.16.200/components/minecraft.breakonpush.json
index 93bcd534..92deda50 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.breakonpush.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.breakonpush.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.breakonpush",
   "additionalProperties": false,
   "type": "boolean",
-  "title": "Break on push 1.16.200",
+  "title": "Break On Push 1.16.200",
   "description": "When pushed by a piston the block breaks."
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.destroy_time.json b/source/behaviour/blocks/1.16.200/components/minecraft.destroy_time.json
index 9addfcaa..4469a493 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.destroy_time.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.destroy_time.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.destroy_time",
   "additionalProperties": false,
   "type": "number",
-  "title": "Destroy time 1.16.200",
+  "title": "Destroy Time 1.16.200",
   "description": "Sets the destroy time property for the block. Greater numbers result in greater mining times."
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.display_name.json b/source/behaviour/blocks/1.16.200/components/minecraft.display_name.json
index e0a37f18..2e1cffc6 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.display_name.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.display_name.json
@@ -3,6 +3,6 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.display_name",
   "additionalProperties": false,
   "type": "string",
-  "title": "Display name 1.16.200",
+  "title": "Display Name 1.16.200",
   "description": "Specifies the display name id for the block."
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.entity_collision.json b/source/behaviour/blocks/1.16.200/components/minecraft.entity_collision.json
index 8713cf7b..5b6fdfed 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.entity_collision.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.entity_collision.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.entity_collision",
   "additionalProperties": false,
-  "title": "Entity collision 1.16.200",
+  "title": "Entity Collision 1.16.200",
   "description": "Can only be set to false, it disables the collision of the block with entities.",
   "oneOf": [
     { "type": "boolean", "const": false },
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.explosion_resistance.json b/source/behaviour/blocks/1.16.200/components/minecraft.explosion_resistance.json
index 0123917a..55e56548 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.explosion_resistance.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.explosion_resistance.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.explosion_resistance",
   "additionalProperties": false,
   "type": "number",
-  "title": "Explosion resistance 1.16.200",
+  "title": "Explosion Resistance 1.16.200",
   "description": "Sets the explosion resistance for this block.",
   "default": 0.0
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.flammable.json b/source/behaviour/blocks/1.16.200/components/minecraft.flammable.json
index d93dcd88..58e67e1a 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.flammable.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.flammable.json
@@ -7,17 +7,7 @@
   "description": "Describes the flammable properties for this block.",
   "additionalItems": false,
   "properties": {
-    "burn_odds": {
-      "type": "integer",
-      "default": 0,
-      "description": "How likely the block will be destroyed by flames when on fire.",
-      "title": "Burn odds"
-    },
-    "flame_odds": {
-      "type": "integer",
-      "default": 0,
-      "description": "How likely the block will catch flame when next to a fire.",
-      "title": "Flame odds"
-    }
+    "burn_odds": { "type": "integer", "default": 0, "description": "How likely the block will be destroyed by flames when on fire.", "title": "Burn Odds" },
+    "flame_odds": { "type": "integer", "default": 0, "description": "How likely the block will catch flame when next to a fire.", "title": "Flame Odds" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.map_color.json b/source/behaviour/blocks/1.16.200/components/minecraft.map_color.json
index 77eb5696..f4fee1b5 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.map_color.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.map_color.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.map_color",
   "additionalProperties": false,
   "type": "string",
-  "title": "Map color 1.16.200",
+  "title": "Map Color 1.16.200",
   "description": "A color represented as a hex value. This will be the color rendered to a map.",
   "format": "color-hex"
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.material_instances.json b/source/behaviour/blocks/1.16.200/components/minecraft.material_instances.json
index b24c320f..ad28041d 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.material_instances.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.material_instances.json
@@ -2,44 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.material_instances",
   "type": "object",
-  "title": "Material instances 1.16.200",
+  "title": "Material Instances 1.16.200",
   "description": "Maps face or material_instance names in a geometry file to an actual material instance. Material instance can either be a full material instance or a name to another already defined instance",
   "definitions": {
     "material_instance": {
-      "title": "Material instance",
+      "title": "Material Instance",
       "description": "A single material instance",
       "additionalProperties": false,
       "properties": {
-        "ambient_occlusion": {
-          "title": "Ambient occlusion",
-          "type": "boolean",
-          "description": "UNDOCUMENTATED"
-        },
-        "face_dimming": {
-          "title": "Face dimming",
-          "type": "boolean",
-          "description": "UNDOCUMENTATED"
-        },
-        "render_method": {
-          "type": "string",
-          "title": "Render method",
-          "description": "TODO description",
-          "enum": ["blend", "opaque", "alpha_test"]
-        },
-        "texture": {
-          "type": "string",
-          "title": "Texture",
-          "description": "TODO description"
-        }
+        "ambient_occlusion": { "title": "Ambient Occlusion", "type": "boolean", "description": "UNDOCUMENTATED" },
+        "face_dimming": { "title": "Face Dimming", "type": "boolean", "description": "UNDOCUMENTATED" },
+        "render_method": { "type": "string", "title": "Render Method", "description": "TODO description", "enum": ["blend", "opaque", "alpha_test"] },
+        "texture": { "type": "string", "title": "Texture", "description": "TODO description" }
       }
     }
   },
-  "properties": {
-    "*": {
-      "$ref": "#/definitions/material_instance"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/material_instance"
-  }
+  "properties": { "*": { "$ref": "#/definitions/material_instance" } },
+  "additionalProperties": { "$ref": "#/definitions/material_instance" }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_fall_on.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_fall_on.json
index 8f9008d7..b7222b91 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_fall_on.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_fall_on.json
@@ -2,32 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_fall_on",
   "type": "object",
-  "title": "On fall on",
+  "title": "On Fall On",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
     "min_fall_distance": {
       "type": "number",
       "default": 0,
       "description": "The minimum distance in blocks that an actor needs to fall to trigger this event.",
-      "title": "Min fall distance"
+      "title": "Min Fall Distance"
     },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_interact.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_interact.json
index 686bd00c..0402d665 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_interact.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_interact.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_interact",
   "type": "object",
-  "title": "On fall on",
+  "title": "On Fall On",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_placed.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_placed.json
index e947840e..f230e031 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_placed.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_placed.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_placed",
   "type": "object",
-  "title": "On placed 1.16.200",
+  "title": "On Placed 1.16.200",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_player_destroyed.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_player_destroyed.json
index 46556f37..0327f095 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_player_destroyed.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_player_destroyed.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_player_destroyed",
   "type": "object",
-  "title": "On player destroyed 1.16.200",
+  "title": "On Player Destroyed 1.16.200",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_player_placing.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_player_placing.json
index f9b7e9db..0c0181df 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_player_placing.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_player_placing.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_player_placing",
   "type": "object",
-  "title": "On player placing 1.16.200",
+  "title": "On Player Placing 1.16.200",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_step_off.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_step_off.json
index d926239e..d4dfd6b9 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_step_off.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_step_off.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_step_off",
   "type": "object",
-  "title": "On step off 1.16.200",
+  "title": "On Step Off 1.16.200",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.on_step_on.json b/source/behaviour/blocks/1.16.200/components/minecraft.on_step_on.json
index 0c13879b..4a72c07b 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.on_step_on.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.on_step_on.json
@@ -2,26 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.on_step_on",
   "type": "object",
-  "title": "On step on 1.16.200",
+  "title": "On Step On 1.16.200",
   "description": "Describes event for this block.",
   "properties": {
-    "condition": {
-      "type": "string",
-      "default": "",
-      "description": "The condition of event to be executed on the block.",
-      "title": "Condition"
-    },
-    "event": {
-      "type": "string",
-      "default": "",
-      "description": "The event executed on the block.",
-      "title": "Event"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target of event executed on the block.",
-      "title": "Target"
-    }
+    "condition": { "type": "string", "default": "", "description": "The condition of event to be executed on the block.", "title": "Condition" },
+    "event": { "type": "string", "default": "", "description": "The event executed on the block.", "title": "Event" },
+    "target": { "type": "string", "default": "self", "description": "The target of event executed on the block.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.onlypistonpush.json b/source/behaviour/blocks/1.16.200/components/minecraft.onlypistonpush.json
index ef41edab..297131ba 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.onlypistonpush.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.onlypistonpush.json
@@ -2,6 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.onlypistonpush",
   "type": "boolean",
-  "title": "Only piston push 1.16.200",
+  "title": "Only Piston Push 1.16.200",
   "description": "Blocks with those components won't stick to stickyPistons"
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.pick_collision.json b/source/behaviour/blocks/1.16.200/components/minecraft.pick_collision.json
index 14a569ce..7430cd23 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.pick_collision.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.pick_collision.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.pick_collision",
-  "title": "Pick collision 1.16.200",
+  "title": "Pick Collision 1.16.200",
   "description": "Can only be set to false, it disables the collision of the block with entities",
   "oneOf": [
     { "type": "boolean", "const": false },
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.placement_filter.json b/source/behaviour/blocks/1.16.200/components/minecraft.placement_filter.json
index aac3436f..272fc495 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.placement_filter.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.placement_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.placement_filter",
-  "title": "Placement filter 1.16.200",
+  "title": "Placement Filter 1.16.200",
   "description": "Sets rules for under what conditions the block can be placed/survive",
   "type": "object",
   "properties": {
@@ -15,20 +15,16 @@
         "description": "TODO",
         "properties": {
           "allowed_faces": {
-            "title": "Allowed faces",
+            "title": "Allowed Faces",
             "description": "List of any of the following strings: up, down, north, south, east, west, side, all",
             "type": "array",
             "items": { "type": "string", "enum": ["up", "down", "north", "south", "east", "west", "side", "all"] }
           },
           "block_filter": {
-            "title": "Block filter",
+            "title": "Block Filter",
             "description": "List of blocks (can use tags to specify them) that this block can be placed against in the allowed_faces direction",
             "type": "array",
-            "items": {
-              "type": "string",
-              "title": "Block identifier",
-              "description": "TODO"
-            }
+            "items": { "type": "string", "title": "Block Identifier", "description": "TODO" }
           }
         }
       }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.preventsjumping.json b/source/behaviour/blocks/1.16.200/components/minecraft.preventsjumping.json
index 91fac69c..36d4872e 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.preventsjumping.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.preventsjumping.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.preventsjumping",
-  "title": "Prevents jumping 1.16.200",
+  "title": "Prevents Jumping 1.16.200",
   "description": "This component makes it so actors can't jump when walking on this block",
   "type": "boolean"
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.random_ticking.json b/source/behaviour/blocks/1.16.200/components/minecraft.random_ticking.json
index d9fca53b..ae24b21b 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.random_ticking.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.random_ticking.json
@@ -1,34 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.random_ticking",
-  "title": "Random ticking 1.16.200",
+  "title": "Random Ticking 1.16.200",
   "description": "Describes the component that will trigger an even at a regular interval between two values",
   "type": "object",
   "additionalProperties": false,
   "properties": {
     "on_tick": {
-      "title": "On tick",
+      "title": "On Tick",
       "description": "Describes the component that will trigger an even at a regular interval between two values",
       "type": "string",
       "additionalProperties": false,
       "properties": {
-        "condition": {
-          "title": "Condition",
-          "type": "string",
-          "default": "1",
-          "description": "The condition of event to be executed on the block. Molang"
-        },
-        "event": {
-          "title": "Event",
-          "type": "string",
-          "default": "set_block_property",
-          "description": "The type of event executed on the block."
-        },
-        "range": {
-          "title": "Range",
-          "type": "array",
-          "items": [{ "type": "integer" }, { "type": "integer" }]
-        },
+        "condition": { "title": "Condition", "type": "string", "default": "1", "description": "The condition of event to be executed on the block. Molang" },
+        "event": { "title": "Event", "type": "string", "default": "set_block_property", "description": "The type of event executed on the block." },
+        "range": { "title": "Range", "type": "array", "items": [{ "type": "integer" }, { "type": "integer" }] },
         "target": {
           "title": "Target",
           "description": "The target of event executed on the block.",
@@ -37,17 +23,7 @@
         }
       }
     },
-    "looping": {
-      "type": "boolean",
-      "default": true,
-      "description": "Does the event loop",
-      "title": "Looping"
-    },
-    "range": {
-      "type": "array",
-      "default": [10, 10],
-      "description": "The Range between which the component will trigger his event.",
-      "title": "Range"
-    }
+    "looping": { "type": "boolean", "default": true, "description": "Does the event loop", "title": "Looping" },
+    "range": { "type": "array", "default": [10, 10], "description": "The Range between which the component will trigger his event.", "title": "Range" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.ticking.json b/source/behaviour/blocks/1.16.200/components/minecraft.ticking.json
index 14af82fd..37b7abd0 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.ticking.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.ticking.json
@@ -6,11 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "looping": {
-      "type": "boolean",
-      "title": "Looping",
-      "description": "Does the event loop"
-    },
+    "looping": { "type": "boolean", "title": "Looping", "description": "Does the event loop" },
     "range": {
       "title": "Range",
       "description": "The Range between which the component will trigger his event.",
@@ -21,16 +17,8 @@
       "type": "object",
       "title": "On Tick",
       "description": "Describes the component that will trigger an even at a regular interval between two values",
-      "condition": {
-        "title": "Condition",
-        "type": "string",
-        "description": "The condition of event to be executed on the block. Molang"
-      },
-      "event": {
-        "title": "Event",
-        "type": "string",
-        "description": "The type of event executed on the block."
-      },
+      "condition": { "title": "Condition", "type": "string", "description": "The condition of event to be executed on the block. Molang" },
+      "event": { "title": "Event", "type": "string", "description": "The type of event executed on the block." },
       "target": {
         "title": "Target",
         "description": "The target of event executed on the block.",
diff --git a/source/behaviour/blocks/1.16.200/components/minecraft.unit_cube.json b/source/behaviour/blocks/1.16.200/components/minecraft.unit_cube.json
index 04424c32..09293337 100644
--- a/source/behaviour/blocks/1.16.200/components/minecraft.unit_cube.json
+++ b/source/behaviour/blocks/1.16.200/components/minecraft.unit_cube.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks.1.16.200.minecraft.unit_cube",
-  "title": "Unit cube 1.16.200",
+  "title": "Unit Cube 1.16.200",
   "description": "Specifies that a unit cube is to be used with tessellation.",
   "type": "string"
 }
diff --git a/source/behaviour/blocks/1.16.200/events.json b/source/behaviour/blocks/1.16.200/events.json
index 84bcbc6e..21a9295d 100644
--- a/source/behaviour/blocks/1.16.200/events.json
+++ b/source/behaviour/blocks/1.16.200/events.json
@@ -15,9 +15,7 @@
     "minecraft:ticking": { "$ref": "#/definitions/event_base" },
     "minecraft:random_ticking": { "$ref": "#/definitions/event_base" }
   },
-  "additionalProperties": {
-    "oneOf": [{ "$ref": "#/definitions/event_base" }, { "$ref": "#/definitions/event_functions" }]
-  },
+  "additionalProperties": { "oneOf": [{ "$ref": "#/definitions/event_base" }, { "$ref": "#/definitions/event_functions" }] },
   "definitions": {
     "event_base": {
       "title": "Event",
@@ -29,12 +27,7 @@
           "title": "Sequence",
           "description": "UNDOCUMENTATED",
           "type": "array",
-          "items": {
-            "title": "Sequence",
-            "description": "UNDOCUMENTATED",
-            "type": "object",
-            "$ref": "#/definitions/event_functions"
-          }
+          "items": { "title": "Sequence", "description": "UNDOCUMENTATED", "type": "object", "$ref": "#/definitions/event_functions" }
         },
         "randomize": {
           "title": "Randomize",
@@ -46,14 +39,7 @@
             "type": "object",
             "$ref": "#/definitions/event_functions",
             "required": ["weight"],
-            "properties": {
-              "weight": {
-                "title": "Weight",
-                "description": "UNDOCUMENTATED",
-                "type": "integer",
-                "minimum": 0
-              }
-            }
+            "properties": { "weight": { "title": "Weight", "description": "UNDOCUMENTATED", "type": "integer", "minimum": 0 } }
           }
         },
         "add_mob_effect": { "$ref": "./events/add_mob_effect.json" },
diff --git a/source/behaviour/blocks/1.16.200/events/add_mob_effect.json b/source/behaviour/blocks/1.16.200/events/add_mob_effect.json
index 7d4fe1a7..675a6969 100644
--- a/source/behaviour/blocks/1.16.200/events/add_mob_effect.json
+++ b/source/behaviour/blocks/1.16.200/events/add_mob_effect.json
@@ -3,32 +3,12 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.add_mob_effect",
   "type": "object",
   "description": "Apply mob effect to target.",
-  "title": "Add mob effect 1.16.200",
+  "title": "Add Mob Effect 1.16.200",
   "additionalProperties": false,
   "properties": {
-    "amplifier": {
-      "type": "integer",
-      "default": 0,
-      "description": "The amplifier for the mob effect.",
-      "title": "Amplifier"
-    },
-    "duration": {
-      "type": "number",
-      "default": 0,
-      "description": "The duration of the mob effect.",
-      "title": "Duration"
-    },
-    "effect": {
-      "type": "string",
-      "default": "",
-      "description": "The mob effect to apply.",
-      "title": "Effect"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "amplifier": { "type": "integer", "default": 0, "description": "The amplifier for the mob effect.", "title": "Amplifier" },
+    "duration": { "type": "number", "default": 0, "description": "The duration of the mob effect.", "title": "Duration" },
+    "effect": { "type": "string", "default": "", "description": "The mob effect to apply.", "title": "Effect" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/damage.json b/source/behaviour/blocks/1.16.200/events/damage.json
index 6e385595..d9ce81cf 100644
--- a/source/behaviour/blocks/1.16.200/events/damage.json
+++ b/source/behaviour/blocks/1.16.200/events/damage.json
@@ -6,23 +6,8 @@
   "title": "Damage 1.16.200",
   "additionalProperties": false,
   "properties": {
-    "amount": {
-      "type": "integer",
-      "default": 0,
-      "description": "The amount of damage to deal.",
-      "title": "Amount"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    },
-    "type": {
-      "type": "string",
-      "default": "",
-      "description": "The type of damage to deal.",
-      "title": "Type"
-    }
+    "amount": { "type": "integer", "default": 0, "description": "The amount of damage to deal.", "title": "Amount" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" },
+    "type": { "type": "string", "default": "", "description": "The type of damage to deal.", "title": "Type" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/decrement_stack.json b/source/behaviour/blocks/1.16.200/events/decrement_stack.json
index 1a158256..5cde1e31 100644
--- a/source/behaviour/blocks/1.16.200/events/decrement_stack.json
+++ b/source/behaviour/blocks/1.16.200/events/decrement_stack.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.decrement_stack",
   "type": "object",
   "description": "Decrement item stack.",
-  "title": "Decrement stack 1.16.200",
+  "title": "Decrement Stack 1.16.200",
   "additionalProperties": false,
   "properties": {}
 }
diff --git a/source/behaviour/blocks/1.16.200/events/die.json b/source/behaviour/blocks/1.16.200/events/die.json
index 89dbd2d7..7275112b 100644
--- a/source/behaviour/blocks/1.16.200/events/die.json
+++ b/source/behaviour/blocks/1.16.200/events/die.json
@@ -5,12 +5,5 @@
   "description": "Kill target. If target is self and this is run from a block then destroy the block.",
   "title": "Die 1.16.200",
   "additionalProperties": false,
-  "properties": {
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
-  }
+  "properties": { "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" } }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/play_effect.json b/source/behaviour/blocks/1.16.200/events/play_effect.json
index 4c59704b..c8539e38 100644
--- a/source/behaviour/blocks/1.16.200/events/play_effect.json
+++ b/source/behaviour/blocks/1.16.200/events/play_effect.json
@@ -3,26 +3,11 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.play_effect",
   "type": "object",
   "description": "Spawns a particle effect relative to target position.",
-  "title": "Play effect 1.16.200",
+  "title": "Play Effect 1.16.200",
   "additionalProperties": false,
   "properties": {
-    "data": {
-      "type": "integer",
-      "default": 0,
-      "description": "Particle data value.",
-      "title": "Data"
-    },
-    "effect": {
-      "type": "string",
-      "default": "",
-      "description": "The name of the particle effect to create.",
-      "title": "Effect"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "data": { "type": "integer", "default": 0, "description": "Particle data value.", "title": "Data" },
+    "effect": { "type": "string", "default": "", "description": "The name of the particle effect to create.", "title": "Effect" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/play_sound.json b/source/behaviour/blocks/1.16.200/events/play_sound.json
index 09d90b7b..b6fa80ce 100644
--- a/source/behaviour/blocks/1.16.200/events/play_sound.json
+++ b/source/behaviour/blocks/1.16.200/events/play_sound.json
@@ -6,17 +6,7 @@
   "title": "Playsound 1.16.200",
   "additionalProperties": false,
   "properties": {
-    "sound": {
-      "type": "string",
-      "default": "",
-      "description": "The name of the sound to play.",
-      "title": "Sound"
-    },
-    "target": {
-      "type": "object",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "sound": { "type": "string", "default": "", "description": "The name of the sound to play.", "title": "Sound" },
+    "target": { "type": "object", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/remove_mob_effect.json b/source/behaviour/blocks/1.16.200/events/remove_mob_effect.json
index da0cdb51..91b9af96 100644
--- a/source/behaviour/blocks/1.16.200/events/remove_mob_effect.json
+++ b/source/behaviour/blocks/1.16.200/events/remove_mob_effect.json
@@ -3,20 +3,10 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.remove_mob_effect",
   "type": "object",
   "description": "Removes mob effect from target.",
-  "title": "Remove mob effect 1.16.200",
+  "title": "Remove Mob Effect 1.16.200",
   "additionalProperties": false,
   "properties": {
-    "effect": {
-      "type": "string",
-      "default": "",
-      "description": "The mob effect to remove. Use 'all' to remove all mob effects from target.",
-      "title": "Effect"
-    },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "effect": { "type": "string", "default": "", "description": "The mob effect to remove. Use 'all' to remove all mob effects from target.", "title": "Effect" },
+    "target": { "type": "string", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/run_command.json b/source/behaviour/blocks/1.16.200/events/run_command.json
index ff7f2354..cf965b20 100644
--- a/source/behaviour/blocks/1.16.200/events/run_command.json
+++ b/source/behaviour/blocks/1.16.200/events/run_command.json
@@ -3,30 +3,15 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.run_command",
   "type": "object",
   "description": "Triggers a slash command or a list of slash commands.",
-  "title": "Run command 1.16.200",
+  "title": "Run Command 1.16.200",
   "additionalProperties": false,
   "properties": {
     "command": {
       "default": "",
       "description": "Slash command to run.",
       "title": "Command",
-      "oneof": [
-        { "type": "string" },
-        {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "title": "Command",
-            "description": "Slash command to run."
-          }
-        }
-      ]
+      "oneof": [{ "type": "string" }, { "type": "array", "items": { "type": "string", "title": "Command", "description": "Slash command to run." } }]
     },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "target": { "type": "string", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/set_block.json b/source/behaviour/blocks/1.16.200/events/set_block.json
index d8361b66..d03b8df1 100644
--- a/source/behaviour/blocks/1.16.200/events/set_block.json
+++ b/source/behaviour/blocks/1.16.200/events/set_block.json
@@ -3,14 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.set_block",
   "type": "object",
   "description": "Sets this block to another block type.",
-  "title": "Set block 1.16.200",
+  "title": "Set Block 1.16.200",
   "additionalProperties": false,
-  "properties": {
-    "block_type": {
-      "type": "string",
-      "default": "",
-      "description": "The type of block to set.",
-      "title": "Block type"
-    }
-  }
+  "properties": { "block_type": { "type": "string", "default": "", "description": "The type of block to set.", "title": "Block Type" } }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/set_block_at_pos.json b/source/behaviour/blocks/1.16.200/events/set_block_at_pos.json
index e31c5aa2..d59d00a3 100644
--- a/source/behaviour/blocks/1.16.200/events/set_block_at_pos.json
+++ b/source/behaviour/blocks/1.16.200/events/set_block_at_pos.json
@@ -3,25 +3,20 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.set_block_at_pos",
   "type": "object",
   "description": "Sets a block relative to this block to another block type.",
-  "title": "Set block at pos 1.16.200",
+  "title": "Set Block At Pos 1.16.200",
   "additionalProperties": false,
   "properties": {
     "block_offset": {
       "type": "array",
       "default": [0.0, 0.0, 0.0],
       "description": "The offset from the block's center.",
-      "title": "Block offset",
+      "title": "Block Offset",
       "items": [
         { "type": "number", "title": "X", "description": "The x offset from the block's center." },
         { "type": "number", "title": "Y", "description": "The y offset from the block's center." },
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "block_type": {
-      "type": "string",
-      "default": "",
-      "description": "The type of block to set.",
-      "title": "Block type"
-    }
+    "block_type": { "type": "string", "default": "", "description": "The type of block to set.", "title": "Block Type" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/set_block_property.json b/source/behaviour/blocks/1.16.200/events/set_block_property.json
index 63398595..a349a13a 100644
--- a/source/behaviour/blocks/1.16.200/events/set_block_property.json
+++ b/source/behaviour/blocks/1.16.200/events/set_block_property.json
@@ -3,13 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.set_block_property",
   "type": "object",
   "description": "Sets a block property on this block",
-  "title": "Set block property 1.16.200",
+  "title": "Set Block Property 1.16.200",
   "additionalProperties": false,
-  "properties": {
-    "property": {
-      "type": "string",
-      "description": "Block property to set on the block.",
-      "title": "Property"
-    }
-  }
+  "properties": { "property": { "type": "string", "description": "Block property to set on the block.", "title": "Property" } }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/spawn_loot.json b/source/behaviour/blocks/1.16.200/events/spawn_loot.json
index 728fae59..4c069ca5 100644
--- a/source/behaviour/blocks/1.16.200/events/spawn_loot.json
+++ b/source/behaviour/blocks/1.16.200/events/spawn_loot.json
@@ -3,14 +3,8 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.spawn_loot",
   "type": "object",
   "description": "Spawn loot from block.",
-  "title": "Spawn loot 1.16.200",
+  "title": "Spawn Loot 1.16.200",
   "required": ["table"],
   "additionalProperties": false,
-  "properties": {
-    "table": {
-      "type": "string",
-      "description": "File path, relative to the Behavior Pack's path, to the loot table file.",
-      "title": "Table"
-    }
-  }
+  "properties": { "table": { "type": "string", "description": "File path, relative to the Behavior Pack's path, to the loot table file.", "title": "Table" } }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/teleport.json b/source/behaviour/blocks/1.16.200/events/teleport.json
index d99915ae..9a1e17b0 100644
--- a/source/behaviour/blocks/1.16.200/events/teleport.json
+++ b/source/behaviour/blocks/1.16.200/events/teleport.json
@@ -6,12 +6,7 @@
   "title": "Teleport 1.16.200",
   "additionalProperties": false,
   "properties": {
-    "avoid_water": {
-      "type": "boolean",
-      "default": true,
-      "description": "Determines if the teleport avoids putting the target in water.",
-      "title": "Avoid water"
-    },
+    "avoid_water": { "type": "boolean", "default": true, "description": "Determines if the teleport avoids putting the target in water.", "title": "Avoid Water" },
     "destination": {
       "default": [0.0, 0.0, 0.0],
       "description": "Origin destination of the teleport.",
@@ -22,27 +17,17 @@
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "land_on_block": {
-      "type": "boolean",
-      "default": true,
-      "description": "Determines if the teleport places the target on a block.",
-      "title": "Land on block"
-    },
+    "land_on_block": { "type": "boolean", "default": true, "description": "Determines if the teleport places the target on a block.", "title": "Land On Block" },
     "max_range": {
       "default": [8.0, 8.0, 8.0],
       "description": "Max range the target can teleport relative to the origin destination.",
-      "title": "Max range",
+      "title": "Max Range",
       "items": [
         { "type": "number", "title": "X", "description": "The x offset from the block's center." },
         { "type": "number", "title": "Y", "description": "The y offset from the block's center." },
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "target": {
-      "type": "string",
-      "default": "self",
-      "description": "The target context to execute against.",
-      "title": "Target"
-    }
+    "target": { "type": "string", "default": "self", "description": "The target context to execute against.", "title": "Target" }
   }
 }
diff --git a/source/behaviour/blocks/1.16.200/events/transform_item.json b/source/behaviour/blocks/1.16.200/events/transform_item.json
index 3906f327..75b2f445 100644
--- a/source/behaviour/blocks/1.16.200/events/transform_item.json
+++ b/source/behaviour/blocks/1.16.200/events/transform_item.json
@@ -3,13 +3,7 @@
   "$id": "blockception.minecraft.behaviour.1.16.200.block.events.transform_item",
   "type": "object",
   "description": "Transforms item into another item.",
-  "title": "Transform item 1.16.200",
+  "title": "Transform Item 1.16.200",
   "additionalProperties": false,
-  "properties": {
-    "transform": {
-      "type": "string",
-      "description": "Name of the item it should transform into",
-      "title": "Transform"
-    }
-  }
+  "properties": { "transform": { "type": "string", "description": "Name of the item it should transform into", "title": "Transform" } }
 }
diff --git a/source/behaviour/blocks/blocks.json b/source/behaviour/blocks/blocks.json
index fd48f013..b19b0806 100644
--- a/source/behaviour/blocks/blocks.json
+++ b/source/behaviour/blocks/blocks.json
@@ -1,19 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.blocks",
-  "examples": [
-    {
-      "format_version": "1.16.200",
-      "minecraft:block": {
-        "description": {
-          "identifier": "namespace:block",
-          "properties": {}
-        },
-        "components": {},
-        "events": {}
-      }
-    }
-  ],
+  "examples": [{ "format_version": "1.16.200", "minecraft:block": { "description": { "identifier": "namespace:block", "properties": {} }, "components": {}, "events": {} } }],
   "allOf": [
     { "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } }, "then": { "$ref": "./1.10.0/blocks.json" } },
     { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/blocks.json" } },
diff --git a/source/behaviour/entities/1.10.0/components.json b/source/behaviour/entities/1.10.0/components.json
index c806aac3..72e2dfc2 100644
--- a/source/behaviour/entities/1.10.0/components.json
+++ b/source/behaviour/entities/1.10.0/components.json
@@ -174,7 +174,6 @@
     "minecraft:walk_animation_speed": { "$ref": "../1.8.0/components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "../1.8.0/components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "../1.8.0/components/minecraft.water_movement.json" },
-
     "minecraft:behavior.admire_item": { "$ref": "../1.8.0/behaviors/minecraft.behavior.admire_item.json" },
     "minecraft:behavior.avoid_mob_type": { "$ref": "../1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json" },
     "minecraft:behavior.beg": { "$ref": "../1.8.0/behaviors/minecraft.behavior.beg.json" },
@@ -244,16 +243,12 @@
     "minecraft:behavior.move_to_random_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_random_block.json" },
     "minecraft:behavior.move_to_village": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_village.json" },
     "minecraft:behavior.move_to_water": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_water.json" },
-    "minecraft:behavior.move_towards_dwelling_restriction": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json"
-    },
+    "minecraft:behavior.move_towards_dwelling_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json" },
     "minecraft:behavior.move_towards_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json" },
     "minecraft:behavior.move_towards_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_target.json" },
     "minecraft:behavior.nap": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nap.json" },
     "minecraft:behavior.nearest_attackable_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json" },
-    "minecraft:behavior.nearest_prioritized_attackable_target": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json"
-    },
+    "minecraft:behavior.nearest_prioritized_attackable_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json" },
     "minecraft:behavior.ocelot_sit_on_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json" },
     "minecraft:behavior.ocelotattack": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelotattack.json" },
     "minecraft:behavior.offer_flower": { "$ref": "../1.8.0/behaviors/minecraft.behavior.offer_flower.json" },
diff --git a/source/behaviour/entities/1.10.0/components/minecraft.projectile.json b/source/behaviour/entities/1.10.0/components/minecraft.projectile.json
index e2706ed4..cb305eb3 100644
--- a/source/behaviour/entities/1.10.0/components/minecraft.projectile.json
+++ b/source/behaviour/entities/1.10.0/components/minecraft.projectile.json
@@ -7,52 +7,23 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "anchor": {
-      "type": "integer",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    },
-    "angle_offset": {
-      "type": "number",
-      "default": 0,
-      "description": "Determines the angle at which the projectile is thrown",
-      "title": "Angle offset"
-    },
-    "catch_fire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be set on fire",
-      "title": "Catch fire"
-    },
+    "anchor": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+    "angle_offset": { "type": "number", "default": 0, "description": "Determines the angle at which the projectile is thrown", "title": "Angle Offset" },
+    "catch_fire": { "type": "boolean", "default": false, "description": "If true, the entity hit will be set on fire", "title": "Catch Fire" },
     "crit_particle_on_hurt": {
       "type": "boolean",
       "default": false,
       "description": "If true, the projectile will produce additional particles when a critical hit happens",
-      "title": "Crit particle on hurt"
-    },
-    "destroy_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be destroyed when hit",
-      "title": "Destroy on hurt"
-    },
-    "destroyOnHurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be destroyed when hit",
-      "title": "Destroy on hurt"
-    },
-    "filter": {
-      "type": "string",
-      "default": "",
-      "description": "Entity Definitions defined here can't be hurt by the projectile",
-      "title": "Filter"
+      "title": "Crit Particle On Hurt"
     },
+    "destroy_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "Destroy On Hurt" },
+    "destroyOnHurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "Destroy On Hurt" },
+    "filter": { "type": "string", "default": "", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "Filter" },
     "fire_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the projectile causes fire is affected by the mob griefing game rule",
-      "title": "Fire affected by griefing"
+      "title": "Fire Affected By Griefing"
     },
     "gravity": {
       "type": "number",
@@ -60,54 +31,19 @@
       "description": "The gravity applied to this entity when thrown. The higher the value, the faster the entity falls",
       "title": "Gravity"
     },
-    "hit_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile hits something",
-      "title": "Hit sound"
-    },
-    "homing": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile homes in to the nearest entity",
-      "title": "Homing"
-    },
-    "inertia": {
-      "type": "number",
-      "default": 0.99,
-      "description": "The fraction of the projectile's speed maintained every frame while traveling in air",
-      "title": "Inertia"
-    },
-    "is_dangerous": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated as dangerous to the players",
-      "title": "Is dangerous"
-    },
-    "knockback": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile will knock back the entity it hits",
-      "title": "Knockback"
-    },
-    "lightning": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be struck by lightning",
-      "title": "Lightning"
-    },
+    "hit_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile hits something", "title": "Hit Sound" },
+    "homing": { "type": "boolean", "default": false, "description": "If true, the projectile homes in to the nearest entity", "title": "Homing" },
+    "inertia": { "type": "number", "default": 0.99, "description": "The fraction of the projectile's speed maintained every frame while traveling in air", "title": "Inertia" },
+    "is_dangerous": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated as dangerous to the players", "title": "Is Dangerous" },
+    "knockback": { "type": "boolean", "default": true, "description": "If true, the projectile will knock back the entity it hits", "title": "Knockback" },
+    "lightning": { "type": "boolean", "default": false, "description": "If true, the entity hit will be struck by lightning", "title": "Lightning" },
     "liquid_inertia": {
       "type": "number",
       "default": 0.6,
       "description": "The fraction of the projectile's speed maintained every frame while traveling in water",
-      "title": "Liquid inertia"
-    },
-    "multiple_targets": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile can hit multiple entities per flight",
-      "title": "Multiple targets"
+      "title": "Liquid Inertia"
     },
+    "multiple_targets": { "type": "boolean", "default": true, "description": "If true, the projectile can hit multiple entities per flight", "title": "Multiple Targets" },
     "offset": {
       "type": "array",
       "default": [0, 0.5, 0],
@@ -131,12 +67,7 @@
         }
       ]
     },
-    "on_fire_time": {
-      "type": "number",
-      "default": 5,
-      "description": "Time in seconds that the entity hit will be on fire for",
-      "title": "On fire time"
-    },
+    "on_fire_time": { "type": "number", "default": 5, "description": "Time in seconds that the entity hit will be on fire for", "title": "On Fire Time" },
     "on_hit": {
       "additionalProperties": false,
       "type": "object",
@@ -388,77 +319,37 @@
         }
       }
     },
-    "particle": {
-      "type": "string",
-      "default": "iconcrack",
-      "description": "Particle to use upon collision",
-      "title": "Particle"
-    },
-    "potion_effect": {
-      "type": "integer",
-      "default": -1,
-      "description": "Defines the effect the arrow will apply to the entity it hits",
-      "title": "Potion effect"
-    },
-    "power": {
-      "type": "number",
-      "default": 1.3,
-      "description": "Determines the velocity of the projectile",
-      "title": "Power"
-    },
-    "reflect_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be reflected back when hit",
-      "title": "Reflect on hurt"
-    },
+    "particle": { "type": "string", "default": "iconcrack", "description": "Particle to use upon collision", "title": "Particle" },
+    "potion_effect": { "type": "integer", "default": -1, "description": "Defines the effect the arrow will apply to the entity it hits", "title": "Potion Effect" },
+    "power": { "type": "number", "default": 1.3, "description": "Determines the velocity of the projectile", "title": "Power" },
+    "reflect_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be reflected back when hit", "title": "Reflect On Hurt" },
     "semi_random_diff_damage": {
       "type": "boolean",
       "default": false,
       "description": "If true, damage will be randomized based on damage and speed",
-      "title": "Semi random diff damage"
-    },
-    "shoot_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile is shot",
-      "title": "Shoot sound"
+      "title": "Semi Random Diff Damage"
     },
+    "shoot_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile is shot", "title": "Shoot Sound" },
     "shoot_target": {
       "type": "boolean",
       "default": true,
       "description": "If true, the projectile will be shot towards the target of the entity firing it",
-      "title": "Shoot target"
-    },
-    "should_bounce": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will bounce upon hit",
-      "title": "Should bounce"
-    },
-    "splash_potion": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated like a splash potion",
-      "title": "Splash potion"
-    },
-    "splash_range": {
-      "type": "number",
-      "default": 4,
-      "description": "Radius in blocks of the 'splash' effect",
-      "title": "Splash range"
+      "title": "Shoot Target"
     },
+    "should_bounce": { "type": "boolean", "default": false, "description": "If true, the projectile will bounce upon hit", "title": "Should Bounce" },
+    "splash_potion": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated like a splash potion", "title": "Splash Potion" },
+    "splash_range": { "type": "number", "default": 4, "description": "Radius in blocks of the 'splash' effect", "title": "Splash Range" },
     "uncertainty_base": {
       "type": "number",
       "default": 0,
       "description": "The base accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty base"
+      "title": "Uncertainty Base"
     },
     "uncertainty_multiplier": {
       "type": "number",
       "default": 0,
       "description": "Determines how much difficulty affects accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty multiplier"
+      "title": "Uncertainty Multiplier"
     }
   }
 }
diff --git a/source/behaviour/entities/1.10.0/entities.json b/source/behaviour/entities/1.10.0/entities.json
index 0c3c857e..a5ad2928 100644
--- a/source/behaviour/entities/1.10.0/entities.json
+++ b/source/behaviour/entities/1.10.0/entities.json
@@ -2,13 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.10.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.10.0",
+  "title": "Behaviour Entity 1.10.0",
   "description": "TODO description",
   "additionalProperties": false,
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "const": "1.10.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.10.0/events.json b/source/behaviour/entities/1.10.0/events.json
index 03b08c32..56310eeb 100644
--- a/source/behaviour/entities/1.10.0/events.json
+++ b/source/behaviour/entities/1.10.0/events.json
@@ -6,19 +6,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -26,41 +22,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: add",
-          "title": "Add"
-        },
-        "remove": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: remove",
-          "title": "Remove"
-        },
+        "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+        "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
         "randomize": {
           "type": "array",
           "items": {
             "required": ["weight"],
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "trigger": {
-                "type": "string",
-                "description": "UNDOCUMENTATED",
-                "title": "UNDOCUMENTATED"
-              },
-              "weight": {
-                "type": "number",
-                "description": "TODO description: weight",
-                "title": "Weight"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+              "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
             },
             "description": "TODO description: randomize",
             "title": "Randomize"
@@ -75,32 +47,16 @@
             "title": "Sequence",
             "type": "object",
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "filters": {
-                "$ref": "./filters.json"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "filters": { "$ref": "./filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "trigger": {
-          "type": "string",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "filters": { "$ref": "./filters.json" },
+        "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
   },
@@ -115,19 +71,9 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.10.0/filters.json b/source/behaviour/entities/1.10.0/filters.json
index 9a4a88c3..816fac44 100644
--- a/source/behaviour/entities/1.10.0/filters.json
+++ b/source/behaviour/entities/1.10.0/filters.json
@@ -6,245 +6,69 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "distance_to_nearest_player" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.10.0/filters/types/base_operator.json b/source/behaviour/entities/1.10.0/filters/types/base_operator.json
index ae04530c..84d4c67a 100644
--- a/source/behaviour/entities/1.10.0/filters/types/base_operator.json
+++ b/source/behaviour/entities/1.10.0/filters/types/base_operator.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_operator",
-  "title": "Filters operator 1.8.0",
+  "title": "Filters Operator 1.8.0",
   "type": "string",
   "description": "The comparison to apply with 'value'.",
   "default": "equals",
diff --git a/source/behaviour/entities/1.10.0/filters/types/base_subject.json b/source/behaviour/entities/1.10.0/filters/types/base_subject.json
index f481a45f..e0b1e791 100644
--- a/source/behaviour/entities/1.10.0/filters/types/base_subject.json
+++ b/source/behaviour/entities/1.10.0/filters/types/base_subject.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_subject",
-  "title": "Filters subject 1.8.0",
+  "title": "Filters Subject 1.8.0",
   "type": "string",
   "description": "The subject of this filter test.",
   "default": "self",
diff --git a/source/behaviour/entities/1.10.0/filters/types/base_test.json b/source/behaviour/entities/1.10.0/filters/types/base_test.json
index b1dbea81..83b1bad2 100644
--- a/source/behaviour/entities/1.10.0/filters/types/base_test.json
+++ b/source/behaviour/entities/1.10.0/filters/types/base_test.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_test",
-  "title": "Filters test 1.8.0",
+  "title": "Filters Test 1.8.0",
   "type": "string",
   "description": "The test operation",
   "enum": [
diff --git a/source/behaviour/entities/1.10.0/minecraft.entity.json b/source/behaviour/entities/1.10.0/minecraft.entity.json
index 15c2c995..eeeaf4d3 100644
--- a/source/behaviour/entities/1.10.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.10.0/minecraft.entity.json
@@ -14,35 +14,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -56,20 +44,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -78,7 +54,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -86,20 +62,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "$ref": "./components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "$ref": "./events.json",
       "uniqueItems": true,
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.10.0/types/entity_types.json b/source/behaviour/entities/1.10.0/types/entity_types.json
index 619eb900..cf61dc62 100644
--- a/source/behaviour/entities/1.10.0/types/entity_types.json
+++ b/source/behaviour/entities/1.10.0/types/entity_types.json
@@ -1,25 +1,16 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.entity_types.1.10.0",
-  "title": "Entity types 1.10.0",
-
+  "title": "Entity Types 1.10.0",
   "definitions": {
     "entity_definition": {
       "description": "The entity type",
-      "title": "The entity type",
+      "title": "Entity Type",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "filters": {
-          "type": "object",
-          "$ref": "../filters.json"
-        },
-        "max_dist": {
-          "type": "number",
-          "description": "Maximum distance this mob can be away to be a valid choice",
-          "default": 16,
-          "title": "Max Dist"
-        },
+        "filters": { "type": "object", "$ref": "../filters.json" },
+        "max_dist": { "type": "number", "description": "Maximum distance this mob can be away to be a valid choice", "default": 16, "title": "Max Dist" },
         "walk_speed_multiplier": {
           "type": "number",
           "description": "Multiplier for the walking speed. A value of 1.0 means the speed is unchanged",
@@ -32,12 +23,7 @@
           "default": 16,
           "title": "Sprint Speed Multiplier"
         },
-        "must_see": {
-          "type": "boolean",
-          "description": "If true, the mob has to be visible to be a valid choice",
-          "default": false,
-          "title": "Must See"
-        },
+        "must_see": { "type": "boolean", "description": "If true, the mob has to be visible to be a valid choice", "default": false, "title": "Must See" },
         "must_see_forget_duration": {
           "type": "number",
           "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
diff --git a/source/behaviour/entities/1.10.0/types/event.json b/source/behaviour/entities/1.10.0/types/event.json
index 1d4dc0ab..f201dc9b 100644
--- a/source/behaviour/entities/1.10.0/types/event.json
+++ b/source/behaviour/entities/1.10.0/types/event.json
@@ -4,25 +4,12 @@
   "title": "Event",
   "description": "Minecraft behaviour event 1.10.0",
   "oneOf": [
-    {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_\\-:]+$",
-      "description": "The event to fire"
-    },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
     {
       "type": "object",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
-        "target": {
-          "type": "string",
-          "description": "The target of the event",
-          "enum": ["block", "damager", "other", "parent", "player", "self", "target"]
-        }
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
+        "target": { "type": "string", "description": "The target of the event", "enum": ["block", "damager", "other", "parent", "player", "self", "target"] }
       }
     }
   ]
diff --git a/source/behaviour/entities/1.10.0/types/range_number_type.json b/source/behaviour/entities/1.10.0/types/range_number_type.json
index 586b6e6a..0aa4f52a 100644
--- a/source/behaviour/entities/1.10.0/types/range_number_type.json
+++ b/source/behaviour/entities/1.10.0/types/range_number_type.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.range_number_type.1.10.0",
-  "title": "Range [a, b]",
+  "title": "Range [a, B]",
   "description": "A described range",
   "items": [
     { "type": "number", "title": "Range: A", "description": "The first value of the range" },
diff --git a/source/behaviour/entities/1.10.0/types/trigger.json b/source/behaviour/entities/1.10.0/types/trigger.json
index ef6c79cd..b92ad819 100644
--- a/source/behaviour/entities/1.10.0/types/trigger.json
+++ b/source/behaviour/entities/1.10.0/types/trigger.json
@@ -6,11 +6,7 @@
   "description": "Trigger to fire",
   "minProperties": 1,
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "Event",
-      "title": "The event to fire"
-    },
+    "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "Filters" },
     "target": { "$ref": "../../1.8.0/filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behaviour/entities/1.11.0/entities.json b/source/behaviour/entities/1.11.0/entities.json
index 9fd66b00..3345cbfe 100644
--- a/source/behaviour/entities/1.11.0/entities.json
+++ b/source/behaviour/entities/1.11.0/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.10.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.11.0",
+  "title": "Behaviour Entity 1.11.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.11.0 format version",
+      "title": "1.11.0 Format Version",
       "type": "string",
       "const": "1.11.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.11.0/events.json b/source/behaviour/entities/1.11.0/events.json
index 47e878fd..67674fd8 100644
--- a/source/behaviour/entities/1.11.0/events.json
+++ b/source/behaviour/entities/1.11.0/events.json
@@ -6,19 +6,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -26,41 +22,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: add",
-          "title": "Add"
-        },
-        "remove": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: remove",
-          "title": "Remove"
-        },
+        "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+        "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
         "randomize": {
           "type": "array",
           "items": {
             "required": ["weight"],
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "trigger": {
-                "type": "string",
-                "description": "UNDOCUMENTATED",
-                "title": "UNDOCUMENTATED"
-              },
-              "weight": {
-                "type": "number",
-                "description": "TODO description: weight",
-                "title": "Weight"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+              "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
             },
             "description": "TODO description: randomize",
             "title": "Randomize"
@@ -75,32 +47,16 @@
             "title": "Sequence",
             "type": "object",
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "filters": {
-                "$ref": "./filters.json"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "filters": { "$ref": "./filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "trigger": {
-          "type": "string",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "filters": { "$ref": "./filters.json" },
+        "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
   },
@@ -115,19 +71,9 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.11.0/filters.json b/source/behaviour/entities/1.11.0/filters.json
index f52b3fc2..917b9097 100644
--- a/source/behaviour/entities/1.11.0/filters.json
+++ b/source/behaviour/entities/1.11.0/filters.json
@@ -6,245 +6,69 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "distance_to_nearest_player" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.11.0/minecraft.entity.json b/source/behaviour/entities/1.11.0/minecraft.entity.json
index a3d1edc3..5923a533 100644
--- a/source/behaviour/entities/1.11.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.11.0/minecraft.entity.json
@@ -14,35 +14,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -56,20 +44,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -78,7 +54,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -86,20 +62,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "$ref": "./components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "$ref": "./events.json",
       "uniqueItems": true,
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.12.0/components.json b/source/behaviour/entities/1.12.0/components.json
index c91ef5a5..649d1832 100644
--- a/source/behaviour/entities/1.12.0/components.json
+++ b/source/behaviour/entities/1.12.0/components.json
@@ -175,7 +175,6 @@
     "minecraft:walk_animation_speed": { "$ref": "../1.8.0/components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "../1.8.0/components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "../1.8.0/components/minecraft.water_movement.json" },
-
     "minecraft:behavior.admire_item": { "$ref": "../1.8.0/behaviors/minecraft.behavior.admire_item.json" },
     "minecraft:behavior.avoid_mob_type": { "$ref": "../1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json" },
     "minecraft:behavior.beg": { "$ref": "../1.8.0/behaviors/minecraft.behavior.beg.json" },
@@ -245,16 +244,12 @@
     "minecraft:behavior.move_to_random_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_random_block.json" },
     "minecraft:behavior.move_to_village": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_village.json" },
     "minecraft:behavior.move_to_water": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_water.json" },
-    "minecraft:behavior.move_towards_dwelling_restriction": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json"
-    },
+    "minecraft:behavior.move_towards_dwelling_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json" },
     "minecraft:behavior.move_towards_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json" },
     "minecraft:behavior.move_towards_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_target.json" },
     "minecraft:behavior.nap": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nap.json" },
     "minecraft:behavior.nearest_attackable_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json" },
-    "minecraft:behavior.nearest_prioritized_attackable_target": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json"
-    },
+    "minecraft:behavior.nearest_prioritized_attackable_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json" },
     "minecraft:behavior.ocelot_sit_on_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json" },
     "minecraft:behavior.ocelotattack": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelotattack.json" },
     "minecraft:behavior.offer_flower": { "$ref": "../1.8.0/behaviors/minecraft.behavior.offer_flower.json" },
diff --git a/source/behaviour/entities/1.12.0/components/minecraft.explode.json b/source/behaviour/entities/1.12.0/components/minecraft.explode.json
index a6ede219..8f1c0da2 100644
--- a/source/behaviour/entities/1.12.0/components/minecraft.explode.json
+++ b/source/behaviour/entities/1.12.0/components/minecraft.explode.json
@@ -7,84 +7,44 @@
   "description": "Defines how the entity explodes.",
   "required": [],
   "properties": {
-    "breaks_blocks": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the explosion will destroy blocks in the explosion radius.",
-      "title": "Breaks blocks"
-    },
-    "causes_fire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, blocks in the explosion radius will be set on fire.",
-      "title": "Causes fire"
-    },
+    "breaks_blocks": { "type": "boolean", "default": true, "description": "If true, the explosion will destroy blocks in the explosion radius.", "title": "Breaks Blocks" },
+    "causes_fire": { "type": "boolean", "default": false, "description": "If true, blocks in the explosion radius will be set on fire.", "title": "Causes Fire" },
     "destroy_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the explosion breaks blocks is affected by the mob griefing game rule.",
-      "title": "Destroy affected by griefing"
+      "title": "Destroy Affected By Griefing"
     },
     "fire_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the explosion causes fire is affected by the mob griefing game rule.",
-      "title": "Fire affected by griefing"
+      "title": "Fire Affected By Griefing"
     },
     "fuse_length": {
       "default": [0.0, 0.0],
       "description": "The range for the random amount of time the fuse will be lit before exploding, a negative value means the explosion will be immediate.",
-      "title": "Fuse length",
+      "title": "Fuse Length",
       "oneOf": [
-        {
-          "type": "array",
-          "items": [
-            {
-              "type": "number"
-            },
-            {
-              "type": "number"
-            }
-          ]
-        },
-        {
-          "type": "number"
-        },
+        { "type": "array", "items": [{ "type": "number" }, { "type": "number" }] },
+        { "type": "number" },
         {
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "range_min": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "range_max": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "range_min": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "range_max": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         }
       ]
     },
-    "fuse_lit": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the fuse is already lit when this component is added to the entity.",
-      "title": "Fuse lit"
-    },
+    "fuse_lit": { "type": "boolean", "default": false, "description": "If true, the fuse is already lit when this component is added to the entity.", "title": "Fuse Lit" },
     "max_resistance": {
       "type": "number",
       "default": 3.40282e38,
       "description": "A blocks explosion resistance will be capped at this value when an explosion occurs.",
-      "title": "Max resistance"
+      "title": "Max Resistance"
     },
-    "power": {
-      "type": "number",
-      "default": 3,
-      "description": "The radius of the explosion in blocks and the amount of damage the explosion deals.",
-      "title": "Power"
-    }
+    "power": { "type": "number", "default": 3, "description": "The radius of the explosion in blocks and the amount of damage the explosion deals.", "title": "Power" }
   }
 }
diff --git a/source/behaviour/entities/1.12.0/components/minecraft.projectile.json b/source/behaviour/entities/1.12.0/components/minecraft.projectile.json
index 1cbb60df..3028af7f 100644
--- a/source/behaviour/entities/1.12.0/components/minecraft.projectile.json
+++ b/source/behaviour/entities/1.12.0/components/minecraft.projectile.json
@@ -7,46 +7,22 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "anchor": {
-      "type": "integer",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    },
-    "angle_offset": {
-      "type": "number",
-      "default": 0,
-      "description": "Determines the angle at which the projectile is thrown",
-      "title": "Angle offset"
-    },
-    "catch_fire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be set on fire",
-      "title": "Catch fire"
-    },
+    "anchor": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+    "angle_offset": { "type": "number", "default": 0, "description": "Determines the angle at which the projectile is thrown", "title": "Angle Offset" },
+    "catch_fire": { "type": "boolean", "default": false, "description": "If true, the entity hit will be set on fire", "title": "Catch Fire" },
     "crit_particle_on_hurt": {
       "type": "boolean",
       "default": false,
       "description": "If true, the projectile will produce additional particles when a critical hit happens",
-      "title": "Crit particle on hurt"
-    },
-    "destroy_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be destroyed when hit",
-      "title": "Destroy on hurt"
-    },
-    "filter": {
-      "type": "string",
-      "default": "",
-      "description": "Entity Definitions defined here can't be hurt by the projectile",
-      "title": "Filter"
+      "title": "Crit Particle On Hurt"
     },
+    "destroy_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "Destroy On Hurt" },
+    "filter": { "type": "string", "default": "", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "Filter" },
     "fire_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the projectile causes fire is affected by the mob griefing game rule",
-      "title": "Fire affected by griefing"
+      "title": "Fire Affected By Griefing"
     },
     "gravity": {
       "type": "number",
@@ -54,89 +30,32 @@
       "description": "The gravity applied to this entity when thrown. The higher the value, the faster the entity falls",
       "title": "Gravity"
     },
-    "hit_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile hits something",
-      "title": "Hit sound"
-    },
-    "hit_ground_sound": {
-      "type": "string",
-      "default": "",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    },
-    "homing": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile homes in to the nearest entity",
-      "title": "Homing"
-    },
-    "inertia": {
-      "type": "number",
-      "default": 0.99,
-      "description": "The fraction of the projectile's speed maintained every frame while traveling in air",
-      "title": "Inertia"
-    },
-    "is_dangerous": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated as dangerous to the players",
-      "title": "Is dangerous"
-    },
-    "knockback": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile will knock back the entity it hits",
-      "title": "Knockback"
-    },
-    "lightning": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be struck by lightning",
-      "title": "Lightning"
-    },
+    "hit_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile hits something", "title": "Hit Sound" },
+    "hit_ground_sound": { "type": "string", "default": "", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+    "homing": { "type": "boolean", "default": false, "description": "If true, the projectile homes in to the nearest entity", "title": "Homing" },
+    "inertia": { "type": "number", "default": 0.99, "description": "The fraction of the projectile's speed maintained every frame while traveling in air", "title": "Inertia" },
+    "is_dangerous": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated as dangerous to the players", "title": "Is Dangerous" },
+    "knockback": { "type": "boolean", "default": true, "description": "If true, the projectile will knock back the entity it hits", "title": "Knockback" },
+    "lightning": { "type": "boolean", "default": false, "description": "If true, the entity hit will be struck by lightning", "title": "Lightning" },
     "liquid_inertia": {
       "type": "number",
       "default": 0.6,
       "description": "The fraction of the projectile's speed maintained every frame while traveling in water",
-      "title": "Liquid inertia"
-    },
-    "multiple_targets": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile can hit multiple entities per flight",
-      "title": "Multiple targets"
+      "title": "Liquid Inertia"
     },
+    "multiple_targets": { "type": "boolean", "default": true, "description": "If true, the projectile can hit multiple entities per flight", "title": "Multiple Targets" },
     "offset": {
       "type": "array",
       "default": [0, 0.5, 0],
       "description": "The offset from the entity's anchor where the projectile will spawn",
       "title": "Offset",
       "items": [
-        {
-          "type": "number",
-          "description": "X",
-          "title": "X"
-        },
-        {
-          "type": "number",
-          "description": "Y",
-          "title": "Y"
-        },
-        {
-          "type": "number",
-          "description": "Z",
-          "title": "Z"
-        }
+        { "type": "number", "description": "X", "title": "X" },
+        { "type": "number", "description": "Y", "title": "Y" },
+        { "type": "number", "description": "Z", "title": "Z" }
       ]
     },
-    "on_fire_time": {
-      "type": "number",
-      "default": 5,
-      "description": "Time in seconds that the entity hit will be on fire for",
-      "title": "On fire time"
-    },
+    "on_fire_time": { "type": "number", "default": 5, "description": "Time in seconds that the entity hit will be on fire for", "title": "On Fire Time" },
     "on_hit": {
       "additionalProperties": false,
       "type": "object",
@@ -148,13 +67,7 @@
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "type": "object",
-          "properties": {
-            "fire_affected_by_griefing": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
-          }
+          "properties": { "fire_affected_by_griefing": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" } }
         },
         "definition_event": {
           "additionalProperties": false,
@@ -162,22 +75,11 @@
           "title": "UNDOCUMENTATED",
           "type": "object",
           "properties": {
-            "affect_projectile": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "event_trigger": {
-              "$ref": "../types/event.json"
-            }
+            "affect_projectile": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "event_trigger": { "$ref": "../types/event.json" }
           }
         },
-        "douse_fire": {
-          "type": "object",
-          "additionalProperties": false,
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
+        "douse_fire": { "type": "object", "additionalProperties": false, "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
         "grant_xp": {
           "additionalProperties": false,
           "type": "object",
@@ -185,16 +87,8 @@
           "title": "UNDOCUMENTATED",
           "effect": "levitation",
           "properties": {
-            "minXP": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "maxXP": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "minXP": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "maxXP": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "impact_damage": {
@@ -203,31 +97,11 @@
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "catch_fire": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "damage": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "destroy_on_hit": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "knockback": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "semi_random_diff_damage": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "catch_fire": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "damage": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "destroy_on_hit": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "knockback": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "semi_random_diff_damage": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "mob_effect": {
@@ -237,31 +111,11 @@
           "title": "UNDOCUMENTATED",
           "effect": "levitation",
           "properties": {
-            "effect": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "durationeasy": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "durationnormal": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "durationhard": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "amplifier": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "effect": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "durationeasy": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "durationnormal": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "durationhard": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "amplifier": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "particle_on_hit": {
@@ -270,75 +124,26 @@
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "particle_type": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "num_particles": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "on_entity_hit": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "on_other_hit": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "particle_type": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "num_particles": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "on_entity_hit": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "on_other_hit": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
-        "remove_on_hit": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
+        "remove_on_hit": { "additionalProperties": false, "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
         "spawn_chance": {
           "additionalProperties": false,
           "type": "object",
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "first_spawn_percent_chance": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "first_spawn_chance": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "second_spawn_chance": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "first_spawn_count": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "second_spawn_count": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "spawn_definition": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "spawn_baby": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "first_spawn_percent_chance": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "first_spawn_chance": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "second_spawn_chance": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "first_spawn_count": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "second_spawn_count": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "spawn_definition": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "spawn_baby": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "spawn_aoe_cloud": {
@@ -347,70 +152,24 @@
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "radius": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "radius_on_use": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "potion": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "particle": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "duration": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
+            "radius": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "radius_on_use": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "potion": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "particle": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "duration": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
             "color": {
               "description": "UNDOCUMENTATED",
               "title": "UNDOCUMENTATED",
               "type": "array",
               "format": "color-array",
               "items": [
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 255,
-                  "description": "R",
-                  "title": "R"
-                },
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 255,
-                  "description": "G",
-                  "title": "G"
-                },
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 255,
-                  "description": "B",
-                  "title": "B"
-                }
+                { "type": "integer", "minimum": 0, "maximum": 255, "description": "R", "title": "R" },
+                { "type": "integer", "minimum": 0, "maximum": 255, "description": "G", "title": "G" },
+                { "type": "integer", "minimum": 0, "maximum": 255, "description": "B", "title": "B" }
               ]
             },
-            "affect_owner": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "reapplication_delay": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "affect_owner": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "reapplication_delay": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "stick_in_ground": {
@@ -418,104 +177,44 @@
           "type": "object",
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
-          "properties": {
-            "shake_time": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
-          }
+          "properties": { "shake_time": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" } }
         },
-        "teleport_owner": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
-        "thrown_potion_effect": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "teleport_owner": { "additionalProperties": false, "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+        "thrown_potion_effect": { "additionalProperties": false, "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     },
-    "particle": {
-      "type": "string",
-      "default": "iconcrack",
-      "description": "Particle to use upon collision",
-      "title": "Particle"
-    },
-    "potion_effect": {
-      "type": "integer",
-      "default": -1,
-      "description": "Defines the effect the arrow will apply to the entity it hits",
-      "title": "Potion effect"
-    },
-    "power": {
-      "type": "number",
-      "default": 1.3,
-      "description": "Determines the velocity of the projectile",
-      "title": "Power"
-    },
-    "reflect_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be reflected back when hit",
-      "title": "Reflect on hurt"
-    },
+    "particle": { "type": "string", "default": "iconcrack", "description": "Particle to use upon collision", "title": "Particle" },
+    "potion_effect": { "type": "integer", "default": -1, "description": "Defines the effect the arrow will apply to the entity it hits", "title": "Potion Effect" },
+    "power": { "type": "number", "default": 1.3, "description": "Determines the velocity of the projectile", "title": "Power" },
+    "reflect_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be reflected back when hit", "title": "Reflect On Hurt" },
     "semi_random_diff_damage": {
       "type": "boolean",
       "default": false,
       "description": "If true, damage will be randomized based on damage and speed",
-      "title": "Semi random diff damage"
-    },
-    "shoot_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile is shot",
-      "title": "Shoot sound"
+      "title": "Semi Random Diff Damage"
     },
+    "shoot_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile is shot", "title": "Shoot Sound" },
     "shoot_target": {
       "type": "boolean",
       "default": true,
       "description": "If true, the projectile will be shot towards the target of the entity firing it",
-      "title": "Shoot target"
-    },
-    "should_bounce": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will bounce upon hit",
-      "title": "Should bounce"
-    },
-    "splash_potion": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated like a splash potion",
-      "title": "Splash potion"
-    },
-    "splash_range": {
-      "type": "number",
-      "default": 4,
-      "description": "Radius in blocks of the 'splash' effect",
-      "title": "Splash range"
-    },
-    "stop_on_hurt": {
-      "type": "boolean",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
+      "title": "Shoot Target"
     },
+    "should_bounce": { "type": "boolean", "default": false, "description": "If true, the projectile will bounce upon hit", "title": "Should Bounce" },
+    "splash_potion": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated like a splash potion", "title": "Splash Potion" },
+    "splash_range": { "type": "number", "default": 4, "description": "Radius in blocks of the 'splash' effect", "title": "Splash Range" },
+    "stop_on_hurt": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "uncertainty_base": {
       "type": "number",
       "default": 0,
       "description": "The base accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty base"
+      "title": "Uncertainty Base"
     },
     "uncertainty_multiplier": {
       "type": "number",
       "default": 0,
       "description": "Determines how much difficulty affects accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty multiplier"
+      "title": "Uncertainty Multiplier"
     }
   }
 }
diff --git a/source/behaviour/entities/1.12.0/entities.json b/source/behaviour/entities/1.12.0/entities.json
index 9baf4372..14138fb5 100644
--- a/source/behaviour/entities/1.12.0/entities.json
+++ b/source/behaviour/entities/1.12.0/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.10.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.12.0",
+  "title": "Behaviour Entity 1.12.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.12.0 format version",
+      "title": "1.12.0 Format Version",
       "type": "string",
       "const": "1.12.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.12.0/events.json b/source/behaviour/entities/1.12.0/events.json
index 0c14f289..a0936581 100644
--- a/source/behaviour/entities/1.12.0/events.json
+++ b/source/behaviour/entities/1.12.0/events.json
@@ -6,19 +6,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -26,41 +22,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: add",
-          "title": "Add"
-        },
-        "remove": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: remove",
-          "title": "Remove"
-        },
+        "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+        "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
         "randomize": {
           "type": "array",
           "items": {
             "required": ["weight"],
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "trigger": {
-                "type": "string",
-                "description": "UNDOCUMENTATED",
-                "title": "UNDOCUMENTATED"
-              },
-              "weight": {
-                "type": "number",
-                "description": "TODO description: weight",
-                "title": "Weight"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+              "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
             },
             "description": "TODO description: randomize",
             "title": "Randomize"
@@ -75,32 +47,16 @@
             "title": "Sequence",
             "type": "object",
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "filters": {
-                "$ref": "./filters.json"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "filters": { "$ref": "./filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "trigger": {
-          "type": "string",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "filters": { "$ref": "./filters.json" },
+        "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
   },
@@ -115,19 +71,9 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.12.0/filters.json b/source/behaviour/entities/1.12.0/filters.json
index 529a59c6..05ab465e 100644
--- a/source/behaviour/entities/1.12.0/filters.json
+++ b/source/behaviour/entities/1.12.0/filters.json
@@ -6,245 +6,69 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "distance_to_nearest_player" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.12.0/minecraft.entity.json b/source/behaviour/entities/1.12.0/minecraft.entity.json
index 27f9e7ba..6bb8d8ee 100644
--- a/source/behaviour/entities/1.12.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.12.0/minecraft.entity.json
@@ -14,35 +14,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -56,20 +44,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -78,7 +54,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -86,20 +62,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "$ref": "./components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "$ref": "./events.json",
       "uniqueItems": true,
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.12.0/types/entity_types.json b/source/behaviour/entities/1.12.0/types/entity_types.json
index 5e21feea..c757a27a 100644
--- a/source/behaviour/entities/1.12.0/types/entity_types.json
+++ b/source/behaviour/entities/1.12.0/types/entity_types.json
@@ -1,20 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.entity_types.1.12.0",
-  "title": "Entity types 1.12.0",
+  "title": "Entity Types 1.12.0",
   "type": "array",
   "items": {
     "description": "The entity type",
-    "title": "The entity type",
+    "title": "Entity Type",
     "type": "object",
     "properties": {
       "filters": { "type": "object", "$ref": "../filters.json" },
-      "max_dist": {
-        "type": "number",
-        "description": "Maximum distance this mob can be away to be a valid choice",
-        "default": 16,
-        "title": "Max Dist"
-      },
+      "max_dist": { "type": "number", "description": "Maximum distance this mob can be away to be a valid choice", "default": 16, "title": "Max Dist" },
       "walk_speed_multiplier": {
         "type": "number",
         "description": "Multiplier for the walking speed. A value of 1.0 means the speed is unchanged",
@@ -27,12 +22,7 @@
         "default": 16,
         "title": "Sprint Speed Multiplier"
       },
-      "must_see": {
-        "type": "boolean",
-        "description": "If true, the mob has to be visible to be a valid choice",
-        "default": false,
-        "title": "Must See"
-      },
+      "must_see": { "type": "boolean", "description": "If true, the mob has to be visible to be a valid choice", "default": false, "title": "Must See" },
       "must_see_forget_duration": {
         "type": "number",
         "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
diff --git a/source/behaviour/entities/1.12.0/types/event.json b/source/behaviour/entities/1.12.0/types/event.json
index b7b5146b..afc60610 100644
--- a/source/behaviour/entities/1.12.0/types/event.json
+++ b/source/behaviour/entities/1.12.0/types/event.json
@@ -4,25 +4,12 @@
   "title": "Event",
   "description": "Minecraft behaviour event 1.12.0",
   "oneOf": [
-    {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_\\-:]+$",
-      "description": "The event to fire"
-    },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
     {
       "type": "object",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
-        "target": {
-          "type": "string",
-          "description": "The target of the event",
-          "enum": ["block", "damager", "other", "parent", "player", "self", "target"]
-        }
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
+        "target": { "type": "string", "description": "The target of the event", "enum": ["block", "damager", "other", "parent", "player", "self", "target"] }
       }
     }
   ]
diff --git a/source/behaviour/entities/1.12.0/types/range_number_type.json b/source/behaviour/entities/1.12.0/types/range_number_type.json
index a1e954ac..604dc1b6 100644
--- a/source/behaviour/entities/1.12.0/types/range_number_type.json
+++ b/source/behaviour/entities/1.12.0/types/range_number_type.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.range_number_type.1.12.0",
-  "title": "Range [a, b]",
+  "title": "Range [a, B]",
   "description": "A described range",
   "items": [
     { "type": "number", "title": "Range: A", "description": "The first value of the range" },
diff --git a/source/behaviour/entities/1.12.0/types/trigger.json b/source/behaviour/entities/1.12.0/types/trigger.json
index d9d9d8ef..a6e9e92d 100644
--- a/source/behaviour/entities/1.12.0/types/trigger.json
+++ b/source/behaviour/entities/1.12.0/types/trigger.json
@@ -6,11 +6,7 @@
   "description": "Trigger to fire",
   "minProperties": 1,
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "Event",
-      "title": "The event to fire"
-    },
+    "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "Filters" },
     "target": { "$ref": "../../1.8.0/filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.find_mount.json b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.find_mount.json
index db073c62..949e6471 100644
--- a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.find_mount.json
+++ b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.find_mount.json
@@ -2,43 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.find_mount",
   "type": "object",
-  "title": "Find mount 1.8.0",
+  "title": "Find Mount 1.8.0",
   "description": "Allows the mob to look around for another mob to ride atop it.",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will not go into water blocks when going towards a mount",
-      "title": "Avoid water"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "avoid_water": { "type": "boolean", "default": false, "description": "If true, the mob will not go into water blocks when going towards a mount", "title": "Avoid Water" },
     "mount_distance": {
       "type": "number",
       "default": -1,
       "description": "This is the distance the mob needs to be, in blocks, from the desired mount to mount it. If the value is below 0, the mob will use its default attack distance",
-      "title": "Mount distance"
+      "title": "Mount Distance"
     },
-    "start_delay": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time the mob will wait before starting to move towards the mount",
-      "title": "Start delay"
-    },
-    "target_needed": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will only look for a mount if it has a target",
-      "title": "Target needed"
-    },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks within which the mob will look for a mount",
-      "title": "Within radius"
-    }
+    "start_delay": { "type": "integer", "default": 0, "description": "Time the mob will wait before starting to move towards the mount", "title": "Start Delay" },
+    "target_needed": { "type": "boolean", "default": false, "description": "If true, the mob will only look for a mount if it has a target", "title": "Target Needed" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks within which the mob will look for a mount", "title": "Within Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.go_home.json b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.go_home.json
index 8590896d..055251bb 100644
--- a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.go_home.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.minecraft.behavior.go_home",
   "type": "object",
-  "title": "Go home 1.13.0",
+  "title": "Go Home 1.13.0",
   "description": "Allows the mob to move back to the position they were spawned.",
   "additionalProperties": false,
   "required": [],
@@ -13,7 +13,7 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "interval": {
       "type": "integer",
@@ -22,42 +22,14 @@
       "title": "Interval"
     },
     "on_home": {
-      "title": "On home",
+      "title": "On Home",
       "description": "Event to run when this mob gets home.",
-      "oneOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "object",
-          "$ref": "../types/trigger.json"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "../types/trigger.json"
-          }
-        }
-      ]
+      "oneOf": [{ "type": "string" }, { "type": "object", "$ref": "../types/trigger.json" }, { "type": "array", "items": { "$ref": "../types/trigger.json" } }]
     },
     "on_failed": {
       "description": "Event to run when this mob gets home.",
-      "oneOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "object",
-          "$ref": "../types/trigger.json"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "../types/trigger.json"
-          }
-        }
-      ],
-      "title": "On failed"
+      "oneOf": [{ "type": "string" }, { "type": "object", "$ref": "../types/trigger.json" }, { "type": "array", "items": { "$ref": "../types/trigger.json" } }],
+      "title": "On Failed"
     }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.stomp_turtle_egg.json b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
index 0a616751..52092716 100644
--- a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
+++ b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.minecraft.behavior.stomp_turtle_egg",
   "description": "Allows this mob to stomp turtle eggs",
   "type": "object",
-  "title": "Stomp turtle egg 1.13.0",
+  "title": "Stomp Turtle Egg 1.13.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -13,7 +13,7 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "interval": {
       "type": "integer",
@@ -25,19 +25,9 @@
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "Search count"
+      "title": "Search Count"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for turtle eggs to move towards",
-      "title": "Search height"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for turtle eggs to move towards",
-      "title": "Search range"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for turtle eggs to move towards", "title": "Search Height" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for turtle eggs to move towards", "title": "Search Range" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.tempt.json b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.tempt.json
index 8becc0e5..960f80b2 100644
--- a/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.tempt.json
+++ b/source/behaviour/entities/1.13.0/behaviors/minecraft.behavior.tempt.json
@@ -13,49 +13,29 @@
       "type": "boolean",
       "default": false,
       "description": "If true, the mob can stop being tempted if the player moves too fast while close to this mob",
-      "title": "Can get scared"
-    },
-    "can_tempt_while_ridden": {
-      "type": "boolean",
-      "title": "Can tempt while ridden",
-      "description": "UNDOCUMENTATED"
+      "title": "Can Get Scared"
     },
+    "can_tempt_while_ridden": { "type": "boolean", "title": "Can Tempt While Ridden", "description": "UNDOCUMENTATED" },
     "items": {
       "type": "array",
       "description": "List of items this mob is tempted by",
-      "items": {
-        "type": "string",
-        "title": "Item",
-        "description": "An item identifier"
-      },
+      "items": { "type": "string", "title": "Item", "description": "An item identifier" },
       "title": "Items"
     },
     "within_radius": {
       "type": "number",
       "default": 0,
       "description": "Distance in blocks this mob can get tempted by a player holding an item they like",
-      "title": "Within radius"
-    },
-    "tempt_sound": {
-      "type": "string",
-      "description": "UNDOCUMENTATED",
-      "title": "Tempt sound"
+      "title": "Within Radius"
     },
+    "tempt_sound": { "type": "string", "description": "UNDOCUMENTATED", "title": "Tempt Sound" },
     "sound_interval": {
       "type": "object",
       "description": "UNDOCUMENTATED",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "properties": {
-        "range_min": {
-          "type": "number",
-          "description": "UNDOCUMENTATED",
-          "title": "Range min"
-        },
-        "range_max": {
-          "type": "number",
-          "description": "UNDOCUMENTATED",
-          "title": "Range max"
-        }
+        "range_min": { "type": "number", "description": "UNDOCUMENTATED", "title": "Range Min" },
+        "range_max": { "type": "number", "description": "UNDOCUMENTATED", "title": "Range Max" }
       },
       "additionalProperties": false
     }
diff --git a/source/behaviour/entities/1.13.0/behaviors/types/base_speed_multiplier.json b/source/behaviour/entities/1.13.0/behaviors/types/base_speed_multiplier.json
index d91ebdf3..9c9afdda 100644
--- a/source/behaviour/entities/1.13.0/behaviors/types/base_speed_multiplier.json
+++ b/source/behaviour/entities/1.13.0/behaviors/types/base_speed_multiplier.json
@@ -5,5 +5,5 @@
   "default": 1.0,
   "description": "Movement speed multiplier of the mob when using this AI Goal.",
   "type": "number",
-  "title": "Speed multiplier"
+  "title": "Speed Multiplier"
 }
diff --git a/source/behaviour/entities/1.13.0/components.json b/source/behaviour/entities/1.13.0/components.json
index c754815d..b810da72 100644
--- a/source/behaviour/entities/1.13.0/components.json
+++ b/source/behaviour/entities/1.13.0/components.json
@@ -174,7 +174,6 @@
     "minecraft:walk_animation_speed": { "$ref": "../1.8.0/components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "../1.8.0/components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "../1.8.0/components/minecraft.water_movement.json" },
-
     "minecraft:behavior.admire_item": { "$ref": "../1.8.0/behaviors/minecraft.behavior.admire_item.json" },
     "minecraft:behavior.avoid_mob_type": { "$ref": "../1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json" },
     "minecraft:behavior.beg": { "$ref": "../1.8.0/behaviors/minecraft.behavior.beg.json" },
@@ -244,16 +243,12 @@
     "minecraft:behavior.move_to_random_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_random_block.json" },
     "minecraft:behavior.move_to_village": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_village.json" },
     "minecraft:behavior.move_to_water": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_water.json" },
-    "minecraft:behavior.move_towards_dwelling_restriction": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json"
-    },
+    "minecraft:behavior.move_towards_dwelling_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json" },
     "minecraft:behavior.move_towards_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json" },
     "minecraft:behavior.move_towards_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_target.json" },
     "minecraft:behavior.nap": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nap.json" },
     "minecraft:behavior.nearest_attackable_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json" },
-    "minecraft:behavior.nearest_prioritized_attackable_target": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json"
-    },
+    "minecraft:behavior.nearest_prioritized_attackable_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json" },
     "minecraft:behavior.ocelot_sit_on_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json" },
     "minecraft:behavior.ocelotattack": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelotattack.json" },
     "minecraft:behavior.offer_flower": { "$ref": "../1.8.0/behaviors/minecraft.behavior.offer_flower.json" },
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.ageable.json b/source/behaviour/entities/1.13.0/components/minecraft.ageable.json
index 06e0a6ae..574818f9 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.ageable.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.ageable.json
@@ -8,43 +8,15 @@
   "properties": {
     "drop_items": {
       "description": "List of items that the entity drops when it grows up.",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ],
-      "title": "TODO title"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1200,
-      "description": "Amount of time before the entity grows up, -1 for always a baby.",
-      "title": "TODO title"
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }],
+      "title": "TODO Title"
     },
+    "duration": { "type": "number", "default": 1200, "description": "Amount of time before the entity grows up, -1 for always a baby.", "title": "TODO Title" },
     "feed_items": {
       "description": "List of items that can be fed to the entity. Includes 'item' for the item name and 'growth' to define how much time it grows up by",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ],
-      "title": "TODO title"
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }],
+      "title": "TODO Title"
     },
-    "grow_up": {
-      "description": "Event to run when this entity grows up.",
-      "title": "TODO title"
-    }
+    "grow_up": { "description": "Event to run when this entity grows up.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.ambient_sound_interval.json b/source/behaviour/entities/1.13.0/components/minecraft.ambient_sound_interval.json
index cb440b0a..22ea1e63 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.ambient_sound_interval.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.ambient_sound_interval.json
@@ -3,27 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.ambient_sound_interval",
   "additionalProperties": false,
   "type": "object",
-  "title": "Ambient sound interval 1.8.0",
+  "title": "Ambient Sound Interval 1.8.0",
   "description": "Sets the entity's delay between playing its ambient sound.",
   "required": ["event_name"],
   "properties": {
-    "event_name": {
-      "type": "string",
-      "default": "ambient",
-      "description": "Level sound event to be played as the ambient sound.",
-      "title": "Event name"
-    },
-    "range": {
-      "type": "number",
-      "default": 16,
-      "description": "Maximum time in seconds to randomly add to the ambient sound delay time.",
-      "title": "Range"
-    },
-    "value": {
-      "type": "number",
-      "default": 8,
-      "description": "Minimum time in seconds before the entity plays its ambient sound again",
-      "title": "Value"
-    }
+    "event_name": { "type": "string", "default": "ambient", "description": "Level sound event to be played as the ambient sound.", "title": "Event Name" },
+    "range": { "type": "number", "default": 16, "description": "Maximum time in seconds to randomly add to the ambient sound delay time.", "title": "Range" },
+    "value": { "type": "number", "default": 8, "description": "Minimum time in seconds before the entity plays its ambient sound again", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.breedable.json b/source/behaviour/entities/1.13.0/components/minecraft.breedable.json
index f9449944..06eb74a5 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.breedable.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.breedable.json
@@ -12,100 +12,43 @@
       "additionalItems": false,
       "required": [],
       "properties": {
-        "baby_type": {
-          "type": "string",
-          "description": "The entity definition of this entity's babies.",
-          "title": "Baby Type"
-        },
-        "breed_event": {
-          "$ref": "../types/event.json",
-          "description": "Event to run when this entity breeds.",
-          "title": "Breed Event"
-        },
-        "mate_type": {
-          "type": "string",
-          "description": "The entity definition of this entity's mate.",
-          "title": "Mate Type"
-        }
+        "baby_type": { "type": "string", "description": "The entity definition of this entity's babies.", "title": "Baby Type" },
+        "breed_event": { "$ref": "../types/event.json", "description": "Event to run when this entity breeds.", "title": "Breed Event" },
+        "mate_type": { "type": "string", "description": "The entity definition of this entity's mate.", "title": "Mate Type" }
       }
     }
   },
   "required": [],
   "properties": {
-    "allow_sitting": {
-      "description": "If true, entities can breed while sitting.",
-      "type": "boolean",
-      "default": false,
-      "title": "Allow Sitting"
-    },
+    "allow_sitting": { "description": "If true, entities can breed while sitting.", "type": "boolean", "default": false, "title": "Allow Sitting" },
     "blend_attributes": {
       "description": "If true, the entities will blend their attributes in the offspring after they breed. For example, horses blend their health, movement, and jump_strength in their offspring.",
       "type": "boolean",
       "default": true,
       "title": "Blend Attributes"
     },
-    "breed_cooldown": {
-      "description": "Time in seconds before the Entity can breed again.",
-      "type": "number",
-      "default": 60.0,
-      "title": "Breed Cooldown"
-    },
+    "breed_cooldown": { "description": "Time in seconds before the Entity can breed again.", "type": "number", "default": 60.0, "title": "Breed Cooldown" },
     "breed_items": {
       "description": "The list of items that can be used to get the entity into the 'love' state",
       "title": "Breed Items",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ]
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }]
     },
     "breeds_with": {
       "description": "The list of entity definitions that this entity can breed with.",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/breeds_with_spec"
-        },
-        {
-          "uniqueItems": true,
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/breeds_with_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/breeds_with_spec" },
+        { "uniqueItems": true, "type": "array", "items": { "type": "object", "$ref": "#/definitions/breeds_with_spec" } }
       ],
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "deny_parents_variant": {
       "type": "object",
       "description": "Determines how likely the baby of parents with the same variant will deny that variant and take a random variant within the given range instead.",
       "additionalProperties": false,
       "properties": {
-        "chance": {
-          "type": "number",
-          "default": 0,
-          "description": "The percentage chance of denying the parents' variant.",
-          "title": "Chance"
-        },
-        "max_variant": {
-          "type": "integer",
-          "default": 0,
-          "description": "The inclusive maximum of the variant range.",
-          "title": "Max Variant"
-        },
-        "min_variant": {
-          "type": "integer",
-          "default": 0,
-          "description": "The inclusive minimum of the variant range.",
-          "title": "Min Variant"
-        }
+        "chance": { "type": "number", "default": 0, "description": "The percentage chance of denying the parents' variant.", "title": "Chance" },
+        "max_variant": { "type": "integer", "default": 0, "description": "The inclusive maximum of the variant range.", "title": "Max Variant" },
+        "min_variant": { "type": "integer", "default": 0, "description": "The inclusive minimum of the variant range.", "title": "Min Variant" }
       },
       "title": "Deny Parents Variant"
     },
@@ -127,11 +70,7 @@
             },
             "title": "Blocks"
           },
-          "count": {
-            "type": "number",
-            "description": "The number of the required block types nearby for the entity to breed.",
-            "title": "Count"
-          },
+          "count": { "type": "number", "description": "The number of the required block types nearby for the entity to breed.", "title": "Count" },
           "radius": {
             "type": "number",
             "description": "How many blocks radius from the mob's center to search in for the required blocks. Bounded between 0 and 16.",
@@ -157,14 +96,7 @@
       "description": "Determines how likely the babies are to NOT inherit one of their parent's variances. Values are between 0.0 and 1.0, with a higher number meaning more likely to mutate.",
       "additionalProperties": false,
       "properties": {
-        "color": {
-          "type": "number",
-          "default": 0,
-          "minimum": 0.0,
-          "maximum": 1.0,
-          "description": "The percentage chance of a mutation on the entity's color.",
-          "title": "Color"
-        },
+        "color": { "type": "number", "default": 0, "minimum": 0.0, "maximum": 1.0, "description": "The percentage chance of a mutation on the entity's color.", "title": "Color" },
         "extra_variant": {
           "type": "number",
           "default": 0,
@@ -184,29 +116,14 @@
       },
       "title": "Mutation Factor"
     },
-    "causes_pregnancy": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity will become pregnant instead of spawning a baby.",
-      "title": "Causes pregnancy"
-    },
-    "inherit_tamed": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the babies will be automatically tamed if its parents are",
-      "title": "Inherit tamed"
-    },
+    "causes_pregnancy": { "type": "boolean", "default": false, "description": "If true, the entity will become pregnant instead of spawning a baby.", "title": "Causes Pregnancy" },
+    "inherit_tamed": { "type": "boolean", "default": true, "description": "If true, the babies will be automatically tamed if its parents are", "title": "Inherit Tamed" },
     "require_full_health": {
       "type": "boolean",
       "default": false,
       "description": "If true, the entity needs to be at full health before it can breed.",
-      "title": "Require full health"
+      "title": "Require Full Health"
     },
-    "require_tame": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the entities need to be tamed first before they can breed.",
-      "title": "Require tame"
-    }
+    "require_tame": { "type": "boolean", "default": true, "description": "If true, the entities need to be tamed first before they can breed.", "title": "Require Tame" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.damage_sensor.json b/source/behaviour/entities/1.13.0/components/minecraft.damage_sensor.json
index e3a3df95..27cf21b5 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.damage_sensor.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.damage_sensor.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.minecraft.damage_sensor",
-  "title": "Damage sensor 1.13.0",
+  "title": "Damage Sensor 1.13.0",
   "description": "Defines what events to call when this entity is damaged by specific entities or items.",
   "type": "object",
   "additionalProperties": false,
@@ -19,44 +19,27 @@
           "type": "number",
           "default": 1,
           "description": "A multiplier that modifies the base damage from the damage cause. If deals_damage is true the multiplier can only reduce the damage the entity will take to a minimum of 1.",
-          "title": "Damage multiplier"
+          "title": "Damage Multiplier"
         },
         "deals_damage": {
           "type": "boolean",
           "default": true,
           "description": "If true, the damage dealt to the entity will take away health from it, set to false to make the entity ignore that damage.",
-          "title": "Deals damage"
+          "title": "Deals Damage"
         },
         "on_damage": {
           "additionalProperties": false,
           "type": "object",
           "description": "Specifies filters for entity definitions and events.",
-          "title": "On damage",
+          "title": "On Damage",
           "properties": {
-            "filters": {
-              "$ref": "../filters.json"
-            },
-            "event": {
-              "type": "string",
-              "pattern": "^.*$",
-              "description": "TODO description: event",
-              "title": "Event"
-            },
-            "target": {
-              "$ref": "../filters/types/base_subject.json",
-              "description": "TODO description: target",
-              "title": "Target"
-            }
+            "filters": { "$ref": "../filters.json" },
+            "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
+            "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
           },
-          "on_damage_sound_event": {
-            "type": "string",
-            "description": "Defines what sound to play, if any, when the on_damage filters are met.",
-            "title": "On damage sound event"
-          }
+          "on_damage_sound_event": { "type": "string", "description": "Defines what sound to play, if any, when the on_damage filters are met.", "title": "On Damage Sound Event" }
         },
-        "on_damage_sound_event": {
-          "$ref": "../../1.8.0/types/event.json"
-        }
+        "on_damage_sound_event": { "$ref": "../../1.8.0/types/event.json" }
       }
     }
   },
@@ -65,16 +48,8 @@
       "description": "The list of triggers with the events to call when taking specific kinds of damage.",
       "title": "Triggers",
       "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/trigger"
-          }
-        },
-        {
-          "type": "object",
-          "$ref": "#/definitions/trigger"
-        }
+        { "type": "array", "items": { "$ref": "#/definitions/trigger" } },
+        { "type": "object", "$ref": "#/definitions/trigger" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.environment_sensor.json b/source/behaviour/entities/1.13.0/components/minecraft.environment_sensor.json
index 9fa52ab8..ee33e77f 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.environment_sensor.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.environment_sensor.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.minecraft.environment_sensor",
-  "title": "Environment sensor 1.13.0",
+  "title": "Environment Sensor 1.13.0",
   "description": "Creates a trigger based on environment conditions.",
   "type": "object",
   "additionalProperties": false,
@@ -10,16 +10,8 @@
       "description": "The list of triggers that fire when the environment conditions match the given filter criteria.",
       "title": "Triggers",
       "anyOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "../types/trigger.json"
-          }
-        },
-        {
-          "type": "object",
-          "$ref": "../types/trigger.json"
-        }
+        { "type": "array", "items": { "$ref": "../types/trigger.json" } },
+        { "type": "object", "$ref": "../types/trigger.json" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.experience_reward.json b/source/behaviour/entities/1.13.0/components/minecraft.experience_reward.json
index 8372d702..d617e2ee 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.experience_reward.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.experience_reward.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.minecraft.experience_reward",
   "type": "object",
-  "title": "Experience reward 1.13.0",
+  "title": "Experience Reward 1.13.0",
   "description": "TODO",
   "additionalProperties": false,
   "properties": {
@@ -10,13 +10,13 @@
       "type": "string",
       "default": 0,
       "description": "A molang expression defining the amount of experience rewarded when this entity is successfully bred. An array of expressions adds each expression's result together for a final total.",
-      "title": "On bred"
+      "title": "On Bred"
     },
     "on_death": {
       "type": "string",
       "default": 0,
       "description": "A molang expression defining the amount of experience rewarded when this entity dies. An array of expressions adds each expression's result together for a final total.",
-      "title": "On death"
+      "title": "On Death"
     }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.interact.json b/source/behaviour/entities/1.13.0/components/minecraft.interact.json
index cd9eb444..47adb16e 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.interact.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.interact.json
@@ -9,118 +9,64 @@
     "interaction_spec": {
       "type": "object",
       "properties": {
-        "add_items": {
-          "type": "object",
-          "description": "Loot table with items to add to the player's inventory upon successful interaction.",
-          "title": "Add items"
-        },
-        "cooldown": {
-          "type": "number",
-          "default": 0,
-          "description": "Time in seconds before this entity can be interacted with again.",
-          "title": "Cooldown"
-        },
+        "add_items": { "type": "object", "description": "Loot table with items to add to the player's inventory upon successful interaction.", "title": "Add Items" },
+        "cooldown": { "type": "number", "default": 0, "description": "Time in seconds before this entity can be interacted with again.", "title": "Cooldown" },
         "hurt_item": {
           "type": "integer",
           "default": 0,
           "description": "The amount of damage the item will take when used to interact with this entity. A value of 0 means the item won't lose durability.",
-          "title": "Hurt item"
+          "title": "Hurt Item"
         },
         "interact_text": {
           "type": "string",
           "default": "",
           "description": "Text to show when the player is able to interact in this way with this entity when playing with Touch-screen controls.",
-          "title": "Interact text"
-        },
-        "on_interact": {
-          "$ref": "../types/trigger.json",
-          "description": "Event to fire when the interaction occurs.",
-          "title": "On interact"
+          "title": "Interact Text"
         },
+        "on_interact": { "$ref": "../types/trigger.json", "description": "Event to fire when the interaction occurs.", "title": "On Interact" },
         "particle_on_start": {
           "type": "object",
           "description": "Particle effect that will be triggered at the start of the interaction.",
-          "title": "Particle on start",
+          "title": "Particle On Start",
           "properties": {
             "particle_offset_towards_interactor": {
               "type": "boolean",
               "description": "Whether or not the particle will appear closer to who performed the interaction.",
-              "title": "Particle offset towards interactor"
+              "title": "Particle Offset Towards Interactor"
             },
-            "particle_type": {
-              "type": "string",
-              "description": "The type of particle that will be spawned.",
-              "title": "Particle type"
-            },
-            "particle_y_offset": {
-              "type": "number",
-              "description": "Will offset the particle this amount in the y direction.",
-              "title": "Particle y offset"
-            }
+            "particle_type": { "type": "string", "description": "The type of particle that will be spawned.", "title": "Particle Type" },
+            "particle_y_offset": { "type": "number", "description": "Will offset the particle this amount in the y direction.", "title": "Particle Y Offset" }
           }
         },
-        "play_sounds": {
-          "type": "string",
-          "default": "",
-          "description": "List of sounds to play when the interaction occurs.",
-          "title": "Play sounds"
-        },
-        "spawn_entities": {
-          "type": "string",
-          "default": "",
-          "description": "List of entities to spawn when the interaction occurs.",
-          "title": "Spawn entities"
-        },
+        "play_sounds": { "type": "string", "default": "", "description": "List of sounds to play when the interaction occurs.", "title": "Play Sounds" },
+        "spawn_entities": { "type": "string", "default": "", "description": "List of entities to spawn when the interaction occurs.", "title": "Spawn Entities" },
         "spawn_items": {
           "type": "object",
           "description": "Loot table with items to drop on the ground upon successful interaction.",
-          "title": "Spawn items",
+          "title": "Spawn Items",
           "properties": {
-            "table": {
-              "type": "string",
-              "default": "",
-              "description": "File path, relative to the Behavior Pack's path, to the loot table file.",
-              "title": "Table"
-            }
+            "table": { "type": "string", "default": "", "description": "File path, relative to the Behavior Pack's path, to the loot table file.", "title": "Table" }
           }
         },
-        "swing": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, the player will do the 'swing' animation when interacting with this entity.",
-          "title": "Swing"
-        },
+        "swing": { "type": "boolean", "default": false, "description": "If true, the player will do the 'swing' animation when interacting with this entity.", "title": "Swing" },
         "transform_to_item": {
           "type": "string",
           "default": "",
           "description": "The item used will transform to this item upon successful interaction. Format: itemName:auxValue",
-          "title": "Transform to item"
+          "title": "Transform To Item"
         },
-        "use_item": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, the interaction will use an item.",
-          "title": "Use item"
-        }
+        "use_item": { "type": "boolean", "default": false, "description": "If true, the interaction will use an item.", "title": "Use Item" }
       }
     }
   },
   "properties": {
     "interactions": {
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/interaction_spec"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/interaction_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/interaction_spec" },
+        { "type": "array", "items": { "$ref": "#/definitions/interaction_spec" } }
       ],
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.navigation.climb.json b/source/behaviour/entities/1.13.0/components/minecraft.navigation.climb.json
index f6cdfd93..c456e5c2 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.navigation.climb.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.navigation.climb.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.navigation.float.json b/source/behaviour/entities/1.13.0/components/minecraft.navigation.float.json
index 2329b6e6..84c5119a 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.navigation.float.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.navigation.float.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.navigation.fly.json b/source/behaviour/entities/1.13.0/components/minecraft.navigation.fly.json
index 22e0292a..7a8f72ba 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.navigation.fly.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.navigation.fly.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.navigation.generic.json b/source/behaviour/entities/1.13.0/components/minecraft.navigation.generic.json
index 16302259..d3e13d77 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.navigation.generic.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.navigation.generic.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.navigation.swim.json b/source/behaviour/entities/1.13.0/components/minecraft.navigation.swim.json
index 23400212..600b714f 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.navigation.swim.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.navigation.swim.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.navigation.walk.json b/source/behaviour/entities/1.13.0/components/minecraft.navigation.walk.json
index cafbb969..555ef533 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.navigation.walk.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.navigation.walk.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.projectile.json b/source/behaviour/entities/1.13.0/components/minecraft.projectile.json
index b40c327f..90d04e95 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.projectile.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.projectile.json
@@ -7,46 +7,22 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "anchor": {
-      "type": "number",
-      "title": "Anchor",
-      "description": "UNDOCUMENTATED"
-    },
-    "angle_offset": {
-      "type": "number",
-      "default": 0,
-      "description": "Determines the angle at which the projectile is thrown",
-      "title": "Angle offset"
-    },
-    "catch_fire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be set on fire",
-      "title": "Catch fire"
-    },
+    "anchor": { "type": "number", "title": "Anchor", "description": "UNDOCUMENTATED" },
+    "angle_offset": { "type": "number", "default": 0, "description": "Determines the angle at which the projectile is thrown", "title": "Angle Offset" },
+    "catch_fire": { "type": "boolean", "default": false, "description": "If true, the entity hit will be set on fire", "title": "Catch Fire" },
     "crit_particle_on_hurt": {
       "type": "boolean",
       "default": false,
       "description": "If true, the projectile will produce additional particles when a critical hit happens",
-      "title": "Crit particle on hurt"
-    },
-    "destroy_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be destroyed when hit",
-      "title": "Destroy on hurt"
-    },
-    "filter": {
-      "type": "string",
-      "default": "",
-      "description": "Entity Definitions defined here can't be hurt by the projectile",
-      "title": "Filter"
+      "title": "Crit Particle On Hurt"
     },
+    "destroy_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "Destroy On Hurt" },
+    "filter": { "type": "string", "default": "", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "Filter" },
     "fire_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the projectile causes fire is affected by the mob griefing game rule",
-      "title": "Fire affected by griefing"
+      "title": "Fire Affected By Griefing"
     },
     "gravity": {
       "type": "number",
@@ -54,236 +30,97 @@
       "description": "The gravity applied to this entity when thrown. The higher the value, the faster the entity falls",
       "title": "Gravity"
     },
-    "hit_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile hits something",
-      "title": "Hit sound"
-    },
-    "homing": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile homes in to the nearest entity",
-      "title": "Homing"
-    },
-    "inertia": {
-      "type": "number",
-      "default": 0.99,
-      "description": "The fraction of the projectile's speed maintained every frame while traveling in air",
-      "title": "Inertia"
-    },
-    "is_dangerous": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated as dangerous to the players",
-      "title": "Is dangerous"
-    },
-    "knockback": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile will knock back the entity it hits",
-      "title": "Knockback"
-    },
-    "lightning": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be struck by lightning",
-      "title": "Lightning"
-    },
+    "hit_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile hits something", "title": "Hit Sound" },
+    "homing": { "type": "boolean", "default": false, "description": "If true, the projectile homes in to the nearest entity", "title": "Homing" },
+    "inertia": { "type": "number", "default": 0.99, "description": "The fraction of the projectile's speed maintained every frame while traveling in air", "title": "Inertia" },
+    "is_dangerous": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated as dangerous to the players", "title": "Is Dangerous" },
+    "knockback": { "type": "boolean", "default": true, "description": "If true, the projectile will knock back the entity it hits", "title": "Knockback" },
+    "lightning": { "type": "boolean", "default": false, "description": "If true, the entity hit will be struck by lightning", "title": "Lightning" },
     "liquid_inertia": {
       "type": "number",
       "default": 0.6,
       "description": "The fraction of the projectile's speed maintained every frame while traveling in water",
-      "title": "Liquid inertia"
-    },
-    "multiple_targets": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile can hit multiple entities per flight",
-      "title": "Multiple targets"
+      "title": "Liquid Inertia"
     },
+    "multiple_targets": { "type": "boolean", "default": true, "description": "If true, the projectile can hit multiple entities per flight", "title": "Multiple Targets" },
     "offset": {
       "type": "array",
       "default": [0.0, 0.5, 0.0],
       "description": "The offset from the entity's anchor where the projectile will spawn",
       "title": "Offset",
       "items": [
-        {
-          "type": "number",
-          "title": "X"
-        },
-        {
-          "type": "number",
-          "title": "Y"
-        },
-        {
-          "type": "number",
-          "title": "Z"
-        }
+        { "type": "number", "title": "X" },
+        { "type": "number", "title": "Y" },
+        { "type": "number", "title": "Z" }
       ]
     },
-    "on_fire_time": {
-      "type": "number",
-      "default": 5,
-      "description": "Time in seconds that the entity hit will be on fire for",
-      "title": "On fire time"
-    },
+    "on_fire_time": { "type": "number", "default": 5, "description": "Time in seconds that the entity hit will be on fire for", "title": "On Fire Time" },
     "on_hit": {
       "additionalProperties": false,
       "type": "object",
-      "title": "On hit",
+      "title": "On Hit",
       "description": "UNDOCUMENTATED",
       "properties": {
-        "arrow_effect": {
-          "description": "UNDOCUMENTATED",
-          "title": "Arrow effect",
-          "type": "object",
-          "additionalProperties": false
-        },
+        "arrow_effect": { "description": "UNDOCUMENTATED", "title": "Arrow Effect", "type": "object", "additionalProperties": false },
         "impact_damage": {
           "additionalProperties": false,
           "type": "object",
-          "title": "Impact damage",
+          "title": "Impact Damage",
           "description": "UNDOCUMENTATED",
           "properties": {
             "damage": {
-              "oneOf": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "array",
-                  "items": [
-                    {
-                      "type": "integer"
-                    },
-                    {
-                      "type": "integer"
-                    }
-                  ]
-                }
-              ],
+              "oneOf": [{ "type": "number" }, { "type": "array", "items": [{ "type": "integer" }, { "type": "integer" }] }],
               "title": "Damage",
               "description": "UNDOCUMENTATED"
             },
-            "destroy_on_hit": {
-              "type": "boolean",
-              "title": "Destroy on hit",
-              "description": "UNDOCUMENTATED"
-            },
-            "knockback": {
-              "type": "boolean",
-              "title": "Knockback",
-              "description": "UNDOCUMENTATED"
-            },
-            "max_critical_damage": {
-              "type": "integer",
-              "title": "Max critical damage",
-              "description": "UNDOCUMENTATED"
-            },
-            "min_critical_damage": {
-              "type": "integer",
-              "title": "Min critical damage",
-              "description": "UNDOCUMENTATED"
-            },
-            "power_multiplier": {
-              "type": "number",
-              "title": "Power multiplier",
-              "description": "UNDOCUMENTATED"
-            },
-            "semi_random_diff_damage": {
-              "type": "boolean",
-              "title": "Semi random diff damage",
-              "description": "UNDOCUMENTATED"
-            }
+            "destroy_on_hit": { "type": "boolean", "title": "Destroy On Hit", "description": "UNDOCUMENTATED" },
+            "knockback": { "type": "boolean", "title": "Knockback", "description": "UNDOCUMENTATED" },
+            "max_critical_damage": { "type": "integer", "title": "Max Critical Damage", "description": "UNDOCUMENTATED" },
+            "min_critical_damage": { "type": "integer", "title": "Min Critical Damage", "description": "UNDOCUMENTATED" },
+            "power_multiplier": { "type": "number", "title": "Power Multiplier", "description": "UNDOCUMENTATED" },
+            "semi_random_diff_damage": { "type": "boolean", "title": "Semi Random Diff Damage", "description": "UNDOCUMENTATED" }
           }
         },
         "stick_in_ground": {
           "additionalProperties": false,
-          "title": "Stick in ground",
+          "title": "Stick In Ground",
           "description": "UNDOCUMENTATED",
           "type": "object",
-          "properties": {
-            "shake_time": {
-              "title": "Shake time",
-              "description": "UNDOCUMENTATED",
-              "type": "number"
-            }
-          }
+          "properties": { "shake_time": { "title": "Shake Time", "description": "UNDOCUMENTATED", "type": "number" } }
         }
       }
     },
-    "particle": {
-      "type": "string",
-      "default": "iconcrack",
-      "description": "Particle to use upon collision",
-      "title": "Particle"
-    },
-    "potion_effect": {
-      "type": "integer",
-      "default": -1,
-      "description": "Defines the effect the arrow will apply to the entity it hits",
-      "title": "Potion effect"
-    },
-    "power": {
-      "type": "number",
-      "default": 1.3,
-      "description": "Determines the velocity of the projectile",
-      "title": "Power"
-    },
-    "reflect_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be reflected back when hit",
-      "title": "Reflect on hurt"
-    },
+    "particle": { "type": "string", "default": "iconcrack", "description": "Particle to use upon collision", "title": "Particle" },
+    "potion_effect": { "type": "integer", "default": -1, "description": "Defines the effect the arrow will apply to the entity it hits", "title": "Potion Effect" },
+    "power": { "type": "number", "default": 1.3, "description": "Determines the velocity of the projectile", "title": "Power" },
+    "reflect_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be reflected back when hit", "title": "Reflect On Hurt" },
     "semi_random_diff_damage": {
       "type": "boolean",
       "default": false,
       "description": "If true, damage will be randomized based on damage and speed",
-      "title": "Semi random diff damage"
-    },
-    "shoot_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile is shot",
-      "title": "Shoot sound"
+      "title": "Semi Random Diff Damage"
     },
+    "shoot_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile is shot", "title": "Shoot Sound" },
     "shoot_target": {
       "type": "boolean",
       "default": true,
       "description": "If true, the projectile will be shot towards the target of the entity firing it",
-      "title": "Shoot target"
-    },
-    "should_bounce": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will bounce upon hit",
-      "title": "Should bounce"
-    },
-    "splash_potion": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated like a splash potion",
-      "title": "Splash potion"
-    },
-    "splash_range": {
-      "type": "number",
-      "default": 4,
-      "description": "Radius in blocks of the 'splash' effect",
-      "title": "Splash range"
+      "title": "Shoot Target"
     },
+    "should_bounce": { "type": "boolean", "default": false, "description": "If true, the projectile will bounce upon hit", "title": "Should Bounce" },
+    "splash_potion": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated like a splash potion", "title": "Splash Potion" },
+    "splash_range": { "type": "number", "default": 4, "description": "Radius in blocks of the 'splash' effect", "title": "Splash Range" },
     "uncertainty_base": {
       "type": "number",
       "default": 0,
       "description": "The base accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty base"
+      "title": "Uncertainty Base"
     },
     "uncertainty_multiplier": {
       "type": "number",
       "default": 0,
       "description": "Determines how much difficulty affects accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty multiplier"
+      "title": "Uncertainty Multiplier"
     }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.rideable.json b/source/behaviour/entities/1.13.0/components/minecraft.rideable.json
index 29240152..762178df 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.rideable.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.rideable.json
@@ -15,92 +15,49 @@
           "default": 181,
           "description": "Angle in degrees that a rider is allowed to rotate while riding this entity. Omit this property for no limit"
         },
-        "max_rider_count": {
-          "type": "integer",
-          "default": 0,
-          "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid"
-        },
+        "max_rider_count": { "type": "integer", "default": 0, "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid" },
         "min_rider_count": {
           "type": "integer",
           "default": 0,
           "description": "Defines the minimum number of riders that need to be riding this entity before this seat can be used"
         },
-        "position": {
-          "$ref": "../../../../general/array_3_number.json",
-          "default": [0.0, 0.0, 0.0],
-          "description": "Position of this seat relative to this entity's position"
-        },
-        "rotate_rider_by": {
-          "$ref": "../../../../molang/1.8.0/number.json",
-          "description": "Offset to rotate riders by"
-        }
+        "position": { "$ref": "../../../../general/array_3_number.json", "default": [0.0, 0.0, 0.0], "description": "Position of this seat relative to this entity's position" },
+        "rotate_rider_by": { "$ref": "../../../../molang/1.8.0/number.json", "description": "Offset to rotate riders by" }
       }
     }
   },
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "controlling_seat": {
-      "type": "integer",
-      "default": 0,
-      "description": "The seat that designates the driver of the entity",
-      "title": "TODO title"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "controlling_seat": { "type": "integer", "default": 0, "description": "The seat that designates the driver of the entity", "title": "TODO Title" },
     "crouching_skip_interact": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity can't be interacted with if the entity interacting with it is crouching",
-      "title": "TODO title"
-    },
-    "family_types": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "List of entities that can ride this entity",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "family_types": { "type": "array", "items": { "type": "string" }, "description": "List of entities that can ride this entity", "title": "TODO Title" },
     "interact_text": {
       "type": "string",
       "default": "",
       "description": "The text to display when the player can interact with the entity when playing with Touch-screen controls",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "pull_in_entities": {
       "type": "boolean",
       "default": false,
       "description": "If true, this entity will pull in entities that are in the correct family_types into any available seats",
-      "title": "TODO title"
-    },
-    "rider_can_interact": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be picked when looked at by the rider",
-      "title": "TODO title"
-    },
-    "seat_count": {
-      "type": "integer",
-      "default": 1,
-      "description": "The number of entities that can ride this entity at the same time",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "rider_can_interact": { "type": "boolean", "default": false, "description": "If true, this entity will be picked when looked at by the rider", "title": "TODO Title" },
+    "seat_count": { "type": "integer", "default": 1, "description": "The number of entities that can ride this entity at the same time", "title": "TODO Title" },
     "seats": {
       "description": "The list of positions and number of riders for each position for entities riding this entity",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/seats_spec"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/seats_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/seats_spec" },
+        { "type": "array", "items": { "$ref": "#/definitions/seats_spec" } }
       ],
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/minecraft.transformation.json b/source/behaviour/entities/1.13.0/components/minecraft.transformation.json
index 0f91d71e..76128409 100644
--- a/source/behaviour/entities/1.13.0/components/minecraft.transformation.json
+++ b/source/behaviour/entities/1.13.0/components/minecraft.transformation.json
@@ -10,23 +10,11 @@
     "add": {
       "type": "object",
       "description": "List of components to add to the entity after the transformation",
-      "properties": {
-        "component_groups": {
-          "type": "array",
-          "description": "Names of component groups to add",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "title": "TODO title",
+      "properties": { "component_groups": { "type": "array", "description": "Names of component groups to add", "items": { "type": "string" } } },
+      "title": "TODO Title",
       "additionalProperties": false
     },
-    "begin_transform_sound": {
-      "type": "string",
-      "description": "Sound to play when the transformation starts",
-      "title": "TODO title"
-    },
+    "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "TODO Title" },
     "delay": {
       "type": "object",
       "description": "Defines the properties of the delay for the transformation",
@@ -36,64 +24,37 @@
           "default": 0,
           "description": "Chance that the entity will look for nearby blocks that can speed up the transformation. Value must be between 0.0 and 1.0"
         },
-        "block_chance": {
-          "type": "number",
-          "default": 0,
-          "description": "Chance that, once a block is found, will help speed up the transformation"
-        },
+        "block_chance": { "type": "number", "default": 0, "description": "Chance that, once a block is found, will help speed up the transformation" },
         "block_max": {
           "type": "integer",
           "default": 0,
           "description": "Maximum number of blocks the entity will look for to aid in the transformation. If not defined or set to 0, it will be set to the block radius"
         },
-        "block_radius": {
-          "type": "integer",
-          "default": 0,
-          "description": "Distance in Blocks that the entity will search for blocks that can help the transformation"
-        },
+        "block_radius": { "type": "integer", "default": 0, "description": "Distance in Blocks that the entity will search for blocks that can help the transformation" },
         "block_types": {
           "type": "array",
           "description": "List of blocks that can help the transformation of this entity",
-          "items": {
-            "$ref": "../../../../general/blocks_identifiers.json"
-          }
+          "items": { "$ref": "../../../../general/blocks_identifiers.json" }
         },
-        "value": {
-          "type": "number",
-          "default": 0,
-          "description": "Time in seconds before the entity transforms"
-        }
+        "value": { "type": "number", "default": 0, "description": "Time in seconds before the entity transforms" }
       },
-      "title": "TODO title",
+      "title": "TODO Title",
       "additionalProperties": false
     },
-    "drop_equipment": {
-      "type": "boolean",
-      "default": false,
-      "description": "Cause the entity to drop all equipment upon transformation",
-      "title": "TODO title"
-    },
-    "into": {
-      "type": "string",
-      "description": "Entity Definition that this entity will transform into",
-      "title": "TODO title"
-    },
+    "drop_equipment": { "type": "boolean", "default": false, "description": "Cause the entity to drop all equipment upon transformation", "title": "TODO Title" },
+    "into": { "type": "string", "description": "Entity Definition that this entity will transform into", "title": "TODO Title" },
     "keep_level": {
       "type": "boolean",
       "default": false,
       "description": "If this entity has trades and has leveled up, it should maintain that level after transformation.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "keep_owner": {
       "type": "boolean",
       "default": false,
       "description": "If this entity is owned by another entity, it should remain owned after transformation.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "transformation_sound": {
-      "type": "string",
-      "description": "Sound to play when the entity is done transforming",
-      "title": "TODO title"
-    }
+    "transformation_sound": { "type": "string", "description": "Sound to play when the entity is done transforming", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json b/source/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json
index d91ebdf3..9c9afdda 100644
--- a/source/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json
+++ b/source/behaviour/entities/1.13.0/components/types/base_speed_multiplier.json
@@ -5,5 +5,5 @@
   "default": 1.0,
   "description": "Movement speed multiplier of the mob when using this AI Goal.",
   "type": "number",
-  "title": "Speed multiplier"
+  "title": "Speed Multiplier"
 }
diff --git a/source/behaviour/entities/1.13.0/entities.json b/source/behaviour/entities/1.13.0/entities.json
index c62349fa..9855d0fe 100644
--- a/source/behaviour/entities/1.13.0/entities.json
+++ b/source/behaviour/entities/1.13.0/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.13.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.13.0",
+  "title": "Behaviour Entity 1.13.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.13.0 format version",
+      "title": "1.13.0 Format Version",
       "type": "string",
       "const": "1.13.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.13.0/events.json b/source/behaviour/entities/1.13.0/events.json
index c66a03ff..993b514c 100644
--- a/source/behaviour/entities/1.13.0/events.json
+++ b/source/behaviour/entities/1.13.0/events.json
@@ -6,19 +6,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -26,41 +22,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: add",
-          "title": "Add"
-        },
-        "remove": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: remove",
-          "title": "Remove"
-        },
+        "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+        "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
         "randomize": {
           "type": "array",
           "items": {
             "required": ["weight"],
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "trigger": {
-                "type": "string",
-                "description": "UNDOCUMENTATED",
-                "title": "UNDOCUMENTATED"
-              },
-              "weight": {
-                "type": "number",
-                "description": "TODO description: weight",
-                "title": "Weight"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+              "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
             },
             "description": "TODO description: randomize",
             "title": "Randomize"
@@ -75,32 +47,16 @@
             "title": "Sequence",
             "type": "object",
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "filters": {
-                "$ref": "./filters.json"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "filters": { "$ref": "./filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "trigger": {
-          "type": "string",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "filters": { "$ref": "./filters.json" },
+        "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
   },
@@ -115,19 +71,9 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.13.0/filters.json b/source/behaviour/entities/1.13.0/filters.json
index 34a61165..c8cbb5e5 100644
--- a/source/behaviour/entities/1.13.0/filters.json
+++ b/source/behaviour/entities/1.13.0/filters.json
@@ -6,317 +6,86 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "distance_to_nearest_player" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_container_open" } } },
-              "then": { "$ref": "./filters/has_container_open.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ranged_weapon" } } },
-              "then": { "$ref": "./filters/has_ranged_weapon.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_target" } } },
-              "then": { "$ref": "./filters/has_target.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_nether" } } },
-              "then": { "$ref": "./filters/in_nether.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "inactivity_timer" } } },
-              "then": { "$ref": "./filters/inactivity_timer.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_block" } } },
-              "then": { "$ref": "./filters/is_block.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed_to" } } },
-              "then": { "$ref": "./filters/is_leashed_to.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_persistent" } } },
-              "then": { "$ref": "./filters/is_persistent.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sleeping" } } },
-              "then": { "$ref": "./filters/is_sleeping.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "not": {
-                "properties": { "test": { "const": "is_weather" } },
-                "$comment": "DEPRECATED"
-              }
-            },
-            {
-              "if": { "properties": { "test": { "const": "light_level" } } },
-              "then": { "$ref": "./filters/light_level.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "random_chance" } } },
-              "then": { "$ref": "./filters/random_chance.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "rider_count" } } },
-              "then": { "$ref": "./filters/rider_count.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "surface_mob" } } },
-              "then": { "$ref": "./filters/surface_mob.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "trusts" } } },
-              "then": { "$ref": "./filters/trusts.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "weather" } } },
-              "then": { "$ref": "./filters/weather.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "weather_at_position" } }
-              },
-              "then": { "$ref": "./filters/weather_at_position.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_container_open" } } }, "then": { "$ref": "./filters/has_container_open.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_ranged_weapon" } } }, "then": { "$ref": "./filters/has_ranged_weapon.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_target" } } }, "then": { "$ref": "./filters/has_target.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_nether" } } }, "then": { "$ref": "./filters/in_nether.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "inactivity_timer" } } }, "then": { "$ref": "./filters/inactivity_timer.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_block" } } }, "then": { "$ref": "./filters/is_block.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed_to" } } }, "then": { "$ref": "./filters/is_leashed_to.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_persistent" } } }, "then": { "$ref": "./filters/is_persistent.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sleeping" } } }, "then": { "$ref": "./filters/is_sleeping.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "not": { "properties": { "test": { "const": "is_weather" } }, "$comment": "DEPRECATED" } },
+            { "if": { "properties": { "test": { "const": "light_level" } } }, "then": { "$ref": "./filters/light_level.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } },
+            { "if": { "properties": { "test": { "const": "random_chance" } } }, "then": { "$ref": "./filters/random_chance.json" } },
+            { "if": { "properties": { "test": { "const": "rider_count" } } }, "then": { "$ref": "./filters/rider_count.json" } },
+            { "if": { "properties": { "test": { "const": "surface_mob" } } }, "then": { "$ref": "./filters/surface_mob.json" } },
+            { "if": { "properties": { "test": { "const": "trusts" } } }, "then": { "$ref": "./filters/trusts.json" } },
+            { "if": { "properties": { "test": { "const": "weather" } } }, "then": { "$ref": "./filters/weather.json" } },
+            { "if": { "properties": { "test": { "const": "weather_at_position" } } }, "then": { "$ref": "./filters/weather_at_position.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.13.0/filters/has_container_open.json b/source/behaviour/entities/1.13.0/filters/has_container_open.json
index 905225ab..9b236b49 100644
--- a/source/behaviour/entities/1.13.0/filters/has_container_open.json
+++ b/source/behaviour/entities/1.13.0/filters/has_container_open.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.has_container_open",
   "type": "object",
-  "title": "Filters has container open 1.13.0",
+  "title": "Filters Has Container Open 1.13.0",
   "description": "Returns true when the subject Player entity has opened a container.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/has_ranged_weapon.json b/source/behaviour/entities/1.13.0/filters/has_ranged_weapon.json
index 3b209ddf..9e54270e 100644
--- a/source/behaviour/entities/1.13.0/filters/has_ranged_weapon.json
+++ b/source/behaviour/entities/1.13.0/filters/has_ranged_weapon.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.has_ranged_weapon",
   "type": "object",
-  "title": "Filters has ranged weapon 1.13.0",
+  "title": "Filters Has Ranged Weapon 1.13.0",
   "description": "Returns true when the subject entity is holding a ranged weapon like a bow or crossbow.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/has_target.json b/source/behaviour/entities/1.13.0/filters/has_target.json
index af8efe0c..35511e77 100644
--- a/source/behaviour/entities/1.13.0/filters/has_target.json
+++ b/source/behaviour/entities/1.13.0/filters/has_target.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.has_target",
   "type": "object",
-  "title": "Filters has target 1.13.0",
+  "title": "Filters Has Target 1.13.0",
   "description": "Returns true if the subject entity has a valid target.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/in_nether.json b/source/behaviour/entities/1.13.0/filters/in_nether.json
index e9ffec63..d2b8d4df 100644
--- a/source/behaviour/entities/1.13.0/filters/in_nether.json
+++ b/source/behaviour/entities/1.13.0/filters/in_nether.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.in_nether",
   "type": "object",
-  "title": "Filters in nether 1.13.0",
+  "title": "Filters In Nether 1.13.0",
   "description": "Returns true when the subject entity is in Nether.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/inactivity_timer.json b/source/behaviour/entities/1.13.0/filters/inactivity_timer.json
index a61340c1..8d11d54e 100644
--- a/source/behaviour/entities/1.13.0/filters/inactivity_timer.json
+++ b/source/behaviour/entities/1.13.0/filters/inactivity_timer.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.inactivity_timer",
   "type": "object",
-  "title": "Filters inactivity timer 1.13.0",
+  "title": "Filters Inactivity Timer 1.13.0",
   "description": "Tests if the specified duration in seconds of inactivity for despawning has been reached.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/filters/is_block.json b/source/behaviour/entities/1.13.0/filters/is_block.json
index 401894f7..bd3f1b20 100644
--- a/source/behaviour/entities/1.13.0/filters/is_block.json
+++ b/source/behaviour/entities/1.13.0/filters/is_block.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.is_block",
   "type": "object",
-  "title": "Filters is block 1.13.0",
+  "title": "Filters Is Block 1.13.0",
   "description": "Returns true when the block has the given name.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/filters/is_leashed_to.json b/source/behaviour/entities/1.13.0/filters/is_leashed_to.json
index e6b25bf2..ddca93d3 100644
--- a/source/behaviour/entities/1.13.0/filters/is_leashed_to.json
+++ b/source/behaviour/entities/1.13.0/filters/is_leashed_to.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.is_leashed_to",
   "type": "object",
-  "title": "Filters is leashed to 1.13.0",
+  "title": "Filters Is Leashed To 1.13.0",
   "description": "Returns true if the subject entity leashed to the calling entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/is_persistent.json b/source/behaviour/entities/1.13.0/filters/is_persistent.json
index b8a3e146..c1e46fc1 100644
--- a/source/behaviour/entities/1.13.0/filters/is_persistent.json
+++ b/source/behaviour/entities/1.13.0/filters/is_persistent.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.is_persistent",
   "type": "object",
-  "title": "Filters is persistent 1.13.0",
+  "title": "Filters Is Persistent 1.13.0",
   "description": "Tests if the subject's persistence matches the bool value passed in.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/is_sleeping.json b/source/behaviour/entities/1.13.0/filters/is_sleeping.json
index a3c951fe..a8541aae 100644
--- a/source/behaviour/entities/1.13.0/filters/is_sleeping.json
+++ b/source/behaviour/entities/1.13.0/filters/is_sleeping.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.is_sleeping",
   "type": "object",
-  "title": "Filters is sleeping 1.13.0",
+  "title": "Filters Is Sleeping 1.13.0",
   "description": "Tests whether the Subject is sleeping.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/light_level.json b/source/behaviour/entities/1.13.0/filters/light_level.json
index e8da66de..849ec9b7 100644
--- a/source/behaviour/entities/1.13.0/filters/light_level.json
+++ b/source/behaviour/entities/1.13.0/filters/light_level.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.light_level",
   "type": "object",
-  "title": "Filters light level 1.13.0",
+  "title": "Filters Light Level 1.13.0",
   "description": "Tests is the mob is outside of the specified light level range (0, 16).",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value",
-      "minimum": 0,
-      "maximum": 16
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value", "minimum": 0, "maximum": 16 }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/filters/random_chance.json b/source/behaviour/entities/1.13.0/filters/random_chance.json
index 5a63a219..acc84283 100644
--- a/source/behaviour/entities/1.13.0/filters/random_chance.json
+++ b/source/behaviour/entities/1.13.0/filters/random_chance.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.random_chance",
   "type": "object",
-  "title": "Filters random chance 1.13.0",
+  "title": "Filters Random Chance 1.13.0",
   "description": "Returns true if the random chance rolls 0 out of a specified max range.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/filters/rider_count.json b/source/behaviour/entities/1.13.0/filters/rider_count.json
index a2763237..dd7ca5fc 100644
--- a/source/behaviour/entities/1.13.0/filters/rider_count.json
+++ b/source/behaviour/entities/1.13.0/filters/rider_count.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.rider_count",
   "type": "object",
-  "title": "Filters rider count 1.13.0",
+  "title": "Filters Rider Count 1.13.0",
   "description": "Returns the number of riders on this entity.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/filters/surface_mob.json b/source/behaviour/entities/1.13.0/filters/surface_mob.json
index 62e6fd28..0bc1c13d 100644
--- a/source/behaviour/entities/1.13.0/filters/surface_mob.json
+++ b/source/behaviour/entities/1.13.0/filters/surface_mob.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.surface_mob",
   "type": "object",
-  "title": "Filters surface mob 1.13.0",
+  "title": "Filters Surface Mob 1.13.0",
   "description": "Tests if the subject is a surface mob.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/trusts.json b/source/behaviour/entities/1.13.0/filters/trusts.json
index 86dc514f..60372cd3 100644
--- a/source/behaviour/entities/1.13.0/filters/trusts.json
+++ b/source/behaviour/entities/1.13.0/filters/trusts.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.trusts",
   "type": "object",
-  "title": "Filters trusts 1.13.0",
+  "title": "Filters Trusts 1.13.0",
   "description": "Returns true if the subject is trusted by entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json b/source/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json
index d91ebdf3..9c9afdda 100644
--- a/source/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json
+++ b/source/behaviour/entities/1.13.0/filters/types/base_speed_multiplier.json
@@ -5,5 +5,5 @@
   "default": 1.0,
   "description": "Movement speed multiplier of the mob when using this AI Goal.",
   "type": "number",
-  "title": "Speed multiplier"
+  "title": "Speed Multiplier"
 }
diff --git a/source/behaviour/entities/1.13.0/filters/weather.json b/source/behaviour/entities/1.13.0/filters/weather.json
index dc8e9232..13139ef6 100644
--- a/source/behaviour/entities/1.13.0/filters/weather.json
+++ b/source/behaviour/entities/1.13.0/filters/weather.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.weather",
   "type": "object",
-  "title": "Filters weather 1.13.0",
+  "title": "Filters Weather 1.13.0",
   "description": "Tests the current weather in the dimension against a provided weather value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/filters/weather_at_position.json b/source/behaviour/entities/1.13.0/filters/weather_at_position.json
index 26f238af..a8e44195 100644
--- a/source/behaviour/entities/1.13.0/filters/weather_at_position.json
+++ b/source/behaviour/entities/1.13.0/filters/weather_at_position.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.13.0.filters.weather_at_position",
   "type": "object",
-  "title": "Filters weather at position 1.13.0",
+  "title": "Filters Weather At Position 1.13.0",
   "description": "Tests the current weather, at the actor's position, against a provided weather value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/minecraft.entity.json b/source/behaviour/entities/1.13.0/minecraft.entity.json
index 4ec4244e..a55f24fe 100644
--- a/source/behaviour/entities/1.13.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.13.0/minecraft.entity.json
@@ -14,35 +14,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -56,20 +44,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -78,7 +54,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -86,20 +62,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "$ref": "./components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "$ref": "./events.json",
       "uniqueItems": true,
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.13.0/types/entity_types.json b/source/behaviour/entities/1.13.0/types/entity_types.json
index 99cc9c4e..0b5e0fc3 100644
--- a/source/behaviour/entities/1.13.0/types/entity_types.json
+++ b/source/behaviour/entities/1.13.0/types/entity_types.json
@@ -1,20 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.entity_types.1.13.0",
-  "title": "Entity types 1.13.0",
+  "title": "Entity Types 1.13.0",
   "type": "array",
   "items": {
     "description": "The entity type",
-    "title": "The entity type",
+    "title": "Entity Type",
     "type": "object",
     "properties": {
       "filters": { "type": "object", "$ref": "../filters.json" },
-      "max_dist": {
-        "type": "number",
-        "description": "Maximum distance this mob can be away to be a valid choice",
-        "default": 16,
-        "title": "Max Dist"
-      },
+      "max_dist": { "type": "number", "description": "Maximum distance this mob can be away to be a valid choice", "default": 16, "title": "Max Dist" },
       "walk_speed_multiplier": {
         "type": "number",
         "description": "Multiplier for the walking speed. A value of 1.0 means the speed is unchanged",
@@ -27,12 +22,7 @@
         "default": 16,
         "title": "Sprint Speed Multiplier"
       },
-      "must_see": {
-        "type": "boolean",
-        "description": "If true, the mob has to be visible to be a valid choice",
-        "default": false,
-        "title": "Must See"
-      },
+      "must_see": { "type": "boolean", "description": "If true, the mob has to be visible to be a valid choice", "default": false, "title": "Must See" },
       "must_see_forget_duration": {
         "type": "number",
         "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
diff --git a/source/behaviour/entities/1.13.0/types/event.json b/source/behaviour/entities/1.13.0/types/event.json
index 66477b20..2279fa1a 100644
--- a/source/behaviour/entities/1.13.0/types/event.json
+++ b/source/behaviour/entities/1.13.0/types/event.json
@@ -4,25 +4,12 @@
   "title": "Event",
   "description": "Minecraft behaviour event 1.13.0",
   "oneOf": [
-    {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_\\-:]+$",
-      "description": "The event to fire"
-    },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
     {
       "type": "object",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
-        "target": {
-          "type": "string",
-          "description": "The target of the event",
-          "enum": ["block", "damager", "other", "parent", "player", "self", "target", "baby"]
-        }
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
+        "target": { "type": "string", "description": "The target of the event", "enum": ["block", "damager", "other", "parent", "player", "self", "target", "baby"] }
       }
     }
   ]
diff --git a/source/behaviour/entities/1.13.0/types/range_number_type.json b/source/behaviour/entities/1.13.0/types/range_number_type.json
index 9438ea3d..72c622bd 100644
--- a/source/behaviour/entities/1.13.0/types/range_number_type.json
+++ b/source/behaviour/entities/1.13.0/types/range_number_type.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.range_number_type.1.13.0",
-  "title": "Range [a, b]",
+  "title": "Range [a, B]",
   "description": "A described range",
   "items": [
     { "type": "number", "title": "Range: A", "description": "The first value of the range" },
diff --git a/source/behaviour/entities/1.13.0/types/trigger.json b/source/behaviour/entities/1.13.0/types/trigger.json
index 174c3716..8e3b6b33 100644
--- a/source/behaviour/entities/1.13.0/types/trigger.json
+++ b/source/behaviour/entities/1.13.0/types/trigger.json
@@ -6,11 +6,7 @@
   "description": "Trigger to fire",
   "minProperties": 1,
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "Event",
-      "title": "The event to fire"
-    },
+    "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
     "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "Filters" },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
diff --git a/source/behaviour/entities/1.14.0/entities.json b/source/behaviour/entities/1.14.0/entities.json
index d2416ac1..a61af68a 100644
--- a/source/behaviour/entities/1.14.0/entities.json
+++ b/source/behaviour/entities/1.14.0/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.14.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.14.0",
+  "title": "Behaviour Entity 1.14.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.14.0 format version",
+      "title": "1.14.0 Format Version",
       "type": "string",
       "const": "1.14.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.14.0/events.json b/source/behaviour/entities/1.14.0/events.json
index 7512dbe3..af633dfd 100644
--- a/source/behaviour/entities/1.14.0/events.json
+++ b/source/behaviour/entities/1.14.0/events.json
@@ -6,19 +6,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -26,41 +22,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: add",
-          "title": "Add"
-        },
-        "remove": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: remove",
-          "title": "Remove"
-        },
+        "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+        "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
         "randomize": {
           "type": "array",
           "items": {
             "required": ["weight"],
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "trigger": {
-                "type": "string",
-                "description": "UNDOCUMENTATED",
-                "title": "UNDOCUMENTATED"
-              },
-              "weight": {
-                "type": "number",
-                "description": "TODO description: weight",
-                "title": "Weight"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+              "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
             },
             "description": "TODO description: randomize",
             "title": "Randomize"
@@ -75,32 +47,16 @@
             "title": "Sequence",
             "type": "object",
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "filters": {
-                "$ref": "./filters.json"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "filters": { "$ref": "./filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "trigger": {
-          "type": "string",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "filters": { "$ref": "./filters.json" },
+        "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
   },
@@ -115,19 +71,9 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.14.0/filters.json b/source/behaviour/entities/1.14.0/filters.json
index c95eb6a5..7bbc2d73 100644
--- a/source/behaviour/entities/1.14.0/filters.json
+++ b/source/behaviour/entities/1.14.0/filters.json
@@ -6,275 +6,76 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "distance_to_nearest_player" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_target" } } },
-              "then": { "$ref": "../1.13.0/filters/has_target.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_block" } } },
-              "then": { "$ref": "../1.13.0/filters/is_block.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed_to" } } },
-              "then": { "$ref": "../1.13.0/filters/is_leashed_to.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sleeping" } } },
-              "then": { "$ref": "../1.13.0/filters/is_sleeping.json" }
-            },
-            {
-              "not": {
-                "properties": { "test": { "const": "is_weather" } },
-                "$comment": "DEPRECATED"
-              }
-            },
-            {
-              "if": { "properties": { "test": { "const": "rider_count" } } },
-              "then": { "$ref": "../1.13.0/filters/rider_count.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "trusts" } } },
-              "then": { "$ref": "../1.13.0/filters/trusts.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } },
+            { "if": { "properties": { "test": { "const": "has_target" } } }, "then": { "$ref": "../1.13.0/filters/has_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_block" } } }, "then": { "$ref": "../1.13.0/filters/is_block.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed_to" } } }, "then": { "$ref": "../1.13.0/filters/is_leashed_to.json" } },
+            { "if": { "properties": { "test": { "const": "is_sleeping" } } }, "then": { "$ref": "../1.13.0/filters/is_sleeping.json" } },
+            { "not": { "properties": { "test": { "const": "is_weather" } }, "$comment": "DEPRECATED" } },
+            { "if": { "properties": { "test": { "const": "rider_count" } } }, "then": { "$ref": "../1.13.0/filters/rider_count.json" } },
+            { "if": { "properties": { "test": { "const": "trusts" } } }, "then": { "$ref": "../1.13.0/filters/trusts.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.14.0/minecraft.entity.json b/source/behaviour/entities/1.14.0/minecraft.entity.json
index 31beade2..f9761de8 100644
--- a/source/behaviour/entities/1.14.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.14.0/minecraft.entity.json
@@ -14,35 +14,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -56,20 +44,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -78,7 +54,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -86,20 +62,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "$ref": "./components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "$ref": "./events.json",
       "uniqueItems": true,
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.admire_item.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.admire_item.json
index beaee7d7..6e79f9b5 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.admire_item.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.admire_item.json
@@ -2,54 +2,28 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.admire_item",
   "type": "object",
-  "title": "Admire item 1.16.0",
+  "title": "Admire Item 1.16.0",
   "description": "Enables the mob to admire items that have been configured as admirable. Must be used in combination with the admire_item component.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "admire_item_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound event to play when admiring the item",
-      "title": "Admire item sound"
-    },
-    "on_admire_item_start": { "$ref": "../types/event.json", "title": "On admire item start", "description": "UNDOCUMENTATED" },
-    "on_admire_item_stop": { "$ref": "../types/event.json", "title": "On admire item stop", "description": "UNDOCUMENTATED" },
+    "priority": { "$ref": "types/base_priority.json" },
+    "admire_item_sound": { "type": "string", "default": "", "description": "The sound event to play when admiring the item", "title": "Admire Item Sound" },
+    "on_admire_item_start": { "$ref": "../types/event.json", "title": "On Admire Item Start", "description": "UNDOCUMENTATED" },
+    "on_admire_item_stop": { "$ref": "../types/event.json", "title": "On Admire Item Stop", "description": "UNDOCUMENTATED" },
     "sound_interval": {
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again.",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": {
-              "type": "number"
-            },
-            "range_max": {
-              "type": "number"
-            }
-          }
-        }
+        { "type": "number" },
+        { "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.avoid_block.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.avoid_block.json
index 3af1ce2a..e540b18a 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.avoid_block.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.avoid_block.json
@@ -2,99 +2,39 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.avoid_block",
   "type": "object",
-  "title": "Avoid block 1.16.0",
+  "title": "Avoid Block 1.16.0",
   "description": "UNDOCUMENTATED",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "tick_interval": {
-      "type": "integer",
-      "title": "Tick interval",
-      "description": "UNDOCUMENTATED"
-    },
-    "search_range": {
-      "type": "integer",
-      "title": "Search range",
-      "description": "UNDOCUMENTATED"
-    },
-    "search_height": {
-      "type": "integer",
-      "title": "Search height",
-      "description": "UNDOCUMENTATED"
-    },
-    "sprint_speed_modifier": {
-      "type": "number",
-      "title": "Sprint speed modifier",
-      "description": "UNDOCUMENTATED"
-    },
-    "target_selection_method": {
-      "type": "string",
-      "title": "Target selection method",
-      "description": "UNDOCUMENTATED"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "tick_interval": { "type": "integer", "title": "Tick Interval", "description": "UNDOCUMENTATED" },
+    "search_range": { "type": "integer", "title": "Search Range", "description": "UNDOCUMENTATED" },
+    "search_height": { "type": "integer", "title": "Search Height", "description": "UNDOCUMENTATED" },
+    "sprint_speed_modifier": { "type": "number", "title": "Sprint Speed Modifier", "description": "UNDOCUMENTATED" },
+    "target_selection_method": { "type": "string", "title": "Target Selection Method", "description": "UNDOCUMENTATED" },
     "target_blocks": {
       "type": "array",
-      "title": "Target blocks",
+      "title": "Target Blocks",
       "description": "UNDOCUMENTATED",
-      "items": {
-        "type": "string",
-        "title": "Block ID",
-        "description": "UNDOCUMENTATED"
-      }
-    },
-    "avoid_block_sound": {
-      "type": "string",
-      "title": "Avoid block sound",
-      "description": "UNDOCUMENTATED"
-    },
-    "walk_speed_modifier": {
-      "type": "number",
-      "title": "Walk speed modifier",
-      "description": "UNDOCUMENTATED"
-    },
-    "on_escape": {
-      "type": "array",
-      "title": "Walk speed modifier",
-      "description": "UNDOCUMENTATED",
-      "items": {
-        "$ref": "../types/event.json"
-      }
+      "items": { "type": "string", "title": "Block ID", "description": "UNDOCUMENTATED" }
     },
+    "avoid_block_sound": { "type": "string", "title": "Avoid Block Sound", "description": "UNDOCUMENTATED" },
+    "walk_speed_modifier": { "type": "number", "title": "Walk Speed Modifier", "description": "UNDOCUMENTATED" },
+    "on_escape": { "type": "array", "title": "Walk Speed Modifier", "description": "UNDOCUMENTATED", "items": { "$ref": "../types/event.json" } },
     "sound_interval": {
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again.",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": {
-              "type": "number"
-            },
-            "range_max": {
-              "type": "number"
-            }
-          }
-        }
+        { "type": "number" },
+        { "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.barter.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.barter.json
index c64d7cb9..8030e46f 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.barter.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.barter.json
@@ -5,9 +5,5 @@
   "title": "Barter 1.16.0",
   "description": "Enables the mob to barter for items that have been configured as barter currency. Must be used in combination with the barter component",
   "additionalProperties": false,
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.celebrate.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.celebrate.json
index 5cbad4e5..a262fa21 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.celebrate.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.celebrate.json
@@ -6,94 +6,40 @@
   "description": "This allows the mob celebrate by jumping up and playing a sound periodically.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "celebration_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound to occasionally play.",
-      "title": "Celebration sound"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1,
-      "description": "The duration of the celebration (in seconds).",
-      "title": "Duration"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "celebration_sound": { "type": "string", "default": "", "description": "The sound to occasionally play.", "title": "Celebration Sound" },
+    "duration": { "type": "number", "default": 1, "description": "The duration of the celebration (in seconds).", "title": "Duration" },
     "jump_interval": {
       "default": 0,
       "description": "The range of time in seconds to randomly wait before jumping again.",
-      "title": "Jump interval",
+      "title": "Jump Interval",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": {
-              "type": "number"
-            },
-            "range_max": {
-              "type": "number"
-            }
-          }
-        }
+        { "type": "number" },
+        { "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }
       ]
     },
-    "on_celebration_end_event": {
-      "$ref": "../types/trigger.json",
-      "description": "The event to trigger when the goal's duration expires.",
-      "title": "On celebration end event"
-    },
+    "on_celebration_end_event": { "$ref": "../types/trigger.json", "description": "The event to trigger when the goal's duration expires.", "title": "On Celebration End Event" },
     "sound_interval": {
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again.",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": {
-              "type": "number"
-            },
-            "range_max": {
-              "type": "number"
-            }
-          }
-        }
+        { "type": "number" },
+        { "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.defend_trusted_target.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.defend_trusted_target.json
index 56ce3887..50ee227c 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.defend_trusted_target.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.defend_trusted_target.json
@@ -2,54 +2,23 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.defend_trusted_target",
   "type": "object",
-  "title": "Defend trusted target 1.16.0",
+  "title": "Defend Trusted Target 1.16.0",
   "description": "Allows the mob to target another mob that hurts an entity it trusts.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "aggro_sound": {
-      "type": "string",
-      "default": "",
-      "description": "Sound to occasionally play while defending.",
-      "title": "Aggro sound"
-    },
-    "attack_interval": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time in seconds between attacks",
-      "title": "Attack interval"
-    },
-    "must_see": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities in this mob's viewing range can be selected as targets",
-      "title": "Must see"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "aggro_sound": { "type": "string", "default": "", "description": "Sound to occasionally play while defending.", "title": "Aggro Sound" },
+    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds between attacks", "title": "Attack Interval" },
+    "must_see": { "type": "boolean", "default": false, "description": "If true, only entities in this mob's viewing range can be selected as targets", "title": "Must See" },
     "must_see_forget_duration": {
       "type": "number",
       "default": 3,
       "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
-      "title": "Must see forget duration"
+      "title": "Must See Forget Duration"
     },
-    "on_defend_start": { "$ref": "../types/event.json", "title": "On defend start", "description": "UNDOCUMENTATED" },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that the target can be within to launch an attack",
-      "title": "Within radius"
-    },
-    "entity_types": {
-      "type": "object",
-      "description": "List of entity types that this mob considers valid targets",
-      "title": "Entity types",
-      "additionalProperties": false
-    },
-    "sound_chance": {
-      "title": "Sound chance",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    }
+    "on_defend_start": { "$ref": "../types/event.json", "title": "On Defend Start", "description": "UNDOCUMENTATED" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that the target can be within to launch an attack", "title": "Within Radius" },
+    "entity_types": { "type": "object", "description": "List of entity types that this mob considers valid targets", "title": "Entity Types", "additionalProperties": false },
+    "sound_chance": { "title": "Sound Chance", "description": "UNDOCUMENTATED", "type": "number" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
index aec815fc..ebc83377 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drink_potion.json
@@ -9,11 +9,7 @@
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "speed_modifier": {
-      "default": 0.0,
-      "description": "TODO description: speed modifier",
-      "title": "Speed Modifier"
-    },
+    "speed_modifier": { "default": 0.0, "description": "TODO description: speed modifier", "title": "Speed Modifier" },
     "potions": {
       "type": "array",
       "description": "A list of potions that this entity can drink.",
@@ -21,12 +17,7 @@
         "required": ["id", "chance", "filters"],
         "additionalProperties": false,
         "properties": {
-          "id": {
-            "type": "integer",
-            "default": -1,
-            "description": "The registry ID of the potion to use",
-            "title": "Id"
-          },
+          "id": { "type": "integer", "default": -1, "description": "The registry ID of the potion to use", "title": "Id" },
           "chance": {
             "type": "number",
             "default": 1.0,
@@ -35,11 +26,7 @@
             "description": "The percent chance (from 0.0 to 1.0) of this potion being selected when searching for a potion to use.",
             "title": "Chance"
           },
-          "filters": {
-            "description": "The filters to use when determining if this potion can be selected.",
-            "$ref": "../filters.json",
-            "title": "Filters"
-          }
+          "filters": { "description": "The filters to use when determining if this potion can be selected.", "$ref": "../filters.json", "title": "Filters" }
         },
         "description": "TODO description: potions",
         "title": "Potions"
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drop_item_for.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drop_item_for.json
index 1b48301c..127215e9 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drop_item_for.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.drop_item_for.json
@@ -3,97 +3,38 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.drop_item_for",
   "additionalProperties": false,
   "description": "Allows the mob to move near a target and drop an item.",
-  "title": "Drop item for 1.16.0",
+  "title": "Drop Item For 1.16.0",
   "type": "object",
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown": {
-      "title": "Cooldown",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    },
-    "drop_item_chance": {
-      "type": "number",
-      "default": [1.0],
-      "description": "The probability that the mob will drop an item.",
-      "title": "Drop item chance"
-    },
-    "entity_types": {
-      "description": "List of entity types this mob will drop items for.",
-      "title": "Entity types",
-      "$ref": "../types/entity_types.json"
-    },
+    "cooldown": { "title": "Cooldown", "description": "UNDOCUMENTATED", "type": "number" },
+    "drop_item_chance": { "type": "number", "default": [1.0], "description": "The probability that the mob will drop an item.", "title": "Drop Item Chance" },
+    "entity_types": { "description": "List of entity types this mob will drop items for.", "title": "Entity Types", "$ref": "../types/entity_types.json" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
-    },
-    "loot_table": {
-      "type": "string",
-      "pattern": "^loot_tables.*\\.json$",
-      "description": "Loot table to select items from.",
-      "title": "Loot table"
-    },
-    "max_dist": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum distance in blocks this mob will look for entities to drop an item for.",
-      "title": "Max dist"
-    },
-    "minimum_teleport_distance": {
-      "title": "Minimum teleport distance",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    },
-    "max_head_look_at_height": {
-      "title": "Max head look at height",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
+      "title": "Goal Radius"
     },
+    "loot_table": { "type": "string", "pattern": "^loot_tables.*\\.json$", "description": "Loot table to select items from.", "title": "Loot Table" },
+    "max_dist": { "type": "number", "default": 0, "description": "Maximum distance in blocks this mob will look for entities to drop an item for.", "title": "Max Dist" },
+    "minimum_teleport_distance": { "title": "Minimum Teleport Distance", "description": "UNDOCUMENTATED", "type": "number" },
+    "max_head_look_at_height": { "title": "Max Head Look At Height", "description": "UNDOCUMENTATED", "type": "number" },
     "offering_distance": {
       "type": "number",
       "default": [1.0],
       "description": "The distance in blocks the mob will try to be away from the entity when it drops the item.",
-      "title": "Offering distance"
-    },
-    "on_drop_attempt": {
-      "$ref": "../types/event.json",
-      "description": "Event to run when this mob attempts to drop an item.",
-      "title": "On drop attempt"
-    },
-    "seconds_before_pickup": {
-      "title": "Seconds before pickup",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    },
-    "search_count": {
-      "type": "integer",
-      "default": 1,
-      "description": "UNDOCUMENTATED",
-      "title": "Search height"
-    },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks from the target the mob can be.",
-      "title": "Search height"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks from the target the mob can be.",
-      "title": "Search range"
-    },
-    "target_range": {
-      "title": "Target range",
-      "description": "UNDOCUMENTATED",
-      "type": "array",
-      "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }]
+      "title": "Offering Distance"
     },
+    "on_drop_attempt": { "$ref": "../types/event.json", "description": "Event to run when this mob attempts to drop an item.", "title": "On Drop Attempt" },
+    "seconds_before_pickup": { "title": "Seconds Before Pickup", "description": "UNDOCUMENTATED", "type": "number" },
+    "search_count": { "type": "integer", "default": 1, "description": "UNDOCUMENTATED", "title": "Search Height" },
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks from the target the mob can be.", "title": "Search Height" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks from the target the mob can be.", "title": "Search Range" },
+    "target_range": { "title": "Target Range", "description": "UNDOCUMENTATED", "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
     "teleport_offset": {
-      "title": "Teleport offset",
+      "title": "Teleport Offset",
       "description": "UNDOCUMENTATED",
       "type": "array",
       "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }]
@@ -101,19 +42,11 @@
     "time_of_day_range": {
       "default": [0.0, 1.0],
       "description": "The valid times of day that this goal can be used. For reference: noon is 0.0, sunset is 0.25, midnight is 0.5, and sunrise is 0.75, and back to noon for 1.0.",
-      "title": "Time of day range",
+      "title": "Time Of Day Range",
       "type": "array",
       "items": [
-        {
-          "type": "number",
-          "minimum": 0,
-          "maximum": 1
-        },
-        {
-          "type": "number",
-          "minimum": 0,
-          "maximum": 1
-        }
+        { "type": "number", "minimum": 0, "maximum": 1 },
+        { "type": "number", "minimum": 0, "maximum": 1 }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.eat_carried_item.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.eat_carried_item.json
index 37e3bd19..d759d027 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.eat_carried_item.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.eat_carried_item.json
@@ -2,17 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.eat_carried_item",
   "type": "object",
-  "title": "Eat carried item 1.16.0",
+  "title": "Eat Carried Item 1.16.0",
   "description": "If the mob is carrying a food item, the mob will eat it and the effects will be applied to the mob.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "delay_before_eating": {
-      "type": "number",
-      "description": "Time in seconds the mob should wait before eating the item.",
-      "title": "Delay before eating"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "delay_before_eating": { "type": "number", "description": "Time in seconds the mob should wait before eating the item.", "title": "Delay Before Eating" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.equip_item.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.equip_item.json
index 8a7a5179..8020f0a0 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.equip_item.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.equip_item.json
@@ -2,12 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.equip_item",
   "type": "object",
-  "title": "Equip item 1.16.0",
+  "title": "Equip Item 1.16.0",
   "description": "UNDOCUMENTATED",
   "additionalProperties": false,
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_cover.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_cover.json
index 6000143b..5265cb27 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_cover.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_cover.json
@@ -2,17 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.find_cover",
   "type": "object",
-  "title": "Find cover 1.16.0",
+  "title": "Find Cover 1.16.0",
   "description": "Allows the mob to seek shade.",
   "additionalProperties": false,
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    }
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_mount.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_mount.json
index 02fbc668..0ca4cb60 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_mount.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.find_mount.json
@@ -3,47 +3,20 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.find_mount",
   "additionalProperties": false,
   "description": "Allows the mob to look around for another mob to ride atop it.",
-  "title": "Find mount 1.16.0",
+  "title": "Find Mount 1.16.0",
   "type": "object",
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will not go into water blocks when going towards a mount",
-      "title": "TODO title"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "avoid_water": { "type": "boolean", "default": false, "description": "If true, the mob will not go into water blocks when going towards a mount", "title": "TODO Title" },
     "mount_distance": {
       "type": "number",
       "default": -1,
       "description": "This is the distance the mob needs to be, in blocks, from the desired mount to mount it. If the value is below 0, the mob will use its default attack distance",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "start_delay": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time the mob will wait before starting to move towards the mount",
-      "title": "TODO title"
-    },
-    "target_needed": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will only look for a mount if it has a target",
-      "title": "TODO title"
-    },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks within which the mob will look for a mount",
-      "title": "TODO title"
-    },
-    "max_failed_attempts": {
-      "type": "integer",
-      "$comment": "NOT DOCUMENTATED BY MINECRAFT",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "start_delay": { "type": "integer", "default": 0, "description": "Time the mob will wait before starting to move towards the mount", "title": "TODO Title" },
+    "target_needed": { "type": "boolean", "default": false, "description": "If true, the mob will only look for a mount if it has a target", "title": "TODO Title" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks within which the mob will look for a mount", "title": "TODO Title" },
+    "max_failed_attempts": { "type": "integer", "$comment": "NOT DOCUMENTATED BY MINECRAFT", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.go_home.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
index 14bc4c77..7b842552 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.go_home.json
@@ -3,30 +3,23 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.go_home",
   "additionalProperties": false,
   "description": "Allows the mob to move back to the position they were spawned.",
-  "title": "Go home",
+  "title": "Go Home",
   "type": "object",
   "definitions": {
     "on_home_spec": {
       "additionalProperties": false,
       "type": "object",
-      "title": "On home event",
+      "title": "On Home Event",
       "description": "UNDOCUMENTATED",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
         "target": {
           "type": "string",
           "description": "The target of the event",
           "title": "Target",
           "enum": ["baby", "block", "damager", "other", "parent", "player", "self", "target"]
         },
-        "filters": {
-          "$ref": "../filters.json"
-        }
+        "filters": { "$ref": "../filters.json" }
       }
     }
   },
@@ -37,7 +30,7 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "interval": {
       "type": "integer",
@@ -47,24 +40,13 @@
     },
     "on_home": {
       "description": "Event to run when this mob gets home.",
-      "title": "On home",
+      "title": "On Home",
       "oneOf": [
-        {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$"
-        },
-        {
-          "type": "object",
-          "$ref": "#/definitions/on_home_spec"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/on_home_spec"
-          }
-        }
+        { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$" },
+        { "type": "object", "$ref": "#/definitions/on_home_spec" },
+        { "type": "array", "items": { "$ref": "#/definitions/on_home_spec" } }
       ]
     },
-    "on_failed": { "$ref": "../types/event.json", "title": "On failed", "description": "UNDOCUMENTATED" }
+    "on_failed": { "$ref": "../types/event.json", "title": "On Failed", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.hold_ground.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.hold_ground.json
index 7b38f328..412482b9 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.hold_ground.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.hold_ground.json
@@ -2,35 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.hold_ground",
   "type": "object",
-  "title": "Hold ground 1.16.0",
+  "title": "Hold Ground 1.16.0",
   "description": "The mob freezes and looks at the mob they are targeting.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "broadcast": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether to broadcast out the mob's target to other mobs of the same type.",
-      "title": "Broadcast"
-    },
-    "broadcast_range": {
-      "type": "number",
-      "default": 0.0,
-      "description": "Range in blocks for how far to broadcast.",
-      "title": "Broadcast range"
-    },
-    "min_radius": {
-      "type": "number",
-      "default": 10.0,
-      "description": "Minimum distance the target must be for the mob to run this goal.",
-      "title": "Min radius"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "broadcast": { "type": "boolean", "default": false, "description": "Whether to broadcast out the mob's target to other mobs of the same type.", "title": "Broadcast" },
+    "broadcast_range": { "type": "number", "default": 0.0, "description": "Range in blocks for how far to broadcast.", "title": "Broadcast Range" },
+    "min_radius": { "type": "number", "default": 10.0, "description": "Minimum distance the target must be for the mob to run this goal.", "title": "Min Radius" },
     "within_radius_event": {
       "$ref": "../types/event.json",
       "description": "Event to run when target is within the radius. This event is broadcasted if broadcast is true.",
-      "title": "Within radius event"
+      "title": "Within Radius Event"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
index aa7f85a9..39776b0c 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.knockback_roar.json
@@ -3,48 +3,18 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.knockback_roar",
   "description": "Allows the mob to perform a damaging knockback that affects all nearby entities.",
   "type": "object",
-  "title": "Knockback roar 1.16.0",
+  "title": "Knockback Roar 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "attack_time": {
-      "type": "number",
-      "default": 0.5,
-      "description": "The delay after which the knockback occurs (in seconds).",
-      "title": "TODO title"
-    },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "TODO title"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1,
-      "description": "The duration of the roar (in seconds).",
-      "title": "TODO title"
-    },
-    "knockback_damage": {
-      "type": "integer",
-      "default": 6,
-      "description": "The damage dealt by the knockback roar.",
-      "title": "TODO title"
-    },
-    "knockback_range": {
-      "type": "integer",
-      "default": 4,
-      "description": "The radius (in blocks) of the knockback effect.",
-      "title": "TODO title"
-    },
-    "knockback_strength": {
-      "type": "integer",
-      "default": 4,
-      "description": "The strength of the knockback.",
-      "title": "TODO title"
-    },
-    "Trigger": { "$ref": "../types/trigger.json", "description": "On_roar_end", "title": "TODO title" },
+    "attack_time": { "type": "number", "default": 0.5, "description": "The delay after which the knockback occurs (in seconds).", "title": "TODO Title" },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "TODO Title" },
+    "duration": { "type": "number", "default": 1, "description": "The duration of the roar (in seconds).", "title": "TODO Title" },
+    "knockback_damage": { "type": "integer", "default": 6, "description": "The damage dealt by the knockback roar.", "title": "TODO Title" },
+    "knockback_range": { "type": "integer", "default": 4, "description": "The radius (in blocks) of the knockback effect.", "title": "TODO Title" },
+    "knockback_strength": { "type": "integer", "default": 4, "description": "The strength of the knockback.", "title": "TODO Title" },
+    "Trigger": { "$ref": "../types/trigger.json", "description": "On_roar_end", "title": "TODO Title" },
     "knockback_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "damage_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "on_roar_end": { "$ref": "../types/event.json", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.leap_at_target.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.leap_at_target.json
index 630f62fb..d7400c49 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.leap_at_target.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.leap_at_target.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.leap_at_target",
   "description": "Allows monsters to jump at and attack their target. Can only be used by hostile mobs.",
   "type": "object",
-  "title": "Leap at target 1.16.0",
+  "title": "Leap At Target 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -12,25 +12,10 @@
       "type": "boolean",
       "default": true,
       "description": "If true, the mob will only jump at its target if its on the ground. Setting it to false will allow it to jump even if its already in the air",
-      "title": "Must be on ground"
+      "title": "Must Be On Ground"
     },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "Set persistent"
-    },
-    "yd": {
-      "type": "number",
-      "default": 0,
-      "description": "The height in blocks the mob jumps when leaping at its target",
-      "title": "Yd"
-    },
-    "target_dist": {
-      "type": "number",
-      "default": 0,
-      "description": "UNDOCUMENTATED",
-      "title": "Target dist"
-    }
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "Set Persistent" },
+    "yd": { "type": "number", "default": 0, "description": "The height in blocks the mob jumps when leaping at its target", "title": "Yd" },
+    "target_dist": { "type": "number", "default": 0, "description": "UNDOCUMENTATED", "title": "Target Dist" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.look_at_player.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.look_at_player.json
index f3ded46b..119d5285 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.look_at_player.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.look_at_player.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.look_at_player",
   "type": "object",
-  "title": "Look at player 1.16.0",
+  "title": "Look At Player 1.16.0",
   "description": "Allows the mob to look at the player when the player is nearby.",
   "additionalProperties": false,
   "required": [],
@@ -20,37 +20,15 @@
       "description": "The angle in degrees that the mob can see in the Y-axis (up-down)",
       "title": "Angle Of View Horizontal"
     },
-    "look_distance": {
-      "type": "number",
-      "default": 8.0,
-      "description": "The distance in blocks from which the entity will look at",
-      "title": "Look Distance"
-    },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "minimum": 0,
-      "description": "The probability of looking at the target. A value of 1.00 is 100%",
-      "title": "Probability"
-    },
+    "look_distance": { "type": "number", "default": 8.0, "description": "The distance in blocks from which the entity will look at", "title": "Look Distance" },
+    "probability": { "type": "number", "default": 0.02, "minimum": 0, "description": "The probability of looking at the target. A value of 1.00 is 100%", "title": "Probability" },
     "look_time": {
       "type": "array",
       "default": [2, 4],
       "description": "Time range to look at the entity",
       "title": "Look Time",
-      "items": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "number"
-        }
-      ]
+      "items": [{ "type": "number" }, { "type": "number" }]
     },
-    "target_distance": {
-      "type": "number",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    }
+    "target_distance": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_to_lava.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_to_lava.json
index 87dd853b..bb4be26f 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_to_lava.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_to_lava.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.move_to_lava",
   "type": "object",
-  "title": "Move to lava 1.16.0",
+  "title": "Move To Lava 1.16.0",
   "description": "Allows the mob to move back into lava when on land.",
   "additionalProperties": false,
   "properties": {
@@ -12,25 +12,15 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "search_count": {
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "Search count"
+      "title": "Search Count"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for lava to move towards",
-      "title": "Search height"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for lava to move towards",
-      "title": "Search range"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for lava to move towards", "title": "Search Height" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for lava to move towards", "title": "Search Range" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json
index 1af8edcb..55ec6f2e 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json
@@ -2,11 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.move_towards_home_restriction",
   "type": "object",
-  "title": "Move towards home restriction 1.16.0",
+  "title": "Move Towards Home Restriction 1.16.0",
   "description": "UNDOCUMENTATED",
   "additionalProperties": false,
-  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nap.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nap.json
index ba7a89b1..e599ec9e 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nap.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nap.json
@@ -8,31 +8,21 @@
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_max": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown max"
-    },
-    "cooldown_min": {
-      "type": "number",
-      "default": 0,
-      "description": "Minimum time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown min"
-    },
+    "cooldown_max": { "type": "number", "default": 0, "description": "Maximum time in seconds the mob has to wait before using the goal again", "title": "Cooldown Max" },
+    "cooldown_min": { "type": "number", "default": 0, "description": "Minimum time in seconds the mob has to wait before using the goal again", "title": "Cooldown Min" },
     "mob_detect_dist": {
       "type": "number",
       "default": 6,
       "description": "The block distance in x and z that will be checked for mobs that this mob detects",
-      "title": "Mob detect dist"
+      "title": "Mob Detect Dist"
     },
     "mob_detect_height": {
       "type": "number",
       "default": 6,
       "description": "The block distance in y that will be checked for mobs that this mob detects",
-      "title": "Mob detect height"
+      "title": "Mob Detect Height"
     },
-    "can_nap_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Can nap filters" },
-    "wake_mob_exceptions": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Wake mob exceptions" }
+    "can_nap_filters": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Can Nap Filters" },
+    "wake_mob_exceptions": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Wake Mob Exceptions" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
index 99cb875e..3682ec5c 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.nearest_attackable_target",
   "type": "object",
-  "title": "Nearest attackable target 1.16.0",
+  "title": "Nearest Attackable Target 1.16.0",
   "description": "Allows the mob to check for and pursue the nearest valid target.",
   "additionalProperties": false,
   "required": [],
@@ -11,28 +11,24 @@
       "type": "object",
       "description": "A entity type",
       "properties": {
-        "filters": {
-          "$ref": "../filters.json",
-          "description": "Conditions that make this target a valid type.",
-          "title": "Filters"
-        },
+        "filters": { "$ref": "../filters.json", "description": "Conditions that make this target a valid type.", "title": "Filters" },
         "max_dist": {
           "type": "number",
           "default": 16,
           "description": "To be a valid target choice, the target type cannot be farther away from this entity than \"max_dist\".",
-          "title": "Max dist"
+          "title": "Max Dist"
         },
         "must_see": {
           "type": "boolean",
           "default": false,
           "description": "Determines if target-validity requires this entity to be in range only, or both in range and in sight.",
-          "title": "Must see"
+          "title": "Must See"
         },
         "must_see_forget_duration": {
           "type": "boolean",
           "default": 3,
           "description": "Time (in seconds) the target must not be seen by this entity to become invalid. Used only if \"must_see\" is true.",
-          "title": "Must see forget duration"
+          "title": "Must See Forget Duration"
         }
       }
     }
@@ -41,102 +37,77 @@
     "priority": { "$ref": "./types/base_priority.json" },
     "entity_types": {
       "description": "Filters which types of targets are valid for this entity.",
-      "title": "Entity types",
-      "oneOf": [
-        {
-          "$ref": "#/definitions/entity_type"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/entity_type"
-          }
-        }
-      ]
+      "title": "Entity Types",
+      "oneOf": [{ "$ref": "#/definitions/entity_type" }, { "type": "array", "items": { "$ref": "#/definitions/entity_type" } }]
     },
     "attack_interval": {
       "type": "integer",
       "default": 0,
       "description": "Time range (in seconds) between searching for an attack target, range is in (0, \"attack_interval\"]. Only used if \"attack_interval\" is greater than 0, otherwise \"scan_interval\" is used.",
-      "title": "Attack interval"
+      "title": "Attack Interval"
     },
     "attack_interval_min": {
       "type": "number",
       "default": 0,
       "description": "Alias for \"attack_interval\"; provides the same functionality as \"attack_interval\".",
-      "title": "Attack interval min"
-    },
-    "attack_owner": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can attack its owner.",
-      "title": "Attack owner"
-    },
-    "must_reach": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity requires a path to the target.",
-      "title": "Must reach"
+      "title": "Attack Interval Min"
     },
+    "attack_owner": { "type": "boolean", "default": false, "description": "If true, this entity can attack its owner.", "title": "Attack Owner" },
+    "must_reach": { "type": "boolean", "default": false, "description": "If true, this entity requires a path to the target.", "title": "Must Reach" },
     "must_see": {
       "type": "boolean",
       "default": false,
       "description": "Determines if target-validity requires this entity to be in range only, or both in range and in sight.",
-      "title": "Must see"
+      "title": "Must See"
     },
     "must_see_forget_duration": {
       "type": "number",
       "default": 3,
       "description": "Time (in seconds) the target must not be seen by this entity to become invalid. Used only if \"must_see\" is true.",
-      "title": "Must see forget duration"
+      "title": "Must See Forget Duration"
     },
     "persist_time": {
       "type": "number",
       "default": 0,
       "description": "Time (in seconds) this entity can continue attacking the target after the target is no longer valid.",
-      "title": "Persist time"
+      "title": "Persist Time"
     },
     "reselect_targets": {
       "type": "boolean",
       "default": false,
       "description": "Allows the attacking entity to update the nearest target, otherwise a target is only reselected after each \"scan_interval\" or \"attack_interval\".",
-      "title": "Reselect targets"
+      "title": "Reselect Targets"
     },
     "scan_interval": {
       "type": "integer",
       "default": 10,
       "description": "If \"attack_interval\" is 0 or isn't declared, then between attacks: scanning for a new target occurs every amount of ticks equal to \"scan_interval\", minimum value is 1. Values under 10 can affect performance.",
-      "title": "Scan interval"
-    },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "Set persistent"
+      "title": "Scan Interval"
     },
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "Set Persistent" },
     "target_invisible_multiplier": {
       "type": "number",
       "default": 0.7,
       "description": "Multiplied with the target's armor coverage percentage to modify \"max_dist\" when detecting an invisible target.",
-      "title": "Target invisible multiplier"
+      "title": "Target Invisible Multiplier"
     },
     "target_search_height": {
       "type": "number",
       "default": -1,
       "description": "Maximum vertical target-search distance, if it's greater than the target type's \"max_dist\". A negative value defaults to \"entity_types\" greatest \"max_dist\".",
-      "title": "Target search height"
+      "title": "Target Search Height"
     },
     "target_sneak_visibility_multiplier": {
       "type": "number",
       "default": 0.8,
       "description": "Multiplied with the target type's \"max_dist\" when trying to detect a sneaking target.",
-      "title": "Target sneak visibility multiplier"
+      "title": "Target Sneak Visibility Multiplier"
     },
     "within_radius": {
       "type": "number",
       "default": 0,
       "description": "Maximum distance this entity can be from the target when following it, otherwise the target becomes invalid. This value is only used if the entity doesn't declare \"minecraft:follow_range\".",
-      "title": "Within radius"
+      "title": "Within Radius"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
index 9e845257..610ad666 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
@@ -2,76 +2,42 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.nearest_prioritized_attackable_target",
   "type": "object",
-  "title": "Nearest prioritized attackable target 1.16.0",
+  "title": "Nearest Prioritized Attackable Target 1.16.0",
   "description": "Allows the mob to check for and pursue the nearest valid target.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "description": "List of entity types that this mob considers valid targets",
-      "title": "Entity types",
-      "$ref": "../types/entity_types.json"
-    },
-    "attack_interval": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time in seconds before selecting a target",
-      "title": "Attack interval"
-    },
-    "must_reach": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities that this mob can path to can be selected as targets",
-      "title": "Must reach"
-    },
-    "must_see": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities in this mob's viewing range can be selected as targets",
-      "title": "Must see"
-    },
+    "entity_types": { "description": "List of entity types that this mob considers valid targets", "title": "Entity Types", "$ref": "../types/entity_types.json" },
+    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds before selecting a target", "title": "Attack Interval" },
+    "must_reach": { "type": "boolean", "default": false, "description": "If true, only entities that this mob can path to can be selected as targets", "title": "Must Reach" },
+    "must_see": { "type": "boolean", "default": false, "description": "If true, only entities in this mob's viewing range can be selected as targets", "title": "Must See" },
     "must_see_forget_duration": {
       "type": "number",
       "default": 3,
       "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
-      "title": "Must see forget duration"
+      "title": "Must See Forget Duration"
     },
     "persist_time": {
       "type": "number",
       "default": 0.0,
       "description": "Time in seconds for a valid target to stay targeted when it becomes and invalid target.",
-      "title": "Persist time"
+      "title": "Persist Time"
     },
     "reselect_targets": {
       "type": "boolean",
       "default": false,
       "description": "If true, the target will change to the current closest entity whenever a different entity is closer",
-      "title": "Reselect targets"
-    },
-    "scan_interval": {
-      "type": "integer",
-      "default": 10,
-      "description": "How many ticks to wait between scanning for a target.",
-      "title": "Scan interval"
-    },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "Set persistent"
+      "title": "Reselect Targets"
     },
+    "scan_interval": { "type": "integer", "default": 10, "description": "How many ticks to wait between scanning for a target.", "title": "Scan Interval" },
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "Set Persistent" },
     "target_search_height": {
       "type": "number",
       "default": -1.0,
       "description": "Height in blocks to search for a target mob. -1.0f means the height does not matter.",
-      "title": "Target search height"
+      "title": "Target Search Height"
     },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that the target can be within to launch an attack",
-      "title": "Within radius"
-    }
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that the target can be within to launch an attack", "title": "Within Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
index ff4c4962..cd13a926 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
@@ -13,25 +13,10 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks from the owner the pet can be to sleep with owner.",
-      "title": "Search height"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks from the owner the pet can be to sleep with owner.",
-      "title": "Search range"
-    },
-    "search_radius": {
-      "type": "integer",
-      "default": 0,
-      "description": "UNDOCUMENTATED",
-      "title": "Search radius"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks from the owner the pet can be to sleep with owner.", "title": "Search Height" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks from the owner the pet can be to sleep with owner.", "title": "Search Range" },
+    "search_radius": { "type": "integer", "default": 0, "description": "UNDOCUMENTATED", "title": "Search Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pickup_items.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pickup_items.json
index 8af7826c..eadd43aa 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pickup_items.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.pickup_items.json
@@ -4,51 +4,31 @@
   "description": "Allows the mob to pick up items on the ground.",
   "additionalProperties": false,
   "type": "object",
-  "title": "pickup items 1.16.0",
+  "title": "Pickup Items 1.16.0",
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "can_pickup_any_item": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob can pickup any item",
-      "title": "Can pickup any item"
-    },
+    "can_pickup_any_item": { "type": "boolean", "default": false, "description": "If true, the mob can pickup any item", "title": "Can Pickup Any Item" },
     "can_pickup_to_hand_or_equipment": {
       "type": "boolean",
       "default": true,
       "description": "If true, the mob can pickup items to its hand or armor slots",
-      "title": "Can pickup to hand or equipment"
-    },
-    "cooldown_after_being_attacked": {
-      "type": "number",
-      "default": true,
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
+      "title": "Can Pickup To Hand Or Equipment"
     },
+    "cooldown_after_being_attacked": { "type": "number", "default": true, "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
-    },
-    "max_dist": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum distance this mob will look for items to pick up",
-      "title": "Max dist"
+      "title": "Goal Radius"
     },
+    "max_dist": { "type": "number", "default": 0, "description": "Maximum distance this mob will look for items to pick up", "title": "Max Dist" },
     "pickup_based_on_chance": {
       "type": "boolean",
       "default": false,
       "description": "If true, depending on the difficulty, there is a random chance that the mob may not be able to pickup items",
-      "title": "Pickup based on chance"
+      "title": "Pickup Based On Chance"
     },
-    "track_target": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will chase after the target as long as it's a valid target",
-      "title": "Track target"
-    }
+    "track_target": { "type": "boolean", "default": false, "description": "If true, this mob will chase after the target as long as it's a valid target", "title": "Track Target" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_fly.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_fly.json
index 6455cefb..a5070062 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_fly.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_fly.json
@@ -3,39 +3,31 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.random_fly",
   "description": "Allows a mob to randomly fly around",
   "type": "object",
-  "title": "Random fly 1.16.0",
+  "title": "Random Fly 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "avoid_damage_blocks": {
-      "type": "boolean",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    },
+    "avoid_damage_blocks": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "can_land_on_trees": {
       "type": "boolean",
       "default": true,
       "description": "If true, the mob can stop flying and land on a tree instead of the ground",
-      "title": "Can land on trees"
+      "title": "Can Land On Trees"
     },
     "xz_dist": {
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "Xz dist"
+      "title": "Xz Dist"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "Y dist"
+      "title": "Y Dist"
     },
-    "y_offset": {
-      "type": "integer",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    }
+    "y_offset": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_hover.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_hover.json
index 7ea9e518..31022114 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_hover.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_hover.json
@@ -3,25 +3,13 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.random_hover",
   "description": "Allows the mob to hover around randomly, close to the surface",
   "type": "object",
-  "title": "Random hover 1.16.0",
+  "title": "Random Hover 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "hover_height": {
-      "type": "array",
-      "description": "UNDOCUMENTATED",
-      "title": "Hover height",
-      "items": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "number"
-        }
-      ]
-    },
+    "hover_height": { "type": "array", "description": "UNDOCUMENTATED", "title": "Hover Height", "items": [{ "type": "number" }, { "type": "number" }] },
     "interval": {
       "type": "integer",
       "default": 120,
@@ -32,19 +20,14 @@
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "Xz dist"
+      "title": "Xz Dist"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "Y dist"
+      "title": "Y Dist"
     },
-    "y_offset": {
-      "type": "number",
-      "default": 0,
-      "description": "Height in blocks to add to the selected target position",
-      "title": "Y offset"
-    }
+    "y_offset": { "type": "number", "default": 0, "description": "Height in blocks to add to the selected target position", "title": "Y Offset" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_look_around_and_sit.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
index 8efd3dc0..c23e7cd5 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
@@ -3,42 +3,25 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.random_look_around_and_sit",
   "description": "Allows the mob to randomly sit and look around for a duration. Note: Must have a sitting animation set up to use this.",
   "type": "object",
-  "title": "Random look around and sit 1.16.0",
+  "title": "Random Look Around And Sit 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "max_look_count": {
-      "type": "integer",
-      "default": 2,
-      "description": "The max amount of unique looks a mob will have while looking around.",
-      "title": "Max look count"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "max_look_count": { "type": "integer", "default": 2, "description": "The max amount of unique looks a mob will have while looking around.", "title": "Max Look Count" },
     "max_look_time": {
       "type": "integer",
       "default": 40,
       "description": "The max amount of time (in ticks) a mob will stay looking at a direction while looking around.",
-      "title": "Max look time"
-    },
-    "min_look_count": {
-      "type": "integer",
-      "default": 1,
-      "description": "The min amount of unique looks a mob will have while looking around.",
-      "title": "Min look count"
+      "title": "Max Look Time"
     },
+    "min_look_count": { "type": "integer", "default": 1, "description": "The min amount of unique looks a mob will have while looking around.", "title": "Min Look Count" },
     "min_look_time": {
       "type": "integer",
       "default": 20,
       "description": "The min amount of time (in ticks) a mob will stay looking at a direction while looking around.",
-      "title": "Min look time"
+      "title": "Min Look Time"
     },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "description": "The probability of randomly looking around/sitting.",
-      "title": "Probability"
-    }
+    "probability": { "type": "number", "default": 0.02, "description": "The probability of randomly looking around/sitting.", "title": "Probability" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.rise_to_liquid_level.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
index fe424717..b6e488f4 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
@@ -3,27 +3,13 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.rise_to_liquid_level",
   "description": "Allows the mob to stay at a certain level when in liquid.",
   "type": "object",
-  "title": "Rise to liquid level 1.16.0",
+  "title": "Rise To Liquid Level 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "liquid_y_offset": {
-      "type": "number",
-      "title": "Liquid y offset",
-      "description": "UNDOCUMENTATED"
-    },
-    "rise_delta": {
-      "type": "number",
-      "title": "Rise delta",
-      "description": "UNDOCUMENTATED"
-    },
-    "sink_delta": {
-      "type": "number",
-      "title": "Sink delta",
-      "description": "UNDOCUMENTATED"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "liquid_y_offset": { "type": "number", "title": "Liquid Y Offset", "description": "UNDOCUMENTATED" },
+    "rise_delta": { "type": "number", "title": "Rise Delta", "description": "UNDOCUMENTATED" },
+    "sink_delta": { "type": "number", "title": "Sink Delta", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.send_event.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
index 05e88347..b2b6669b 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.send_event.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.send_event",
   "description": "Allows the mob to send an event to another mob.",
   "type": "object",
-  "title": "Send event 1.16.0",
+  "title": "Send Event 1.16.0",
   "additionalProperties": false,
   "required": [],
   "definitions": {
@@ -14,32 +14,16 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "base_delay": {
-            "type": "number",
-            "default": 0,
-            "description": "Amount of time in seconds before starting this step"
-          },
-          "event": {
-            "type": "string",
-            "default": "",
-            "description": "The event to send to the entity"
-          },
-          "sound_event": {
-            "type": "string",
-            "default": "",
-            "description": "The sound event to play when this step happens"
-          }
+          "base_delay": { "type": "number", "default": 0, "description": "Amount of time in seconds before starting this step" },
+          "event": { "type": "string", "default": "", "description": "The event to send to the entity" },
+          "sound_event": { "type": "string", "default": "", "description": "The sound event to play when this step happens" }
         }
       }
     }
   },
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "cast_duration": {
-      "type": "number",
-      "description": "Time in seconds for the entire event sending process",
-      "title": "TODO title"
-    },
+    "cast_duration": { "type": "number", "description": "Time in seconds for the entire event sending process", "title": "TODO Title" },
     "event_choices": {
       "type": "array",
       "title": "UNDOCUMENTATED",
@@ -50,51 +34,18 @@
         "title": "UNDOCUMENTATED",
         "description": "UNDOCUMENTATED",
         "properties": {
-          "min_activation_range": {
-            "type": "number",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "max_activation_range": {
-            "type": "number",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "cooldown_time": {
-            "type": "number",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "cast_duration": {
-            "type": "number",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "filters": {
-            "$ref": "../filters.json"
-          },
-          "particle_color": {
-            "type": "string",
-            "format": "color-hex",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "weight": {
-            "type": "integer",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "start_sound_event": {
-            "type": "string",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "sequence": {
-            "$ref": "#/definitions/sequence"
-          }
+          "min_activation_range": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "max_activation_range": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "cooldown_time": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "cast_duration": { "type": "number", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "filters": { "$ref": "../filters.json" },
+          "particle_color": { "type": "string", "format": "color-hex", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "weight": { "type": "integer", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "start_sound_event": { "type": "string", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "sequence": { "$ref": "#/definitions/sequence" }
         }
       }
     },
-    "sequence": { "$ref": "#/definitions/sequence", "description": "TODO description", "title": "TODO title" }
+    "sequence": { "$ref": "#/definitions/sequence", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
index 9f9e664b..cac73d90 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
@@ -3,72 +3,46 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.stalk_and_pounce_on_target",
   "description": "Allows the mob to stay at a certain level when in liquid.",
   "type": "object",
-  "title": "Stalk and pounce on target 1.16.0",
+  "title": "Stalk And Pounce On Target 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
     "interest_time": {
       "type": "number",
       "default": 2,
       "description": "The amount of time the mob will be interested before pouncing. This happens when the mob is within range of pouncing",
-      "title": "Interest time"
-    },
-    "leap_distance": {
-      "type": "number",
-      "default": 0.8,
-      "description": "The distance in blocks the mob jumps in the direction of its target",
-      "title": "Leap distance"
-    },
-    "leap_height": {
-      "type": "number",
-      "default": 0.9,
-      "description": "The height in blocks the mob jumps when leaping at its target",
-      "title": "Leap height"
+      "title": "Interest Time"
     },
+    "leap_distance": { "type": "number", "default": 0.8, "description": "The distance in blocks the mob jumps in the direction of its target", "title": "Leap Distance" },
+    "leap_height": { "type": "number", "default": 0.9, "description": "The height in blocks the mob jumps when leaping at its target", "title": "Leap Height" },
     "max_stalk_dist": {
       "type": "number",
       "default": 10,
       "description": "The maximum distance away a target can be before the mob gives up on stalking",
-      "title": "Max stalk dist"
+      "title": "Max Stalk Dist"
     },
     "pounce_max_dist": {
       "type": "number",
       "default": 5,
       "description": "The maximum distance away from the target in blocks to begin pouncing at the target",
-      "title": "Pounce max dist"
-    },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "Set persistent"
-    },
-    "stalk_speed": {
-      "type": "number",
-      "default": 1.2,
-      "description": "The movement speed in which you stalk your target",
-      "title": "Stalk speed"
+      "title": "Pounce Max Dist"
     },
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "Set Persistent" },
+    "stalk_speed": { "type": "number", "default": 1.2, "description": "The movement speed in which you stalk your target", "title": "Stalk Speed" },
     "strike_dist": {
       "type": "number",
       "default": 2,
       "description": "The max distance away from the target when landing from the pounce that will still result in damaging the target",
-      "title": "Strike dist"
+      "title": "Strike Dist"
     },
     "stuck_time": {
       "type": "number",
       "default": 2,
       "description": "The amount of time the mob will be stuck if they fail and land on a block they can be stuck on",
-      "title": "Stuck time"
+      "title": "Stuck Time"
     },
-    "leap_dist": {
-      "type": "number",
-      "description": "UNDOCUMENTATED",
-      "title": "Leap dist"
-    },
-    "stuck_blocks": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Stuck block" }
+    "leap_dist": { "type": "number", "description": "UNDOCUMENTATED", "title": "Leap Dist" },
+    "stuck_blocks": { "$ref": "../filters.json", "description": "UNDOCUMENTATED", "title": "Stuck Block" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stroll_towards_village.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stroll_towards_village.json
index 5edcf3a2..4f739da0 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stroll_towards_village.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.stroll_towards_village.json
@@ -3,42 +3,25 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.stroll_towards_village",
   "description": "Allows the mob to stay at a certain level when in liquid.",
   "type": "object",
-  "title": "Stroll towards village 1.16.0",
+  "title": "Stroll Towards Village 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "search_range": {
       "type": "integer",
       "default": 0,
       "description": "The distance in blocks to search for points inside villages. If <= 0, find the closest village regardless of distance.",
-      "title": "Search range"
+      "title": "Search Range"
     },
-    "speed_multiplier": {
-      "type": "number",
-      "default": 1,
-      "description": "Movement speed multiplier of the mob when using this AI Goal",
-      "title": "Speed multiplier"
-    },
-    "start_chance": {
-      "type": "number",
-      "default": 0.1,
-      "description": "This is the chance that the mob will start this goal, from 0 to 1",
-      "title": "Start chance"
-    }
+    "speed_multiplier": { "type": "number", "default": 1, "description": "Movement speed multiplier of the mob when using this AI Goal", "title": "Speed Multiplier" },
+    "start_chance": { "type": "number", "default": 0.1, "description": "This is the chance that the mob will start this goal, from 0 to 1", "title": "Start Chance" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.swim_idle.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.swim_idle.json
index d796ddd4..e3607cb5 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.swim_idle.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.swim_idle.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.behavior.swim_idle",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "title": "Swim idle 1.16.0",
+  "title": "Swim Idle 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "idle_time": {
-      "type": "number",
-      "title": "Idle time",
-      "description": "UNDOCUMENTATED"
-    },
-    "success_rate": {
-      "type": "number",
-      "title": "Succes rate",
-      "description": "UNDOCUMENTATED"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "idle_time": { "type": "number", "title": "Idle Time", "description": "UNDOCUMENTATED" },
+    "success_rate": { "type": "number", "title": "Succes Rate", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.tempt.json b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.tempt.json
index 26d86b79..0c7795d8 100644
--- a/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.tempt.json
+++ b/source/behaviour/entities/1.16.0/behaviors/minecraft.behavior.tempt.json
@@ -13,31 +13,11 @@
       "type": "boolean",
       "default": false,
       "description": "If true, the mob can stop being tempted if the player moves too fast while close to this mob",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "can_tempt_while_ridden": {
-      "type": "boolean",
-      "title": "Can tempt while ridden",
-      "description": "UNDOCUMENTATED"
-    },
-    "can_tempt_vertically": {
-      "type": "boolean",
-      "title": "Can tempt vertically",
-      "description": "UNDOCUMENTATED"
-    },
-    "items": {
-      "type": "array",
-      "description": "List of items this mob is tempted by",
-      "items": {
-        "$ref": "../../../../general/item/identifier.json"
-      },
-      "title": "TODO title"
-    },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks this mob can get tempted by a player holding an item they like",
-      "title": "TODO title"
-    }
+    "can_tempt_while_ridden": { "type": "boolean", "title": "Can Tempt While Ridden", "description": "UNDOCUMENTATED" },
+    "can_tempt_vertically": { "type": "boolean", "title": "Can Tempt Vertically", "description": "UNDOCUMENTATED" },
+    "items": { "type": "array", "description": "List of items this mob is tempted by", "items": { "$ref": "../../../../general/item/identifier.json" }, "title": "TODO Title" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks this mob can get tempted by a player holding an item they like", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/behaviors/types/base_speed_multiplier.json b/source/behaviour/entities/1.16.0/behaviors/types/base_speed_multiplier.json
index 0d87dfd9..caeb9eb9 100644
--- a/source/behaviour/entities/1.16.0/behaviors/types/base_speed_multiplier.json
+++ b/source/behaviour/entities/1.16.0/behaviors/types/base_speed_multiplier.json
@@ -5,5 +5,5 @@
   "default": 1.0,
   "description": "Movement speed multiplier of the mob when using this AI Goal.",
   "type": "number",
-  "title": "Speed multiplier"
+  "title": "Speed Multiplier"
 }
diff --git a/source/behaviour/entities/1.16.0/components.json b/source/behaviour/entities/1.16.0/components.json
index 73f5c364..bb1a8797 100644
--- a/source/behaviour/entities/1.16.0/components.json
+++ b/source/behaviour/entities/1.16.0/components.json
@@ -177,7 +177,6 @@
     "minecraft:walk_animation_speed": { "$ref": "../1.8.0/components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "./components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "../1.8.0/components/minecraft.water_movement.json" },
-
     "minecraft:behavior.admire_item": { "$ref": "./behaviors/minecraft.behavior.admire_item.json" },
     "minecraft:behavior.avoid_block": { "$ref": "./behaviors/minecraft.behavior.avoid_block.json" },
     "minecraft:behavior.avoid_mob_type": { "$ref": "../1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json" },
@@ -251,16 +250,12 @@
     "minecraft:behavior.move_to_village": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_village.json" },
     "minecraft:behavior.move_to_water": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_water.json" },
     "minecraft:behavior.move_towards_home_restriction": { "$ref": "./behaviors/minecraft.behavior.move_towards_home_restriction.json" },
-    "minecraft:behavior.move_towards_dwelling_restriction": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json"
-    },
+    "minecraft:behavior.move_towards_dwelling_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json" },
     "minecraft:behavior.move_towards_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json" },
     "minecraft:behavior.move_towards_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_target.json" },
     "minecraft:behavior.nap": { "$ref": "./behaviors/minecraft.behavior.nap.json" },
     "minecraft:behavior.nearest_attackable_target": { "$ref": "./behaviors/minecraft.behavior.nearest_attackable_target.json" },
-    "minecraft:behavior.nearest_prioritized_attackable_target": {
-      "$ref": "./behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json"
-    },
+    "minecraft:behavior.nearest_prioritized_attackable_target": { "$ref": "./behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json" },
     "minecraft:behavior.ocelot_sit_on_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json" },
     "minecraft:behavior.ocelotattack": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelotattack.json" },
     "minecraft:behavior.offer_flower": { "$ref": "../1.8.0/behaviors/minecraft.behavior.offer_flower.json" },
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.admire_item.json b/source/behaviour/entities/1.16.0/components/minecraft.admire_item.json
index 3baad5ba..074701a1 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.admire_item.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.admire_item.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.admire_item",
   "type": "object",
-  "title": "Admire item 1.16.0",
+  "title": "Admire Item 1.16.0",
   "description": "Causes the mob to ignore attackable targets for a given duration.",
   "additionalProperties": false,
   "properties": {
@@ -10,13 +10,8 @@
       "type": "integer",
       "default": 0,
       "description": "Duration, in seconds, for which mob won't admire items if it was hurt",
-      "title": "Cooldown after being attacked"
+      "title": "Cooldown After Being Attacked"
     },
-    "duration": {
-      "type": "integer",
-      "default": 10,
-      "description": "Duration, in seconds, that the mob is pacified.",
-      "title": "Duration"
-    }
+    "duration": { "type": "integer", "default": 10, "description": "Duration, in seconds, that the mob is pacified.", "title": "Duration" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.ageable.json b/source/behaviour/entities/1.16.0/components/minecraft.ageable.json
index 263c827b..bfde5e64 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.ageable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.ageable.json
@@ -9,55 +9,21 @@
     "drop_items": {
       "description": "List of items that the entity drops when it grows up.",
       "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "../../../../general/item/identifier.json"
-          }
-        },
-        {
-          "type": "string",
-          "$ref": "../../../../general/item/identifier.json"
-        }
+        { "type": "array", "items": { "$ref": "../../../../general/item/identifier.json" } },
+        { "type": "string", "$ref": "../../../../general/item/identifier.json" }
       ],
-      "title": "TODO title"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1200,
-      "description": "Amount of time before the entity grows up, -1 for always a baby.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "duration": { "type": "number", "default": 1200, "description": "Amount of time before the entity grows up, -1 for always a baby.", "title": "TODO Title" },
     "feed_items": {
       "description": "List of items that can be fed to the entity. Includes 'item' for the item name and 'growth' to define how much time it grows up by",
       "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "../../../../general/item/identifier.json"
-          }
-        },
-        {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "growth": {
-                "type": "number"
-              },
-              "item": {
-                "$ref": "../../../../general/item/identifier.json"
-              }
-            }
-          }
-        },
-        {
-          "type": "string",
-          "$ref": "../../../../general/item/identifier.json"
-        }
+        { "type": "array", "items": { "$ref": "../../../../general/item/identifier.json" } },
+        { "type": "array", "items": { "type": "object", "properties": { "growth": { "type": "number" }, "item": { "$ref": "../../../../general/item/identifier.json" } } } },
+        { "type": "string", "$ref": "../../../../general/item/identifier.json" }
       ],
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "grow_up": { "$ref": "../types/event.json", "description": "Event to run when this entity grows up.", "title": "TODO title" }
+    "grow_up": { "$ref": "../types/event.json", "description": "Event to run when this entity grows up.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.ambient_sound_interval.json b/source/behaviour/entities/1.16.0/components/minecraft.ambient_sound_interval.json
index 075bbf6f..c64338c9 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.ambient_sound_interval.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.ambient_sound_interval.json
@@ -3,27 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.ambient_sound_interval",
   "additionalProperties": false,
   "type": "object",
-  "title": "Ambient sound interval 1.16.0",
+  "title": "Ambient Sound Interval 1.16.0",
   "description": "Sets the entity's delay between playing its ambient sound.",
   "required": [],
   "properties": {
-    "event_name": {
-      "type": "string",
-      "default": "ambient",
-      "description": "Level sound event to be played as the ambient sound.",
-      "title": "Event name"
-    },
-    "range": {
-      "type": "number",
-      "default": 16,
-      "description": "Maximum time in seconds to randomly add to the ambient sound delay time.",
-      "title": "Range"
-    },
-    "value": {
-      "type": "number",
-      "default": 8,
-      "description": "Minimum time in seconds before the entity plays its ambient sound again",
-      "title": "Value"
-    }
+    "event_name": { "type": "string", "default": "ambient", "description": "Level sound event to be played as the ambient sound.", "title": "Event Name" },
+    "range": { "type": "number", "default": 16, "description": "Maximum time in seconds to randomly add to the ambient sound delay time.", "title": "Range" },
+    "value": { "type": "number", "default": 8, "description": "Minimum time in seconds before the entity plays its ambient sound again", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.angry.json b/source/behaviour/entities/1.16.0/components/minecraft.angry.json
index 2c0aec75..78a7eb8b 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.angry.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.angry.json
@@ -11,102 +11,60 @@
       "type": "boolean",
       "default": false,
       "description": "If true, other entities of the same entity definition within the broadcastRange will also become angry",
-      "title": "Broadcast anger"
-    },
-    "broadcast_filters": {
-      "$ref": "../filters.json",
-      "description": "Conditions that make this entry in the list valid",
-      "title": "Broadcast Filters"
-    },
-    "filters": {
-      "$ref": "../filters.json",
-      "description": "Filter out mob types that it should not attack while angry (other Piglins)",
-      "title": "Filters"
+      "title": "Broadcast Anger"
     },
+    "broadcast_filters": { "$ref": "../filters.json", "description": "Conditions that make this entry in the list valid", "title": "Broadcast Filters" },
+    "filters": { "$ref": "../filters.json", "description": "Filter out mob types that it should not attack while angry (other Piglins)", "title": "Filters" },
     "broadcast_range": {
       "type": "integer",
       "default": 20,
       "description": "Distance in blocks within which other entities of the same entity definition will become angry",
-      "title": "Broadcast range"
+      "title": "Broadcast Range"
     },
     "broadcast_targets": {
       "type": "array",
       "description": "A list of entity families to broadcast anger to",
-      "items": {
-        "type": "string",
-        "description": "An entity family",
-        "pattern": "^.+$",
-        "title": "Broadcast Targets"
-      },
+      "items": { "type": "string", "description": "An entity family", "pattern": "^.+$", "title": "Broadcast Targets" },
       "title": "Broadcast Targets"
     },
     "calm_event": {
       "$ref": "../types/event.json",
       "description": "Event to run after the number of seconds specified in duration expires (when the entity stops being 'angry')",
-      "title": "Calm event"
-    },
-    "angry_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound event to play when the mob is angry",
-      "title": "Angry sound"
+      "title": "Calm Event"
     },
+    "angry_sound": { "type": "string", "default": "", "description": "The sound event to play when the mob is angry", "title": "Angry Sound" },
     "broadcast_anger_on_attack": {
       "type": "boolean",
       "default": false,
       "description": "If true, other entities of the same entity definition within the broadcastRange will also become angry whenever this mob attacks",
-      "title": "Broadcast anger on attack"
+      "title": "Broadcast Anger On Attack"
     },
     "broadcast_anger_on_being_attacked": {
       "type": "boolean",
       "default": false,
       "description": "If true, other entities of the same entity definition within the broadcastRange will also become angry whenever this mob is attacked",
-      "title": "Broadcast anger on being attacked"
-    },
-    "duration": {
-      "type": "integer",
-      "default": 25,
-      "description": "The amount of time in seconds that the entity will be angry",
-      "title": "Duration"
-    },
-    "duration_delta": {
-      "type": "integer",
-      "default": 0,
-      "description": "Variance in seconds added to the duration [-delta, delta]",
-      "title": "Duration delta"
+      "title": "Broadcast Anger On Being Attacked"
     },
+    "duration": { "type": "integer", "default": 25, "description": "The amount of time in seconds that the entity will be angry", "title": "Duration" },
+    "duration_delta": { "type": "integer", "default": 0, "description": "Variance in seconds added to the duration [-delta, delta]", "title": "Duration Delta" },
     "sound_interval": {
       "description": "The range of time in seconds to randomly wait before playing the sound again",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
           "default": [0, 0],
           "items": [
-            {
-              "type": "integer",
-              "minimum": 0
-            },
-            {
-              "type": "integer",
-              "minimum": 0
-            }
+            { "type": "integer", "minimum": 0 },
+            { "type": "integer", "minimum": 0 }
           ]
         },
         {
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "range_min": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "range_max": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "range_min": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "range_max": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         }
       ]
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.area_attack.json b/source/behaviour/entities/1.16.0/components/minecraft.area_attack.json
index acd3934b..842b94f2 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.area_attack.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.area_attack.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.area_attack",
   "type": "object",
-  "title": "Area attack 1.16.0",
+  "title": "Area Attack 1.16.0",
   "description": "A component that does damage to entities that get within range.",
   "additionalProperties": false,
   "properties": {
@@ -10,20 +10,10 @@
       "type": "integer",
       "default": 2,
       "description": "How much damage per tick is applied to entities that enter the damage range.",
-      "title": "Damage per tick"
-    },
-    "damage_range": {
-      "type": "number",
-      "default": 0.2,
-      "description": "How close a hostile entity must be to have the damage applied.",
-      "title": "Damage range"
+      "title": "Damage Per Tick"
     },
+    "damage_range": { "type": "number", "default": 0.2, "description": "How close a hostile entity must be to have the damage applied.", "title": "Damage Range" },
     "entity_filter": { "$ref": "../filters.json", "description": "Entity_filter", "title": "Filter" },
-    "cause": {
-      "type": "string",
-      "description": "TODO",
-      "title": "Cause",
-      "$ref": "../../../../general/entity/damage_source.json"
-    }
+    "cause": { "type": "string", "description": "TODO", "title": "Cause", "$ref": "../../../../general/entity/damage_source.json" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.attack_cooldown.json b/source/behaviour/entities/1.16.0/components/minecraft.attack_cooldown.json
index 4b81fdaa..a530daf7 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.attack_cooldown.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.attack_cooldown.json
@@ -2,36 +2,28 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.attack_cooldown",
   "type": "object",
-  "title": "Attack cooldown 1.16.0",
+  "title": "Attack Cooldown 1.16.0",
   "description": "Adds a cooldown to a mob. The intention of this cooldown is to be used to prevent the mob from attempting to aquire new attack targets.",
   "additionalProperties": false,
   "properties": {
     "attack_cooldown_complete_event": {
       "$ref": "../types/trigger.json",
       "description": "Event to be runned when the cooldown is complete.",
-      "title": "Attack cooldown complete event"
+      "title": "Attack Cooldown Complete Event"
     },
     "attack_cooldown_time": {
       "default": [0.0, 1.0],
       "description": "Amount of time in seconds for the cooldown. Can be specified as a number or a pair of numbers (min and max).",
-      "title": "Attack cooldown time",
+      "title": "Attack Cooldown Time",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        }
+        { "type": "number" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.barter.json b/source/behaviour/entities/1.16.0/components/minecraft.barter.json
index aa057fc7..992eae17 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.barter.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.barter.json
@@ -6,16 +6,12 @@
   "description": "Enables the component to drop an item as a barter exchange.",
   "additionalProperties": false,
   "properties": {
-    "barter_table": {
-      "type": "string",
-      "description": "Loot table that's used to drop a random item.",
-      "title": "Barter table"
-    },
+    "barter_table": { "type": "string", "description": "Loot table that's used to drop a random item.", "title": "Barter Table" },
     "cooldown_after_being_attacked": {
       "type": "integer",
       "default": 0,
       "description": "Duration, in seconds, for which mob won't barter items if it was hurt",
-      "title": "Cooldown after being attacked"
+      "title": "Cooldown After Being Attacked"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.block_sensor.json b/source/behaviour/entities/1.16.0/components/minecraft.block_sensor.json
index 63c471e0..ea370d4f 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.block_sensor.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.block_sensor.json
@@ -2,38 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.block_sensor",
   "type": "object",
-  "title": "Block sensor 1.16.0",
+  "title": "Block Sensor 1.16.0",
   "description": "Fires off a specified event when a block in the block list is broken within the sensor range.",
   "additionalProperties": false,
   "properties": {
-    "sensor_radius": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Sensor radius",
-      "minimum": 0
-    },
+    "sensor_radius": { "type": "integer", "description": "TODO", "title": "Sensor Radius", "minimum": 0 },
     "on_break": {
       "type": "array",
-      "title": "On break",
+      "title": "On Break",
       "items": {
         "type": "object",
-        "title": "On block broken",
+        "title": "On Block Broken",
         "additionalProperties": false,
         "properties": {
-          "block_list": {
-            "type": "array",
-            "title": "Block list",
-            "description": "TODO",
-            "items": {
-              "type": "string",
-              "title": "Block ID"
-            }
-          },
-          "on_block_broken": {
-            "type": "string",
-            "title": "On block broken",
-            "description": "On block broken"
-          }
+          "block_list": { "type": "array", "title": "Block List", "description": "TODO", "items": { "type": "string", "title": "Block ID" } },
+          "on_block_broken": { "type": "string", "title": "On Block Broken", "description": "On block broken" }
         }
       },
       "description": "TODO description"
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.boostable.json b/source/behaviour/entities/1.16.0/components/minecraft.boostable.json
index b4ac6dfe..b3677745 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.boostable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.boostable.json
@@ -7,45 +7,25 @@
   "description": "Defines the conditions and behavior of a rideable entity's boost",
   "required": [],
   "properties": {
-    "duration": {
-      "type": "number",
-      "default": 3,
-      "description": "Time in seconds for the boost.",
-      "title": "Duration"
-    },
+    "duration": { "type": "number", "default": 3, "description": "Time in seconds for the boost.", "title": "Duration" },
     "speed_multiplier": {
       "type": "number",
       "default": 1,
       "description": "Factor by which the entity's normal speed increases. E.g. 2.0 means go twice as fast.",
-      "title": "Speed multiplier"
+      "title": "Speed Multiplier"
     },
     "boost_items": {
       "type": "array",
       "description": "List of items that can be used to boost while riding this entity",
-      "title": "Boost items",
+      "title": "Boost Items",
       "items": {
         "type": "object",
         "additionalProperties": false,
         "description": "List of items that can be used to boost while riding this entity.",
         "properties": {
-          "damage": {
-            "type": "integer",
-            "default": 1,
-            "description": "This is the damage that the item will take each time it is used.",
-            "title": "Damage"
-          },
-          "item": {
-            "type": "string",
-            "default": "",
-            "description": "Name of the item that can be used to boost.",
-            "title": "Item"
-          },
-          "replace_item": {
-            "type": "string",
-            "default": "",
-            "description": "The item used to boost will become this item once it is used up.",
-            "title": "Replace item"
-          }
+          "damage": { "type": "integer", "default": 1, "description": "This is the damage that the item will take each time it is used.", "title": "Damage" },
+          "item": { "type": "string", "default": "", "description": "Name of the item that can be used to boost.", "title": "Item" },
+          "replace_item": { "type": "string", "default": "", "description": "The item used to boost will become this item once it is used up.", "title": "Replace Item" }
         }
       }
     }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.breedable.json b/source/behaviour/entities/1.16.0/components/minecraft.breedable.json
index f863f8c1..f8817073 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.breedable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.breedable.json
@@ -12,21 +12,9 @@
       "additionalItems": false,
       "required": [],
       "properties": {
-        "baby_type": {
-          "type": "string",
-          "description": "The entity definition of this entity's babies.",
-          "title": "Baby Type"
-        },
-        "breed_event": {
-          "$ref": "../types/event.json",
-          "description": "Event to run when this entity breeds.",
-          "title": "Breed Event"
-        },
-        "mate_type": {
-          "type": "string",
-          "description": "The entity definition of this entity's mate.",
-          "title": "Mate Type"
-        }
+        "baby_type": { "type": "string", "description": "The entity definition of this entity's babies.", "title": "Baby Type" },
+        "breed_event": { "$ref": "../types/event.json", "description": "Event to run when this entity breeds.", "title": "Breed Event" },
+        "mate_type": { "type": "string", "description": "The entity definition of this entity's mate.", "title": "Mate Type" }
       }
     },
     "enviroment_requirements": {
@@ -46,19 +34,10 @@
                 "title": "Blocks"
               }
             },
-            {
-              "description": "A block type required nearby for the entity to breed.",
-              "type": "string",
-              "$ref": "../../../../general/blocks_item.json",
-              "title": "Blocks"
-            }
+            { "description": "A block type required nearby for the entity to breed.", "type": "string", "$ref": "../../../../general/blocks_item.json", "title": "Blocks" }
           ]
         },
-        "count": {
-          "type": "number",
-          "description": "The number of the required block types nearby for the entity to breed.",
-          "title": "Count"
-        },
+        "count": { "type": "number", "description": "The number of the required block types nearby for the entity to breed.", "title": "Count" },
         "radius": {
           "type": "number",
           "description": "How many blocks radius from the mob's center to search in for the required blocks. Bounded between 0 and 16.",
@@ -71,24 +50,14 @@
   },
   "required": [],
   "properties": {
-    "allow_sitting": {
-      "description": "If true, entities can breed while sitting.",
-      "type": "boolean",
-      "default": false,
-      "title": "Allow Sitting"
-    },
+    "allow_sitting": { "description": "If true, entities can breed while sitting.", "type": "boolean", "default": false, "title": "Allow Sitting" },
     "blend_attributes": {
       "description": "If true, the entities will blend their attributes in the offspring after they breed. For example, horses blend their health, movement, and jump_strength in their offspring.",
       "type": "boolean",
       "default": true,
       "title": "Blend Attributes"
     },
-    "breed_cooldown": {
-      "description": "Time in seconds before the Entity can breed again.",
-      "type": "number",
-      "default": 60.0,
-      "title": "Breed Cooldown"
-    },
+    "breed_cooldown": { "description": "Time in seconds before the Entity can breed again.", "type": "number", "default": 60.0, "title": "Breed Cooldown" },
     "breed_items": {
       "description": "The list of items that can be used to get the entity into the 'love' state",
       "title": "Breed Items",
@@ -99,73 +68,36 @@
             "type": "string",
             "description": "An item that can be used to get the entity into the 'love' state",
             "$ref": "../../../../general/item/identifier.json",
-            "title": "TODO title"
+            "title": "TODO Title"
           }
         },
-        {
-          "type": "string",
-          "$ref": "../../../../general/item/identifier.json",
-          "title": "TODO title"
-        }
+        { "type": "string", "$ref": "../../../../general/item/identifier.json", "title": "TODO Title" }
       ]
     },
     "breeds_with": {
       "description": "The list of entity definitions that this entity can breed with.",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/breeds_with_spec"
-        },
-        {
-          "uniqueItems": true,
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/breeds_with_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/breeds_with_spec" },
+        { "uniqueItems": true, "type": "array", "items": { "type": "object", "$ref": "#/definitions/breeds_with_spec" } }
       ],
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "deny_parents_variant": {
       "type": "object",
       "description": "Determines how likely the baby of parents with the same variant will deny that variant and take a random variant within the given range instead.",
       "additionalProperties": false,
       "properties": {
-        "chance": {
-          "type": "number",
-          "default": 0,
-          "description": "The percentage chance of denying the parents' variant.",
-          "title": "Chance"
-        },
-        "max_variant": {
-          "type": "integer",
-          "default": 0,
-          "description": "The inclusive maximum of the variant range.",
-          "title": "Max Variant"
-        },
-        "min_variant": {
-          "type": "integer",
-          "default": 0,
-          "description": "The inclusive minimum of the variant range.",
-          "title": "Min Variant"
-        }
+        "chance": { "type": "number", "default": 0, "description": "The percentage chance of denying the parents' variant.", "title": "Chance" },
+        "max_variant": { "type": "integer", "default": 0, "description": "The inclusive maximum of the variant range.", "title": "Max Variant" },
+        "min_variant": { "type": "integer", "default": 0, "description": "The inclusive minimum of the variant range.", "title": "Min Variant" }
       },
       "title": "Deny Parents Variant"
     },
     "environment_requirements": {
       "description": "The list of nearby block requirements to get the entity into the 'love' state.",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/enviroment_requirements"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/enviroment_requirements"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/enviroment_requirements" },
+        { "type": "array", "items": { "$ref": "#/definitions/enviroment_requirements" } }
       ],
       "title": "Environment Requirements"
     },
@@ -183,14 +115,7 @@
       "description": "Determines how likely the babies are to NOT inherit one of their parent's variances. Values are between 0.0 and 1.0, with a higher number meaning more likely to mutate.",
       "additionalProperties": false,
       "properties": {
-        "color": {
-          "type": "number",
-          "default": 0,
-          "minimum": 0.0,
-          "maximum": 1.0,
-          "description": "The percentage chance of a mutation on the entity's color.",
-          "title": "Color"
-        },
+        "color": { "type": "number", "default": 0, "minimum": 0.0, "maximum": 1.0, "description": "The percentage chance of a mutation on the entity's color.", "title": "Color" },
         "extra_variant": {
           "type": "number",
           "default": 0,
@@ -210,29 +135,14 @@
       },
       "title": "Mutation Factor"
     },
-    "causes_pregnancy": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity will become pregnant instead of spawning a baby.",
-      "title": "Causes pregnancy"
-    },
-    "inherit_tamed": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the babies will be automatically tamed if its parents are",
-      "title": "Inherit tamed"
-    },
+    "causes_pregnancy": { "type": "boolean", "default": false, "description": "If true, the entity will become pregnant instead of spawning a baby.", "title": "Causes Pregnancy" },
+    "inherit_tamed": { "type": "boolean", "default": true, "description": "If true, the babies will be automatically tamed if its parents are", "title": "Inherit Tamed" },
     "require_full_health": {
       "type": "boolean",
       "default": false,
       "description": "If true, the entity needs to be at full health before it can breed.",
-      "title": "Require full health"
+      "title": "Require Full Health"
     },
-    "require_tame": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the entities need to be tamed first before they can breed.",
-      "title": "Require tame"
-    }
+    "require_tame": { "type": "boolean", "default": true, "description": "If true, the entities need to be tamed first before they can breed.", "title": "Require Tame" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.buoyant.json b/source/behaviour/entities/1.16.0/components/minecraft.buoyant.json
index 08988321..dd730b92 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.buoyant.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.buoyant.json
@@ -10,46 +10,33 @@
       "type": "boolean",
       "default": true,
       "description": "Applies gravity each tick. Causes more of a wave simulation, but will cause more gravity to be applied outside liquids.",
-      "title": "Apply gravity"
-    },
-    "base_buoyancy": {
-      "type": "number",
-      "default": 1,
-      "description": "Base buoyancy used to calculate how much will a mob float.",
-      "title": "Base buoyancy"
+      "title": "Apply Gravity"
     },
+    "base_buoyancy": { "type": "number", "default": 1, "description": "Base buoyancy used to calculate how much will a mob float.", "title": "Base Buoyancy" },
     "big_wave_probability": {
       "type": "number",
       "default": 0.03,
       "description": "Probability for a big wave hitting the entity. Only used if `simulate_waves` is true.",
-      "title": "Big wave probability"
+      "title": "Big Wave Probability"
     },
     "big_wave_speed": {
       "type": "number",
       "default": 10,
       "description": "Multiplier for the speed to make a big wave. Triggered depending on 'big_wave_probability'.",
-      "title": "Big wave speed"
+      "title": "Big Wave Speed"
     },
     "drag_down_on_buoyancy_removed": {
       "type": "number",
       "default": 0,
       "description": "How much an actor will be dragged down when the Buoyancy Component is removed.",
-      "title": "Drag down on buoyancy removed"
+      "title": "Drag Down On Buoyancy Removed"
     },
     "liquid_blocks": {
       "type": "array",
       "description": "List of blocks this entity can float on. Must be a liquid block.",
-      "title": "Liquid blocks",
-      "items": {
-        "type": "string",
-        "title": "Block ID"
-      }
+      "title": "Liquid Blocks",
+      "items": { "type": "string", "title": "Block ID" }
     },
-    "simulate_waves": {
-      "type": "boolean",
-      "default": true,
-      "description": "Should the movement simulate waves going through.",
-      "title": "Simulate waves"
-    }
+    "simulate_waves": { "type": "boolean", "default": true, "description": "Should the movement simulate waves going through.", "title": "Simulate Waves" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.celebrate_hunt.json b/source/behaviour/entities/1.16.0/components/minecraft.celebrate_hunt.json
index 98e83871..fd9e75b4 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.celebrate_hunt.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.celebrate_hunt.json
@@ -2,33 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.celebrate_hunt",
   "type": "object",
-  "title": "Celebrate hunt 1.16.0",
+  "title": "Celebrate Hunt 1.16.0",
   "description": "Specifies hunt celebration behaviour.",
   "additionalProperties": false,
   "properties": {
-    "broadcast": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, celebration will be broadcasted to other entities in the radius.",
-      "title": "Broadcast"
-    },
+    "broadcast": { "type": "boolean", "default": true, "description": "If true, celebration will be broadcasted to other entities in the radius.", "title": "Broadcast" },
     "celebration_targets": {
       "$ref": "../filters.json",
       "description": "The list of conditions that target of hunt must satisfy to initiate celebration.",
-      "title": "Celeberation targets"
-    },
-    "celebrate_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound event to play when the mob is celebrating",
-      "title": "Celebrate sound"
-    },
-    "duration": {
-      "type": "integer",
-      "default": 4,
-      "description": "Duration, in seconds, of celebration",
-      "title": "Duration"
+      "title": "Celeberation Targets"
     },
+    "celebrate_sound": { "type": "string", "default": "", "description": "The sound event to play when the mob is celebrating", "title": "Celebrate Sound" },
+    "duration": { "type": "integer", "default": 4, "description": "Duration, in seconds, of celebration", "title": "Duration" },
     "radius": {
       "type": "number",
       "default": 16,
@@ -38,38 +23,22 @@
     "sound_interval": {
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        },
+        { "type": "number" },
         {
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "range_min": {
-              "type": "number",
-              "title": "Update interval variant",
-              "description": "UNDOCUMENTATED"
-            },
-            "range_max": {
-              "type": "number",
-              "title": "Update interval variant",
-              "description": "UNDOCUMENTATED"
-            }
+            "range_min": { "type": "number", "title": "Update Interval Variant", "description": "UNDOCUMENTATED" },
+            "range_max": { "type": "number", "title": "Update Interval Variant", "description": "UNDOCUMENTATED" }
           }
         }
       ]
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.custom_hit_test.json b/source/behaviour/entities/1.16.0/components/minecraft.custom_hit_test.json
index c74f7b28..96eeb45a 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.custom_hit_test.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.custom_hit_test.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.custom_hit_test",
   "type": "object",
-  "title": "Custom hit test 1.16.0",
+  "title": "Custom Hit Test 1.16.0",
   "description": "List of hitboxes for melee and ranged hits against the entity.",
   "additionalProperties": false,
   "properties": {
@@ -16,32 +16,9 @@
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "width": {
-            "type": "number",
-            "title": "Width",
-            "description": "TODO"
-          },
-          "height": {
-            "type": "number",
-            "title": "Height",
-            "description": "TODO"
-          },
-          "pivot": {
-            "type": "array",
-            "title": "Pivot",
-            "description": "TODO",
-            "items": [
-              {
-                "type": "number"
-              },
-              {
-                "type": "number"
-              },
-              {
-                "type": "number"
-              }
-            ]
-          }
+          "width": { "type": "number", "title": "Width", "description": "TODO" },
+          "height": { "type": "number", "title": "Height", "description": "TODO" },
+          "pivot": { "type": "array", "title": "Pivot", "description": "TODO", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] }
         }
       }
     }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.damage_sensor.json b/source/behaviour/entities/1.16.0/components/minecraft.damage_sensor.json
index 746941df..424aa21c 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.damage_sensor.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.damage_sensor.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.damage_sensor",
-  "title": "Damage sensor",
+  "title": "Damage Sensor",
   "description": "Defines what events to call when this entity is damaged by specific entities or items.",
   "type": "object",
   "additionalProperties": false,
@@ -19,40 +19,25 @@
           "type": "number",
           "default": 1,
           "description": "A multiplier that modifies the base damage from the damage cause. If deals_damage is true the multiplier can only reduce the damage the entity will take to a minimum of 1.",
-          "title": "Damage multiplier"
+          "title": "Damage Multiplier"
         },
         "deals_damage": {
           "type": "boolean",
           "default": true,
           "description": "If true, the damage dealt to the entity will take away health from it, set to false to make the entity ignore that damage.",
-          "title": "Deals damage"
+          "title": "Deals Damage"
         },
         "on_damage": {
           "additionalProperties": false,
           "type": "object",
           "description": "Specifies filters for entity definitions and events.",
-          "title": "On damage",
+          "title": "On Damage",
           "properties": {
-            "filters": {
-              "$ref": "../filters.json"
-            },
-            "event": {
-              "type": "string",
-              "pattern": "^.*$",
-              "description": "TODO description: event",
-              "title": "Event"
-            },
-            "target": {
-              "$ref": "../filters/types/base_subject.json",
-              "description": "TODO description: target",
-              "title": "Target"
-            }
+            "filters": { "$ref": "../filters.json" },
+            "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
+            "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
           },
-          "on_damage_sound_event": {
-            "type": "string",
-            "description": "Defines what sound to play, if any, when the on_damage filters are met.",
-            "title": "On damage sound event"
-          }
+          "on_damage_sound_event": { "type": "string", "description": "Defines what sound to play, if any, when the on_damage filters are met.", "title": "On Damage Sound Event" }
         }
       }
     }
@@ -62,16 +47,8 @@
       "description": "The list of triggers that fire when the environment conditions match the given filter criteria.",
       "title": "Triggers",
       "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/trigger"
-          }
-        },
-        {
-          "type": "object",
-          "$ref": "#/definitions/trigger"
-        }
+        { "type": "array", "items": { "$ref": "#/definitions/trigger" } },
+        { "type": "object", "$ref": "#/definitions/trigger" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.despawn.json b/source/behaviour/entities/1.16.0/components/minecraft.despawn.json
index fdaccb67..746b03cf 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.despawn.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.despawn.json
@@ -10,39 +10,29 @@
       "type": "boolean",
       "default": true,
       "description": "Determines if \"min_range_random_chance\" is used in the standard despawn rules",
-      "title": "Despawn from chance"
+      "title": "Despawn From Chance"
     },
     "despawn_from_distance": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "max_distance": {
-          "type": "integer",
-          "default": 128,
-          "description": "Maximum distance for standard despawn rules to instantly despawn the mob.",
-          "title": "Max distance"
-        },
-        "min_distance": {
-          "type": "integer",
-          "default": 32,
-          "description": "Minimum distance for standard despawn rules to try to despawn the mob.",
-          "title": "Min distance"
-        }
+        "max_distance": { "type": "integer", "default": 128, "description": "Maximum distance for standard despawn rules to instantly despawn the mob.", "title": "Max Distance" },
+        "min_distance": { "type": "integer", "default": 32, "description": "Minimum distance for standard despawn rules to try to despawn the mob.", "title": "Min Distance" }
       },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "despawn_from_inactivity": {
       "type": "boolean",
       "default": true,
       "description": "Determines if the \"min_range_inactivity_timer\" is used in the standard despawn rules.",
-      "title": "Despawn from inactivity"
+      "title": "Despawn From Inactivity"
     },
     "despawn_from_simulation_edge": {
       "type": "boolean",
       "default": true,
       "description": "Determines if the mob is instantly despawned at the edge of simulation distance in the standard despawn rules.",
-      "title": "Despawn from simulation edge"
+      "title": "Despawn From Simulation Edge"
     },
     "filters": {
       "$ref": "../filters.json",
@@ -53,19 +43,14 @@
       "type": "integer",
       "default": 30,
       "description": "The amount of time in seconds that the mob must be inactive.",
-      "title": "Min range inactivity timer"
-    },
-    "min_range_random_chance": {
-      "type": "integer",
-      "default": 800,
-      "description": "A random chance between 1 and the given value.",
-      "title": "Min range random chance"
+      "title": "Min Range Inactivity Timer"
     },
+    "min_range_random_chance": { "type": "integer", "default": 800, "description": "A random chance between 1 and the given value.", "title": "Min Range Random Chance" },
     "remove_child_entities": {
       "type": "boolean",
       "default": false,
       "description": "If true, all entities linked to this entity in a child relationship (eg. leashed) will also be despawned.",
-      "title": "Remove child entities"
+      "title": "Remove Child Entities"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.entity_sensor.json b/source/behaviour/entities/1.16.0/components/minecraft.entity_sensor.json
index 2f2a9237..f111dcd7 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.entity_sensor.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.entity_sensor.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.entity_sensor",
   "type": "object",
-  "title": "Entity sensor 1.16.0",
+  "title": "Entity Sensor 1.16.0",
   "description": "A component that fires an event when a set of conditions are met by other entities within the defined range.",
   "additionalProperties": false,
   "properties": {
@@ -10,37 +10,28 @@
       "type": "integer",
       "default": -1,
       "description": "The maximum number of entities that must pass the filter conditions for the event to send.",
-      "title": "Maximum count"
+      "title": "Maximum Count"
     },
     "minimum_count": {
       "type": "integer",
       "default": 1,
       "description": "The minimum number of entities that must pass the filter conditions for the event to send.",
-      "title": "Minimum count"
-    },
-    "relative_range": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true the sensor range is additive on top of the entity's size.",
-      "title": "Relative range"
+      "title": "Minimum Count"
     },
+    "relative_range": { "type": "boolean", "default": true, "description": "If true the sensor range is additive on top of the entity's size.", "title": "Relative Range" },
     "require_all": {
       "type": "boolean",
       "default": false,
       "description": "If true requires all nearby entities to pass the filter conditions for the event to send.",
-      "title": "Require all"
+      "title": "Require All"
     },
     "sensor_range": {
       "type": "number",
       "default": 10,
       "description": "The maximum distance another entity can be from this and have the filters checked against it.",
-      "title": "Sensor range"
+      "title": "Sensor Range"
     },
     "event_filters": { "$ref": "../filters.json" },
-    "event": {
-      "title": "Event",
-      "description": "event",
-      "type": "string"
-    }
+    "event": { "title": "Event", "description": "event", "type": "string" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.environment_sensor.json b/source/behaviour/entities/1.16.0/components/minecraft.environment_sensor.json
index ebe05eee..c6026179 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.environment_sensor.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.environment_sensor.json
@@ -1,28 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.environment_sensor",
-  "title": "Environment sensor",
+  "title": "Environment Sensor",
   "description": "Creates a trigger based on environment conditions.",
   "type": "object",
   "additionalProperties": false,
-  "definitions": {
-    "trigger": { "$ref": "../types/trigger.json" }
-  },
+  "definitions": { "trigger": { "$ref": "../types/trigger.json" } },
   "properties": {
     "triggers": {
       "description": "The list of triggers that fire when the environment conditions match the given filter criteria.",
       "title": "Triggers",
       "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/trigger"
-          }
-        },
-        {
-          "type": "object",
-          "$ref": "#/definitions/trigger"
-        }
+        { "type": "array", "items": { "$ref": "#/definitions/trigger" } },
+        { "type": "object", "$ref": "#/definitions/trigger" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.equip_item.json b/source/behaviour/entities/1.16.0/components/minecraft.equip_item.json
index 09a1837b..d18ae559 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.equip_item.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.equip_item.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.equip_item",
   "type": "object",
-  "title": "Equip item 1.16.0",
+  "title": "Equip Item 1.16.0",
   "description": "The entity puts on the desired equipment.",
   "additionalProperties": false,
   "properties": {}
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.equipment.json b/source/behaviour/entities/1.16.0/components/minecraft.equipment.json
index 51695527..eb9e31b4 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.equipment.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.equipment.json
@@ -9,32 +9,19 @@
     "slot_drop_chance": {
       "type": "array",
       "description": "A list of slots with the chance to drop an equipped item from that slot",
-      "title": "Slot drop chance",
+      "title": "Slot Drop Chance",
       "items": {
         "additionalProperties": false,
-        "title": "Slot drop chance",
+        "title": "Slot Drop Chance",
         "description": "UNDOCUMENTATED",
         "type": "object",
         "properties": {
-          "drop_chance": {
-            "type": "number",
-            "title": "Drop chance",
-            "description": "UNDOCUMENTATED"
-          },
-          "slot": {
-            "type": "string",
-            "title": "Slot",
-            "description": "UNDOCUMENTATED"
-          }
+          "drop_chance": { "type": "number", "title": "Drop Chance", "description": "UNDOCUMENTATED" },
+          "slot": { "type": "string", "title": "Slot", "description": "UNDOCUMENTATED" }
         }
       }
     },
-    "table": {
-      "type": "string",
-      "pattern": ".*\\.json$",
-      "description": "TODO description: table",
-      "title": "Table"
-    }
+    "table": { "type": "string", "pattern": ".*\\.json$", "description": "TODO description: table", "title": "Table" }
   },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.equippable.json b/source/behaviour/entities/1.16.0/components/minecraft.equippable.json
index 0431d59d..6c275d58 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.equippable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.equippable.json
@@ -14,43 +14,21 @@
         "description": "A slot and the item that can be equipped",
         "type": "object",
         "properties": {
-          "slot": {
-            "type": "integer",
-            "default": 0,
-            "description": "The slot number of this slot",
-            "title": "Slot"
-          },
+          "slot": { "type": "integer", "default": 0, "description": "The slot number of this slot", "title": "Slot" },
           "accepted_items": {
             "type": "array",
             "description": "The list of items that can go in this slot",
-            "items": {
-              "type": "string",
-              "description": "A item name",
-              "$ref": "../../../../general/item/identifier.json",
-              "title": "Accepted Items"
-            },
+            "items": { "type": "string", "description": "A item name", "$ref": "../../../../general/item/identifier.json", "title": "Accepted Items" },
             "title": "Accepted Items"
           },
-          "item": {
-            "$ref": "../../../../general/item/identifier.json",
-            "description": "Identifier of the item that can be equipped for this slot",
-            "title": "Item"
-          },
+          "item": { "$ref": "../../../../general/item/identifier.json", "description": "Identifier of the item that can be equipped for this slot", "title": "Item" },
           "interact_text": {
             "type": "string",
             "description": "Text to be displayed when the entity can be equipped with this item when playing with Touch-screen controls",
             "title": "Interact Text"
           },
-          "on_equip": {
-            "$ref": "../types/event.json",
-            "description": "Event to trigger when this entity is equipped with this item",
-            "title": "On Equip"
-          },
-          "on_unequip": {
-            "$ref": "../types/event.json",
-            "description": "Event to trigger when this item is removed from this entity",
-            "title": "On Unequip"
-          }
+          "on_equip": { "$ref": "../types/event.json", "description": "Event to trigger when this entity is equipped with this item", "title": "On Equip" },
+          "on_unequip": { "$ref": "../types/event.json", "description": "Event to trigger when this item is removed from this entity", "title": "On Unequip" }
         },
         "title": "Slots"
       },
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.experience_reward.json b/source/behaviour/entities/1.16.0/components/minecraft.experience_reward.json
index 5440ea84..733637fb 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.experience_reward.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.experience_reward.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.experience_reward",
   "type": "object",
-  "title": "Experience reward 1.16.0",
+  "title": "Experience Reward 1.16.0",
   "description": "TODO",
   "additionalProperties": false,
   "properties": {
@@ -10,13 +10,13 @@
       "type": "string",
       "default": 0,
       "description": "A molang expression defining the amount of experience rewarded when this entity is successfully bred. An array of expressions adds each expression's result together for a final total.",
-      "title": "On bred"
+      "title": "On Bred"
     },
     "on_death": {
       "type": "string",
       "default": 0,
       "description": "A molang expression defining the amount of experience rewarded when this entity dies. An array of expressions adds each expression's result together for a final total.",
-      "title": "On death"
+      "title": "On Death"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.explode.json b/source/behaviour/entities/1.16.0/components/minecraft.explode.json
index 877b089c..6db5162a 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.explode.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.explode.json
@@ -7,68 +7,33 @@
   "description": "Defines how the entity explodes.",
   "required": [],
   "properties": {
-    "breaks_blocks": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the explosion will destroy blocks in the explosion radius.",
-      "title": "Breaks blocks"
-    },
-    "causes_fire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, blocks in the explosion radius will be set on fire.",
-      "title": "Causes fire"
-    },
+    "breaks_blocks": { "type": "boolean", "default": true, "description": "If true, the explosion will destroy blocks in the explosion radius.", "title": "Breaks Blocks" },
+    "causes_fire": { "type": "boolean", "default": false, "description": "If true, blocks in the explosion radius will be set on fire.", "title": "Causes Fire" },
     "destroy_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the explosion breaks blocks is affected by the mob griefing game rule.",
-      "title": "Destroy affected by griefing"
+      "title": "Destroy Affected By Griefing"
     },
     "fire_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the explosion causes fire is affected by the mob griefing game rule.",
-      "title": "Fire affected by griefing"
+      "title": "Fire Affected By Griefing"
     },
     "fuse_length": {
       "default": [0.0, 0.0],
       "description": "The range for the random amount of time the fuse will be lit before exploding, a negative value means the explosion will be immediate.",
-      "title": "Fuse length",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": [
-            {
-              "type": "number"
-            },
-            {
-              "type": "number"
-            }
-          ]
-        },
-        {
-          "type": "number"
-        }
-      ]
-    },
-    "fuse_lit": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the fuse is already lit when this component is added to the entity.",
-      "title": "Fuse lit"
+      "title": "Fuse Length",
+      "oneOf": [{ "type": "array", "items": [{ "type": "number" }, { "type": "number" }] }, { "type": "number" }]
     },
+    "fuse_lit": { "type": "boolean", "default": false, "description": "If true, the fuse is already lit when this component is added to the entity.", "title": "Fuse Lit" },
     "max_resistance": {
       "type": "number",
       "default": 3.40282e38,
       "description": "A blocks explosion resistance will be capped at this value when an explosion occurs.",
-      "title": "Max resistance"
+      "title": "Max Resistance"
     },
-    "power": {
-      "type": "number",
-      "default": 3,
-      "description": "The radius of the explosion in blocks and the amount of damage the explosion deals.",
-      "title": "Power"
-    }
+    "power": { "type": "number", "default": 3, "description": "The radius of the explosion in blocks and the amount of damage the explosion deals.", "title": "Power" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.flocking.json b/source/behaviour/entities/1.16.0/components/minecraft.flocking.json
index 9ece0a53..387d312f 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.flocking.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.flocking.json
@@ -6,113 +6,63 @@
   "description": "Allows entities to flock in groups in water or not.",
   "additionalProperties": false,
   "properties": {
-    "block_distance": {
-      "type": "number",
-      "default": 0,
-      "description": "The amount of blocks away the entity will look at to push away from.",
-      "title": "Block distance"
-    },
-    "block_weight": {
-      "type": "number",
-      "default": 0,
-      "description": "The weight of the push back away from blocks.",
-      "title": "Block weight"
-    },
+    "block_distance": { "type": "number", "default": 0, "description": "The amount of blocks away the entity will look at to push away from.", "title": "Block Distance" },
+    "block_weight": { "type": "number", "default": 0, "description": "The weight of the push back away from blocks.", "title": "Block Weight" },
     "breach_influence": {
       "type": "number",
       "default": 0,
       "description": "The amount of push back given to a flocker that breaches out of the water.",
-      "title": "Breach influence"
-    },
-    "cohesion_threshold": {
-      "type": "number",
-      "default": 1,
-      "description": "The threshold in which to start applying cohesion.",
-      "title": "Cohesion threshold"
-    },
-    "cohesion_weight": {
-      "type": "number",
-      "default": 1,
-      "description": "The weight applied for the cohesion steering of the flock.",
-      "title": "Cohesion weight"
-    },
-    "goal_weight": {
-      "type": "number",
-      "default": 0,
-      "description": "The weight on which to apply on the goal output.",
-      "title": "Goal weight"
+      "title": "Breach Influence"
     },
+    "cohesion_threshold": { "type": "number", "default": 1, "description": "The threshold in which to start applying cohesion.", "title": "Cohesion Threshold" },
+    "cohesion_weight": { "type": "number", "default": 1, "description": "The weight applied for the cohesion steering of the flock.", "title": "Cohesion Weight" },
+    "goal_weight": { "type": "number", "default": 0, "description": "The weight on which to apply on the goal output.", "title": "Goal Weight" },
     "high_flock_limit": {
       "type": "integer",
       "default": 0,
       "description": "Determines the high bound amount of entities that can be allowed in the flock.",
-      "title": "High flock limit"
-    },
-    "in_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the Flocking Component if the entity exists in water.",
-      "title": "In water"
-    },
-    "influence_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "The area around the entity that allows others to be added to the flock.",
-      "title": "Influence radius"
+      "title": "High Flock Limit"
     },
+    "in_water": { "type": "boolean", "default": false, "description": "Tells the Flocking Component if the entity exists in water.", "title": "In Water" },
+    "influence_radius": { "type": "number", "default": 0, "description": "The area around the entity that allows others to be added to the flock.", "title": "Influence Radius" },
     "innner_cohesion_threshold": {
       "type": "number",
       "default": 0,
       "description": "The distance in which the flocker will stop applying cohesion.",
-      "title": "Innner cohesion threshold"
+      "title": "Innner Cohesion Threshold"
     },
     "loner_chance": {
       "type": "number",
       "default": 0,
       "description": "The percentage chance between 0-1 that a fish will spawn and not want to join flocks. Invalid values will be capped at the end points.",
-      "title": "Loner chance"
+      "title": "Loner Chance"
     },
     "low_flock_limit": {
       "type": "integer",
       "default": 0,
       "description": "Determines the low bound amount of entities that can be allowed in the flock.",
-      "title": "Low flock limit"
+      "title": "Low Flock Limit"
     },
     "match_variants": {
       "type": "boolean",
       "default": false,
       "description": "Tells the flockers that they can only match similar entities that also match the variant, mark variants, and color data of the other potential flockers.",
-      "title": "Match variants"
-    },
-    "max_height": {
-      "type": "number",
-      "default": 0,
-      "description": "The max height allowable in the air or water.",
-      "title": "Max height"
-    },
-    "min_height": {
-      "type": "number",
-      "default": 0,
-      "description": "The min height allowable in the air or water.",
-      "title": "Min height"
+      "title": "Match Variants"
     },
+    "max_height": { "type": "number", "default": 0, "description": "The max height allowable in the air or water.", "title": "Max Height" },
+    "min_height": { "type": "number", "default": 0, "description": "The min height allowable in the air or water.", "title": "Min Height" },
     "separation_threshold": {
       "type": "number",
       "default": 2,
       "description": "The distance that is determined to be to close to another flocking and to start applying separation.",
-      "title": "Separation threshold"
-    },
-    "separation_weight": {
-      "type": "number",
-      "default": 1,
-      "description": "The weight applied to the separation of the flock.",
-      "title": "Separation weight"
+      "title": "Separation Threshold"
     },
+    "separation_weight": { "type": "number", "default": 1, "description": "The weight applied to the separation of the flock.", "title": "Separation Weight" },
     "use_center_of_mass": {
       "type": "boolean",
       "default": false,
       "description": "Tells the flockers that they will follow flocks based on the center of mass.",
-      "title": "Use center of mass"
+      "title": "Use Center Of Mass"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.giveable.json b/source/behaviour/entities/1.16.0/components/minecraft.giveable.json
index 8c1aef76..8ae7dd67 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.giveable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.giveable.json
@@ -11,12 +11,7 @@
       "description": "UNDOCUMENTATED",
       "title": "UNDOCUMENTATED",
       "properties": {
-        "cooldown": {
-          "type": "number",
-          "default": 0.0,
-          "description": "An optional cool down in seconds to prevent spamming interactions.",
-          "title": "Cooldown"
-        },
+        "cooldown": { "type": "number", "default": 0.0, "description": "An optional cool down in seconds to prevent spamming interactions.", "title": "Cooldown" },
         "items": {
           "type": "array",
           "description": "The list of items that can be given to the entity to place in their inventory.",
@@ -27,11 +22,7 @@
           },
           "title": "Properties"
         },
-        "on_give": {
-          "$ref": "../types/event.json",
-          "description": "Event to fire when the correct item is given.",
-          "title": "On Give"
-        }
+        "on_give": { "$ref": "../types/event.json", "description": "Event to fire when the correct item is given.", "title": "On Give" }
       }
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.group_size.json b/source/behaviour/entities/1.16.0/components/minecraft.group_size.json
index a86ad9e9..ec15b8dc 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.group_size.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.group_size.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.group_size",
   "type": "object",
-  "title": "Group size 1.16.0",
+  "title": "Group Size 1.16.0",
   "description": "Keeps track of entity group size in the given radius.",
   "additionalProperties": false,
   "properties": {
@@ -11,11 +11,6 @@
       "description": "The list of conditions that must be satisfied for other entities to be counted towards group size.",
       "title": "Filters"
     },
-    "radius": {
-      "type": "number",
-      "default": 16,
-      "description": "Radius from center of entity.",
-      "title": "Radius"
-    }
+    "radius": { "type": "number", "default": 16, "description": "Radius from center of entity.", "title": "Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.grows_crop.json b/source/behaviour/entities/1.16.0/components/minecraft.grows_crop.json
index 25eed423..92cdd677 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.grows_crop.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.grows_crop.json
@@ -2,23 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.grows_crop",
   "type": "object",
-  "title": "Grows crop 1.16.0",
+  "title": "Grows Crop 1.16.0",
   "description": "Could increase crop growth when entity walks over crop.",
   "additionalProperties": false,
   "properties": {
-    "chance": {
-      "type": "number",
-      "default": 0,
-      "description": "Value between 0-1. Chance of success per tick.",
-      "minimum": 0,
-      "maximum": 1,
-      "title": "Chance"
-    },
-    "charges": {
-      "type": "integer",
-      "default": 10,
-      "description": "Number of charges",
-      "title": "Charges"
-    }
+    "chance": { "type": "number", "default": 0, "description": "Value between 0-1. Chance of success per tick.", "minimum": 0, "maximum": 1, "title": "Chance" },
+    "charges": { "type": "integer", "default": 10, "description": "Number of charges", "title": "Charges" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.home.json b/source/behaviour/entities/1.16.0/components/minecraft.home.json
index 288b8609..989887ce 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.home.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.home.json
@@ -7,17 +7,17 @@
   "additionalProperties": false,
   "properties": {
     "restriction_radius": {
-      "title": "Restriction radius",
+      "title": "Restriction Radius",
       "description": "The radius that the entity will be restricted to in relation to its home",
       "type": "integer",
       "default": -1
     },
     "home_block_list": {
-      "title": "Home block list",
+      "title": "Home Block List",
       "description": "Optional block list that the home position will be associated with. If any of the blocks no longer exist at that position, the home restriction is removed. Example syntax: minecraft:sand. Not supported: minecraft:sand:1",
       "type": "array",
       "items": {
-        "title": "Home block",
+        "title": "Home Block",
         "description": "Optional block that the home position will be associated with. If any of the blocks no longer exist at that position, the home restriction is removed. Example syntax: minecraft:sand. Not supported: minecraft:sand:1",
         "type": "string",
         "$ref": "../../../../general/item/identifier.json"
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.horse.jump_strength.json b/source/behaviour/entities/1.16.0/components/minecraft.horse.jump_strength.json
index 5cd78636..923c975e 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.horse.jump_strength.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.horse.jump_strength.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.horse.jump_strength",
   "type": "object",
-  "title": "Horse.jump strength 1.16.0",
+  "title": "Horse.jump Strength 1.16.0",
   "additionalProperties": false,
   "description": "UNDOCUMENTATED",
   "required": [],
@@ -10,23 +10,7 @@
     "value": {
       "description": "UNDOCUMENTATED",
       "title": "Value",
-      "oneOf": [
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": {
-              "type": "number"
-            },
-            "range_max": {
-              "type": "number"
-            }
-          }
-        },
-        {
-          "type": "number"
-        }
-      ]
+      "oneOf": [{ "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }, { "type": "number" }]
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.hurt_on_condition.json b/source/behaviour/entities/1.16.0/components/minecraft.hurt_on_condition.json
index 77afadfb..11c0ffc8 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.hurt_on_condition.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.hurt_on_condition.json
@@ -2,34 +2,23 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.hurt_on_condition",
   "type": "object",
-  "title": "Hurt on condition 1.16.0",
+  "title": "Hurt On Condition 1.16.0",
   "description": "Defines a set of conditions under which an entity should take damage.",
   "additionalProperties": false,
   "properties": {
     "damage_conditions": {
       "type": "array",
-      "title": "Damage conditions",
+      "title": "Damage Conditions",
       "description": "TODO",
       "items": {
         "type": "object",
-        "title": "Damage condition",
+        "title": "Damage Condition",
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "filters": {
-            "$ref": "../filters.json"
-          },
-          "cause": {
-            "type": "string",
-            "title": "Cause",
-            "description": "Damage cause",
-            "$ref": "../../../../general/entity/damage_source.json"
-          },
-          "damage_per_tick": {
-            "type": "integer",
-            "title": "Damage per tick",
-            "description": "TODO"
-          }
+          "filters": { "$ref": "../filters.json" },
+          "cause": { "type": "string", "title": "Cause", "description": "Damage cause", "$ref": "../../../../general/entity/damage_source.json" },
+          "damage_per_tick": { "type": "integer", "title": "Damage Per Tick", "description": "TODO" }
         }
       }
     }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.instant_despawn.json b/source/behaviour/entities/1.16.0/components/minecraft.instant_despawn.json
index f8b1378d..fa0197d3 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.instant_despawn.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.instant_despawn.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.instant_despawn",
   "type": "object",
-  "title": "Instant despawn 1.16.0",
+  "title": "Instant Despawn 1.16.0",
   "description": "Despawns the Actor immediately.",
   "additionalProperties": false,
   "properties": {
@@ -10,7 +10,7 @@
       "type": "boolean",
       "default": false,
       "description": "If true, all entities linked to this entity in a child relationship (eg. leashed) will also be despawned.",
-      "title": "Remove child entities"
+      "title": "Remove Child Entities"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.interact.json b/source/behaviour/entities/1.16.0/components/minecraft.interact.json
index 561777fc..518e6d4a 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.interact.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.interact.json
@@ -9,118 +9,64 @@
     "interaction_spec": {
       "type": "object",
       "properties": {
-        "add_items": {
-          "type": "object",
-          "description": "Loot table with items to add to the player's inventory upon successful interaction.",
-          "title": "Add items"
-        },
-        "cooldown": {
-          "type": "number",
-          "default": 0,
-          "description": "Time in seconds before this entity can be interacted with again.",
-          "title": "Cooldown"
-        },
+        "add_items": { "type": "object", "description": "Loot table with items to add to the player's inventory upon successful interaction.", "title": "Add Items" },
+        "cooldown": { "type": "number", "default": 0, "description": "Time in seconds before this entity can be interacted with again.", "title": "Cooldown" },
         "hurt_item": {
           "type": "integer",
           "default": 0,
           "description": "The amount of damage the item will take when used to interact with this entity. A value of 0 means the item won't lose durability.",
-          "title": "Hurt item"
+          "title": "Hurt Item"
         },
         "interact_text": {
           "type": "string",
           "default": "",
           "description": "Text to show when the player is able to interact in this way with this entity when playing with Touch-screen controls.",
-          "title": "Interact text"
-        },
-        "on_interact": {
-          "$ref": "../types/trigger.json",
-          "description": "Event to fire when the interaction occurs.",
-          "title": "On interact"
+          "title": "Interact Text"
         },
+        "on_interact": { "$ref": "../types/trigger.json", "description": "Event to fire when the interaction occurs.", "title": "On Interact" },
         "particle_on_start": {
           "type": "object",
           "description": "Particle effect that will be triggered at the start of the interaction.",
-          "title": "Particle on start",
+          "title": "Particle On Start",
           "properties": {
             "particle_offset_towards_interactor": {
               "type": "boolean",
               "description": "Whether or not the particle will appear closer to who performed the interaction.",
-              "title": "Particle offset towards interactor"
+              "title": "Particle Offset Towards Interactor"
             },
-            "particle_type": {
-              "type": "string",
-              "description": "The type of particle that will be spawned.",
-              "title": "Particle type"
-            },
-            "particle_y_offset": {
-              "type": "number",
-              "description": "Will offset the particle this amount in the y direction.",
-              "title": "Particle y offset"
-            }
+            "particle_type": { "type": "string", "description": "The type of particle that will be spawned.", "title": "Particle Type" },
+            "particle_y_offset": { "type": "number", "description": "Will offset the particle this amount in the y direction.", "title": "Particle Y Offset" }
           }
         },
-        "play_sounds": {
-          "type": "string",
-          "default": "",
-          "description": "List of sounds to play when the interaction occurs.",
-          "title": "Play sounds"
-        },
-        "spawn_entities": {
-          "type": "string",
-          "default": "",
-          "description": "List of entities to spawn when the interaction occurs.",
-          "title": "Spawn entities"
-        },
+        "play_sounds": { "type": "string", "default": "", "description": "List of sounds to play when the interaction occurs.", "title": "Play Sounds" },
+        "spawn_entities": { "type": "string", "default": "", "description": "List of entities to spawn when the interaction occurs.", "title": "Spawn Entities" },
         "spawn_items": {
           "type": "object",
           "description": "Loot table with items to drop on the ground upon successful interaction.",
-          "title": "Spawn items",
+          "title": "Spawn Items",
           "properties": {
-            "table": {
-              "type": "string",
-              "default": "",
-              "description": "File path, relative to the Behavior Pack's path, to the loot table file.",
-              "title": "Table"
-            }
+            "table": { "type": "string", "default": "", "description": "File path, relative to the Behavior Pack's path, to the loot table file.", "title": "Table" }
           }
         },
-        "swing": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, the player will do the 'swing' animation when interacting with this entity.",
-          "title": "Swing"
-        },
+        "swing": { "type": "boolean", "default": false, "description": "If true, the player will do the 'swing' animation when interacting with this entity.", "title": "Swing" },
         "transform_to_item": {
           "type": "string",
           "default": "",
           "description": "The item used will transform to this item upon successful interaction. Format: itemName:auxValue",
-          "title": "Transform to item"
+          "title": "Transform To Item"
         },
-        "use_item": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, the interaction will use an item.",
-          "title": "Use item"
-        }
+        "use_item": { "type": "boolean", "default": false, "description": "If true, the interaction will use an item.", "title": "Use Item" }
       }
     }
   },
   "properties": {
     "interactions": {
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/interaction_spec"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/interaction_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/interaction_spec" },
+        { "type": "array", "items": { "$ref": "#/definitions/interaction_spec" } }
       ],
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.inventory.json b/source/behaviour/entities/1.16.0/components/minecraft.inventory.json
index 01b718fd..763686e2 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.inventory.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.inventory.json
@@ -11,38 +11,28 @@
       "type": "integer",
       "default": 0,
       "description": "Number of slots that this entity can gain per extra strength",
-      "title": "Additional slots per strength"
+      "title": "Additional Slots Per Strength"
     },
     "can_be_siphoned_from": {
       "type": "boolean",
       "default": false,
       "description": "If true, the contents of this inventory can be removed by a hopper",
-      "title": "Can be siphoned from"
+      "title": "Can Be Siphoned From"
     },
     "container_type": {
       "type": "string",
       "default": "none",
       "description": "Type of container this entity has. Can be horse, minecart_chest, minecart_hopper, inventory, container or hopper",
-      "title": "Container type",
+      "title": "Container Type",
       "enum": ["horse", "minecart_chest", "minecart_hopper", "inventory", "container", "hopper"]
     },
-    "inventory_size": {
-      "type": "integer",
-      "default": 5,
-      "description": "Number of slots the container has",
-      "title": "Inventory size"
-    },
-    "private": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only the entity can access the inventory",
-      "title": "Private"
-    },
+    "inventory_size": { "type": "integer", "default": 5, "description": "Number of slots the container has", "title": "Inventory Size" },
+    "private": { "type": "boolean", "default": false, "description": "If true, only the entity can access the inventory", "title": "Private" },
     "restrict_to_owner": {
       "type": "boolean",
       "default": false,
       "description": "If true, the entity's inventory can only be accessed by its owner or itself",
-      "title": "Restrict to owner"
+      "title": "Restrict To Owner"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.leashable.json b/source/behaviour/entities/1.16.0/components/minecraft.leashable.json
index 4d95120c..fb06de82 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.leashable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.leashable.json
@@ -10,27 +10,17 @@
       "type": "boolean",
       "default": false,
       "description": "If true, players can leash this entity even if it is already leashed to another mob.",
-      "title": "Can be stolen"
+      "title": "Can Be Stolen"
     },
-    "hard_distance": {
-      "type": "number",
-      "default": 6,
-      "description": "Distance in blocks at which the leash stiffens, restricting movement.",
-      "title": "Hard distance"
-    },
-    "max_distance": {
-      "type": "number",
-      "default": 10,
-      "description": "Distance in blocks at which the leash breaks.",
-      "title": "Max distance"
-    },
-    "on_leash": { "$ref": "../types/event.json", "description": "Event to call when this entity is leashed.", "title": "On leash" },
-    "on_unleash": { "$ref": "../types/event.json", "description": "Event to call when this entity is unleashed.", "title": "On unleash" },
+    "hard_distance": { "type": "number", "default": 6, "description": "Distance in blocks at which the leash stiffens, restricting movement.", "title": "Hard Distance" },
+    "max_distance": { "type": "number", "default": 10, "description": "Distance in blocks at which the leash breaks.", "title": "Max Distance" },
+    "on_leash": { "$ref": "../types/event.json", "description": "Event to call when this entity is leashed.", "title": "On Leash" },
+    "on_unleash": { "$ref": "../types/event.json", "description": "Event to call when this entity is unleashed.", "title": "On Unleash" },
     "soft_distance": {
       "type": "number",
       "default": 4,
       "description": "Distance in blocks at which the 'spring' effect starts acting to keep this entity close to the entity that leashed it.",
-      "title": "Soft distance"
+      "title": "Soft Distance"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.lookat.json b/source/behaviour/entities/1.16.0/components/minecraft.lookat.json
index 70b2d87b..2fe97ba1 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.lookat.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.lookat.json
@@ -11,49 +11,25 @@
       "type": "boolean",
       "default": false,
       "description": "If true, invulnerable entities (e.g. Players in creative mode) are considered valid targets.",
-      "title": "Allow invulnerable"
+      "title": "Allow Invulnerable"
     },
-    "filters": { "$ref": "../filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO title" },
+    "filters": { "$ref": "../filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO Title" },
     "look_cooldown": {
       "$ref": "../types/range_number_type.json",
       "default": [0.0, 0.0],
       "description": "The range for the random amount of time during which the entity is 'cooling down' and won't get angered or look for a target",
-      "title": "TODO title"
-    },
-    "look_event": {
-      "type": "string",
-      "description": "The event identifier to run when the entities specified in filters look at this entity",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "look_event": { "type": "string", "description": "The event identifier to run when the entities specified in filters look at this entity", "title": "TODO Title" },
     "mAllowInvulnerable": {
       "type": "boolean",
       "default": false,
       "description": "If true, invulnerable entities (e.g. Players in creative mode) are considered valid targets",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "searchRadius": {
-      "type": "number",
-      "default": 10,
-      "description": "Maximum distance this entity will look for another entity looking at it",
-      "title": "TODO title"
-    },
-    "setTarget": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity will set the attack target as the entity that looked at it",
-      "title": "TODO title"
-    },
-    "search_radius": {
-      "type": "number",
-      "default": 10,
-      "description": "Maximum distance this entity will look for another entity looking at it.",
-      "title": "Search radius"
-    },
-    "set_target": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity will set the attack target as the entity that looked at it.",
-      "title": "Set target"
-    }
+    "searchRadius": { "type": "number", "default": 10, "description": "Maximum distance this entity will look for another entity looking at it", "title": "TODO Title" },
+    "setTarget": { "type": "boolean", "default": true, "description": "If true, this entity will set the attack target as the entity that looked at it", "title": "TODO Title" },
+    "search_radius": { "type": "number", "default": 10, "description": "Maximum distance this entity will look for another entity looking at it.", "title": "Search Radius" },
+    "set_target": { "type": "boolean", "default": true, "description": "If true, this entity will set the attack target as the entity that looked at it.", "title": "Set Target" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.mob_effect.json b/source/behaviour/entities/1.16.0/components/minecraft.mob_effect.json
index 0f4f7a5e..4943ca79 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.mob_effect.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.mob_effect.json
@@ -2,28 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.mob_effect",
   "type": "object",
-  "title": "Mob effect 1.16.0",
+  "title": "Mob Effect 1.16.0",
   "description": "A component that applies a mob effect to entities that get within range.",
   "additionalProperties": false,
   "properties": {
-    "effect_range": {
-      "type": "number",
-      "default": 0.2,
-      "description": "How close a hostile entity must be to have the mob effect applied.",
-      "title": "Effect range"
-    },
-    "effect_time": {
-      "type": "integer",
-      "default": 10,
-      "description": "How long the applied mob effect lasts in seconds.",
-      "title": "Effect time"
-    },
-    "mob_effect": {
-      "type": "string",
-      "default": "",
-      "description": "The mob effect that is applied to entities that enter this entities effect range.",
-      "title": "Mob effect"
-    },
-    "entity_filter": { "$ref": "../filters.json", "title": "Entity filter", "description": "TODO" }
+    "effect_range": { "type": "number", "default": 0.2, "description": "How close a hostile entity must be to have the mob effect applied.", "title": "Effect Range" },
+    "effect_time": { "type": "integer", "default": 10, "description": "How long the applied mob effect lasts in seconds.", "title": "Effect Time" },
+    "mob_effect": { "type": "string", "default": "", "description": "The mob effect that is applied to entities that enter this entities effect range.", "title": "Mob Effect" },
+    "entity_filter": { "$ref": "../filters.json", "title": "Entity Filter", "description": "TODO" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.movement.hover.json b/source/behaviour/entities/1.16.0/components/minecraft.movement.hover.json
index 201c084e..66788690 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.movement.hover.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.movement.hover.json
@@ -5,12 +5,5 @@
   "description": "This move control causes the mob to hover.",
   "type": "object",
   "additionalProperties": false,
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "Max turn"
-    }
-  }
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "Max Turn" } }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.movement.jump.json b/source/behaviour/entities/1.16.0/components/minecraft.movement.jump.json
index 752e56da..eeafd59f 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.movement.jump.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.movement.jump.json
@@ -11,21 +11,9 @@
       "type": "array",
       "default": [0.0, 0.0],
       "description": "Delay after landing when using the slime move control.",
-      "title": "Jump delay",
-      "items": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "number"
-        }
-      ]
+      "title": "Jump Delay",
+      "items": [{ "type": "number" }, { "type": "number" }]
     },
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "Max turn"
-    }
+    "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "Max Turn" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.movement.sway.json b/source/behaviour/entities/1.16.0/components/minecraft.movement.sway.json
index cdc7d2d5..56ce20ef 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.movement.sway.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.movement.sway.json
@@ -6,16 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "Max turn"
-    },
-    "sway_amplitude": {
-      "type": "number",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "Max Turn" },
+    "sway_amplitude": { "type": "number", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.nameable.json b/source/behaviour/entities/1.16.0/components/minecraft.nameable.json
index 42643a87..d5ebdd19 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.nameable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.nameable.json
@@ -11,51 +11,24 @@
       "type": "object",
       "additionalProperties": false,
       "description": "Describes the special names for this entity and the events to call when the entity acquires those names",
-      "title": "Name action",
+      "title": "Name Action",
       "properties": {
-        "name_filter": {
-          "type": "string",
-          "default": "",
-          "description": "List of special names that will cause the events defined in 'on_named' to fire",
-          "title": "Name filter"
-        },
-        "on_named": {
-          "$ref": "../types/event.json",
-          "description": "Event to be called when this entity acquires the name specified in 'name_filter'",
-          "title": "On named"
-        }
+        "name_filter": { "type": "string", "default": "", "description": "List of special names that will cause the events defined in 'on_named' to fire", "title": "Name Filter" },
+        "on_named": { "$ref": "../types/event.json", "description": "Event to be called when this entity acquires the name specified in 'name_filter'", "title": "On Named" }
       }
     }
   },
   "properties": {
-    "allow_name_tag_renaming": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity can be renamed with name tags",
-      "title": "Allow name tag renaming"
-    },
-    "always_show": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the name will always be shown",
-      "title": "Always show"
-    },
-    "default_trigger": { "$ref": "../types/trigger.json", "description": "Trigger to run when the entity gets named", "title": "Default trigger" },
+    "allow_name_tag_renaming": { "type": "boolean", "default": true, "description": "If true, this entity can be renamed with name tags", "title": "Allow Name Tag Renaming" },
+    "always_show": { "type": "boolean", "default": false, "description": "If true, the name will always be shown", "title": "Always Show" },
+    "default_trigger": { "$ref": "../types/trigger.json", "description": "Trigger to run when the entity gets named", "title": "Default Trigger" },
     "name_actions": {
       "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/name_action"
-          }
-        },
-        {
-          "type": "object",
-          "$ref": "#/definitions/name_action"
-        }
+        { "type": "array", "items": { "$ref": "#/definitions/name_action" } },
+        { "type": "object", "$ref": "#/definitions/name_action" }
       ],
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.climb.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.climb.json
index fea99fd5..4d942762 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.climb.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.climb.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.float.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.float.json
index 10f8e413..6426170d 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.float.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.float.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.fly.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.fly.json
index 2735881e..dee1885a 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.fly.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.fly.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.generic.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.generic.json
index 13a742ac..26d48624 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.generic.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.generic.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.hover.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.hover.json
index 6439ff79..52c109b1 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.hover.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.hover.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.swim.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.swim.json
index 844608a4..dac711f4 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.swim.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.swim.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.navigation.walk.json b/source/behaviour/entities/1.16.0/components/minecraft.navigation.walk.json
index 9bafb67c..40dca1b2 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.navigation.walk.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.navigation.walk.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.npc.json b/source/behaviour/entities/1.16.0/components/minecraft.npc.json
index ace2e412..4979bfbd 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.npc.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.npc.json
@@ -18,63 +18,40 @@
   "properties": {
     "npc_data": {
       "type": "object",
-      "title": "Npc data",
+      "title": "Npc Data",
       "description": "UNDOCUMENTATED",
       "additionalProperties": false,
       "properties": {
         "portrait_offsets": {
           "type": "object",
-          "title": "Portrait offsets",
+          "title": "Portrait Offsets",
           "description": "UNDOCUMENTATED",
           "additionalProperties": false,
           "properties": {
-            "translate": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Translate",
-              "description": "UNDOCUMENTATED"
-            },
-            "scale": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Scale",
-              "description": "UNDOCUMENTATED"
-            }
+            "translate": { "$ref": "#/definitions/rangeXYZ", "title": "Translate", "description": "UNDOCUMENTATED" },
+            "scale": { "$ref": "#/definitions/rangeXYZ", "title": "Scale", "description": "UNDOCUMENTATED" }
           }
         },
         "picker_offsets": {
           "type": "object",
-          "title": "Picker offsets",
+          "title": "Picker Offsets",
           "description": "UNDOCUMENTATED",
           "additionalProperties": false,
           "properties": {
-            "translate": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Translate",
-              "description": "UNDOCUMENTATED"
-            },
-            "scale": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Scale",
-              "description": "UNDOCUMENTATED"
-            }
+            "translate": { "$ref": "#/definitions/rangeXYZ", "title": "Translate", "description": "UNDOCUMENTATED" },
+            "scale": { "$ref": "#/definitions/rangeXYZ", "title": "Scale", "description": "UNDOCUMENTATED" }
           }
         },
         "skin_list": {
           "type": "array",
-          "title": "Skin list",
+          "title": "Skin List",
           "description": "UNDOCUMENTATED",
           "items": {
             "type": "object",
             "title": "Skin",
             "description": "UNDOCUMENTATED",
             "additionalProperties": false,
-            "properties": {
-              "variant": {
-                "title": "Variant",
-                "description": "UNDOCUMENTATED",
-                "type": "integer",
-                "minimum": 0
-              }
-            }
+            "properties": { "variant": { "title": "Variant", "description": "UNDOCUMENTATED", "type": "integer", "minimum": 0 } }
           }
         }
       }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.projectile.json b/source/behaviour/entities/1.16.0/components/minecraft.projectile.json
index 35dac0b1..32d98b71 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.projectile.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.projectile.json
@@ -6,46 +6,22 @@
   "description": "Allows the entity to be a thrown entity.",
   "additionalProperties": false,
   "properties": {
-    "anchor": {
-      "type": "integer",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    },
-    "angle_offset": {
-      "type": "number",
-      "default": 0,
-      "description": "Determines the angle at which the projectile is thrown",
-      "title": "Angle offset"
-    },
-    "catch_fire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be set on fire",
-      "title": "Catch fire"
-    },
+    "anchor": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+    "angle_offset": { "type": "number", "default": 0, "description": "Determines the angle at which the projectile is thrown", "title": "Angle Offset" },
+    "catch_fire": { "type": "boolean", "default": false, "description": "If true, the entity hit will be set on fire", "title": "Catch Fire" },
     "crit_particle_on_hurt": {
       "type": "boolean",
       "default": false,
       "description": "If true, the projectile will produce additional particles when a critical hit happens",
-      "title": "Crit particle on hurt"
-    },
-    "destroy_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be destroyed when hit",
-      "title": "Destroy on hurt"
-    },
-    "filter": {
-      "type": "string",
-      "default": "",
-      "description": "Entity Definitions defined here can't be hurt by the projectile",
-      "title": "Filter"
+      "title": "Crit Particle On Hurt"
     },
+    "destroy_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "Destroy On Hurt" },
+    "filter": { "type": "string", "default": "", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "Filter" },
     "fire_affected_by_griefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the projectile causes fire is affected by the mob griefing game rule",
-      "title": "Fire affected by griefing"
+      "title": "Fire Affected By Griefing"
     },
     "gravity": {
       "type": "number",
@@ -53,83 +29,31 @@
       "description": "The gravity applied to this entity when thrown. The higher the value, the faster the entity falls",
       "title": "Gravity"
     },
-    "hit_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile hits something",
-      "title": "Hit sound"
-    },
-    "homing": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile homes in to the nearest entity",
-      "title": "Homing"
-    },
-    "inertia": {
-      "type": "number",
-      "default": 0.99,
-      "description": "The fraction of the projectile's speed maintained every frame while traveling in air",
-      "title": "Inertia"
-    },
-    "is_dangerous": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated as dangerous to the players",
-      "title": "Is dangerous"
-    },
-    "knockback": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile will knock back the entity it hits",
-      "title": "Knockback"
-    },
-    "lightning": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be struck by lightning",
-      "title": "Lightning"
-    },
+    "hit_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile hits something", "title": "Hit Sound" },
+    "homing": { "type": "boolean", "default": false, "description": "If true, the projectile homes in to the nearest entity", "title": "Homing" },
+    "inertia": { "type": "number", "default": 0.99, "description": "The fraction of the projectile's speed maintained every frame while traveling in air", "title": "Inertia" },
+    "is_dangerous": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated as dangerous to the players", "title": "Is Dangerous" },
+    "knockback": { "type": "boolean", "default": true, "description": "If true, the projectile will knock back the entity it hits", "title": "Knockback" },
+    "lightning": { "type": "boolean", "default": false, "description": "If true, the entity hit will be struck by lightning", "title": "Lightning" },
     "liquid_inertia": {
       "type": "number",
       "default": 0.6,
       "description": "The fraction of the projectile's speed maintained every frame while traveling in water",
-      "title": "Liquid inertia"
-    },
-    "multiple_targets": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile can hit multiple entities per flight",
-      "title": "Multiple targets"
+      "title": "Liquid Inertia"
     },
+    "multiple_targets": { "type": "boolean", "default": true, "description": "If true, the projectile can hit multiple entities per flight", "title": "Multiple Targets" },
     "offset": {
       "type": "array",
       "default": [0, 0.5, 0],
       "description": "The offset from the entity's anchor where the projectile will spawn",
       "title": "Offset",
       "items": [
-        {
-          "type": "number",
-          "description": "X",
-          "title": "X"
-        },
-        {
-          "type": "number",
-          "description": "Y",
-          "title": "Y"
-        },
-        {
-          "type": "number",
-          "description": "Z",
-          "title": "Z"
-        }
+        { "type": "number", "description": "X", "title": "X" },
+        { "type": "number", "description": "Y", "title": "Y" },
+        { "type": "number", "description": "Z", "title": "Z" }
       ]
     },
-    "on_fire_time": {
-      "type": "number",
-      "default": 5,
-      "description": "Time in seconds that the entity hit will be on fire for",
-      "title": "On fire time"
-    },
+    "on_fire_time": { "type": "number", "default": 5, "description": "Time in seconds that the entity hit will be on fire for", "title": "On Fire Time" },
     "on_hit": {
       "additionalProperties": false,
       "type": "object",
@@ -141,13 +65,7 @@
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "type": "object",
-          "properties": {
-            "fire_affected_by_griefing": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
-          }
+          "properties": { "fire_affected_by_griefing": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" } }
         },
         "definition_event": {
           "additionalProperties": false,
@@ -155,57 +73,23 @@
           "title": "UNDOCUMENTATED",
           "type": "object",
           "properties": {
-            "affect_projectile": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "event_trigger": {
-              "$ref": "../types/event.json"
-            }
+            "affect_projectile": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "event_trigger": { "$ref": "../types/event.json" }
           }
         },
-        "douse_fire": {
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
+        "douse_fire": { "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
         "impact_damage": {
           "additionalProperties": false,
           "type": "object",
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "filter": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "catch_fire": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "damage": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "destroy_on_hit": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "knockback": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "semi_random_diff_damage": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "filter": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "catch_fire": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "damage": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "destroy_on_hit": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "knockback": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "semi_random_diff_damage": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "particle_on_hit": {
@@ -214,232 +98,87 @@
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "particle_type": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "num_particles": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "on_entity_hit": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "on_other_hit": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "particle_type": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "num_particles": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "on_entity_hit": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "on_other_hit": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
-        "remove_on_hit": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
+        "remove_on_hit": { "additionalProperties": false, "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
         "spawn_chance": {
           "additionalProperties": false,
           "type": "object",
           "description": "UNDOCUMENTATED",
           "title": "UNDOCUMENTATED",
           "properties": {
-            "first_spawn_percent_chance": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "first_spawn_chance": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "second_spawn_chance": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "first_spawn_count": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "second_spawn_count": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "spawn_definition": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "spawn_baby": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "first_spawn_percent_chance": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "first_spawn_chance": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "second_spawn_chance": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "first_spawn_count": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "second_spawn_count": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "spawn_definition": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "spawn_baby": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
         "spawn_aoe_cloud": {
           "additionalProperties": false,
           "type": "object",
           "properties": {
-            "radius": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "radius_on_use": {
-              "type": "number",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "potion": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "particle": {
-              "type": "string",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "duration": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
+            "radius": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "radius_on_use": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "potion": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "particle": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "duration": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
             "color": {
               "description": "UNDOCUMENTATED",
               "title": "UNDOCUMENTATED",
               "type": "array",
               "format": "color-array",
               "items": [
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 255,
-                  "description": "R",
-                  "title": "R"
-                },
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 255,
-                  "description": "G",
-                  "title": "G"
-                },
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 255,
-                  "description": "B",
-                  "title": "B"
-                }
+                { "type": "integer", "minimum": 0, "maximum": 255, "description": "R", "title": "R" },
+                { "type": "integer", "minimum": 0, "maximum": 255, "description": "G", "title": "G" },
+                { "type": "integer", "minimum": 0, "maximum": 255, "description": "B", "title": "B" }
               ]
             },
-            "affect_owner": {
-              "type": "boolean",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            },
-            "reapplication_delay": {
-              "type": "integer",
-              "description": "UNDOCUMENTATED",
-              "title": "UNDOCUMENTATED"
-            }
+            "affect_owner": { "type": "boolean", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+            "reapplication_delay": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
           }
         },
-        "stick_in_ground": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
-        "teleport_owner": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "stick_in_ground": { "additionalProperties": false, "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+        "teleport_owner": { "additionalProperties": false, "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     },
-    "particle": {
-      "type": "string",
-      "default": "iconcrack",
-      "description": "Particle to use upon collision",
-      "title": "Particle"
-    },
-    "potion_effect": {
-      "type": "integer",
-      "default": -1,
-      "description": "Defines the effect the arrow will apply to the entity it hits",
-      "title": "Potion effect"
-    },
-    "power": {
-      "type": "number",
-      "default": 1.3,
-      "description": "Determines the velocity of the projectile",
-      "title": "Power"
-    },
-    "reflect_on_hurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be reflected back when hit",
-      "title": "Reflect on hurt"
-    },
+    "particle": { "type": "string", "default": "iconcrack", "description": "Particle to use upon collision", "title": "Particle" },
+    "potion_effect": { "type": "integer", "default": -1, "description": "Defines the effect the arrow will apply to the entity it hits", "title": "Potion Effect" },
+    "power": { "type": "number", "default": 1.3, "description": "Determines the velocity of the projectile", "title": "Power" },
+    "reflect_on_hurt": { "type": "boolean", "default": false, "description": "If true, this entity will be reflected back when hit", "title": "Reflect On Hurt" },
     "semi_random_diff_damage": {
       "type": "boolean",
       "default": false,
       "description": "If true, damage will be randomized based on damage and speed",
-      "title": "Semi random diff damage"
-    },
-    "shoot_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile is shot",
-      "title": "Shoot sound"
+      "title": "Semi Random Diff Damage"
     },
+    "shoot_sound": { "type": "string", "default": "", "description": "The sound that plays when the projectile is shot", "title": "Shoot Sound" },
     "shoot_target": {
       "type": "boolean",
       "default": true,
       "description": "If true, the projectile will be shot towards the target of the entity firing it",
-      "title": "Shoot target"
-    },
-    "should_bounce": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will bounce upon hit",
-      "title": "Should bounce"
-    },
-    "splash_potion": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated like a splash potion",
-      "title": "Splash potion"
-    },
-    "splash_range": {
-      "type": "number",
-      "default": 4,
-      "description": "Radius in blocks of the 'splash' effect",
-      "title": "Splash range"
+      "title": "Shoot Target"
     },
+    "should_bounce": { "type": "boolean", "default": false, "description": "If true, the projectile will bounce upon hit", "title": "Should Bounce" },
+    "splash_potion": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated like a splash potion", "title": "Splash Potion" },
+    "splash_range": { "type": "number", "default": 4, "description": "Radius in blocks of the 'splash' effect", "title": "Splash Range" },
     "uncertainty_base": {
       "type": "number",
       "default": 0,
       "description": "The base accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty base"
+      "title": "Uncertainty Base"
     },
     "uncertainty_multiplier": {
       "type": "number",
       "default": 0,
       "description": "Determines how much difficulty affects accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "Uncertainty multiplier"
+      "title": "Uncertainty Multiplier"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.rideable.json b/source/behaviour/entities/1.16.0/components/minecraft.rideable.json
index 9bdebf69..8cbeb96f 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.rideable.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.rideable.json
@@ -15,88 +15,47 @@
           "default": 181,
           "description": "Angle in degrees that a rider is allowed to rotate while riding this entity. Omit this property for no limit"
         },
-        "max_rider_count": {
-          "type": "integer",
-          "default": 0,
-          "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid"
-        },
+        "max_rider_count": { "type": "integer", "default": 0, "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid" },
         "min_rider_count": {
           "type": "integer",
           "default": 0,
           "description": "Defines the minimum number of riders that need to be riding this entity before this seat can be used"
         },
-        "position": {
-          "$ref": "../../../../general/array_3_number.json",
-          "default": [0.0, 0.0, 0.0],
-          "description": "Position of this seat relative to this entity's position"
-        },
-        "rotate_rider_by": {
-          "$ref": "../../../../molang/1.8.0/number.json",
-          "description": "Offset to rotate riders by"
-        }
+        "position": { "$ref": "../../../../general/array_3_number.json", "default": [0.0, 0.0, 0.0], "description": "Position of this seat relative to this entity's position" },
+        "rotate_rider_by": { "$ref": "../../../../molang/1.8.0/number.json", "description": "Offset to rotate riders by" }
       }
     }
   },
   "required": [],
   "properties": {
-    "controlling_seat": {
-      "type": "integer",
-      "default": 0,
-      "description": "The seat that designates the driver of the entity",
-      "title": "TODO title"
-    },
+    "controlling_seat": { "type": "integer", "default": 0, "description": "The seat that designates the driver of the entity", "title": "TODO Title" },
     "crouching_skip_interact": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity can't be interacted with if the entity interacting with it is crouching",
-      "title": "TODO title"
-    },
-    "family_types": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "List of entities that can ride this entity",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "family_types": { "type": "array", "items": { "type": "string" }, "description": "List of entities that can ride this entity", "title": "TODO Title" },
     "interact_text": {
       "type": "string",
       "default": "",
       "description": "The text to display when the player can interact with the entity when playing with Touch-screen controls",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "pull_in_entities": {
       "type": "boolean",
       "default": false,
       "description": "If true, this entity will pull in entities that are in the correct family_types into any available seats",
-      "title": "TODO title"
-    },
-    "rider_can_interact": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be picked when looked at by the rider",
-      "title": "TODO title"
-    },
-    "seat_count": {
-      "type": "integer",
-      "default": 1,
-      "description": "The number of entities that can ride this entity at the same time",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "rider_can_interact": { "type": "boolean", "default": false, "description": "If true, this entity will be picked when looked at by the rider", "title": "TODO Title" },
+    "seat_count": { "type": "integer", "default": 1, "description": "The number of entities that can ride this entity at the same time", "title": "TODO Title" },
     "seats": {
       "description": "The list of positions and number of riders for each position for entities riding this entity",
-      "title": "TODO title",
+      "title": "TODO Title",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/seats_spec"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/seats_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/seats_spec" },
+        { "type": "array", "items": { "$ref": "#/definitions/seats_spec" } }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.scheduler.json b/source/behaviour/entities/1.16.0/components/minecraft.scheduler.json
index 7b48a6b9..06b211ed 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.scheduler.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.scheduler.json
@@ -7,35 +7,18 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "min_delay_secs": {
-      "type": "integer",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED",
-      "minimum": 0
-    },
-    "max_delay_secs": {
-      "type": "integer",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED",
-      "minimum": 0
-    },
+    "min_delay_secs": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED", "minimum": 0 },
+    "max_delay_secs": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED", "minimum": 0 },
     "scheduled_events": {
       "type": "array",
       "description": "The list of triggers that fire when the conditions match the given filter criteria. If any filter criteria overlap the first defined event will be picked.",
-      "title": "Scheduled events",
+      "title": "Scheduled Events",
       "items": {
         "additionalProperties": false,
         "type": "object",
         "description": "UNDOCUMENTATED",
         "title": "UNDOCUMENTATED",
-        "properties": {
-          "filters": {
-            "$ref": "../filters.json"
-          },
-          "event": {
-            "$ref": "../types/event.json"
-          }
-        }
+        "properties": { "filters": { "$ref": "../filters.json" }, "event": { "$ref": "../types/event.json" } }
       }
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.shareables.json b/source/behaviour/entities/1.16.0/components/minecraft.shareables.json
index de0ee174..317885bb 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.shareables.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.shareables.json
@@ -11,26 +11,16 @@
       "type": "boolean",
       "default": false,
       "description": "A bucket for all other items in the game. Note this category is always least priority items.",
-      "title": "All items"
-    },
-    "all_items_max_amount": {
-      "type": "integer",
-      "default": -1,
-      "description": "Maximum number of this item the mob will hold.",
-      "title": "All items max amount"
+      "title": "All Items"
     },
+    "all_items_max_amount": { "type": "integer", "default": -1, "description": "Maximum number of this item the mob will hold.", "title": "All Items Max Amount" },
     "all_items_surplus_amount": {
       "type": "integer",
       "default": -1,
       "description": "Number of this item considered extra that the entity wants to share.",
-      "title": "All items surplus amount"
-    },
-    "all_items_want_amount": {
-      "type": "integer",
-      "default": -1,
-      "description": "Number of this item this entity wants to share.",
-      "title": "All items want amount"
+      "title": "All Items Surplus Amount"
     },
+    "all_items_want_amount": { "type": "integer", "default": -1, "description": "Number of this item this entity wants to share.", "title": "All Items Want Amount" },
     "items": {
       "type": "array",
       "description": "List of items that the entity wants to share",
@@ -47,59 +37,27 @@
             "description": "Mob will barter for the item after picking it up. For this to work the mob needs to have a Barter component and a Barter goal.",
             "title": "Barter"
           },
-          "consume_item": {
-            "type": "boolean",
-            "description": "Determines whether the mob will consume the item or not.",
-            "title": "Consume item"
-          },
+          "consume_item": { "type": "boolean", "description": "Determines whether the mob will consume the item or not.", "title": "Consume Item" },
           "craft_into": {
             "type": "string",
             "description": "Defines the item this entity wants to craft with the item defined above. Should be an item name.",
-            "title": "Craft into"
-          },
-          "item": {
-            "type": "string",
-            "description": "The name of the item",
-            "$ref": "../../../../general/item/identifier.json"
-          },
-          "item_aux": {
-            "type": "integer",
-            "description": "Aux value for the item.",
-            "title": "Item aux"
-          },
-          "max_amount": {
-            "type": "integer",
-            "description": "Maximum number of this item the mob will hold.",
-            "title": "Max amount"
-          },
-          "pickup_limit": {
-            "type": "integer",
-            "description": "Maximum number of this item the mob will pick up during a single goal tick.",
-            "title": "Pickup limit"
-          },
-          "priority": {
-            "type": "integer",
-            "description": "Prioritizes which items the entity prefers. 0 is the highest priority.",
-            "title": "Priority"
+            "title": "Craft Into"
           },
+          "item": { "type": "string", "description": "The name of the item", "$ref": "../../../../general/item/identifier.json" },
+          "item_aux": { "type": "integer", "description": "Aux value for the item.", "title": "Item Aux" },
+          "max_amount": { "type": "integer", "description": "Maximum number of this item the mob will hold.", "title": "Max Amount" },
+          "pickup_limit": { "type": "integer", "description": "Maximum number of this item the mob will pick up during a single goal tick.", "title": "Pickup Limit" },
+          "priority": { "type": "integer", "description": "Prioritizes which items the entity prefers. 0 is the highest priority.", "title": "Priority" },
           "stored_in_inventory": {
             "type": "boolean",
             "description": "Determines whether the mob will try to put the item in its inventory if it has the inventory component and if it can't be equipped.",
-            "title": "Stored in inventory"
+            "title": "Stored In Inventory"
           },
-          "surplus_amount": {
-            "type": "integer",
-            "description": "Number of this item considered extra that the entity wants to share.",
-            "title": "Surplus amount"
-          },
-          "want_amount": {
-            "type": "integer",
-            "description": "Number of this item this entity wants to have.",
-            "title": "Want amount"
-          }
+          "surplus_amount": { "type": "integer", "description": "Number of this item considered extra that the entity wants to share.", "title": "Surplus Amount" },
+          "want_amount": { "type": "integer", "description": "Number of this item this entity wants to have.", "title": "Want Amount" }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.shooter.json b/source/behaviour/entities/1.16.0/components/minecraft.shooter.json
index 7d1e1916..650881ec 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.shooter.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.shooter.json
@@ -7,21 +7,12 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "aux_val": {
-      "type": "integer",
-      "title": "Aux val",
-      "default": -1,
-      "description": "ID of the Potion effect to be applied on hit"
-    },
+    "aux_val": { "type": "integer", "title": "Aux Val", "default": -1, "description": "ID of the Potion effect to be applied on hit" },
     "def": {
       "title": "Def",
       "type": "string",
       "description": "Actor definition to use as projectile for the ranged attack. The actor definition must have the projectile component to be able to be shot as a projectile"
     },
-    "type": {
-      "title": "Type",
-      "type": "string",
-      "description": "UNDOCUMENTATED"
-    }
+    "type": { "title": "Type", "type": "string", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.spawn_entity.json b/source/behaviour/entities/1.16.0/components/minecraft.spawn_entity.json
index 14f4f224..4efea003 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.spawn_entity.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.spawn_entity.json
@@ -3,79 +3,41 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.spawn_entity",
   "type": "object",
   "description": "Adds a timer after which this entity will spawn another entity or item (similar to vanilla's chicken's egg-laying behavior).",
-  "title": "Spawn entity 1.16.0",
+  "title": "Spawn Entity 1.16.0",
   "additionalProperties": false,
   "required": [],
   "definitions": {
     "entity_spawn": {
       "additionalProperties": false,
       "type": "object",
-      "title": "Entity spawn",
+      "title": "Entity Spawn",
       "properties": {
-        "filters": {
-          "description": "If present, the specified entity will only spawn if the filter evaluates to true",
-          "$ref": "../filters.json"
-        },
+        "filters": { "description": "If present, the specified entity will only spawn if the filter evaluates to true", "$ref": "../filters.json" },
         "max_wait_time": {
           "type": "integer",
           "default": 600,
           "description": "Maximum amount of time to randomly wait in seconds before another entity is spawned.",
-          "title": "Max wait time"
+          "title": "Max Wait Time"
         },
         "min_wait_time": {
           "type": "integer",
           "default": 300,
           "description": "Minimum amount of time to randomly wait in seconds before another entity is spawned.",
-          "title": "Min wait time"
-        },
-        "num_to_spawn": {
-          "type": "integer",
-          "default": 1,
-          "description": "The number of entities of this type to spawn each time that this triggers.",
-          "title": "Num to spawn"
-        },
-        "should_leash": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, this the spawned entity will be leashed to the parent.",
-          "title": "Should leash"
-        },
-        "single_use": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, this component will only ever spawn the specified entity once.",
-          "title": "Single use"
+          "title": "Min Wait Time"
         },
+        "num_to_spawn": { "type": "integer", "default": 1, "description": "The number of entities of this type to spawn each time that this triggers.", "title": "Num To Spawn" },
+        "should_leash": { "type": "boolean", "default": false, "description": "If true, this the spawned entity will be leashed to the parent.", "title": "Should Leash" },
+        "single_use": { "type": "boolean", "default": false, "description": "If true, this component will only ever spawn the specified entity once.", "title": "Single Use" },
         "spawn_entity": {
           "type": "string",
           "default": "",
           "description": "Identifier of the entity to spawn, leave empty to spawn the item defined above instead.",
-          "title": "Spawn entity"
+          "title": "Spawn Entity"
         },
-        "spawn_event": {
-          "type": "string",
-          "default": "minecraft:entity_born",
-          "description": "Event to call when the entity is spawned.",
-          "title": "Spawn event"
-        },
-        "spawn_item": {
-          "type": "string",
-          "default": "egg",
-          "description": "Item identifier of the item to spawn.",
-          "title": "Spawn item"
-        },
-        "spawn_method": {
-          "type": "string",
-          "default": "born",
-          "description": "Method to use to spawn the entity.",
-          "title": "Spawn method"
-        },
-        "spawn_sound": {
-          "type": "string",
-          "default": "plop",
-          "description": "Identifier of the sound effect to play when the entity is spawned.",
-          "title": "Spawn sound"
-        }
+        "spawn_event": { "type": "string", "default": "minecraft:entity_born", "description": "Event to call when the entity is spawned.", "title": "Spawn Event" },
+        "spawn_item": { "type": "string", "default": "egg", "description": "Item identifier of the item to spawn.", "title": "Spawn Item" },
+        "spawn_method": { "type": "string", "default": "born", "description": "Method to use to spawn the entity.", "title": "Spawn Method" },
+        "spawn_sound": { "type": "string", "default": "plop", "description": "Identifier of the sound effect to play when the entity is spawned.", "title": "Spawn Sound" }
       }
     }
   },
@@ -84,16 +46,8 @@
       "title": "Entities",
       "description": "UNDOCUMENTATED",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/entity_spawn"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/entity_spawn"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/entity_spawn" },
+        { "type": "array", "items": { "$ref": "#/definitions/entity_spawn" } }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.strength.json b/source/behaviour/entities/1.16.0/components/minecraft.strength.json
index d8904b0c..42bceb30 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.strength.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.strength.json
@@ -7,17 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "max": {
-      "type": "integer",
-      "default": 5,
-      "description": "The maximum strength of this entity",
-      "title": "Maximum"
-    },
-    "value": {
-      "type": "integer",
-      "default": 1,
-      "description": "The initial value of the strength",
-      "title": "Value"
-    }
+    "max": { "type": "integer", "default": 5, "description": "The maximum strength of this entity", "title": "Maximum" },
+    "value": { "type": "integer", "default": 1, "description": "The initial value of the strength", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.tamemount.json b/source/behaviour/entities/1.16.0/components/minecraft.tamemount.json
index cf9a8bfe..c41b98b3 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.tamemount.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.tamemount.json
@@ -15,87 +15,40 @@
           "description": "Name of the item this entity likes and can be used to increase this entity's temper",
           "title": "Item"
         },
-        "temper_mod": {
-          "type": "number",
-          "default": 0,
-          "description": "The amount of temper this entity gains when fed this item",
-          "title": "Temper mod"
-        }
+        "temper_mod": { "type": "number", "default": 0, "description": "The amount of temper this entity gains when fed this item", "title": "Temper Mod" }
       }
     },
     "auto_reject_items": {
       "type": "object",
       "description": "The list of items that this entity dislikes and will cause it to get angry if used while untamed.",
       "properties": {
-        "item": {
-          "$ref": "../../../../general/item/identifier.json",
-          "description": "Name of the item this entity dislikes and will cause it to get angry if used while untamed"
-        }
+        "item": { "$ref": "../../../../general/item/identifier.json", "description": "Name of the item this entity dislikes and will cause it to get angry if used while untamed" }
       }
     }
   },
   "required": [],
   "properties": {
-    "attempt_temper_mod": {
-      "type": "integer",
-      "default": 5,
-      "description": "The amount the entity's temper will increase when mounted.",
-      "title": "Attempt temper mod"
-    },
+    "attempt_temper_mod": { "type": "integer", "default": 5, "description": "The amount the entity's temper will increase when mounted.", "title": "Attempt Temper Mod" },
     "auto_reject_items": {
       "description": "The list of items that, if carried while interacting with the entity, will anger it.",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/auto_reject_items"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/auto_reject_items"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/auto_reject_items" },
+        { "type": "array", "items": { "$ref": "#/definitions/auto_reject_items" } }
       ],
-      "title": "TODO title"
-    },
-    "feed_text": {
-      "type": "string",
-      "description": "The text that shows in the feeding interact button",
-      "title": "Feed text"
+      "title": "TODO Title"
     },
+    "feed_text": { "type": "string", "description": "The text that shows in the feeding interact button", "title": "Feed Text" },
     "feed_items": {
       "description": "The list of items that can be used to increase the entity's temper and speed up the taming process",
-      "title": "Feed items",
+      "title": "Feed Items",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/feed_items"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/feed_items"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/feed_items" },
+        { "type": "array", "items": { "$ref": "#/definitions/feed_items" } }
       ]
     },
-    "max_temper": {
-      "type": "integer",
-      "default": 100,
-      "description": "The maximum value for the entity's random starting temper",
-      "title": "Max temper"
-    },
-    "min_temper": {
-      "type": "integer",
-      "default": 0,
-      "description": "The minimum value for the entity's random starting temper",
-      "title": "Min temper"
-    },
-    "ride_text": {
-      "type": "string",
-      "description": "The text that shows in the riding interact button",
-      "title": "Ride text"
-    },
-    "tame_event": { "$ref": "../types/event.json", "description": "Event that triggers when the entity becomes tamed", "title": "TODO title" }
+    "max_temper": { "type": "integer", "default": 100, "description": "The maximum value for the entity's random starting temper", "title": "Max Temper" },
+    "min_temper": { "type": "integer", "default": 0, "description": "The minimum value for the entity's random starting temper", "title": "Min Temper" },
+    "ride_text": { "type": "string", "description": "The text that shows in the riding interact button", "title": "Ride Text" },
+    "tame_event": { "$ref": "../types/event.json", "description": "Event that triggers when the entity becomes tamed", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.trade_resupply.json b/source/behaviour/entities/1.16.0/components/minecraft.trade_resupply.json
index fcfe4b36..86b5a504 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.trade_resupply.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.trade_resupply.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.trade_resupply",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "title": "Trade resupply 1.16.0",
+  "title": "Trade Resupply 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.trail.json b/source/behaviour/entities/1.16.0/components/minecraft.trail.json
index 7895a6a6..21f3a65f 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.trail.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.trail.json
@@ -11,31 +11,22 @@
       "type": "string",
       "default": "air",
       "description": "The type of block you wish to be spawned by the entity as it move about the world. Solid blocks may not be spawned at an offset of (0,0,0).",
-      "title": "Block type"
+      "title": "Block Type"
     },
     "spawn_filter": {
       "$ref": "../filters.json",
       "description": "One or more conditions that must be met in order to cause the chosen block type to spawn.",
-      "title": "Spawn filter"
+      "title": "Spawn Filter"
     },
     "spawn_offset": {
       "type": "array",
       "default": [0, 0, 0],
       "description": "The distance from the entities current position to spawn the block. Capped at up to 16 blocks away. The X value is left/right(-/+), the Z value is backward/forward(-/+), the Y value is below/above(-/+).",
-      "title": "Spawn offset",
+      "title": "Spawn Offset",
       "items": [
-        {
-          "type": "number",
-          "title": "X"
-        },
-        {
-          "type": "number",
-          "title": "Y"
-        },
-        {
-          "type": "number",
-          "title": "Z"
-        }
+        { "type": "number", "title": "X" },
+        { "type": "number", "title": "Y" },
+        { "type": "number", "title": "Z" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.transformation.json b/source/behaviour/entities/1.16.0/components/minecraft.transformation.json
index bdfc5c7c..55eccbf0 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.transformation.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.transformation.json
@@ -10,23 +10,11 @@
     "add": {
       "type": "object",
       "description": "List of components to add to the entity after the transformation",
-      "properties": {
-        "component_groups": {
-          "type": "array",
-          "description": "Names of component groups to add",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "title": "TODO title",
+      "properties": { "component_groups": { "type": "array", "description": "Names of component groups to add", "items": { "type": "string" } } },
+      "title": "TODO Title",
       "additionalProperties": false
     },
-    "begin_transform_sound": {
-      "type": "string",
-      "description": "Sound to play when the transformation starts",
-      "title": "TODO title"
-    },
+    "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "TODO Title" },
     "delay": {
       "description": "Defines the properties of the delay for the transformation",
       "oneOf": [
@@ -39,79 +27,45 @@
               "default": 0,
               "description": "Chance that the entity will look for nearby blocks that can speed up the transformation. Value must be between 0.0 and 1.0"
             },
-            "block_chance": {
-              "type": "number",
-              "default": 0,
-              "description": "Chance that, once a block is found, will help speed up the transformation"
-            },
+            "block_chance": { "type": "number", "default": 0, "description": "Chance that, once a block is found, will help speed up the transformation" },
             "block_max": {
               "type": "integer",
               "default": 0,
               "description": "Maximum number of blocks the entity will look for to aid in the transformation. If not defined or set to 0, it will be set to the block radius"
             },
-            "block_radius": {
-              "type": "integer",
-              "default": 0,
-              "description": "Distance in Blocks that the entity will search for blocks that can help the transformation"
-            },
+            "block_radius": { "type": "integer", "default": 0, "description": "Distance in Blocks that the entity will search for blocks that can help the transformation" },
             "block_types": {
               "type": "array",
               "description": "List of blocks that can help the transformation of this entity",
-              "items": {
-                "$ref": "../../../../general/blocks_identifiers.json"
-              }
+              "items": { "$ref": "../../../../general/blocks_identifiers.json" }
             },
-            "value": {
-              "type": "number",
-              "default": 0,
-              "description": "Time in seconds before the entity transforms"
-            }
+            "value": { "type": "number", "default": 0, "description": "Time in seconds before the entity transforms" }
           }
         }
       ],
-      "title": "TODO title"
-    },
-    "drop_equipment": {
-      "type": "boolean",
-      "default": false,
-      "description": "Cause the entity to drop all equipment upon transformation",
-      "title": "Drop equipment"
-    },
-    "drop_inventory": {
-      "type": "boolean",
-      "default": false,
-      "description": "Cause the entity to drop all items in inventory upon transformation",
-      "title": "Drop inventory"
-    },
-    "into": {
-      "type": "string",
-      "default": "",
-      "description": "Entity Definition that this entity will transform into",
-      "title": "Into"
+      "title": "TODO Title"
     },
+    "drop_equipment": { "type": "boolean", "default": false, "description": "Cause the entity to drop all equipment upon transformation", "title": "Drop Equipment" },
+    "drop_inventory": { "type": "boolean", "default": false, "description": "Cause the entity to drop all items in inventory upon transformation", "title": "Drop Inventory" },
+    "into": { "type": "string", "default": "", "description": "Entity Definition that this entity will transform into", "title": "Into" },
     "keep_level": {
       "type": "boolean",
       "default": false,
       "description": "If this entity has trades and has leveled up, it should maintain that level after transformation.",
-      "title": "Keep level"
+      "title": "Keep Level"
     },
     "keep_owner": {
       "type": "boolean",
       "default": false,
       "description": "If this entity is owned by another entity, it should remain owned after transformation.",
-      "title": "Keep owner"
+      "title": "Keep Owner"
     },
     "preserve_equipment": {
       "type": "boolean",
       "default": false,
       "description": "Cause the entity to keep equipment after going through transformation",
-      "title": "Preserve equipment"
+      "title": "Preserve Equipment"
     },
-    "transformation_sound": {
-      "type": "string",
-      "default": "",
-      "description": "Sound to play when the entity is done transforming",
-      "title": "Transformation sound"
-    }
+    "transformation_sound": { "type": "string", "default": "", "description": "Sound to play when the entity is done transforming", "title": "Transformation Sound" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/components/minecraft.wants_jockey.json b/source/behaviour/entities/1.16.0/components/minecraft.wants_jockey.json
index bef90440..0e286385 100644
--- a/source/behaviour/entities/1.16.0/components/minecraft.wants_jockey.json
+++ b/source/behaviour/entities/1.16.0/components/minecraft.wants_jockey.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.minecraft.wants_jockey",
   "description": "Sets that this entity wants to become a jockey.",
   "type": "object",
-  "title": "Wants jockey 1.16.0",
+  "title": "Wants Jockey 1.16.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.16.0/entities.json b/source/behaviour/entities/1.16.0/entities.json
index 9bb262ab..587381c4 100644
--- a/source/behaviour/entities/1.16.0/entities.json
+++ b/source/behaviour/entities/1.16.0/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.16.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.16.0",
+  "title": "Behaviour Entity 1.16.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.16.0 format version",
+      "title": "1.16.0 Format Version",
       "type": "string",
       "const": "1.16.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.16.0/events.json b/source/behaviour/entities/1.16.0/events.json
index 5c33088a..0c5b6844 100644
--- a/source/behaviour/entities/1.16.0/events.json
+++ b/source/behaviour/entities/1.16.0/events.json
@@ -7,19 +7,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -30,26 +26,10 @@
       "items": {
         "required": ["weight"],
         "properties": {
-          "add": {
-            "$ref": "#/definitions/addremove",
-            "description": "TODO description: add",
-            "title": "Add"
-          },
-          "remove": {
-            "$ref": "#/definitions/addremove",
-            "description": "TODO description: remove",
-            "title": "Remove"
-          },
-          "trigger": {
-            "type": "string",
-            "description": "UNDOCUMENTATED",
-            "title": "UNDOCUMENTATED"
-          },
-          "weight": {
-            "type": "number",
-            "description": "TODO description: weight",
-            "title": "Weight"
-          }
+          "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+          "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+          "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+          "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
         }
       }
     },
@@ -57,39 +37,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "title": "Add",
-          "$ref": "#/definitions/addremove",
-          "description": "The components groups to be added to this entity"
-        },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "randomize": {
-          "type": "array",
-          "$ref": "#/definitions/randomize"
-        },
-        "remove": {
-          "title": "Remove",
-          "description": "The components groups and all its components to be removed",
-          "$ref": "#/definitions/addremove"
-        },
+        "add": { "title": "Add", "$ref": "#/definitions/addremove", "description": "The components groups to be added to this entity" },
+        "filters": { "$ref": "./filters.json" },
+        "randomize": { "type": "array", "$ref": "#/definitions/randomize" },
+        "remove": { "title": "Remove", "description": "The components groups and all its components to be removed", "$ref": "#/definitions/addremove" },
         "sequence": {
           "description": "A series of filters and components to be added",
           "title": "Sequences",
           "type": "array",
-          "items": {
-            "description": "TODO description: sequence",
-            "title": "Sequence",
-            "type": "object",
-            "$ref": "#/definitions/event_base"
-          }
+          "items": { "description": "TODO description: sequence", "title": "Sequence", "type": "object", "$ref": "#/definitions/event_base" }
         },
-        "trigger": {
-          "type": "string",
-          "description": "The event to run",
-          "title": "Trigger"
-        }
+        "trigger": { "type": "string", "description": "The event to run", "title": "Trigger" }
       }
     }
   },
@@ -104,18 +62,8 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
-  }
+  "additionalProperties": { "$ref": "#/definitions/event_base" }
 }
diff --git a/source/behaviour/entities/1.16.0/filters.json b/source/behaviour/entities/1.16.0/filters.json
index 2e2cf362..1199a247 100644
--- a/source/behaviour/entities/1.16.0/filters.json
+++ b/source/behaviour/entities/1.16.0/filters.json
@@ -6,315 +6,86 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_container_open" } } },
-              "then": { "$ref": "./filters/has_container_open.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ranged_weapon" } } },
-              "then": { "$ref": "./filters/has_ranged_weapon.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_target" } } },
-              "then": { "$ref": "./filters/has_target.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_nether" } } },
-              "then": { "$ref": "./filters/in_nether.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "inactivity_timer" } } },
-              "then": { "$ref": "./filters/inactivity_timer.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_block" } } },
-              "then": { "$ref": "./filters/is_block.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed_to" } } },
-              "then": { "$ref": "./filters/is_leashed_to.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_persistent" } } },
-              "then": { "$ref": "./filters/is_persistent.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sleeping" } } },
-              "then": { "$ref": "./filters/is_sleeping.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "not": {
-                "properties": { "test": { "const": "is_weather" } },
-                "$comment": "DEPRECATED"
-              }
-            },
-            {
-              "if": { "properties": { "test": { "const": "light_level" } } },
-              "then": { "$ref": "./filters/light_level.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "random_chance" } } },
-              "then": { "$ref": "./filters/random_chance.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "rider_count" } } },
-              "then": { "$ref": "./filters/rider_count.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "surface_mob" } } },
-              "then": { "$ref": "./filters/surface_mob.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "trusts" } } },
-              "then": { "$ref": "./filters/trusts.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "weather" } } },
-              "then": { "$ref": "./filters/weather.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "weather_at_position" } }
-              },
-              "then": { "$ref": "./filters/weather_at_position.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_container_open" } } }, "then": { "$ref": "./filters/has_container_open.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_ranged_weapon" } } }, "then": { "$ref": "./filters/has_ranged_weapon.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_target" } } }, "then": { "$ref": "./filters/has_target.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_nether" } } }, "then": { "$ref": "./filters/in_nether.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "inactivity_timer" } } }, "then": { "$ref": "./filters/inactivity_timer.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_block" } } }, "then": { "$ref": "./filters/is_block.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed_to" } } }, "then": { "$ref": "./filters/is_leashed_to.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_persistent" } } }, "then": { "$ref": "./filters/is_persistent.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sleeping" } } }, "then": { "$ref": "./filters/is_sleeping.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "not": { "properties": { "test": { "const": "is_weather" } }, "$comment": "DEPRECATED" } },
+            { "if": { "properties": { "test": { "const": "light_level" } } }, "then": { "$ref": "./filters/light_level.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } },
+            { "if": { "properties": { "test": { "const": "random_chance" } } }, "then": { "$ref": "./filters/random_chance.json" } },
+            { "if": { "properties": { "test": { "const": "rider_count" } } }, "then": { "$ref": "./filters/rider_count.json" } },
+            { "if": { "properties": { "test": { "const": "surface_mob" } } }, "then": { "$ref": "./filters/surface_mob.json" } },
+            { "if": { "properties": { "test": { "const": "trusts" } } }, "then": { "$ref": "./filters/trusts.json" } },
+            { "if": { "properties": { "test": { "const": "weather" } } }, "then": { "$ref": "./filters/weather.json" } },
+            { "if": { "properties": { "test": { "const": "weather_at_position" } } }, "then": { "$ref": "./filters/weather_at_position.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.16.0/filters/has_container_open.json b/source/behaviour/entities/1.16.0/filters/has_container_open.json
index b2a5d204..2eff234a 100644
--- a/source/behaviour/entities/1.16.0/filters/has_container_open.json
+++ b/source/behaviour/entities/1.16.0/filters/has_container_open.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.has_container_open",
   "type": "object",
-  "title": "Filters has container open 1.16.0",
+  "title": "Filters Has Container Open 1.16.0",
   "description": "Returns true when the subject Player entity has opened a container.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/has_ranged_weapon.json b/source/behaviour/entities/1.16.0/filters/has_ranged_weapon.json
index cb0e6702..1b096b52 100644
--- a/source/behaviour/entities/1.16.0/filters/has_ranged_weapon.json
+++ b/source/behaviour/entities/1.16.0/filters/has_ranged_weapon.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.has_ranged_weapon",
   "type": "object",
-  "title": "Filters has ranged weapon 1.16.0",
+  "title": "Filters Has Ranged Weapon 1.16.0",
   "description": "Returns true when the subject entity is holding a ranged weapon like a bow or crossbow.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/has_target.json b/source/behaviour/entities/1.16.0/filters/has_target.json
index 9fbef022..28ec98d0 100644
--- a/source/behaviour/entities/1.16.0/filters/has_target.json
+++ b/source/behaviour/entities/1.16.0/filters/has_target.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.has_target",
   "type": "object",
-  "title": "Filters has target 1.16.0",
+  "title": "Filters Has Target 1.16.0",
   "description": "Returns true if the subject entity has a valid target.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/in_nether.json b/source/behaviour/entities/1.16.0/filters/in_nether.json
index 100e1af3..0970ca15 100644
--- a/source/behaviour/entities/1.16.0/filters/in_nether.json
+++ b/source/behaviour/entities/1.16.0/filters/in_nether.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.in_nether",
   "type": "object",
-  "title": "Filters in nether 1.16.0",
+  "title": "Filters In Nether 1.16.0",
   "description": "Returns true when the subject entity is in Nether.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/inactivity_timer.json b/source/behaviour/entities/1.16.0/filters/inactivity_timer.json
index 619d1456..d5656bb0 100644
--- a/source/behaviour/entities/1.16.0/filters/inactivity_timer.json
+++ b/source/behaviour/entities/1.16.0/filters/inactivity_timer.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.inactivity_timer",
   "type": "object",
-  "title": "Filters inactivity timer 1.16.0",
+  "title": "Filters Inactivity Timer 1.16.0",
   "description": "Tests if the specified duration in seconds of inactivity for despawning has been reached.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/filters/is_block.json b/source/behaviour/entities/1.16.0/filters/is_block.json
index a21d47cc..1b481f05 100644
--- a/source/behaviour/entities/1.16.0/filters/is_block.json
+++ b/source/behaviour/entities/1.16.0/filters/is_block.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.is_block",
   "type": "object",
-  "title": "Filters is block 1.16.0",
+  "title": "Filters Is Block 1.16.0",
   "description": "Returns true when the block has the given name.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/filters/is_leashed_to.json b/source/behaviour/entities/1.16.0/filters/is_leashed_to.json
index efa668b9..c1375b8f 100644
--- a/source/behaviour/entities/1.16.0/filters/is_leashed_to.json
+++ b/source/behaviour/entities/1.16.0/filters/is_leashed_to.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.is_leashed_to",
   "type": "object",
-  "title": "Filters is leashed to 1.16.0",
+  "title": "Filters Is Leashed To 1.16.0",
   "description": "Returns true if the subject entity leashed to the calling entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/is_persistent.json b/source/behaviour/entities/1.16.0/filters/is_persistent.json
index b4ef4327..1f8ff472 100644
--- a/source/behaviour/entities/1.16.0/filters/is_persistent.json
+++ b/source/behaviour/entities/1.16.0/filters/is_persistent.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.is_persistent",
   "type": "object",
-  "title": "Filters is persistent 1.16.0",
+  "title": "Filters Is Persistent 1.16.0",
   "description": "Tests if the subject's persistence matches the bool value passed in.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/is_sleeping.json b/source/behaviour/entities/1.16.0/filters/is_sleeping.json
index d3116e91..5c9f6e77 100644
--- a/source/behaviour/entities/1.16.0/filters/is_sleeping.json
+++ b/source/behaviour/entities/1.16.0/filters/is_sleeping.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.is_sleeping",
   "type": "object",
-  "title": "Filters is sleeping 1.16.0",
+  "title": "Filters Is Sleeping 1.16.0",
   "description": "Tests whether the Subject is sleeping.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/light_level.json b/source/behaviour/entities/1.16.0/filters/light_level.json
index 128c0a37..0e905608 100644
--- a/source/behaviour/entities/1.16.0/filters/light_level.json
+++ b/source/behaviour/entities/1.16.0/filters/light_level.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.light_level",
   "type": "object",
-  "title": "Filters light level 1.16.0",
+  "title": "Filters Light Level 1.16.0",
   "description": "Tests is the mob is outside of the specified light level range (0, 16).",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value",
-      "minimum": 0,
-      "maximum": 16
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value", "minimum": 0, "maximum": 16 }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/filters/random_chance.json b/source/behaviour/entities/1.16.0/filters/random_chance.json
index edc31c58..e6118f6f 100644
--- a/source/behaviour/entities/1.16.0/filters/random_chance.json
+++ b/source/behaviour/entities/1.16.0/filters/random_chance.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.random_chance",
   "type": "object",
-  "title": "Filters random chance 1.16.0",
+  "title": "Filters Random Chance 1.16.0",
   "description": "Returns true if the random chance rolls 0 out of a specified max range.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/filters/rider_count.json b/source/behaviour/entities/1.16.0/filters/rider_count.json
index 374f0f37..4273e5b7 100644
--- a/source/behaviour/entities/1.16.0/filters/rider_count.json
+++ b/source/behaviour/entities/1.16.0/filters/rider_count.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.rider_count",
   "type": "object",
-  "title": "Filters rider count 1.16.0",
+  "title": "Filters Rider Count 1.16.0",
   "description": "Returns the number of riders on this entity.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/filters/surface_mob.json b/source/behaviour/entities/1.16.0/filters/surface_mob.json
index f07b0bfa..78ab3ef0 100644
--- a/source/behaviour/entities/1.16.0/filters/surface_mob.json
+++ b/source/behaviour/entities/1.16.0/filters/surface_mob.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.surface_mob",
   "type": "object",
-  "title": "Filters surface mob 1.16.0",
+  "title": "Filters Surface Mob 1.16.0",
   "description": "Tests if the subject is a surface mob.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/trusts.json b/source/behaviour/entities/1.16.0/filters/trusts.json
index 2de93957..1ad73c4c 100644
--- a/source/behaviour/entities/1.16.0/filters/trusts.json
+++ b/source/behaviour/entities/1.16.0/filters/trusts.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.trusts",
   "type": "object",
-  "title": "Filters trusts 1.16.0",
+  "title": "Filters Trusts 1.16.0",
   "description": "Returns true if the subject is trusted by entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.0/filters/weather.json b/source/behaviour/entities/1.16.0/filters/weather.json
index c5b01030..bc5c25d4 100644
--- a/source/behaviour/entities/1.16.0/filters/weather.json
+++ b/source/behaviour/entities/1.16.0/filters/weather.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.weather",
   "type": "object",
-  "title": "Filters weather 1.16.0",
+  "title": "Filters Weather 1.16.0",
   "description": "Tests the current weather in the dimension against a provided weather value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/filters/weather_at_position.json b/source/behaviour/entities/1.16.0/filters/weather_at_position.json
index 8d585c65..9907f8b0 100644
--- a/source/behaviour/entities/1.16.0/filters/weather_at_position.json
+++ b/source/behaviour/entities/1.16.0/filters/weather_at_position.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.0.filters.weather_at_position",
   "type": "object",
-  "title": "Filters weather at position 1.16.0",
+  "title": "Filters Weather At Position 1.16.0",
   "description": "Tests the current weather, at the actor's position, against a provided weather value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/minecraft.entity.json b/source/behaviour/entities/1.16.0/minecraft.entity.json
index 11b99afd..65626c24 100644
--- a/source/behaviour/entities/1.16.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.16.0/minecraft.entity.json
@@ -4,9 +4,7 @@
   "title": "Entity 1.16.0",
   "required": ["description"],
   "additionalProperties": false,
-  "dependencies": {
-    "component_groups": ["events"]
-  },
+  "dependencies": { "component_groups": ["events"] },
   "properties": {
     "description": {
       "required": ["identifier"],
@@ -17,35 +15,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -59,20 +45,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -81,7 +55,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -89,20 +63,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "uniqueItems": true,
       "$ref": "./components.json",
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "uniqueItems": true,
       "$ref": "./events.json",
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.0/types/entity_types.json b/source/behaviour/entities/1.16.0/types/entity_types.json
index 9fc4b687..9fafdf11 100644
--- a/source/behaviour/entities/1.16.0/types/entity_types.json
+++ b/source/behaviour/entities/1.16.0/types/entity_types.json
@@ -1,20 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.entity_types.1.16.0",
-  "title": "Entity types 1.16.0",
+  "title": "Entity Types 1.16.0",
   "type": "array",
   "items": {
     "description": "The entity type",
-    "title": "The entity type",
+    "title": "Entity Type",
     "type": "object",
     "properties": {
       "filters": { "type": "object", "$ref": "../filters.json" },
-      "max_dist": {
-        "type": "number",
-        "description": "Maximum distance this mob can be away to be a valid choice",
-        "default": 16,
-        "title": "Max Dist"
-      },
+      "max_dist": { "type": "number", "description": "Maximum distance this mob can be away to be a valid choice", "default": 16, "title": "Max Dist" },
       "walk_speed_multiplier": {
         "type": "number",
         "description": "Multiplier for the walking speed. A value of 1.0 means the speed is unchanged",
@@ -27,12 +22,7 @@
         "default": 16,
         "title": "Sprint Speed Multiplier"
       },
-      "must_see": {
-        "type": "boolean",
-        "description": "If true, the mob has to be visible to be a valid choice",
-        "default": false,
-        "title": "Must See"
-      },
+      "must_see": { "type": "boolean", "description": "If true, the mob has to be visible to be a valid choice", "default": false, "title": "Must See" },
       "must_see_forget_duration": {
         "type": "number",
         "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
diff --git a/source/behaviour/entities/1.16.0/types/event.json b/source/behaviour/entities/1.16.0/types/event.json
index 4519578e..c75b9452 100644
--- a/source/behaviour/entities/1.16.0/types/event.json
+++ b/source/behaviour/entities/1.16.0/types/event.json
@@ -4,20 +4,11 @@
   "title": "Event",
   "description": "Minecraft behaviour event 1.16.0",
   "oneOf": [
-    {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_\\-:]+$",
-      "description": "The event to fire"
-    },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
     {
       "type": "object",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
         "target": {
           "type": "string",
           "description": "The target of the event",
diff --git a/source/behaviour/entities/1.16.0/types/range_number_type.json b/source/behaviour/entities/1.16.0/types/range_number_type.json
index 5d25cbe9..98912da0 100644
--- a/source/behaviour/entities/1.16.0/types/range_number_type.json
+++ b/source/behaviour/entities/1.16.0/types/range_number_type.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.range_number_type.1.16.0",
-  "title": "Range [a, b]",
+  "title": "Range [a, B]",
   "description": "A described range",
   "items": [
     { "type": "number", "title": "Range: A", "description": "The first value of the range" },
diff --git a/source/behaviour/entities/1.16.0/types/trigger.json b/source/behaviour/entities/1.16.0/types/trigger.json
index 08f84172..883d2591 100644
--- a/source/behaviour/entities/1.16.0/types/trigger.json
+++ b/source/behaviour/entities/1.16.0/types/trigger.json
@@ -5,12 +5,8 @@
   "type": "object",
   "description": "Trigger to fire for 1.16.0",
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "Event",
-      "title": "The event to fire"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO title" },
+    "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
+    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO Title" },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behaviour/entities/1.16.100/behaviors/types/base_speed_multiplier.json b/source/behaviour/entities/1.16.100/behaviors/types/base_speed_multiplier.json
index 43cb80bb..d7ed6697 100644
--- a/source/behaviour/entities/1.16.100/behaviors/types/base_speed_multiplier.json
+++ b/source/behaviour/entities/1.16.100/behaviors/types/base_speed_multiplier.json
@@ -5,5 +5,5 @@
   "default": 1.0,
   "description": "Movement speed multiplier of the mob when using this AI Goal.",
   "type": "number",
-  "title": "Speed multiplier"
+  "title": "Speed Multiplier"
 }
diff --git a/source/behaviour/entities/1.16.100/components.json b/source/behaviour/entities/1.16.100/components.json
index 23a473cf..4a482a5a 100644
--- a/source/behaviour/entities/1.16.100/components.json
+++ b/source/behaviour/entities/1.16.100/components.json
@@ -177,7 +177,6 @@
     "minecraft:walk_animation_speed": { "$ref": "../1.8.0/components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "../1.16.0/components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "../1.8.0/components/minecraft.water_movement.json" },
-
     "minecraft:behavior.admire_item": { "$ref": "../1.16.0/behaviors/minecraft.behavior.admire_item.json" },
     "minecraft:behavior.avoid_block": { "$ref": "../1.16.0/behaviors/minecraft.behavior.avoid_block.json" },
     "minecraft:behavior.avoid_mob_type": { "$ref": "../1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json" },
@@ -251,16 +250,12 @@
     "minecraft:behavior.move_to_village": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_village.json" },
     "minecraft:behavior.move_to_water": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_to_water.json" },
     "minecraft:behavior.move_towards_home_restriction": { "$ref": "../1.16.0/behaviors/minecraft.behavior.move_towards_home_restriction.json" },
-    "minecraft:behavior.move_towards_dwelling_restriction": {
-      "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json"
-    },
+    "minecraft:behavior.move_towards_dwelling_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json" },
     "minecraft:behavior.move_towards_restriction": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json" },
     "minecraft:behavior.move_towards_target": { "$ref": "../1.8.0/behaviors/minecraft.behavior.move_towards_target.json" },
     "minecraft:behavior.nap": { "$ref": "../1.16.0/behaviors/minecraft.behavior.nap.json" },
     "minecraft:behavior.nearest_attackable_target": { "$ref": "../1.16.0/behaviors/minecraft.behavior.nearest_attackable_target.json" },
-    "minecraft:behavior.nearest_prioritized_attackable_target": {
-      "$ref": "../1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json"
-    },
+    "minecraft:behavior.nearest_prioritized_attackable_target": { "$ref": "../1.16.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json" },
     "minecraft:behavior.ocelot_sit_on_block": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json" },
     "minecraft:behavior.ocelotattack": { "$ref": "../1.8.0/behaviors/minecraft.behavior.ocelotattack.json" },
     "minecraft:behavior.offer_flower": { "$ref": "../1.8.0/behaviors/minecraft.behavior.offer_flower.json" },
diff --git a/source/behaviour/entities/1.16.100/entities.json b/source/behaviour/entities/1.16.100/entities.json
index cafda639..63f39341 100644
--- a/source/behaviour/entities/1.16.100/entities.json
+++ b/source/behaviour/entities/1.16.100/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity1.16.100",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.16.100",
+  "title": "Behaviour Entity 1.16.100",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.16.100 format version",
+      "title": "1.16.100 Format Version",
       "type": "string",
       "const": "1.16.100",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.16.100/events.json b/source/behaviour/entities/1.16.100/events.json
index e7cc1f97..78632653 100644
--- a/source/behaviour/entities/1.16.100/events.json
+++ b/source/behaviour/entities/1.16.100/events.json
@@ -7,19 +7,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -30,26 +26,10 @@
       "items": {
         "required": ["weight"],
         "properties": {
-          "add": {
-            "$ref": "#/definitions/addremove",
-            "description": "TODO description: add",
-            "title": "Add"
-          },
-          "remove": {
-            "$ref": "#/definitions/addremove",
-            "description": "TODO description: remove",
-            "title": "Remove"
-          },
-          "trigger": {
-            "type": "string",
-            "description": "UNDOCUMENTATED",
-            "title": "UNDOCUMENTATED"
-          },
-          "weight": {
-            "type": "number",
-            "description": "TODO description: weight",
-            "title": "Weight"
-          }
+          "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+          "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+          "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+          "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
         }
       }
     },
@@ -57,39 +37,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "title": "Add",
-          "$ref": "#/definitions/addremove",
-          "description": "The components groups to be added to this entity"
-        },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "randomize": {
-          "type": "array",
-          "$ref": "#/definitions/randomize"
-        },
-        "remove": {
-          "title": "Remove",
-          "description": "The components groups and all its components to be removed",
-          "$ref": "#/definitions/addremove"
-        },
+        "add": { "title": "Add", "$ref": "#/definitions/addremove", "description": "The components groups to be added to this entity" },
+        "filters": { "$ref": "./filters.json" },
+        "randomize": { "type": "array", "$ref": "#/definitions/randomize" },
+        "remove": { "title": "Remove", "description": "The components groups and all its components to be removed", "$ref": "#/definitions/addremove" },
         "sequence": {
           "description": "A series of filters and components to be added",
           "title": "Sequences",
           "type": "array",
-          "items": {
-            "description": "TODO description: sequence",
-            "title": "Sequence",
-            "type": "object",
-            "$ref": "#/definitions/event_base"
-          }
+          "items": { "description": "TODO description: sequence", "title": "Sequence", "type": "object", "$ref": "#/definitions/event_base" }
         },
-        "trigger": {
-          "type": "string",
-          "description": "The event to run",
-          "title": "Trigger"
-        }
+        "trigger": { "type": "string", "description": "The event to run", "title": "Trigger" }
       }
     }
   },
@@ -104,18 +62,8 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
-  }
+  "additionalProperties": { "$ref": "#/definitions/event_base" }
 }
diff --git a/source/behaviour/entities/1.16.100/filters.json b/source/behaviour/entities/1.16.100/filters.json
index 41ba3220..523cdf5e 100644
--- a/source/behaviour/entities/1.16.100/filters.json
+++ b/source/behaviour/entities/1.16.100/filters.json
@@ -6,315 +6,86 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } },
-              "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "../1.8.0/filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "../1.8.0/filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_container_open" } } },
-              "then": { "$ref": "./filters/has_container_open.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "../1.8.0/filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "../1.8.0/filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ranged_weapon" } } },
-              "then": { "$ref": "./filters/has_ranged_weapon.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "../1.8.0/filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_target" } } },
-              "then": { "$ref": "./filters/has_target.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "../1.8.0/filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "../1.8.0/filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "../1.8.0/filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_nether" } } },
-              "then": { "$ref": "./filters/in_nether.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "inactivity_timer" } } },
-              "then": { "$ref": "./filters/inactivity_timer.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "../1.8.0/filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "../1.8.0/filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_block" } } },
-              "then": { "$ref": "./filters/is_block.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "../1.8.0/filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "../1.8.0/filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "../1.8.0/filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "../1.8.0/filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "../1.8.0/filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "../1.8.0/filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "../1.8.0/filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "../1.8.0/filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "../1.8.0/filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "../1.8.0/filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "../1.8.0/filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed_to" } } },
-              "then": { "$ref": "./filters/is_leashed_to.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "../1.8.0/filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "../1.8.0/filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_persistent" } } },
-              "then": { "$ref": "./filters/is_persistent.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "../1.8.0/filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "../1.8.0/filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sleeping" } } },
-              "then": { "$ref": "./filters/is_sleeping.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "../1.8.0/filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "../1.8.0/filters/is_target.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_type" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "is_temperature_value" } }
-              },
-              "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "../1.8.0/filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "../1.8.0/filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "../1.8.0/filters/is_visible.json" }
-            },
-            {
-              "not": {
-                "properties": { "test": { "const": "is_weather" } },
-                "$comment": "DEPRECATED"
-              }
-            },
-            {
-              "if": { "properties": { "test": { "const": "light_level" } } },
-              "then": { "$ref": "./filters/light_level.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "../1.8.0/filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "../1.8.0/filters/on_ladder.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "random_chance" } } },
-              "then": { "$ref": "./filters/random_chance.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "rider_count" } } },
-              "then": { "$ref": "./filters/rider_count.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "surface_mob" } } },
-              "then": { "$ref": "./filters/surface_mob.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "trusts" } } },
-              "then": { "$ref": "./filters/trusts.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "weather" } } },
-              "then": { "$ref": "./filters/weather.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "weather_at_position" } }
-              },
-              "then": { "$ref": "./filters/weather_at_position.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "../1.8.0/filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "../1.8.0/filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "../1.8.0/filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "../1.8.0/filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_container_open" } } }, "then": { "$ref": "./filters/has_container_open.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "../1.8.0/filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "../1.8.0/filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "../1.8.0/filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_ranged_weapon" } } }, "then": { "$ref": "./filters/has_ranged_weapon.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "../1.8.0/filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_target" } } }, "then": { "$ref": "./filters/has_target.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "../1.8.0/filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "../1.8.0/filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "../1.8.0/filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "../1.8.0/filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "../1.8.0/filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_nether" } } }, "then": { "$ref": "./filters/in_nether.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "../1.8.0/filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "../1.8.0/filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "inactivity_timer" } } }, "then": { "$ref": "./filters/inactivity_timer.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "../1.8.0/filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "../1.8.0/filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "../1.8.0/filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_block" } } }, "then": { "$ref": "./filters/is_block.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "../1.8.0/filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "../1.8.0/filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "../1.8.0/filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "../1.8.0/filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "../1.8.0/filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "../1.8.0/filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "../1.8.0/filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "../1.8.0/filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "../1.8.0/filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "../1.8.0/filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "../1.8.0/filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed_to" } } }, "then": { "$ref": "./filters/is_leashed_to.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "../1.8.0/filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "../1.8.0/filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_persistent" } } }, "then": { "$ref": "./filters/is_persistent.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "../1.8.0/filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "../1.8.0/filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sleeping" } } }, "then": { "$ref": "./filters/is_sleeping.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "../1.8.0/filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "../1.8.0/filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "../1.8.0/filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "../1.8.0/filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "../1.8.0/filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "../1.8.0/filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "../1.8.0/filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "../1.8.0/filters/is_visible.json" } },
+            { "not": { "properties": { "test": { "const": "is_weather" } }, "$comment": "DEPRECATED" } },
+            { "if": { "properties": { "test": { "const": "light_level" } } }, "then": { "$ref": "./filters/light_level.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "../1.8.0/filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "../1.8.0/filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "../1.8.0/filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "../1.8.0/filters/on_ladder.json" } },
+            { "if": { "properties": { "test": { "const": "random_chance" } } }, "then": { "$ref": "./filters/random_chance.json" } },
+            { "if": { "properties": { "test": { "const": "rider_count" } } }, "then": { "$ref": "./filters/rider_count.json" } },
+            { "if": { "properties": { "test": { "const": "surface_mob" } } }, "then": { "$ref": "./filters/surface_mob.json" } },
+            { "if": { "properties": { "test": { "const": "trusts" } } }, "then": { "$ref": "./filters/trusts.json" } },
+            { "if": { "properties": { "test": { "const": "weather" } } }, "then": { "$ref": "./filters/weather.json" } },
+            { "if": { "properties": { "test": { "const": "weather_at_position" } } }, "then": { "$ref": "./filters/weather_at_position.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.16.100/filters/has_container_open.json b/source/behaviour/entities/1.16.100/filters/has_container_open.json
index a7dcdd88..0fd09b2f 100644
--- a/source/behaviour/entities/1.16.100/filters/has_container_open.json
+++ b/source/behaviour/entities/1.16.100/filters/has_container_open.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.has_container_open",
   "type": "object",
-  "title": "Filters has container open 1.16.100",
+  "title": "Filters Has Container Open 1.16.100",
   "description": "Returns true when the subject Player entity has opened a container.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/has_ranged_weapon.json b/source/behaviour/entities/1.16.100/filters/has_ranged_weapon.json
index 74c8ce1c..5c5c523c 100644
--- a/source/behaviour/entities/1.16.100/filters/has_ranged_weapon.json
+++ b/source/behaviour/entities/1.16.100/filters/has_ranged_weapon.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.has_ranged_weapon",
   "type": "object",
-  "title": "Filters has ranged weapon 1.16.100",
+  "title": "Filters Has Ranged Weapon 1.16.100",
   "description": "Returns true when the subject entity is holding a ranged weapon like a bow or crossbow.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/has_target.json b/source/behaviour/entities/1.16.100/filters/has_target.json
index 34716af3..bf78889c 100644
--- a/source/behaviour/entities/1.16.100/filters/has_target.json
+++ b/source/behaviour/entities/1.16.100/filters/has_target.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.has_target",
   "type": "object",
-  "title": "Filters has target 1.16.100",
+  "title": "Filters Has Target 1.16.100",
   "description": "Returns true if the subject entity has a valid target.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/in_nether.json b/source/behaviour/entities/1.16.100/filters/in_nether.json
index 3248808e..c9354fc9 100644
--- a/source/behaviour/entities/1.16.100/filters/in_nether.json
+++ b/source/behaviour/entities/1.16.100/filters/in_nether.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.in_nether",
   "type": "object",
-  "title": "Filters in nether 1.16.100",
+  "title": "Filters In Nether 1.16.100",
   "description": "Returns true when the subject entity is in Nether.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/inactivity_timer.json b/source/behaviour/entities/1.16.100/filters/inactivity_timer.json
index 387109bf..3933d1d7 100644
--- a/source/behaviour/entities/1.16.100/filters/inactivity_timer.json
+++ b/source/behaviour/entities/1.16.100/filters/inactivity_timer.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.inactivity_timer",
   "type": "object",
-  "title": "Filters inactivity timer 1.16.100",
+  "title": "Filters Inactivity Timer 1.16.100",
   "description": "Tests if the specified duration in seconds of inactivity for despawning has been reached.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/filters/is_block.json b/source/behaviour/entities/1.16.100/filters/is_block.json
index 3f1a1f70..55b5c68e 100644
--- a/source/behaviour/entities/1.16.100/filters/is_block.json
+++ b/source/behaviour/entities/1.16.100/filters/is_block.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.is_block",
   "type": "object",
-  "title": "Filters is block 1.16.100",
+  "title": "Filters Is Block 1.16.100",
   "description": "Returns true when the block has the given name.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/filters/is_leashed_to.json b/source/behaviour/entities/1.16.100/filters/is_leashed_to.json
index 35ebae4c..a7a47c19 100644
--- a/source/behaviour/entities/1.16.100/filters/is_leashed_to.json
+++ b/source/behaviour/entities/1.16.100/filters/is_leashed_to.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.is_leashed_to",
   "type": "object",
-  "title": "Filters is leashed to 1.16.100",
+  "title": "Filters Is Leashed To 1.16.100",
   "description": "Returns true if the subject entity leashed to the calling entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/is_persistent.json b/source/behaviour/entities/1.16.100/filters/is_persistent.json
index f9f2a422..4d9d2df3 100644
--- a/source/behaviour/entities/1.16.100/filters/is_persistent.json
+++ b/source/behaviour/entities/1.16.100/filters/is_persistent.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.is_persistent",
   "type": "object",
-  "title": "Filters is persistent 1.16.100",
+  "title": "Filters Is Persistent 1.16.100",
   "description": "Tests if the subject's persistence matches the bool value passed in.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/is_sleeping.json b/source/behaviour/entities/1.16.100/filters/is_sleeping.json
index 0c3e7443..28f7d9a1 100644
--- a/source/behaviour/entities/1.16.100/filters/is_sleeping.json
+++ b/source/behaviour/entities/1.16.100/filters/is_sleeping.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.is_sleeping",
   "type": "object",
-  "title": "Filters is sleeping 1.16.100",
+  "title": "Filters Is Sleeping 1.16.100",
   "description": "Tests whether the Subject is sleeping.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/light_level.json b/source/behaviour/entities/1.16.100/filters/light_level.json
index d57a9471..f78da380 100644
--- a/source/behaviour/entities/1.16.100/filters/light_level.json
+++ b/source/behaviour/entities/1.16.100/filters/light_level.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.light_level",
   "type": "object",
-  "title": "Filters light level 1.16.100",
+  "title": "Filters Light Level 1.16.100",
   "description": "Tests is the mob is outside of the specified light level range (0, 16).",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value",
-      "minimum": 0,
-      "maximum": 16
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value", "minimum": 0, "maximum": 16 }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/filters/random_chance.json b/source/behaviour/entities/1.16.100/filters/random_chance.json
index af92fcdb..93fd5185 100644
--- a/source/behaviour/entities/1.16.100/filters/random_chance.json
+++ b/source/behaviour/entities/1.16.100/filters/random_chance.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.random_chance",
   "type": "object",
-  "title": "Filters random chance 1.16.100",
+  "title": "Filters Random Chance 1.16.100",
   "description": "Returns true if the random chance rolls 0 out of a specified max range.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/filters/rider_count.json b/source/behaviour/entities/1.16.100/filters/rider_count.json
index 655cdb79..a8d64b37 100644
--- a/source/behaviour/entities/1.16.100/filters/rider_count.json
+++ b/source/behaviour/entities/1.16.100/filters/rider_count.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.rider_count",
   "type": "object",
-  "title": "Filters rider count 1.16.100",
+  "title": "Filters Rider Count 1.16.100",
   "description": "Returns the number of riders on this entity.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "An integer value.",
-      "type": "integer",
-      "title": "Value"
-    }
+    "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/filters/surface_mob.json b/source/behaviour/entities/1.16.100/filters/surface_mob.json
index 05f3c73f..2965e5d6 100644
--- a/source/behaviour/entities/1.16.100/filters/surface_mob.json
+++ b/source/behaviour/entities/1.16.100/filters/surface_mob.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.surface_mob",
   "type": "object",
-  "title": "Filters surface mob 1.16.100",
+  "title": "Filters Surface Mob 1.16.100",
   "description": "Tests if the subject is a surface mob.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/trusts.json b/source/behaviour/entities/1.16.100/filters/trusts.json
index 705119dc..7e361ff9 100644
--- a/source/behaviour/entities/1.16.100/filters/trusts.json
+++ b/source/behaviour/entities/1.16.100/filters/trusts.json
@@ -2,27 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.trusts",
   "type": "object",
-  "title": "Filters trusts 1.16.100",
+  "title": "Filters Trusts 1.16.100",
   "description": "Returns true if the subject is trusted by entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "enum": ["true", "false"] }
       ],
       "title": "Value"
     }
diff --git a/source/behaviour/entities/1.16.100/filters/weather.json b/source/behaviour/entities/1.16.100/filters/weather.json
index fc68adca..c9024ad7 100644
--- a/source/behaviour/entities/1.16.100/filters/weather.json
+++ b/source/behaviour/entities/1.16.100/filters/weather.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.weather",
   "type": "object",
-  "title": "Filters weather 1.16.100",
+  "title": "Filters Weather 1.16.100",
   "description": "Tests the current weather in the dimension against a provided weather value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/filters/weather_at_position.json b/source/behaviour/entities/1.16.100/filters/weather_at_position.json
index 2cb3f415..553747d3 100644
--- a/source/behaviour/entities/1.16.100/filters/weather_at_position.json
+++ b/source/behaviour/entities/1.16.100/filters/weather_at_position.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.16.100.filters.weather_at_position",
   "type": "object",
-  "title": "Filters weather at position 1.16.100",
+  "title": "Filters Weather At Position 1.16.100",
   "description": "Tests the current weather, at the actor's position, against a provided weather value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "Test",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/minecraft.entity.json b/source/behaviour/entities/1.16.100/minecraft.entity.json
index 38950394..123073c5 100644
--- a/source/behaviour/entities/1.16.100/minecraft.entity.json
+++ b/source/behaviour/entities/1.16.100/minecraft.entity.json
@@ -4,9 +4,7 @@
   "title": "Entity 1.16.100",
   "required": ["description"],
   "additionalProperties": false,
-  "dependencies": {
-    "component_groups": ["events"]
-  },
+  "dependencies": { "component_groups": ["events"] },
   "properties": {
     "description": {
       "required": ["identifier"],
@@ -17,35 +15,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -59,20 +45,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -81,7 +55,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -89,20 +63,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "uniqueItems": true,
       "$ref": "./components.json",
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "uniqueItems": true,
       "$ref": "./events.json",
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.16.100/types/entity_types.json b/source/behaviour/entities/1.16.100/types/entity_types.json
index e22c0df1..221c2a2a 100644
--- a/source/behaviour/entities/1.16.100/types/entity_types.json
+++ b/source/behaviour/entities/1.16.100/types/entity_types.json
@@ -1,20 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.entity_types.1.16.100",
-  "title": "Entity types 1.16.100",
+  "title": "Entity Types 1.16.100",
   "type": "array",
   "items": {
     "description": "The entity type",
-    "title": "The entity type",
+    "title": "Entity Type",
     "type": "object",
     "properties": {
       "filters": { "type": "object", "$ref": "../filters.json" },
-      "max_dist": {
-        "type": "number",
-        "description": "Maximum distance this mob can be away to be a valid choice",
-        "default": 16,
-        "title": "Max Dist"
-      },
+      "max_dist": { "type": "number", "description": "Maximum distance this mob can be away to be a valid choice", "default": 16, "title": "Max Dist" },
       "walk_speed_multiplier": {
         "type": "number",
         "description": "Multiplier for the walking speed. A value of 1.0 means the speed is unchanged",
@@ -27,12 +22,7 @@
         "default": 16,
         "title": "Sprint Speed Multiplier"
       },
-      "must_see": {
-        "type": "boolean",
-        "description": "If true, the mob has to be visible to be a valid choice",
-        "default": false,
-        "title": "Must See"
-      },
+      "must_see": { "type": "boolean", "description": "If true, the mob has to be visible to be a valid choice", "default": false, "title": "Must See" },
       "must_see_forget_duration": {
         "type": "number",
         "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
diff --git a/source/behaviour/entities/1.16.100/types/event.json b/source/behaviour/entities/1.16.100/types/event.json
index 873ff79c..34149693 100644
--- a/source/behaviour/entities/1.16.100/types/event.json
+++ b/source/behaviour/entities/1.16.100/types/event.json
@@ -4,20 +4,11 @@
   "title": "Event",
   "description": "Minecraft behaviour event 1.16.100",
   "oneOf": [
-    {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_\\-:]+$",
-      "description": "The event to fire"
-    },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
     {
       "type": "object",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
         "target": {
           "type": "string",
           "description": "The target of the event",
diff --git a/source/behaviour/entities/1.16.100/types/range_number_type.json b/source/behaviour/entities/1.16.100/types/range_number_type.json
index ca0f679a..169b393a 100644
--- a/source/behaviour/entities/1.16.100/types/range_number_type.json
+++ b/source/behaviour/entities/1.16.100/types/range_number_type.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.range_number_type.1.16.100",
-  "title": "Range [a, b]",
+  "title": "Range [a, B]",
   "description": "A described range",
   "items": [
     { "type": "number", "title": "Range: A", "description": "The first value of the range" },
diff --git a/source/behaviour/entities/1.16.100/types/trigger.json b/source/behaviour/entities/1.16.100/types/trigger.json
index b7f03f49..d119b7c0 100644
--- a/source/behaviour/entities/1.16.100/types/trigger.json
+++ b/source/behaviour/entities/1.16.100/types/trigger.json
@@ -5,12 +5,8 @@
   "type": "object",
   "description": "Trigger to fire for 1.16.100",
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "Event",
-      "title": "The event to fire"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO title" },
+    "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
+    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO Title" },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.admire_item.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.admire_item.json
index fbedc474..0920a4b1 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.admire_item.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.admire_item.json
@@ -2,21 +2,16 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.admire_item",
   "type": "object",
-  "title": "Admire item 1.8.0",
+  "title": "Admire Item 1.8.0",
   "description": "Enables the mob to admire items that have been configured as admirable. Must be used in combination with the admire_item component.",
   "additionalProperties": false,
   "properties": {
-    "admire_item_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound event to play when admiring the item",
-      "title": "Admire item sound"
-    },
+    "admire_item_sound": { "type": "string", "default": "", "description": "The sound event to play when admiring the item", "title": "Admire Item Sound" },
     "sound_interval": {
       "type": "array",
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again.",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "items": [
         { "type": "number", "title": "Minimum" },
         { "type": "number", "title": "Maximum" }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json
index 4e355796..18850b81 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.avoid_mob_type.json
@@ -4,22 +4,12 @@
   "additionalProperties": false,
   "description": "Allows this entity to avoid certain mob types.",
   "type": "object",
-  "title": "Avoid mob type 1.8.0",
+  "title": "Avoid Mob Type 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "max_dist": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum distance to look for an entity",
-      "title": "Max Dist"
-    },
-    "max_flee": {
-      "type": "number",
-      "default": 0.5,
-      "description": "Distance in blocks within the mob considers it should stop fleeing.",
-      "title": "Max Flee"
-    },
+    "max_dist": { "type": "number", "default": 0, "description": "Maximum distance to look for an entity", "title": "Max Dist" },
+    "max_flee": { "type": "number", "default": 0.5, "description": "Distance in blocks within the mob considers it should stop fleeing.", "title": "Max Flee" },
     "walk_speed_multiplier": {
       "type": "number",
       "default": 1.0,
@@ -45,21 +35,13 @@
       "title": "Ignore Visibility"
     },
     "entity_types": { "$ref": "../types/entity_types.json", "description": "TODO description: entity types", "title": "Entity Types" },
-    "avoid_mob_sound": {
-      "title": "Avoid mob sound",
-      "description": "UNDOCUMENTATED",
-      "type": "string"
-    },
-    "remove_target": {
-      "title": "Remove target",
-      "description": "UNDOCUMENTATED",
-      "type": "boolean"
-    },
-    "on_escape_event": { "$ref": "../types/event.json", "title": "On escape event", "description": "UNDOCUMENTATED" },
+    "avoid_mob_sound": { "title": "Avoid Mob Sound", "description": "UNDOCUMENTATED", "type": "string" },
+    "remove_target": { "title": "Remove Target", "description": "UNDOCUMENTATED", "type": "boolean" },
+    "on_escape_event": { "$ref": "../types/event.json", "title": "On Escape Event", "description": "UNDOCUMENTATED" },
     "sound_interval": {
       "default": 0,
       "description": "UNDOCUMENTATED",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
@@ -69,14 +51,7 @@
           ]
         },
         { "type": "number" },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": { "type": "number" },
-            "range_max": { "type": "number" }
-          }
-        }
+        { "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.beg.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.beg.json
index c3aceb6a..da6d2c65 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.beg.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.beg.json
@@ -11,19 +11,10 @@
     "items": {
       "type": "array",
       "description": "List of items that this mob likes",
-      "items": {
-        "type": "string",
-        "description": "TODO description: properties",
-        "title": "Properties"
-      },
+      "items": { "type": "string", "description": "TODO description: properties", "title": "Properties" },
       "title": "Properties"
     },
-    "look_distance": {
-      "type": "number",
-      "default": 8,
-      "description": "Distance in blocks the mob will beg from",
-      "title": "Look Distance"
-    },
+    "look_distance": { "type": "number", "default": 8, "description": "Distance in blocks the mob will beg from", "title": "Look Distance" },
     "look_time": {
       "description": "The range of time in seconds this mob will stare at the player holding a food they like, begging for it",
       "$ref": "../types/range_number_type.json",
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.break_door.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.break_door.json
index e3ede3ea..861a2a0a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.break_door.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.break_door.json
@@ -2,14 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.break_door",
   "type": "object",
-  "title": "Break door 1.8.0",
+  "title": "Break Door 1.8.0",
   "description": "Allows this mob to break doors.",
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" }
-  },
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } },
   "additionalProperties": false
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.breed.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.breed.json
index 1e631c1d..39a6c697 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.breed.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.breed.json
@@ -6,8 +6,5 @@
   "title": "Breed 1.8.0",
   "description": "Allows this mob to breed with other mobs.",
   "required": [],
-  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.celebrate.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.celebrate.json
index 6274eb46..edceadc3 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.celebrate.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.celebrate.json
@@ -6,26 +6,14 @@
   "description": "This allows the mob celebrate by jumping up and playing a sound periodically.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "celebration_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound to occasionally play.",
-      "title": "Celebration sound"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1,
-      "description": "The duration of the celebration (in seconds).",
-      "title": "Duration"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "celebration_sound": { "type": "string", "default": "", "description": "The sound to occasionally play.", "title": "Celebration Sound" },
+    "duration": { "type": "number", "default": 1, "description": "The duration of the celebration (in seconds).", "title": "Duration" },
     "jump_interval": {
       "type": "array",
       "default": 0,
       "description": "The range of time in seconds to randomly wait before jumping again.",
-      "title": "Jump interval",
+      "title": "Jump Interval",
       "oneOf": [
         {
           "type": "array",
@@ -37,16 +25,12 @@
         { "type": "number" }
       ]
     },
-    "on_celebration_end_event": {
-      "$ref": "../types/trigger.json",
-      "description": "The event to trigger when the goal's duration expires.",
-      "title": "On celebration end event"
-    },
+    "on_celebration_end_event": { "$ref": "../types/trigger.json", "description": "The event to trigger when the goal's duration expires.", "title": "On Celebration End Event" },
     "sound_interval": {
       "type": "array",
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again.",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_attack.json
index 8806b338..a70de8f8 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_attack.json
@@ -3,15 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.charge_attack",
   "additionalProperties": false,
   "type": "object",
-  "title": "Charge attack 1.8.0",
+  "title": "Charge Attack 1.8.0",
   "description": "Allows the mob to attack its target by running at it.",
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": {
-      "$ref": "types/base_speed_multiplier.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_held_item.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_held_item.json
index 90043249..693c1364 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_held_item.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.charge_held_item.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.charge_held_item",
   "type": "object",
-  "title": "Charge held item 1.8.0",
+  "title": "Charge Held Item 1.8.0",
   "description": "Allows this mob to charge and use their held item.",
   "additionalProperties": false,
   "required": [],
@@ -12,11 +12,7 @@
       "type": "array",
       "title": "Items",
       "description": "The list of items that can be used to charge the held item.",
-      "items": {
-        "type": "string",
-        "description": "Items names to be used.",
-        "title": "Item ID"
-      }
+      "items": { "type": "string", "description": "Items names to be used.", "title": "Item ID" }
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.circle_around_anchor.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.circle_around_anchor.json
index 354b6a47..638b71a2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.circle_around_anchor.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.circle_around_anchor.json
@@ -2,18 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.circle_around_anchor",
   "type": "object",
-  "title": "Circle around anchor 1.8.0",
+  "title": "Circle Around Anchor 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to move in a circle around a point or a target.",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": {
-      "type": "number",
-      "default": 1.0,
-      "description": "Movement speed multiplier of the mob when using this AI Goal",
-      "title": "Speed Multiplier"
-    },
+    "speed_multiplier": { "type": "number", "default": 1.0, "description": "Movement speed multiplier of the mob when using this AI Goal", "title": "Speed Multiplier" },
     "radius_range": {
       "$ref": "../types/range_number_type.json",
       "default": [5.0, 15.0],
@@ -50,25 +45,9 @@
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
       "title": "Goal Radius"
     },
-    "radius_change": {
-      "type": "number",
-      "title": "Radius change",
-      "description": "UNDOCUMENTATED"
-    },
-    "radius_adjustment_chance": {
-      "type": "number",
-      "title": "Radius adjustment chance",
-      "description": "UNDOCUMENTATED"
-    },
-    "height_adjustment_chance": {
-      "type": "number",
-      "title": "Height adjustment chance",
-      "description": "UNDOCUMENTATED"
-    },
-    "angle_change": {
-      "type": "number",
-      "title": "Angle change",
-      "description": "UNDOCUMENTATED"
-    }
+    "radius_change": { "type": "number", "title": "Radius Change", "description": "UNDOCUMENTATED" },
+    "radius_adjustment_chance": { "type": "number", "title": "Radius Adjustment Chance", "description": "UNDOCUMENTATED" },
+    "height_adjustment_chance": { "type": "number", "title": "Height Adjustment Chance", "description": "UNDOCUMENTATED" },
+    "angle_change": { "type": "number", "title": "Angle Change", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.controlled_by_player.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.controlled_by_player.json
index 2d51c574..742e89bc 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.controlled_by_player.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.controlled_by_player.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.controlled_by_player",
   "additionalProperties": false,
   "type": "object",
-  "title": "Controlled by player 1.8.0",
+  "title": "Controlled By Player 1.8.0",
   "description": "Allows the mob to be controlled by the player.",
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
@@ -11,7 +11,7 @@
       "type": "number",
       "default": 1,
       "description": "Speed multiplier of mount when controlled by player, defaults to 1.0f",
-      "title": "Mount speed multiplier"
+      "title": "Mount Speed Multiplier"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_trusted_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_trusted_target.json
index 47b09464..e2574feb 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_trusted_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_trusted_target.json
@@ -2,49 +2,22 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.defend_trusted_target",
   "type": "object",
-  "title": "Defend trusted target 1.8.0",
+  "title": "Defend Trusted Target 1.8.0",
   "description": "Allows the mob to target another mob that hurts an entity it trusts.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "aggro_sound": {
-      "type": "string",
-      "default": "",
-      "description": "Sound to occasionally play while defending.",
-      "title": "Aggro sound"
-    },
-    "attack_interval": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time in seconds between attacks",
-      "title": "Attack interval"
-    },
-    "must_see": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities in this mob's viewing range can be selected as targets",
-      "title": "Must see"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "aggro_sound": { "type": "string", "default": "", "description": "Sound to occasionally play while defending.", "title": "Aggro Sound" },
+    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds between attacks", "title": "Attack Interval" },
+    "must_see": { "type": "boolean", "default": false, "description": "If true, only entities in this mob's viewing range can be selected as targets", "title": "Must See" },
     "must_see_forget_duration": {
       "type": "number",
       "default": 3,
       "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
-      "title": "Must see forget duration"
+      "title": "Must See Forget Duration"
     },
-    "on_defend_start": { "$ref": "../types/event.json", "title": "On defend start", "description": "UNDOCUMENTATED" },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that the target can be within to launch an attack",
-      "title": "Within radius"
-    },
-    "entity_types": {
-      "type": "object",
-      "description": "List of entity types that this mob considers valid targets",
-      "title": "Entity types",
-      "additionalProperties": false
-    }
+    "on_defend_start": { "$ref": "../types/event.json", "title": "On Defend Start", "description": "UNDOCUMENTATED" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that the target can be within to launch an attack", "title": "Within Radius" },
+    "entity_types": { "type": "object", "description": "List of entity types that this mob considers valid targets", "title": "Entity Types", "additionalProperties": false }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_village_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_village_target.json
index 1052e940..51c321ab 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_village_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.defend_village_target.json
@@ -3,24 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.defend_village_target",
   "additionalProperties": false,
   "type": "object",
-  "title": "Defend village target 1.8.0",
+  "title": "Defend Village Target 1.8.0",
   "description": "Allows the mob to stay in the village and fight mobs hostile to the villagers.",
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "$ref": "../types/entity_types.json",
-      "description": "List of entity types this mob considers a threat to the village",
-      "title": "TODO title"
-    },
-    "must_reach": {
-      "title": "Must reach",
-      "description": "UNDOCUMENTATED",
-      "type": "boolean"
-    },
-    "attack_chance": {
-      "title": "Attack chance",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    }
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entity types this mob considers a threat to the village", "title": "TODO Title" },
+    "must_reach": { "title": "Must Reach", "description": "UNDOCUMENTATED", "type": "boolean" },
+    "attack_chance": { "title": "Attack Chance", "description": "UNDOCUMENTATED", "type": "number" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.delayed_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.delayed_attack.json
index c9920041..b2334999 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.delayed_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.delayed_attack.json
@@ -3,62 +3,29 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.delayed_attack",
   "additionalProperties": false,
   "type": "object",
-  "title": "Delayed attack 1.8.0",
+  "title": "Delayed Attack 1.8.0",
   "description": "Allows the mob to drink potions based on specified environment conditions.",
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "attack_duration": {
-      "type": "number",
-      "default": 1,
-      "description": "The duration of the attack animation in seconds",
-      "title": "TODO title"
-    },
-    "attack_once": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will attack only one time.",
-      "title": "TODO title"
-    },
-    "attack_types": {
-      "type": "string",
-      "default": "",
-      "description": "Defines the entity types this mob will attack",
-      "title": "TODO title"
-    },
-    "hit_delay_pct": {
-      "type": "number",
-      "default": 1,
-      "description": "The percentage of the attack_duration that must pass before the hit is made",
-      "title": "TODO title"
-    },
+    "attack_duration": { "type": "number", "default": 1, "description": "The duration of the attack animation in seconds", "title": "TODO Title" },
+    "attack_once": { "type": "boolean", "default": false, "description": "If true, this mob will attack only one time.", "title": "TODO Title" },
+    "attack_types": { "type": "string", "default": "", "description": "Defines the entity types this mob will attack", "title": "TODO Title" },
+    "hit_delay_pct": { "type": "number", "default": 1, "description": "The percentage of the attack_duration that must pass before the hit is made", "title": "TODO Title" },
     "random_stop_interval": {
       "type": "integer",
       "default": 0,
       "description": "Defines the probability the mob will stop fighting. A value of 0 disables randomly stopping, while a value of 1 defines a 50% chance",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "reach_multiplier": {
       "type": "number",
       "default": 2,
       "description": "Multiplier for how far outside its box the mob can reach its target (this can be used to simulate a mob with longer arms by making this bigger)",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "require_complete_path": {
-      "type": "boolean",
-      "title": "Require complet path",
-      "description": "UNDOCUMENATED"
-    },
-    "sound_event": {
-      "type": "string",
-      "description": "The sound event to play when the attack starts",
-      "title": "TODO title"
-    },
-    "track_target": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will chase after the target as long as it's a valid target",
-      "title": "TODO title"
-    }
+    "require_complete_path": { "type": "boolean", "title": "Require Complet Path", "description": "UNDOCUMENATED" },
+    "sound_event": { "type": "string", "description": "The sound event to play when the attack starts", "title": "TODO Title" },
+    "track_target": { "type": "boolean", "default": false, "description": "If true, this mob will chase after the target as long as it's a valid target", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.door_interact.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.door_interact.json
index c9396ecc..7a0ad76b 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.door_interact.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.door_interact.json
@@ -3,9 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.door_interact",
   "additionalProperties": false,
   "type": "object",
-  "title": "Door interact 1.8.0",
+  "title": "Door Interact 1.8.0",
   "description": "Allows the mob to drink potions based on specified environment conditions.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonchargeplayer.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonchargeplayer.json
index 4b181484..af30f06c 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonchargeplayer.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonchargeplayer.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragonchargeplayer 1.8.0",
   "description": "Allows the dragon to attack a player by flying fast at them. The player is chosen by the dragonscanning goal. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragondeath.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragondeath.json
index de9a4684..253f3124 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragondeath.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragondeath.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragondeath 1.8.0",
   "description": "Allows the dragon to go out with glory. This controls the Ender Dragon's death animation and can't be used by other mobs.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonflaming.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonflaming.json
index 3ba035d0..c3970a71 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonflaming.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonflaming.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragonflaming 1.8.0",
   "description": "Allows the dragon to use its flame breath attack. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonholdingpattern.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonholdingpattern.json
index e00b2621..7b65e139 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonholdingpattern.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonholdingpattern.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragonholdingpattern 1.8.0",
   "description": "Allows the Dragon to fly around in a circle around the center podium. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonlanding.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonlanding.json
index 8e8e2943..b25341a0 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonlanding.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonlanding.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragonlanding 1.8.0",
   "description": "Allows the Dragon to stop flying and transition into perching mode. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonscanning.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonscanning.json
index 93714dc5..436257b6 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonscanning.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonscanning.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragonscanning 1.8.0",
   "description": "Allows the dragon to look around for a player to attack while in perch mode. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonstrafeplayer.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonstrafeplayer.json
index bab8d58d..9ba6b7cd 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonstrafeplayer.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragonstrafeplayer.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragonstrafeplayer 1.8.0",
   "description": "Allows the dragon to fly around looking for a player and shoot fireballs at them. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragontakeoff.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragontakeoff.json
index 20f5fd18..d39b2dad 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragontakeoff.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.dragontakeoff.json
@@ -5,7 +5,5 @@
   "type": "object",
   "title": "Dragontakeoff 1.8.0",
   "description": "Allows the dragon to leave perch mode and go back to flying around. Can only be used by the Ender Dragon.",
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
index 8ce0178a..8c2b8d5d 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
@@ -9,11 +9,7 @@
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "speed_modifier": {
-      "default": 0.0,
-      "description": "TODO description: speed modifier",
-      "title": "Speed Modifier"
-    },
+    "speed_modifier": { "default": 0.0, "description": "TODO description: speed modifier", "title": "Speed Modifier" },
     "potions": {
       "type": "array",
       "description": "A list of potions that this entity can drink.",
@@ -21,12 +17,7 @@
         "required": ["id", "chance", "filters"],
         "additionalProperties": false,
         "properties": {
-          "id": {
-            "type": "integer",
-            "default": -1,
-            "description": "The registry ID of the potion to use",
-            "title": "Id"
-          },
+          "id": { "type": "integer", "default": -1, "description": "The registry ID of the potion to use", "title": "Id" },
           "chance": {
             "type": "number",
             "default": 1.0,
@@ -35,11 +26,7 @@
             "description": "The percent chance (from 0.0 to 1.0) of this potion being selected when searching for a potion to use.",
             "title": "Chance"
           },
-          "filters": {
-            "description": "The filters to use when determining if this potion can be selected.",
-            "$ref": "../filters.json",
-            "title": "Filters"
-          }
+          "filters": { "description": "The filters to use when determining if this potion can be selected.", "$ref": "../filters.json", "title": "Filters" }
         },
         "description": "TODO description: potions",
         "title": "Potions"
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drop_item_for.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drop_item_for.json
index b2e282e4..a923a5f3 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drop_item_for.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.drop_item_for.json
@@ -3,62 +3,35 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.drop_item_for",
   "additionalProperties": false,
   "type": "object",
-  "title": "Drop item for 1.8.0",
+  "title": "Drop Item For 1.8.0",
   "description": "Allows the mob to drink potions based on specified environment conditions.",
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
     "entity_types": { "$ref": "../types/entity_types.json" },
-    "drop_item_chance": {
-      "type": "number",
-      "default": 1.0,
-      "description": "The probability that the mob will drop an item.",
-      "title": "TODO title"
-    },
+    "drop_item_chance": { "type": "number", "default": 1.0, "description": "The probability that the mob will drop an item.", "title": "TODO Title" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
-    },
-    "loot_table": {
-      "type": "string",
-      "description": "Loot table to select items from.",
-      "title": "TODO title"
-    },
-    "max_dist": {
-      "type": "number",
-      "description": "Maximum distance in blocks this mob will look for entities to drop an item for.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "loot_table": { "type": "string", "description": "Loot table to select items from.", "title": "TODO Title" },
+    "max_dist": { "type": "number", "description": "Maximum distance in blocks this mob will look for entities to drop an item for.", "title": "TODO Title" },
     "offering_distance": {
       "type": "number",
       "default": 1.0,
       "description": "The distance in blocks the mob will try to be away from the entity when it drops the item.",
-      "title": "TODO title"
-    },
-    "on_drop_attempt": {
-      "$ref": "../types/event.json",
-      "description": "Event to run when this mob attempts to drop an item.",
-      "title": "TODO title"
-    },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks from the target the mob can be.",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks from the target the mob can be.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "on_drop_attempt": { "$ref": "../types/event.json", "description": "Event to run when this mob attempts to drop an item.", "title": "TODO Title" },
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks from the target the mob can be.", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks from the target the mob can be.", "title": "TODO Title" },
     "time_of_day_range": {
       "$ref": "../types/range_number_type.json",
       "default": [0.0, 1.0],
       "description": "The valid times of day that this goal can be used. For reference: noon is 0.0, sunset is 0.25, midnight is 0.5, and sunrise is 0.75, and back to noon for 1.0.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_block.json
index c11387e7..23b6b818 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_block.json
@@ -2,50 +2,26 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.eat_block",
   "type": "object",
-  "title": "Eat block 1.8.0",
+  "title": "Eat Block 1.8.0",
   "description": "UNDOCUMENTATED",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "on_eat": { "$ref": "../types/trigger.json", "description": "UNDOCUMENTATED", "title": "On Eat" },
-    "success_chance": {
-      "title": "Succes chance",
-      "description": "UNDOCUMENTATED",
-      "oneOf": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "string",
-          "title": "Molang"
-        }
-      ]
-    },
-    "time_until_eat": {
-      "title": "Time until eat",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    },
+    "success_chance": { "title": "Succes Chance", "description": "UNDOCUMENTATED", "oneOf": [{ "type": "number" }, { "type": "string", "title": "Molang" }] },
+    "time_until_eat": { "title": "Time Until Eat", "description": "UNDOCUMENTATED", "type": "number" },
     "eat_and_replace_block_pairs": {
       "type": "array",
-      "title": "Eat and replace block pairs",
+      "title": "Eat And Replace Block Pairs",
       "description": "UNDOCUMENTATED",
       "items": {
         "type": "object",
         "title": "UNDOCUMENTATED",
         "description": "UNDOCUMENTATED",
         "properties": {
-          "eat_block": {
-            "type": "string",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          },
-          "replace_block": {
-            "type": "string",
-            "title": "UNDOCUMENTATED",
-            "description": "UNDOCUMENTATED"
-          }
+          "eat_block": { "type": "string", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+          "replace_block": { "type": "string", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" }
         }
       }
     }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_carried_item.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_carried_item.json
index d889c6e3..03afaa6f 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_carried_item.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.eat_carried_item.json
@@ -2,17 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.eat_carried_item",
   "type": "object",
-  "title": "Eat carried item 1.8.0",
+  "title": "Eat Carried Item 1.8.0",
   "description": "If the mob is carrying a food item, the mob will eat it and the effects will be applied to the mob.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "delay_before_eating": {
-      "type": "number",
-      "description": "Time in seconds the mob should wait before eating the item.",
-      "title": "Delay before eating"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "delay_before_eating": { "type": "number", "description": "Time in seconds the mob should wait before eating the item.", "title": "Delay Before Eating" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_leave_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_leave_block.json
index eed61cd6..a494f5d2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_leave_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_leave_block.json
@@ -2,11 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.enderman_leave_block",
   "type": "object",
-  "title": "Enderman leave block 1.8.0",
+  "title": "Enderman Leave Block 1.8.0",
   "additionalProperties": false,
   "description": "Allows the enderman to drop a block they are carrying. Can only be used by Endermen.",
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_take_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_take_block.json
index d68ea161..6cf22bf7 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_take_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.enderman_take_block.json
@@ -2,11 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.enderman_take_block",
   "type": "object",
-  "title": "Enderman take block 1.8.0",
+  "title": "Enderman Take Block 1.8.0",
   "description": "Allows the enderman to take a block and carry it around. Can only be used by Endermen.",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
index d3bd7ed2..35b0c03d 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
@@ -2,65 +2,23 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.explore_outskirts",
   "type": "object",
-  "title": "Explore outskirts 1.8.0",
+  "title": "Explore Outskirts 1.8.0",
   "description": "Behaviour explore outskirts",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "explore_dist": {
-      "type": "number",
-      "default": 5,
-      "description": "The distance in which the mob will proceed past the village bounds",
-      "title": "Explore dist"
-    },
-    "wait_time": {
-      "type": "integer",
-      "default": 0,
-      "description": "The time the mob will stand around 'searching' for POIs",
-      "title": "Wait time"
-    },
-    "next_xz": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "integer"
-    },
-    "next_y": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "integer"
-    },
-    "min_wait_time": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "max_wait_time": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "max_travel_time": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "min_perimeter": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "min_dist_from_target": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "timer_ratio": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
+    "explore_dist": { "type": "number", "default": 5, "description": "The distance in which the mob will proceed past the village bounds", "title": "Explore Dist" },
+    "wait_time": { "type": "integer", "default": 0, "description": "The time the mob will stand around 'searching' for POIs", "title": "Wait Time" },
+    "next_xz": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "integer" },
+    "next_y": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "integer" },
+    "min_wait_time": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "max_wait_time": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "max_travel_time": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "min_perimeter": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "min_dist_from_target": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "timer_ratio": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
     "dist_from_boundary": {
       "title": "UNDOCUMENTATED",
       "description": "UNDOCUMENATED",
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_cover.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_cover.json
index 9da7a332..d7c8a8a8 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_cover.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_cover.json
@@ -2,17 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.find_cover",
   "type": "object",
-  "title": "Find cover 1.8.0",
+  "title": "Find Cover 1.8.0",
   "description": "Allows the mob to seek shade.",
   "additionalProperties": false,
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    }
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_mount.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_mount.json
index 859b378d..4ed2a2db 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_mount.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_mount.json
@@ -2,43 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.find_mount",
   "type": "object",
-  "title": "Find mount 1.8.0",
+  "title": "Find Mount 1.8.0",
   "description": "Allows the mob to look around for another mob to ride atop it.",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will not go into water blocks when going towards a mount",
-      "title": "TODO title"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "avoid_water": { "type": "boolean", "default": false, "description": "If true, the mob will not go into water blocks when going towards a mount", "title": "TODO Title" },
     "mount_distance": {
       "type": "number",
       "default": -1,
       "description": "This is the distance the mob needs to be, in blocks, from the desired mount to mount it. If the value is below 0, the mob will use its default attack distance",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "start_delay": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time the mob will wait before starting to move towards the mount",
-      "title": "TODO title"
-    },
-    "target_needed": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will only look for a mount if it has a target",
-      "title": "TODO title"
-    },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks within which the mob will look for a mount",
-      "title": "TODO title"
-    }
+    "start_delay": { "type": "integer", "default": 0, "description": "Time the mob will wait before starting to move towards the mount", "title": "TODO Title" },
+    "target_needed": { "type": "boolean", "default": false, "description": "If true, the mob will only look for a mount if it has a target", "title": "TODO Title" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks within which the mob will look for a mount", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_underwater_treasure.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_underwater_treasure.json
index 9483d8d3..8e27665a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_underwater_treasure.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.find_underwater_treasure.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.find_underwater_treasure",
   "type": "object",
-  "title": "Find underwater treasure 1.8.0",
+  "title": "Find Underwater Treasure 1.8.0",
   "description": "Allows the mob to move towards the nearest underwater ruin or shipwreck.",
   "additionalProperties": false,
   "required": [],
@@ -15,11 +15,6 @@
       "description": "The range that the mob will search for a treasure chest within a ruin or shipwreck to move towards.",
       "title": "Search Range"
     },
-    "stop_distance": {
-      "type": "number",
-      "default": 2.0,
-      "description": "The distance the mob will move before stopping.",
-      "title": "Stop Distance"
-    }
+    "stop_distance": { "type": "number", "default": 2.0, "description": "The distance the mob will move before stopping.", "title": "Stop Distance" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.flee_sun.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.flee_sun.json
index de49949a..d6b573ee 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.flee_sun.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.flee_sun.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.flee_sun",
   "type": "object",
-  "title": "Flee sun 1.8.0",
+  "title": "Flee Sun 1.8.0",
   "description": "Allows the mob to run away from direct sunlight and seek shade.",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": {
-      "$ref": "types/base_speed_multiplier.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float.json
index da5eab7a..b59e1026 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float.json
@@ -6,7 +6,5 @@
   "description": "Allows the mob to stay afloat while swimming.",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float_wander.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float_wander.json
index 584e3691..2e716082 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float_wander.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.float_wander.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.float_wander",
   "type": "object",
-  "title": "Float wander 1.8.0",
+  "title": "Float Wander 1.8.0",
   "description": "Allows the mob to float around like the Ghast.",
   "additionalProperties": false,
   "required": [],
@@ -20,18 +20,8 @@
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
       "title": "Y Dist"
     },
-    "y_offset": {
-      "type": "number",
-      "default": 0.0,
-      "description": "Height in blocks to add to the selected target position",
-      "title": "Y Offset"
-    },
-    "must_reach": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the point has to be reachable to be a valid target",
-      "title": "Must Reach"
-    },
+    "y_offset": { "type": "number", "default": 0.0, "description": "Height in blocks to add to the selected target position", "title": "Y Offset" },
+    "must_reach": { "type": "boolean", "default": false, "description": "If true, the point has to be reachable to be a valid target", "title": "Must Reach" },
     "random_reselect": {
       "type": "boolean",
       "default": false,
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_caravan.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_caravan.json
index dd87db0d..45eca01f 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_caravan.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_caravan.json
@@ -2,23 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.follow_caravan",
   "type": "object",
-  "title": "Follow caravan 1.8.0",
+  "title": "Follow Caravan 1.8.0",
   "description": "Allows the mob to follow mobs that are in a caravan.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "entity_types": {
-      "$ref": "../types/entity_types.json",
-      "description": "List of entity types that this mob can follow in a caravan",
-      "title": "TODO title"
-    },
-    "entity_count": {
-      "type": "integer",
-      "description": "Number of entities that can be in the caravan",
-      "default": 1,
-      "title": "TODO title"
-    }
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entity types that this mob can follow in a caravan", "title": "TODO Title" },
+    "entity_count": { "type": "integer", "description": "Number of entities that can be in the caravan", "default": 1, "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_mob.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_mob.json
index b72cb501..13ffef7f 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_mob.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_mob.json
@@ -2,26 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.follow_mob",
   "type": "object",
-  "title": "Follow mob 1.8.0",
+  "title": "Follow Mob 1.8.0",
   "description": "Allows the mob to follow other mobs.",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for a mob to follow",
-      "title": "TODO title"
-    },
-    "stop_distance": {
-      "type": "number",
-      "default": 2,
-      "description": "The distance in blocks this mob stops from the mob it is following",
-      "title": "TODO title"
-    }
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for a mob to follow", "title": "TODO Title" },
+    "stop_distance": { "type": "number", "default": 2, "description": "The distance in blocks this mob stops from the mob it is following", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_owner.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_owner.json
index 93032d43..ee6d8fe3 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_owner.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_owner.json
@@ -2,26 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.follow_owner",
   "type": "object",
-  "title": "Follow owner 1.8.0",
+  "title": "Follow Owner 1.8.0",
   "description": "Allows the mob to follow their parent around.",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
     "start_distance": {
       "type": "number",
       "default": 10,
       "description": "The distance in blocks that the owner can be away from this mob before it starts following it",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "stop_distance": {
-      "type": "number",
-      "default": 2,
-      "description": "The distance in blocks this mob will stop from its owner while following it",
-      "title": "TODO title"
-    }
+    "stop_distance": { "type": "number", "default": 2, "description": "The distance in blocks this mob will stop from its owner while following it", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_parent.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_parent.json
index 563a2943..f7c99a60 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_parent.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_parent.json
@@ -6,10 +6,5 @@
   "description": "Allows the mob to follow their parent around.",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_target_captain.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_target_captain.json
index 0712ff02..e48546a2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_target_captain.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.follow_target_captain.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.follow_target_captain",
   "type": "object",
-  "title": "Follow target captain 1.8.0",
+  "title": "Follow Target Captain 1.8.0",
   "description": "Allows mob to move towards its current target captain.",
   "additionalProperties": false,
   "required": [],
@@ -13,13 +13,13 @@
       "type": "number",
       "default": 0,
       "description": "Defines the distance in blocks the mob will stay from its target while following.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "within_radius": {
       "type": "number",
       "default": 0,
       "description": "Defines the maximum distance in blocks a mob can get from its target captain before giving up trying to follow it.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.go_home.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.go_home.json
index 15c93be9..633f3e31 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.go_home.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.go_home.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.go_home",
   "type": "object",
-  "title": "Go home 1.8.0",
+  "title": "Go Home 1.8.0",
   "description": "Allows the mob to move back to the position they were spawned.",
   "additionalProperties": false,
   "required": [],
@@ -13,14 +13,14 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "interval": {
       "type": "integer",
       "default": 120,
       "description": "A random value to determine when to randomly move somewhere. This has a 1/interval chance to choose this goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "on_home": { "$ref": "../types/event.json", "description": "Event to run when this mob gets home.", "title": "TODO title" }
+    "on_home": { "$ref": "../types/event.json", "description": "Event to run when this mob gets home.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.guardian_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.guardian_attack.json
index be86fa37..b39bcdfe 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.guardian_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.guardian_attack.json
@@ -2,11 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.guardian_attack",
   "type": "object",
-  "title": "Guardian attack 1.8.0",
+  "title": "Guardian Attack 1.8.0",
   "description": "Allows the guardian to use its laser beam attack. Can only be used by Guardians and Elder Guardians.",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json
index 18f287c1..ff4be850 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.harvest_farm_block.json
@@ -2,27 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.harvest_farm_block",
   "type": "object",
-  "title": "Harvest farm block 1.8.0",
+  "title": "Harvest Farm Block 1.8.0",
   "description": "Allows the villager to harvest nearby farms. Can only be used by Villagers.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "max_seconds_before_search": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "search_cooldown_max_seconds": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    },
-    "seconds_until_new_task": {
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENATED",
-      "type": "number"
-    }
+    "max_seconds_before_search": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "search_cooldown_max_seconds": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" },
+    "seconds_until_new_task": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENATED", "type": "number" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hide.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hide.json
index 6805f1ae..cbd3b1fe 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hide.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hide.json
@@ -9,23 +9,13 @@
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "duration": {
-      "type": "number",
-      "default": 1,
-      "description": "Amount of time in seconds that the mob reacts.",
-      "title": "TODO title"
-    },
-    "poi_type": {
-      "type": "string",
-      "default": "",
-      "description": "Defines what POI type to hide at.",
-      "title": "TODO title"
-    },
+    "duration": { "type": "number", "default": 1, "description": "Amount of time in seconds that the mob reacts.", "title": "TODO Title" },
+    "poi_type": { "type": "string", "default": "", "description": "Defines what POI type to hide at.", "title": "TODO Title" },
     "timeout_cooldown": {
       "type": "number",
       "default": 8,
       "description": "The cooldown time in seconds before the goal can be reused after a internal failure or timeout condition.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hold_ground.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hold_ground.json
index 182d7590..f4856365 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hold_ground.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hold_ground.json
@@ -2,35 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.hold_ground",
   "type": "object",
-  "title": "Hold ground 1.8.0",
+  "title": "Hold Ground 1.8.0",
   "description": "The mob freezes and looks at the mob they are targeting.",
   "additionalProperties": false,
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "broadcast": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether to broadcast out the mob's target to other mobs of the same type.",
-      "title": "Broadcast"
-    },
-    "broadcast_range": {
-      "type": "number",
-      "default": 0.0,
-      "description": "Range in blocks for how far to broadcast.",
-      "title": "Broadcast range"
-    },
-    "min_radius": {
-      "type": "number",
-      "default": 10.0,
-      "description": "Minimum distance the target must be for the mob to run this goal.",
-      "title": "Min radius"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "broadcast": { "type": "boolean", "default": false, "description": "Whether to broadcast out the mob's target to other mobs of the same type.", "title": "Broadcast" },
+    "broadcast_range": { "type": "number", "default": 0.0, "description": "Range in blocks for how far to broadcast.", "title": "Broadcast Range" },
+    "min_radius": { "type": "number", "default": 10.0, "description": "Minimum distance the target must be for the mob to run this goal.", "title": "Min Radius" },
     "within_radius_event": {
       "$ref": "../types/event.json",
       "description": "Event to run when target is within the radius. This event is broadcasted if broadcast is true.",
-      "title": "Within radius event"
+      "title": "Within Radius Event"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
index 5193de1e..95117cd9 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
@@ -2,24 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.guardian_attack",
   "type": "object",
-  "title": "Guardian attack 1.8.0",
+  "title": "Guardian Attack 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to target another mob that hurts them.",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "entity_types": { "$ref": "../types/entity_types.json", "description": "TODO description: entity types", "title": "Entity Types" },
-    "alert_same_type": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, nearby mobs of the same type will be alerted about the damage",
-      "title": "Alert Same Type"
-    },
-    "hurt_owner": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will hurt its owner and other mobs with the same owner as itself",
-      "title": "Hurt Owner"
-    }
+    "alert_same_type": { "type": "boolean", "default": false, "description": "If true, nearby mobs of the same type will be alerted about the damage", "title": "Alert Same Type" },
+    "hurt_owner": { "type": "boolean", "default": false, "description": "If true, the mob will hurt its owner and other mobs with the same owner as itself", "title": "Hurt Owner" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.inspect_bookshelf.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.inspect_bookshelf.json
index 1a5dde48..20f6b776 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.inspect_bookshelf.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.inspect_bookshelf.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.inspect_bookshelf",
   "type": "object",
-  "title": "Inspect bookshelf 1.8.0",
+  "title": "Inspect Bookshelf 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to inspect bookshelves.",
   "required": [],
@@ -13,25 +13,15 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "search_count": {
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "The height that the mob will search for bookshelves",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "Distance in blocks the mob will look for books to inspect",
-      "title": "TODO title"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "The height that the mob will search for bookshelves", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "Distance in blocks the mob will look for books to inspect", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.knockback_roar.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.knockback_roar.json
index 728fe467..54f475e2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.knockback_roar.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.knockback_roar.json
@@ -3,47 +3,17 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.knockback_roar",
   "description": "Allows the mob to perform a damaging knockback that affects all nearby entities.",
   "type": "object",
-  "title": "Knockback roar 1.8.0",
+  "title": "Knockback Roar 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "attack_time": {
-      "type": "number",
-      "default": 0.5,
-      "description": "The delay after which the knockback occurs (in seconds).",
-      "title": "TODO title"
-    },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "TODO title"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1,
-      "description": "The duration of the roar (in seconds).",
-      "title": "TODO title"
-    },
-    "knockback_damage": {
-      "type": "integer",
-      "default": 6,
-      "description": "The damage dealt by the knockback roar.",
-      "title": "TODO title"
-    },
-    "knockback_range": {
-      "type": "integer",
-      "default": 4,
-      "description": "The radius (in blocks) of the knockback effect.",
-      "title": "TODO title"
-    },
-    "knockback_strength": {
-      "type": "integer",
-      "default": 4,
-      "description": "The strength of the knockback.",
-      "title": "TODO title"
-    },
+    "attack_time": { "type": "number", "default": 0.5, "description": "The delay after which the knockback occurs (in seconds).", "title": "TODO Title" },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "TODO Title" },
+    "duration": { "type": "number", "default": 1, "description": "The duration of the roar (in seconds).", "title": "TODO Title" },
+    "knockback_damage": { "type": "integer", "default": 6, "description": "The damage dealt by the knockback roar.", "title": "TODO Title" },
+    "knockback_range": { "type": "integer", "default": 4, "description": "The radius (in blocks) of the knockback effect.", "title": "TODO Title" },
+    "knockback_strength": { "type": "integer", "default": 4, "description": "The strength of the knockback.", "title": "TODO Title" },
     "trigger": { "$ref": "../types/trigger.json", "description": "TODO", "title": "Trigger" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_down.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_down.json
index 661cf783..cc03dee8 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_down.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_down.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.lay_down",
   "description": "Allows mobs to lay down at times.",
   "type": "object",
-  "title": "Lay down 1.8.0",
+  "title": "Lay Down 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -12,13 +12,13 @@
       "type": "integer",
       "default": 120,
       "description": "A random value to determine at what intervals something can occur. This has a 1/interval chance to choose this goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "random_stop_interval": {
       "type": "integer",
       "default": 120,
       "description": "A random value in which the goal can use to pull out of the behavior. This is a 1/interval chance to play the sound",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_egg.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_egg.json
index bdac3e7e..b8b3084e 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_egg.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.lay_egg.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.lay_egg",
   "description": "Allows the mob to lay an egg block on a sand block if the mob is pregnant.",
   "type": "object",
-  "title": "Lay egg 1.8.0",
+  "title": "Lay Egg 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -13,20 +13,10 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "on_lay": { "$ref": "../types/event.json", "description": "Event to run when this mob lays the egg.", "title": "TODO title" },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for sand block to move towards",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for a sand block to move towards",
-      "title": "TODO title"
-    }
+    "on_lay": { "$ref": "../types/event.json", "description": "Event to run when this mob lays the egg.", "title": "TODO Title" },
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for sand block to move towards", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for a sand block to move towards", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.leap_at_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.leap_at_target.json
index 28d3c3de..998bbd46 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.leap_at_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.leap_at_target.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.leap_at_target",
   "description": "Allows monsters to jump at and attack their target. Can only be used by hostile mobs.",
   "type": "object",
-  "title": "Leap at target 1.8.0",
+  "title": "Leap At Target 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -12,19 +12,9 @@
       "type": "boolean",
       "default": true,
       "description": "If true, the mob will only jump at its target if its on the ground. Setting it to false will allow it to jump even if its already in the air",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "TODO title"
-    },
-    "yd": {
-      "type": "number",
-      "default": 0,
-      "description": "The height in blocks the mob jumps when leaping at its target",
-      "title": "TODO title"
-    }
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "TODO Title" },
+    "yd": { "type": "number", "default": 0, "description": "The height in blocks the mob jumps when leaping at its target", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
index 8f555a91..217fc7b7 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_entity.json
@@ -3,29 +3,14 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.look_at_entity",
   "description": "Allows the mob to look at nearby entities.",
   "type": "object",
-  "title": "Look at entity 1.8.0",
+  "title": "Look At Entity 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "look_distance": {
-      "type": "number",
-      "default": 8.0,
-      "description": "The distance in blocks from which the entity will look at",
-      "title": "Look Distance"
-    },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "description": "The probability of looking at the target. A value of 1.00 is 100%",
-      "title": "Probability"
-    },
-    "look_time": {
-      "$ref": "../types/range_number_type.json",
-      "default": [2, 4],
-      "description": "Time range to look at the entity",
-      "title": "Look Time"
-    },
+    "look_distance": { "type": "number", "default": 8.0, "description": "The distance in blocks from which the entity will look at", "title": "Look Distance" },
+    "probability": { "type": "number", "default": 0.02, "description": "The probability of looking at the target. A value of 1.00 is 100%", "title": "Probability" },
+    "look_time": { "$ref": "../types/range_number_type.json", "default": [2, 4], "description": "Time range to look at the entity", "title": "Look Time" },
     "angle_of_view_vertical": {
       "type": "integer",
       "default": 360,
@@ -38,10 +23,6 @@
       "description": "The angle in degrees that the mob can see in the Y-axis (up-down)",
       "title": "Angle Of View Horizontal"
     },
-    "filters": {
-      "description": "Filter to determine the conditions for this mob to look at the entity",
-      "$ref": "../filters.json",
-      "title": "Filters"
-    }
+    "filters": { "description": "Filter to determine the conditions for this mob to look at the entity", "$ref": "../filters.json", "title": "Filters" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_player.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_player.json
index d584cc55..55e8170a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_player.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_player.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.look_at_player",
   "type": "object",
-  "title": "Look at player 1.8.0",
+  "title": "Look At Player 1.8.0",
   "description": "Allows the mob to look at the player when the player is nearby.",
   "additionalProperties": false,
   "required": [],
@@ -20,37 +20,15 @@
       "description": "The angle in degrees that the mob can see in the Y-axis (up-down)",
       "title": "Angle Of View Horizontal"
     },
-    "look_distance": {
-      "type": "number",
-      "default": 8.0,
-      "description": "The distance in blocks from which the entity will look at",
-      "title": "Look Distance"
-    },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "minimum": 0,
-      "description": "The probability of looking at the target. A value of 1.00 is 100%",
-      "title": "Probability"
-    },
+    "look_distance": { "type": "number", "default": 8.0, "description": "The distance in blocks from which the entity will look at", "title": "Look Distance" },
+    "probability": { "type": "number", "default": 0.02, "minimum": 0, "description": "The probability of looking at the target. A value of 1.00 is 100%", "title": "Probability" },
     "look_time": {
       "type": "array",
       "default": [2, 4],
       "description": "Time range to look at the entity",
       "title": "Look Time",
-      "items": [
-        {
-          "type": "integer"
-        },
-        {
-          "type": "integer"
-        }
-      ]
+      "items": [{ "type": "integer" }, { "type": "integer" }]
     },
-    "target_distance": {
-      "type": "number",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    }
+    "target_distance": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_target.json
index c55603dd..cbc6504c 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_target.json
@@ -2,30 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.look_at_target",
   "type": "object",
-  "title": "Look at target 1.8.0",
+  "title": "Look At Target 1.8.0",
   "description": "Allows the mob to look at the entity they are targetting.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "look_distance": {
-      "type": "number",
-      "default": 8.0,
-      "description": "The distance in blocks from which the entity will look at",
-      "title": "Look Distance"
-    },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "description": "The probability of looking at the target. A value of 1.00 is 100%",
-      "title": "Probability"
-    },
-    "look_time": {
-      "$ref": "../types/range_number_type.json",
-      "default": [2, 4],
-      "description": "Time range to look at the entity",
-      "title": "Look Time"
-    },
+    "look_distance": { "type": "number", "default": 8.0, "description": "The distance in blocks from which the entity will look at", "title": "Look Distance" },
+    "probability": { "type": "number", "default": 0.02, "description": "The probability of looking at the target. A value of 1.00 is 100%", "title": "Probability" },
+    "look_time": { "$ref": "../types/range_number_type.json", "default": [2, 4], "description": "Time range to look at the entity", "title": "Look Time" },
     "angle_of_view_vertical": {
       "type": "integer",
       "default": 360,
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_trading_player.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_trading_player.json
index 8160ba58..9f70b599 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_trading_player.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.look_at_trading_player.json
@@ -2,30 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.look_at_trading_player",
   "type": "object",
-  "title": "Look at trading player 1.8.0",
+  "title": "Look At Trading Player 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to look at the player they are trading with.",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "look_distance": {
-      "type": "number",
-      "default": 8.0,
-      "description": "The distance in blocks from which the entity will look at",
-      "title": "Look Distance"
-    },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "description": "The probability of looking at the target. A value of 1.00 is 100%",
-      "title": "Probability"
-    },
-    "look_time": {
-      "$ref": "../types/range_number_type.json",
-      "default": [2, 4],
-      "description": "Time range to look at the entity",
-      "title": "Look Time"
-    },
+    "look_distance": { "type": "number", "default": 8.0, "description": "The distance in blocks from which the entity will look at", "title": "Look Distance" },
+    "probability": { "type": "number", "default": 0.02, "description": "The probability of looking at the target. A value of 1.00 is 100%", "title": "Probability" },
+    "look_time": { "$ref": "../types/range_number_type.json", "default": [2, 4], "description": "Time range to look at the entity", "title": "Look Time" },
     "angle_of_view_vertical": {
       "type": "integer",
       "default": 360,
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.make_love.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.make_love.json
index de4dd3b4..4185cc1a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.make_love.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.make_love.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.make_love",
   "description": "Allows the villager to look for a mate to spawn other villagers with. Can only be used by Villagers.",
   "type": "object",
-  "title": "Make love 1.8.0",
+  "title": "Make Love 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json
index aa9b9bb0..5f2b5f5e 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json
@@ -2,35 +2,22 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.melee_attack",
   "type": "object",
-  "title": "Melee attack 1.8.0",
+  "title": "Melee Attack 1.8.0",
   "description": "Allows the mob to use close combat melee attacks.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "title": "Cooldown time",
-      "description": "UNDOCUMENTATED"
-    },
+    "cooldown_time": { "type": "number", "title": "Cooldown Time", "description": "UNDOCUMENTATED" },
     "melee_fov": {
       "type": "number",
       "default": 90.0,
       "description": "The allowable FOV the actor will use to determine if it can make a valid melee attack",
       "title": "Melee Fov"
     },
-    "track_target": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will chase after the target as long as it's a valid target",
-      "title": "Track Target"
-    },
-    "attack_types": {
-      "type": "string",
-      "description": "Defines the entity types this mob will attack",
-      "title": "Attack Types"
-    },
+    "track_target": { "type": "boolean", "default": false, "description": "If true, this mob will chase after the target as long as it's a valid target", "title": "Track Target" },
+    "attack_types": { "type": "string", "description": "Defines the entity types this mob will attack", "title": "Attack Types" },
     "random_stop_interval": {
       "type": "integer",
       "default": 0,
@@ -43,18 +30,13 @@
       "description": "Multiplier for how far outside its box the mob can reach its target (this can be used to simulate a mob with longer arms by making this bigger)",
       "title": "Reach Multiplier"
     },
-    "attack_once": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will attack only one time.",
-      "title": "Attack Once"
-    },
+    "attack_once": { "type": "boolean", "default": false, "description": "If true, this mob will attack only one time.", "title": "Attack Once" },
     "require_complete_path": {
       "type": "boolean",
       "default": false,
       "description": "If true, this goal will only trigger if the mob can reach its target.",
       "title": "Require Complete Path"
     },
-    "on_attack": { "$ref": "../types/event.json", "title": "On attack", "description": "UNDOCUMENTATED" }
+    "on_attack": { "$ref": "../types/event.json", "title": "On Attack", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mingle.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mingle.json
index 3f63720e..bc062e82 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mingle.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mingle.json
@@ -9,39 +9,18 @@
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    },
-    "duration": {
-      "type": "number",
-      "default": 1,
-      "description": "Amount of time in seconds that the entity will chat with another entity",
-      "title": "Duration"
-    },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" },
+    "duration": { "type": "number", "default": 1, "description": "Amount of time in seconds that the entity will chat with another entity", "title": "Duration" },
     "mingle_distance": {
       "type": "number",
       "default": 2.0,
       "description": "The distance from its partner that this entity will mingle. If the entity type is not the same as the entity, this value needs to be identical on both entities.",
-      "title": "Mingle distance"
+      "title": "Mingle Distance"
     },
     "mingle_partner_type": {
       "description": "The entity type that this entity is allowed to mingle with",
-      "title": "Mingle partner type",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "description": "The entity type that this entity is allowed to mingle with",
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ]
+      "title": "Mingle Partner Type",
+      "oneOf": [{ "type": "array", "items": { "description": "The entity type that this entity is allowed to mingle with", "type": "string" } }, { "type": "string" }]
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mount_pathing.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mount_pathing.json
index 10c0bcaf..29e8a964 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mount_pathing.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.mount_pathing.json
@@ -2,24 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.mount_pathing",
   "type": "object",
-  "title": "Mount pathing 1.8.0",
+  "title": "Mount Pathing 1.8.0",
   "description": "Allows the mob to move around on its own while mounted seeking a target to attack.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "target_dist": {
-      "type": "number",
-      "default": 0.0,
-      "description": "The distance at which this mob wants to be away from its target",
-      "title": "Target Dist"
-    },
-    "track_target": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will chase after the target as long as it's a valid target",
-      "title": "Track Target"
-    }
+    "target_dist": { "type": "number", "default": 0.0, "description": "The distance at which this mob wants to be away from its target", "title": "Target Dist" },
+    "track_target": { "type": "boolean", "default": false, "description": "If true, this mob will chase after the target as long as it's a valid target", "title": "Track Target" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json
index 4913390b..6e12bc73 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_indoors.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_indoors",
   "description": "Can only be used by Villagers. Allows them to seek shelter indoors.",
   "type": "object",
-  "title": "Move indoors 1.8.0",
+  "title": "Move Indoors 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -13,7 +13,7 @@
       "type": "number",
       "default": 8,
       "description": "The cooldown time in seconds before the goal can be reused after a internal failure or timeout condition",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_through_village.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_through_village.json
index ee7b1d52..57ff58ff 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_through_village.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_through_village.json
@@ -2,18 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_through_village",
   "type": "object",
-  "title": "Move through village 1.8.0",
+  "title": "Move Through Village 1.8.0",
   "description": "Can only be used by Villagers. Allows the villagers to create paths around the village.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "only_at_night": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will only move through the village during night time",
-      "title": "Only At Night"
-    }
+    "only_at_night": { "type": "boolean", "default": false, "description": "If true, the mob will only move through the village during night time", "title": "Only At Night" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_block.json
index abc2d43f..407d57b1 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_block.json
@@ -2,86 +2,22 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_block",
   "type": "object",
-  "title": "Move to block 1.8.0",
+  "title": "Move To Block 1.8.0",
   "additionalProperties": false,
   "description": "UNDOCUMENTATED",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "tick_interval": {
-      "type": "number",
-      "title": "Tick interval",
-      "description": "UNDOCUMENTATED"
-    },
-    "start_chance": {
-      "type": "number",
-      "title": "Start chance",
-      "description": "UNDOCUMENTATED"
-    },
-    "search_range": {
-      "type": "number",
-      "title": "Search range",
-      "description": "UNDOCUMENTATED"
-    },
-    "search_height": {
-      "type": "number",
-      "title": "Search height",
-      "description": "UNDOCUMENTATED"
-    },
-    "goal_radius": {
-      "type": "number",
-      "title": "Goal radius",
-      "description": "UNDOCUMENTATED"
-    },
-    "stay_duration": {
-      "type": "number",
-      "title": "Stay duration",
-      "description": "UNDOCUMENTATED"
-    },
-    "target_selection_method": {
-      "type": "string",
-      "title": "Target selection method",
-      "description": "UNDOCUMENTATED"
-    },
-    "target_offset": {
-      "type": "array",
-      "title": "Target offset",
-      "description": "UNDOCUMENTATED",
-      "items": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "number"
-        },
-        {
-          "type": "number"
-        }
-      ]
-    },
-    "target_blocks": {
-      "type": "array",
-      "title": "Target blocks",
-      "description": "UNDOCUMENTATED",
-      "items": {
-        "type": "string"
-      }
-    },
-    "on_stay_completed": {
-      "type": "array",
-      "title": "On stay completed",
-      "description": "UNDOCUMENTATED",
-      "items": {
-        "$ref": "../types/event.json"
-      }
-    },
-    "on_reach": {
-      "type": "array",
-      "title": "On reach",
-      "description": "UNDOCUMENTATED",
-      "items": {
-        "$ref": "../types/event.json"
-      }
-    }
+    "tick_interval": { "type": "number", "title": "Tick Interval", "description": "UNDOCUMENTATED" },
+    "start_chance": { "type": "number", "title": "Start Chance", "description": "UNDOCUMENTATED" },
+    "search_range": { "type": "number", "title": "Search Range", "description": "UNDOCUMENTATED" },
+    "search_height": { "type": "number", "title": "Search Height", "description": "UNDOCUMENTATED" },
+    "goal_radius": { "type": "number", "title": "Goal Radius", "description": "UNDOCUMENTATED" },
+    "stay_duration": { "type": "number", "title": "Stay Duration", "description": "UNDOCUMENTATED" },
+    "target_selection_method": { "type": "string", "title": "Target Selection Method", "description": "UNDOCUMENTATED" },
+    "target_offset": { "type": "array", "title": "Target Offset", "description": "UNDOCUMENTATED", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+    "target_blocks": { "type": "array", "title": "Target Blocks", "description": "UNDOCUMENTATED", "items": { "type": "string" } },
+    "on_stay_completed": { "type": "array", "title": "On Stay Completed", "description": "UNDOCUMENTATED", "items": { "$ref": "../types/event.json" } },
+    "on_reach": { "type": "array", "title": "On Reach", "description": "UNDOCUMENTATED", "items": { "$ref": "../types/event.json" } }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json
index 5cd6a452..9c5163ae 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_land.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_land",
   "description": "Allows the mob to move back onto land when in water.",
   "type": "object",
-  "title": "Move to land 1.8.0",
+  "title": "Move To Land 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -13,25 +13,15 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "search_count": {
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for land to move towards",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for land to move towards",
-      "title": "TODO title"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for land to move towards", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for land to move towards", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_lava.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_lava.json
index ec884cba..5db0998c 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_lava.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_lava.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_lava",
   "type": "object",
-  "title": "Move to lava 1.8.0",
+  "title": "Move To Lava 1.8.0",
   "description": "Allows the mob to move back into lava when on land.",
   "additionalProperties": false,
   "properties": {
@@ -12,25 +12,15 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "search_count": {
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "Search count"
+      "title": "Search Count"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for lava to move towards",
-      "title": "Search height"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for lava to move towards",
-      "title": "Search range"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for lava to move towards", "title": "Search Height" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for lava to move towards", "title": "Search Range" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_liquid.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_liquid.json
index f6dbb222..ffadc3b6 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_liquid.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_liquid.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_liquid",
   "type": "object",
-  "title": "Move to liquid 1.8.0",
+  "title": "Move To Liquid 1.8.0",
   "description": "Allows the mob to move back into lava when on land.",
   "additionalProperties": false,
   "properties": {
@@ -12,30 +12,16 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "search_count": {
       "type": "integer",
       "default": 10,
       "description": "The number of blocks each tick that the mob will check within it's search range and height for a valid block to move to. A value of 0 will have the mob check every block within range in one tick",
-      "title": "Search count"
+      "title": "Search Count"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for lava to move towards",
-      "title": "Search height"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for lava to move towards",
-      "title": "Search range"
-    },
-    "material_type": {
-      "title": "Material type",
-      "description": "UNDOCUMENTAED, examples are : Lava",
-      "type": "string"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for lava to move towards", "title": "Search Height" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for lava to move towards", "title": "Search Range" },
+    "material_type": { "title": "Material Type", "description": "UNDOCUMENTAED, examples are : Lava", "type": "string" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json
index 65509252..04853313 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_poi.json
@@ -2,17 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_poi",
   "type": "object",
-  "title": "Move to poi 1.8.0",
+  "title": "Move To Poi 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to move to a POI if able to",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "poi_type": {
-      "type": "string",
-      "description": "Tells the goal what POI type it should be looking for",
-      "title": "TODO title"
-    }
+    "poi_type": { "type": "string", "description": "Tells the goal what POI type it should be looking for", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json
index 8a850e1c..54580baa 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_random_block.json
@@ -2,26 +2,24 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_random_block",
   "type": "object",
-  "title": "Move to random block 1.8.0",
+  "title": "Move To Random Block 1.8.0",
   "description": "Allows mob to move towards a random block.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "speed_multiplier": {
-      "$ref": "types/base_speed_multiplier.json"
-    },
+    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
     "block_distance": {
       "type": "number",
       "default": 16,
       "description": "Defines the distance from the mob, in blocks, that the block to move to will be chosen.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "within_radius": {
       "type": "number",
       "default": 0,
       "description": "Defines the distance in blocks the mob has to be from the block for the movement to be finished.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_village.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_village.json
index 63c6274a..c62c147b 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_village.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_village.json
@@ -2,30 +2,25 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_village",
   "type": "object",
-  "title": "Move to village 1.8.0",
+  "title": "Move To Village 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to move into a random location within a village.",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "TODO title"
-    },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "TODO Title" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "search_range": {
       "type": "integer",
       "default": 0,
       "description": "The distance in blocks to search for villages. If <= 0, find the closest village regardless of distance.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_water.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_water.json
index 56e52618..abf7fac5 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_water.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_to_water.json
@@ -2,25 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_to_water",
   "type": "object",
-  "title": "Move to water 1.8.0",
+  "title": "Move To Water 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to move back into water when on land.",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for water to move towards",
-      "title": "Search Range"
-    },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for water to move towards",
-      "title": "Search Height"
-    },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for water to move towards", "title": "Search Range" },
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for water to move towards", "title": "Search Height" },
     "search_count": {
       "type": "integer",
       "default": 10,
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json
index 60d84d5b..ce144b13 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_dwelling_restriction.json
@@ -2,12 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_towards_dwelling_restriction",
   "type": "object",
-  "title": "Move towards dwelling restriction 1.8.0",
+  "title": "Move Towards Dwelling Restriction 1.8.0",
   "additionalProperties": false,
   "description": "UNDOCUMENTATED, comes from cat",
   "required": [],
-  "properties": {
-    "priority": { "$ref": "types/base_priority.json" },
-    "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json
index 7aed47fa..8de482de 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_restriction.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.move_towards_restriction",
   "type": "object",
-  "title": "Move towards restriction 1.8.0",
+  "title": "Move Towards Restriction 1.8.0",
   "additionalProperties": false,
   "description": "Allows Guardians, Iron Golems and Villagers to move within their pre-defined area that the mob should be restricted to. Other mobs don't have a restriction defined.",
   "required": [],
@@ -11,12 +11,7 @@
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
     "control_flags": {
       "type": "array",
-      "items": {
-        "type": "string",
-        "enum": ["move", "look"],
-        "description": "TODO description: control flags",
-        "title": "Control Flags"
-      },
+      "items": { "type": "string", "enum": ["move", "look"], "description": "TODO description: control flags", "title": "Control Flags" },
       "description": "TODO description: control flags",
       "title": "Control Flags"
     }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_target.json
index 38161513..314c7961 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.move_towards_target.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.guardian_attack",
   "type": "object",
-  "title": "Guardian attack 1.8.0",
+  "title": "Guardian Attack 1.8.0",
   "additionalProperties": false,
   "description": "Allows mob to move towards its current target.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nap.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nap.json
index af8d5791..f369c527 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nap.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nap.json
@@ -8,29 +8,19 @@
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_max": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown max"
-    },
-    "cooldown_min": {
-      "type": "number",
-      "default": 0,
-      "description": "Minimum time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown min"
-    },
+    "cooldown_max": { "type": "number", "default": 0, "description": "Maximum time in seconds the mob has to wait before using the goal again", "title": "Cooldown Max" },
+    "cooldown_min": { "type": "number", "default": 0, "description": "Minimum time in seconds the mob has to wait before using the goal again", "title": "Cooldown Min" },
     "mob_detect_dist": {
       "type": "number",
       "default": 6,
       "description": "The block distance in x and z that will be checked for mobs that this mob detects",
-      "title": "Mob detect dist"
+      "title": "Mob Detect Dist"
     },
     "mob_detect_height": {
       "type": "number",
       "default": 6,
       "description": "The block distance in y that will be checked for mobs that this mob detects",
-      "title": "Mob detect height"
+      "title": "Mob Detect Height"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json
index 1d1c877e..4b9e6032 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_attackable_target.json
@@ -2,70 +2,41 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.nearest_attackable_target",
   "type": "object",
-  "title": "Nearest attackable target 1.8.0",
+  "title": "Nearest Attackable Target 1.8.0",
   "description": "Allows the mob to check for and pursue the nearest valid target.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "description": "List of entity types that this mob considers valid targets",
-      "$ref": "../types/entity_types.json",
-      "title": "TODO title"
-    },
-    "attack_interval": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time in seconds between attacks",
-      "title": "TODO title"
-    },
-    "must_reach": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities that this mob can path to can be selected as targets",
-      "title": "TODO title"
-    },
-    "must_see": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities in this mob's viewing range can be selected as targets",
-      "title": "TODO title"
-    },
+    "entity_types": { "description": "List of entity types that this mob considers valid targets", "$ref": "../types/entity_types.json", "title": "TODO Title" },
+    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds between attacks", "title": "TODO Title" },
+    "must_reach": { "type": "boolean", "default": false, "description": "If true, only entities that this mob can path to can be selected as targets", "title": "TODO Title" },
+    "must_see": { "type": "boolean", "default": false, "description": "If true, only entities in this mob's viewing range can be selected as targets", "title": "TODO Title" },
     "must_see_forget_duration": {
       "type": "number",
       "default": 3,
       "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "persist_time": {
       "type": "number",
       "default": 0.0,
       "description": "Time in seconds for a valid target to stay targeted when it becomes and invalid target.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "reselect_targets": {
       "type": "boolean",
       "default": false,
       "description": "If true, the target will change to the current closest entity whenever a different entity is closer",
-      "title": "TODO title"
-    },
-    "scan_interval": {
-      "type": "integer",
-      "default": 10,
-      "description": "How many ticks to wait between scanning for a target.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "scan_interval": { "type": "integer", "default": 10, "description": "How many ticks to wait between scanning for a target.", "title": "TODO Title" },
     "target_search_height": {
       "type": "number",
       "default": -1.0,
       "description": "Height in blocks to search for a target mob. -1.0f means the height does not matter.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that the target can be within to launch an attack",
-      "title": "TODO title"
-    }
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that the target can be within to launch an attack", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
index fb4e7459..aa9e819b 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.nearest_prioritized_attackable_target.json
@@ -2,76 +2,42 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.nearest_prioritized_attackable_target",
   "type": "object",
-  "title": "Nearest prioritized attackable target 1.8.0",
+  "title": "Nearest Prioritized Attackable Target 1.8.0",
   "description": "Allows the mob to check for and pursue the nearest valid target.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "description": "List of entity types that this mob considers valid targets",
-      "title": "Entity types",
-      "$ref": "../types/entity_types.json"
-    },
-    "attack_interval": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time in seconds before selecting a target",
-      "title": "Attack interval"
-    },
-    "must_reach": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities that this mob can path to can be selected as targets",
-      "title": "Must reach"
-    },
-    "must_see": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only entities in this mob's viewing range can be selected as targets",
-      "title": "Must see"
-    },
+    "entity_types": { "description": "List of entity types that this mob considers valid targets", "title": "Entity Types", "$ref": "../types/entity_types.json" },
+    "attack_interval": { "type": "integer", "default": 0, "description": "Time in seconds before selecting a target", "title": "Attack Interval" },
+    "must_reach": { "type": "boolean", "default": false, "description": "If true, only entities that this mob can path to can be selected as targets", "title": "Must Reach" },
+    "must_see": { "type": "boolean", "default": false, "description": "If true, only entities in this mob's viewing range can be selected as targets", "title": "Must See" },
     "must_see_forget_duration": {
       "type": "number",
       "default": 3,
       "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
-      "title": "Must see forget duration"
+      "title": "Must See Forget Duration"
     },
     "persist_time": {
       "type": "number",
       "default": 0.0,
       "description": "Time in seconds for a valid target to stay targeted when it becomes and invalid target.",
-      "title": "Persist time"
+      "title": "Persist Time"
     },
     "reselect_targets": {
       "type": "boolean",
       "default": false,
       "description": "If true, the target will change to the current closest entity whenever a different entity is closer",
-      "title": "Reselect targets"
-    },
-    "scan_interval": {
-      "type": "integer",
-      "default": 10,
-      "description": "How many ticks to wait between scanning for a target.",
-      "title": "Scan interval"
-    },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "Set persistent"
+      "title": "Reselect Targets"
     },
+    "scan_interval": { "type": "integer", "default": 10, "description": "How many ticks to wait between scanning for a target.", "title": "Scan Interval" },
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "Set Persistent" },
     "target_search_height": {
       "type": "number",
       "default": -1.0,
       "description": "Height in blocks to search for a target mob. -1.0f means the height does not matter.",
-      "title": "Target search height"
+      "title": "Target Search Height"
     },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that the target can be within to launch an attack",
-      "title": "Within radius"
-    }
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that the target can be within to launch an attack", "title": "Within Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json
index 31949286..46b7cf50 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json
@@ -4,12 +4,7 @@
   "additionalProperties": false,
   "description": "TODO description",
   "type": "object",
-  "title": "Ocelot sit on block 1.8.0",
+  "title": "Ocelot Sit On Block 1.8.0",
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelotattack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelotattack.json
index c8aef73b..6ff9f887 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelotattack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ocelotattack.json
@@ -8,12 +8,7 @@
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "walk_speed_multiplier": {
-      "type": "number",
-      "default": 1.0,
-      "description": "Multiplier for the walking speed while using this attack",
-      "title": "Walk Speed Multiplier"
-    },
+    "walk_speed_multiplier": { "type": "number", "default": 1.0, "description": "Multiplier for the walking speed while using this attack", "title": "Walk Speed Multiplier" },
     "sprint_speed_multiplier": {
       "type": "number",
       "default": 1.0,
@@ -26,40 +21,12 @@
       "description": "Multiplier for the sneaking speed. 1.0 means the ocelot will move at the speed it normally sneaks",
       "title": "Sneak Speed Multiplier"
     },
-    "cooldown_time": {
-      "type": "number",
-      "title": "Cooldown time",
-      "description": "UNDOCUMENTATED"
-    },
-    "x_max_rotation": {
-      "type": "number",
-      "title": "X max rotation",
-      "description": "UNDOCUMENTATED"
-    },
-    "y_max_head_rotation": {
-      "type": "number",
-      "title": "Y max head rotation",
-      "description": "UNDOCUMENTATED"
-    },
-    "max_distance": {
-      "type": "number",
-      "title": "Max distance",
-      "description": "UNDOCUMENTATED"
-    },
-    "max_sneak_range": {
-      "type": "number",
-      "title": "Max sneak range",
-      "description": "UNDOCUMENTATED"
-    },
-    "max_sprint_range": {
-      "type": "number",
-      "title": "Max sprint range",
-      "description": "UNDOCUMENTATED"
-    },
-    "reach_multiplier": {
-      "type": "number",
-      "title": "Reach multiplier",
-      "description": "UNDOCUMENTATED"
-    }
+    "cooldown_time": { "type": "number", "title": "Cooldown Time", "description": "UNDOCUMENTATED" },
+    "x_max_rotation": { "type": "number", "title": "X Max Rotation", "description": "UNDOCUMENTATED" },
+    "y_max_head_rotation": { "type": "number", "title": "Y Max Head Rotation", "description": "UNDOCUMENTATED" },
+    "max_distance": { "type": "number", "title": "Max Distance", "description": "UNDOCUMENTATED" },
+    "max_sneak_range": { "type": "number", "title": "Max Sneak Range", "description": "UNDOCUMENTATED" },
+    "max_sprint_range": { "type": "number", "title": "Max Sprint Range", "description": "UNDOCUMENTATED" },
+    "reach_multiplier": { "type": "number", "title": "Reach Multiplier", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.offer_flower.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.offer_flower.json
index c83bb012..7aa35fcc 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.offer_flower.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.offer_flower.json
@@ -2,11 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.offer_flower",
   "type": "object",
-  "title": "Offer flower 1.8.0",
+  "title": "Offer Flower 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to offer the player a flower like the Iron Golem does.",
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.open_door.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.open_door.json
index 0ee2890f..7124dbda 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.open_door.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.open_door.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.guardian_attack",
   "type": "object",
-  "title": "Guardian attack 1.8.0",
+  "title": "Guardian Attack 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to open doors. Requires the mob to be able to path through doors, otherwise the mob won't even want to try opening them.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_by_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_by_target.json
index 5eef79dc..9fabf4b2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_by_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_by_target.json
@@ -2,16 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.owner_hurt_by_target",
   "type": "object",
-  "title": "Owner hurt by target 1.8.0",
+  "title": "Owner Hurt By Target 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to target another mob that hurts their owner.",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "$ref": "../types/entity_types.json",
-      "description": "List of entity types that this mob can target if they hurt their owner",
-      "title": "TODO title"
-    }
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entity types that this mob can target if they hurt their owner", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_target.json
index 40476c57..9c1f6c54 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.owner_hurt_target.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.owner_hurt_target",
   "type": "object",
-  "title": "Owner hurt target 1.8.0",
+  "title": "Owner Hurt Target 1.8.0",
   "additionalProperties": false,
   "description": "Allows the mob to target a mob that is hurt by their owner.",
   "required": [],
@@ -11,7 +11,7 @@
     "entity_types": {
       "$ref": "../types/entity_types.json",
       "description": "List of entity types that this entity can target if the potential target is hurt by this mob's owner",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.panic.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.panic.json
index a7e1c598..1be1658a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.panic.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.panic.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.panic",
   "description": "Allows the mob to enter the panic state, which makes it run around and away from the damage source that made it enter this state.",
   "type": "object",
-  "title": "panic 1.8.0",
+  "title": "Panic 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -11,50 +11,31 @@
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
     "damage_sources": {
       "type": "array",
-      "items": {
-        "$ref": "../../../../general/entity_damage.json"
-      },
+      "items": { "$ref": "../../../../general/entity_damage.json" },
       "description": "The list of Entity Damage Sources that will cause this mob to panic",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "force": {
       "type": "boolean",
       "default": false,
       "description": "If true, this mob will not stop panicking until it can't move anymore or the goal is removed from it",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "ignore_mob_damage": {
       "type": "boolean",
       "default": false,
       "description": "If true, the mob will not panic in response to damage from other mobs. This overrides the damage types in \"damage_sources\"",
-      "title": "TODO title"
-    },
-    "prefer_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the mob will prefer water over land",
-      "title": "TODO title"
-    },
-    "panic_sound": {
-      "type": "string",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
+      "title": "TODO Title"
     },
+    "prefer_water": { "type": "boolean", "default": false, "description": "If true, the mob will prefer water over land", "title": "TODO Title" },
+    "panic_sound": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
     "sound_interval": {
       "type": "object",
       "description": "UNDOCUMENTATED",
       "title": "UNDOCUMENTATED",
       "properties": {
-        "range_min": {
-          "type": "number",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        },
-        "range_max": {
-          "type": "number",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "range_min": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+        "range_max": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       },
       "additionalProperties": false
     }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.peek.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.peek.json
index cf48d35e..d8290b13 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.peek.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.peek.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.peek",
   "description": "Allows the mob to peek out. This is what the shulker uses to look out of its shell.",
   "type": "object",
-  "title": "peek 1.8.0",
+  "title": "Peek 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
index 227bb7d2..65881cdb 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pet_sleep_with_owner.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.pet_sleep_with_owner",
   "description": "Allows the pet mob to move onto a bed with it's owner while sleeping.",
   "type": "object",
-  "title": "pet sleep with owner 1.8.0",
+  "title": "Pet Sleep With Owner 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -13,19 +13,9 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks from the owner the pet can be to sleep with owner.",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks from the owner the pet can be to sleep with owner.",
-      "title": "TODO title"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks from the owner the pet can be to sleep with owner.", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks from the owner the pet can be to sleep with owner.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pickup_items.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pickup_items.json
index 8cae2f1a..6c697085 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pickup_items.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.pickup_items.json
@@ -4,7 +4,7 @@
   "description": "Allows the mob to pick up items on the ground.",
   "additionalProperties": false,
   "type": "object",
-  "title": "pickup items 1.8.0",
+  "title": "Pickup Items 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
@@ -13,19 +13,9 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "max_dist": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum distance this mob will look for items to pick up",
-      "title": "TODO title"
-    },
-    "track_target": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will chase after the target as long as it's a valid target",
-      "title": "TODO title"
-    }
+    "max_dist": { "type": "number", "default": 0, "description": "Maximum distance this mob will look for items to pick up", "title": "TODO Title" },
+    "track_target": { "type": "boolean", "default": false, "description": "If true, this mob will chase after the target as long as it's a valid target", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.play.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.play.json
index adfa6427..dfe78ca9 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.play.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.play.json
@@ -3,15 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.play",
   "description": "Allows the mob to play with other baby villagers. This can only be used by Villagers.",
   "type": "object",
-  "title": "play 1.8.0",
+  "title": "Play 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": {
-      "$ref": "types/base_speed_multiplier.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.player_ride_tamed.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.player_ride_tamed.json
index a057314b..f693d5de 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.player_ride_tamed.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.player_ride_tamed.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.player_ride_tamed",
   "description": "Allows the mob to be ridden by the player after being tamed.",
   "type": "object",
-  "title": "player ride tamed 1.8.0",
+  "title": "Player Ride Tamed 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json
index 87525977..71de6ab5 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json
@@ -4,7 +4,7 @@
   "description": "Allows the mob to eat/raid crops out of farms until they are full.",
   "additionalProperties": false,
   "type": "object",
-  "title": "Raid garden 1.8.0",
+  "title": "Raid Garden 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
@@ -12,55 +12,20 @@
     "blocks": {
       "type": "array",
       "description": "Blocks that the mob is looking for to eat",
-      "items": {
-        "type": "string",
-        "title": "Block id",
-        "description": "A block identifier",
-        "pattern": "[0-9:a-z_]+"
-      },
-      "title": "TODO title"
-    },
-    "eat_delay": {
-      "type": "integer",
-      "default": 2,
-      "description": "Time in seconds between each time it eats",
-      "title": "TODO title"
-    },
-    "full_delay": {
-      "type": "integer",
-      "default": 100,
-      "description": "Amount of time in seconds before this mob wants to eat again",
-      "title": "TODO title"
-    },
-    "initial_eat_delay": {
-      "type": "integer",
-      "default": 0,
-      "description": "Time in seconds before starting to eat/raid once it arrives at it",
-      "title": "Initial eat delay"
+      "items": { "type": "string", "title": "Block Id", "description": "A block identifier", "pattern": "[0-9:a-z_]+" },
+      "title": "TODO Title"
     },
+    "eat_delay": { "type": "integer", "default": 2, "description": "Time in seconds between each time it eats", "title": "TODO Title" },
+    "full_delay": { "type": "integer", "default": 100, "description": "Amount of time in seconds before this mob wants to eat again", "title": "TODO Title" },
+    "initial_eat_delay": { "type": "integer", "default": 0, "description": "Time in seconds before starting to eat/raid once it arrives at it", "title": "Initial Eat Delay" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "max_to_eat": {
-      "type": "integer",
-      "default": 6,
-      "description": "Maximum number of things this entity wants to eat",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "Distance in blocks the mob will look for crops to eat",
-      "title": "TODO title"
-    },
-    "search_height": {
-      "type": "integer",
-      "default": 0,
-      "description": "UNDOCUMENTATED",
-      "title": "TODO title"
-    }
+    "max_to_eat": { "type": "integer", "default": 6, "description": "Maximum number of things this entity wants to eat", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "Distance in blocks the mob will look for crops to eat", "title": "TODO Title" },
+    "search_height": { "type": "integer", "default": 0, "description": "UNDOCUMENTATED", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_breach.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_breach.json
index f19429f8..bddadef7 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_breach.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_breach.json
@@ -3,35 +3,30 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.player_ride_tamed",
   "description": "Allows the mob to randomly break surface of the water.",
   "type": "object",
-  "title": "player ride tamed 1.8.0",
+  "title": "Player Ride Tamed 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "TODO title"
-    },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "TODO Title" },
     "interval": {
       "type": "integer",
       "default": 120,
       "description": "A random value to determine when to randomly move somewhere. This has a 1/interval chance to choose this goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "xz_dist": {
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_fly.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_fly.json
index 35b06365..d1537e08 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_fly.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_fly.json
@@ -3,30 +3,23 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.random_fly",
   "description": "Allows a mob to randomly fly around",
   "type": "object",
-  "title": "Random fly 1.8.0",
+  "title": "Random Fly 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "can_land_on_trees": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the mob can stop flying and land on a tree instead of the ground",
-      "title": "TODO title"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "can_land_on_trees": { "type": "boolean", "default": true, "description": "If true, the mob can stop flying and land on a tree instead of the ground", "title": "TODO Title" },
     "xz_dist": {
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_hover.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_hover.json
index e75d6dc5..c5531d23 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_hover.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_hover.json
@@ -3,25 +3,13 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.random_hover",
   "description": "Allows the mob to hover around randomly, close to the surface",
   "type": "object",
-  "title": "Random hover 1.8.0",
+  "title": "Random Hover 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "hover_height": {
-      "type": "array",
-      "description": "UNDOCUMENTATED",
-      "title": "Hover height",
-      "items": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "number"
-        }
-      ]
-    },
+    "hover_height": { "type": "array", "description": "UNDOCUMENTATED", "title": "Hover Height", "items": [{ "type": "number" }, { "type": "number" }] },
     "interval": {
       "type": "integer",
       "default": 120,
@@ -32,19 +20,14 @@
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "Xz dist"
+      "title": "Xz Dist"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "Y dist"
+      "title": "Y Dist"
     },
-    "y_offset": {
-      "type": "number",
-      "default": 0,
-      "description": "Height in blocks to add to the selected target position",
-      "title": "Y offset"
-    }
+    "y_offset": { "type": "number", "default": 0, "description": "Height in blocks to add to the selected target position", "title": "Y Offset" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json
index 244a11d7..288f1255 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json
@@ -4,7 +4,7 @@
   "additionalProperties": false,
   "description": "Allows the mob to randomly look around.",
   "type": "object",
-  "title": "Random look around 1.8.0",
+  "title": "Random Look Around 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
@@ -12,12 +12,8 @@
       "$ref": "../types/range_number_type.json",
       "default": [2, 4],
       "description": "The range of time in seconds the mob will stay looking in a random direction before looking elsewhere",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "look_distance": {
-      "type": "number",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED"
-    }
+    "look_distance": { "type": "number", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around_and_sit.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
index 899d70c6..9b67c970 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_look_around_and_sit.json
@@ -3,42 +3,25 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.random_look_around_and_sit",
   "description": "Allows the mob to randomly sit and look around for a duration. Note: Must have a sitting animation set up to use this.",
   "type": "object",
-  "title": "Random look around and sit 1.8.0",
+  "title": "Random Look Around And Sit 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "max_look_count": {
-      "type": "integer",
-      "default": 2,
-      "description": "The max amount of unique looks a mob will have while looking around.",
-      "title": "Max look count"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "max_look_count": { "type": "integer", "default": 2, "description": "The max amount of unique looks a mob will have while looking around.", "title": "Max Look Count" },
     "max_look_time": {
       "type": "integer",
       "default": 40,
       "description": "The max amount of time (in ticks) a mob will stay looking at a direction while looking around.",
-      "title": "Max look time"
-    },
-    "min_look_count": {
-      "type": "integer",
-      "default": 1,
-      "description": "The min amount of unique looks a mob will have while looking around.",
-      "title": "Min look count"
+      "title": "Max Look Time"
     },
+    "min_look_count": { "type": "integer", "default": 1, "description": "The min amount of unique looks a mob will have while looking around.", "title": "Min Look Count" },
     "min_look_time": {
       "type": "integer",
       "default": 20,
       "description": "The min amount of time (in ticks) a mob will stay looking at a direction while looking around.",
-      "title": "Min look time"
+      "title": "Min Look Time"
     },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "description": "The probability of randomly looking around/sitting.",
-      "title": "Probability"
-    }
+    "probability": { "type": "number", "default": 0.02, "description": "The probability of randomly looking around/sitting.", "title": "Probability" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_sitting.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_sitting.json
index 84076e19..a54cca55 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_sitting.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_sitting.json
@@ -2,42 +2,17 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.random_sitting",
   "type": "object",
-  "title": "Random sitting 1.8.0",
+  "title": "Random Sitting 1.8.0",
   "description": "Allows the mob to randomly sit for a duration.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown"
-    },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    },
-    "min_sit_time": {
-      "type": "number",
-      "default": 10,
-      "description": "The minimum amount of time in seconds before the mob can stand back up",
-      "title": "Min sit time"
-    },
-    "start_chance": {
-      "type": "number",
-      "default": 0.1,
-      "description": "This is the chance that the mob will start this goal, from 0 to 1",
-      "title": "Start chance"
-    },
-    "stop_chance": {
-      "type": "number",
-      "default": 0.3,
-      "description": "This is the chance that the mob will stop this goal, from 0 to 1",
-      "title": "Stop chance"
-    }
+    "cooldown": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown" },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" },
+    "min_sit_time": { "type": "number", "default": 10, "description": "The minimum amount of time in seconds before the mob can stand back up", "title": "Min Sit Time" },
+    "start_chance": { "type": "number", "default": 0.1, "description": "This is the chance that the mob will start this goal, from 0 to 1", "title": "Start Chance" },
+    "stop_chance": { "type": "number", "default": 0.3, "description": "This is the chance that the mob will stop this goal, from 0 to 1", "title": "Stop Chance" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_stroll.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_stroll.json
index 715011b7..53d9b92e 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_stroll.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_stroll.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.random_stroll",
   "description": "Allows a mob to randomly stroll around.",
   "type": "object",
-  "title": "Random stroll 1.8.0",
+  "title": "Random Stroll 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
@@ -12,19 +12,19 @@
       "type": "integer",
       "default": 120,
       "description": "A random value to determine when to randomly move somewhere. This has a 1/interval chance to choose this goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "xz_dist": {
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   },
   "additionalProperties": false
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_swim.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_swim.json
index c6558fe4..d5602638 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_swim.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.random_swim.json
@@ -2,35 +2,30 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.random_swim",
   "type": "object",
-  "title": "Random swim 1.8.0",
+  "title": "Random Swim 1.8.0",
   "description": "Allows an entity to randomly move through water",
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "avoid_surface": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the mob will avoid surface water blocks by swimming below them",
-      "title": "TODO title"
-    },
+    "avoid_surface": { "type": "boolean", "default": true, "description": "If true, the mob will avoid surface water blocks by swimming below them", "title": "TODO Title" },
     "interval": {
       "type": "integer",
       "default": 120,
       "description": "A random value to determine when to randomly move somewhere. This has a 1/interval chance to choose this goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "xz_dist": {
       "type": "integer",
       "default": 10,
       "description": "Distance in blocks on ground that the mob will look for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "y_dist": {
       "type": "integer",
       "default": 7,
       "description": "Distance in blocks that the mob will look up or down for a new spot to move to. Must be at least 1",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   },
   "additionalProperties": false
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ranged_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ranged_attack.json
index 5d61d1c5..04988da2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ranged_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.ranged_attack.json
@@ -3,75 +3,57 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.ranged_attack",
   "description": "Allows the mob to use ranged attacks like shooting arrows.",
   "type": "object",
-  "title": "Ranged attack 1.8.0",
+  "title": "Ranged Attack 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "attack_interval": {
-      "type": "number",
-      "default": 0,
-      "description": "UNDOCUMENTATED",
-      "title": "TODO title"
-    },
+    "attack_interval": { "type": "number", "default": 0, "description": "UNDOCUMENTATED", "title": "TODO Title" },
     "attack_interval_max": {
       "type": "number",
       "default": 0,
       "description": "Maximum amount of time in seconds the entity will wait after an attack before launching another",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "attack_interval_min": {
       "type": "number",
       "default": 0,
       "description": "Minimum amount of time in seconds the entity will wait after an attack before launching another",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "attack_radius": {
       "type": "number",
       "default": 0,
       "description": "Maximum distance the target can be for this mob to fire. If the target is further away, this mob will move first before firing",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "burst_interval": {
       "type": "number",
       "default": 0,
       "description": "Amount of time in seconds between each individual shot when firing multiple shots per attack",
-      "title": "TODO title"
-    },
-    "burst_shots": {
-      "type": "integer",
-      "default": 1,
-      "description": "Number of shots fired every time the mob uses a charged attack",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "burst_shots": { "type": "integer", "default": 1, "description": "Number of shots fired every time the mob uses a charged attack", "title": "TODO Title" },
     "charge_charged_trigger": {
       "type": "number",
       "default": 0,
       "description": "The minimum amount of time in ticks the mob has to charge before firing a charged attack",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "charge_shoot_trigger": {
       "type": "number",
       "default": 0,
       "description": "The minimum amount of time in ticks for the mob to start charging a charged shot. Must be greater than 0 to enable burst shots",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "ranged_fov": {
       "type": "number",
       "default": 90,
       "description": "The allowable FOV the actor will use to determine if it can make a valid ranged attack",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "target_in_sight_time": {
-      "type": "number",
-      "title": "Target in sight time",
-      "description": "UNDOCUMENTATED"
-    },
-    "attack_radius_min": {
-      "type": "number",
-      "title": "Attack radius min",
-      "description": "UNDOCUMENTATED"
-    }
+    "target_in_sight_time": { "type": "number", "title": "Target In Sight Time", "description": "UNDOCUMENTATED" },
+    "attack_radius_min": { "type": "number", "title": "Attack Radius Min", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.receive_love.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.receive_love.json
index 903ecca7..f59e4ae8 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.receive_love.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.receive_love.json
@@ -3,12 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.receive_love",
   "description": "Allows the villager to stop so another villager can breed with it. Can only be used by a Villager.",
   "type": "object",
-  "title": "Receive love 1.8.0",
+  "title": "Receive Love 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_open_door.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_open_door.json
index 53b1ea76..8e9c0681 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_open_door.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_open_door.json
@@ -3,12 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.restrict_open_door",
   "description": "Allows the mob to stay indoors during night time.",
   "type": "object",
-  "title": "Restrict open door 1.8.0",
+  "title": "Restrict Open Door 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_sun.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_sun.json
index e68b0c36..f78b2ec3 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_sun.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.restrict_sun.json
@@ -3,12 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.restrict_sun",
   "description": "Allows the mob to automatically start avoiding the sun when its a clear day out.",
   "type": "object",
-  "title": "Restrict sun 1.8.0",
+  "title": "Restrict Sun 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
index 554972a7..61f405d6 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
@@ -3,27 +3,13 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.rise_to_liquid_level",
   "description": "Allows the mob to stay at a certain level when in liquid.",
   "type": "object",
-  "title": "Rise to liquid level 1.8.0",
+  "title": "Rise To Liquid Level 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "liquid_y_offset": {
-      "type": "number",
-      "title": "Liquid y offset",
-      "description": "UNDOCUMENTATED"
-    },
-    "rise_delta": {
-      "type": "number",
-      "title": "Rise delta",
-      "description": "UNDOCUMENTATED"
-    },
-    "sink_delta": {
-      "type": "number",
-      "title": "Sink delta",
-      "description": "UNDOCUMENTATED"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "liquid_y_offset": { "type": "number", "title": "Liquid Y Offset", "description": "UNDOCUMENTATED" },
+    "rise_delta": { "type": "number", "title": "Rise Delta", "description": "UNDOCUMENTATED" },
+    "sink_delta": { "type": "number", "title": "Sink Delta", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.roll.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.roll.json
index 48309eb4..a44f5e52 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.roll.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.roll.json
@@ -7,14 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "probability": {
-      "type": "number",
-      "minimum": 0,
-      "description": "The probability that the mob will use the goal.",
-      "title": "TODO title"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "probability": { "type": "number", "minimum": 0, "description": "The probability that the mob will use the goal.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.run_around_like_crazy.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.run_around_like_crazy.json
index b11584ad..400e3eb1 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.run_around_like_crazy.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.run_around_like_crazy.json
@@ -3,15 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.restrict_open_door",
   "description": "Allows the mob to run around aimlessly.",
   "type": "object",
-  "title": "Restrict open door 1.8.0",
+  "title": "Restrict Open Door 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": {
-      "$ref": "types/base_speed_multiplier.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.scared.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.scared.json
index 43dbf63d..f6e90c1a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.scared.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.scared.json
@@ -12,7 +12,7 @@
       "type": "integer",
       "default": 0,
       "description": "The interval in which a sound will play when active in a 1/delay chance to kick off",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.send_event.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.send_event.json
index 0c15d0d5..9077472b 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.send_event.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.send_event.json
@@ -3,16 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.send_event",
   "description": "Allows the mob to send an event to another mob.",
   "type": "object",
-  "title": "Send event 1.8.0",
+  "title": "Send Event 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "cast_duration": {
-      "type": "number",
-      "description": "Time in seconds for the entire event sending process",
-      "title": "TODO title"
-    },
+    "cast_duration": { "type": "number", "description": "Time in seconds for the entire event sending process", "title": "TODO Title" },
     "sequence": {
       "type": "array",
       "description": "List of events to send",
@@ -20,24 +16,12 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "base_delay": {
-            "type": "number",
-            "default": 0,
-            "description": "Amount of time in seconds before starting this step"
-          },
-          "event": {
-            "type": "string",
-            "default": "",
-            "description": "The event to send to the entity"
-          },
-          "sound_event": {
-            "type": "string",
-            "default": "",
-            "description": "The sound event to play when this step happens"
-          }
+          "base_delay": { "type": "number", "default": 0, "description": "Amount of time in seconds before starting this step" },
+          "event": { "type": "string", "default": "", "description": "The event to send to the entity" },
+          "sound_event": { "type": "string", "default": "", "description": "The sound event to play when this step happens" }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.share_items.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.share_items.json
index a77de013..47dda949 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.share_items.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.share_items.json
@@ -3,24 +3,19 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.share_items",
   "description": "Allows the mob to send an event to another mob.",
   "type": "object",
-  "title": "Share items 1.8.0",
+  "title": "Share Items 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entities this mob will share items with", "title": "TODO title" },
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entities this mob will share items with", "title": "TODO Title" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "max_dist": {
-      "type": "number",
-      "default": 0,
-      "description": "Maximum distance in blocks this mob will look for entities to share items with",
-      "title": "TODO title"
-    }
+    "max_dist": { "type": "number", "default": 0, "description": "Maximum distance in blocks this mob will look for entities to share items with", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_merge_with_stone.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_merge_with_stone.json
index fd25995f..f3625a6b 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_merge_with_stone.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_merge_with_stone.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.silverfish_merge_with_stone",
   "description": "Allows the mob to go into stone blocks like Silverfish do. Currently it can only be used by Silverfish.",
   "type": "object",
-  "title": "Silverfish merge with stone 1.8.0",
+  "title": "Silverfish Merge With Stone 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_wake_up_friends.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_wake_up_friends.json
index 855fd2ae..837efaf1 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_wake_up_friends.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.silverfish_wake_up_friends.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.silverfish_wake_up_friends",
   "description": "Allows the mob to alert mobs in nearby blocks to come out. Currently it can only be used by Silverfish.",
   "type": "object",
-  "title": "Silverfish wake up friends 1.8.0",
+  "title": "Silverfish Wake Up Friends 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.skeleton_horse_trap.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.skeleton_horse_trap.json
index 30f51ff0..64f501b0 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.skeleton_horse_trap.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.skeleton_horse_trap.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.skeleton_horse_trap",
   "description": "Allows Equine mobs to be Horse Traps and be triggered like them, spawning a lightning bolt and a bunch of horses when a player is nearby. Can only be used by Horses, Mules, Donkeys and Skeleton Horses.",
   "type": "object",
-  "title": "Skeleton horse trap 1.8.0",
+  "title": "Skeleton Horse Trap 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -12,13 +12,8 @@
       "type": "number",
       "default": 1,
       "description": "Amount of time in seconds the trap exists. After this amount of time is elapsed, the trap is removed from the world if it hasn't been activated",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that the player has to be within to trigger the horse trap",
-      "title": "TODO title"
-    }
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that the player has to be within to trigger the horse trap", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sleep.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sleep.json
index 4877e3c0..e67f97d1 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sleep.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sleep.json
@@ -9,41 +9,16 @@
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    },
-    "goal_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "UNDOCUMANTED",
-      "title": "UNDOCUMANTED"
-    },
-    "sleep_collider_height": {
-      "type": "number",
-      "default": 1,
-      "description": "The height of the mob's collider while sleeping",
-      "title": "Sleep collider height"
-    },
-    "sleep_collider_width": {
-      "type": "number",
-      "default": 1,
-      "description": "The width of the mob's collider while sleeping",
-      "title": "Sleep collider width"
-    },
-    "sleep_y_offset": {
-      "type": "number",
-      "default": 1,
-      "description": "The y offset of the mob's collider while sleeping",
-      "title": "Sleep y offset"
-    },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" },
+    "goal_radius": { "type": "number", "default": 0, "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+    "sleep_collider_height": { "type": "number", "default": 1, "description": "The height of the mob's collider while sleeping", "title": "Sleep Collider Height" },
+    "sleep_collider_width": { "type": "number", "default": 1, "description": "The width of the mob's collider while sleeping", "title": "Sleep Collider Width" },
+    "sleep_y_offset": { "type": "number", "default": 1, "description": "The y offset of the mob's collider while sleeping", "title": "Sleep Y Offset" },
     "timeout_cooldown": {
       "type": "number",
       "default": 8,
       "description": "The cooldown time in seconds before the goal can be reused after a internal failure or timeout condition",
-      "title": "Timeout cooldown"
+      "title": "Timeout Cooldown"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_attack.json
index 5298d8ac..d87a60b6 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_attack.json
@@ -4,15 +4,10 @@
   "additionalProperties": false,
   "description": "Can only be used by Slimes and Magma Cubes. Allows the mob to use a melee attack like the slime's.",
   "type": "object",
-  "title": "Slime attack 1.8.0",
+  "title": "Slime Attack 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "TODO title"
-    }
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_float.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_float.json
index 811d5e68..1e57d6ef 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_float.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_float.json
@@ -4,15 +4,11 @@
   "additionalProperties": false,
   "description": "Can only be used by Slimes and Magma Cubes. Controls their ability to float in water / lava.",
   "type": "object",
-  "title": "Slime float 1.8.0",
+  "title": "Slime Float 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "jump_chance_percentage": {
-      "type": "number",
-      "title": "Sink delta",
-      "description": "UNDOCUMENTATED"
-    }
+    "jump_chance_percentage": { "type": "number", "title": "Sink Delta", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_keep_on_jumping.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_keep_on_jumping.json
index b1319621..15f99c20 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_keep_on_jumping.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_keep_on_jumping.json
@@ -4,14 +4,7 @@
   "additionalProperties": false,
   "description": "Can only be used by Slimes and Magma Cubes. Allows the mob to continuously jump around like a slime.",
   "type": "object",
-  "title": "Slime keep on jumping 1.8.0",
+  "title": "Slime Keep On Jumping 1.8.0",
   "required": [],
-  "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "speed_multiplier": {
-      "$ref": "types/base_speed_multiplier.json"
-    }
-  }
+  "properties": { "priority": { "$ref": "types/base_priority.json" }, "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_random_direction.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_random_direction.json
index 867f57b2..9274347b 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_random_direction.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.slime_random_direction.json
@@ -4,24 +4,12 @@
   "additionalProperties": false,
   "description": "Can only be used by Slimes and Magma Cubes. Allows the mob to move in random directions like a slime.",
   "type": "object",
-  "title": "Slime random direction 1.8.0",
+  "title": "Slime Random Direction 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "add_random_time_range": {
-      "type": "number",
-      "title": "Add random time range",
-      "description": "UNDOCUMENTATED"
-    },
-    "turn_range": {
-      "type": "number",
-      "title": "Turn range",
-      "description": "UNDOCUMENTATED"
-    },
-    "min_change_direction_time": {
-      "type": "number",
-      "title": "Min change direction time",
-      "description": "UNDOCUMENTATED"
-    }
+    "add_random_time_range": { "type": "number", "title": "Add Random Time Range", "description": "UNDOCUMENTATED" },
+    "turn_range": { "type": "number", "title": "Turn Range", "description": "UNDOCUMENTATED" },
+    "min_change_direction_time": { "type": "number", "title": "Min Change Direction Time", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.snacking.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.snacking.json
index f6d10413..0be3ad60 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.snacking.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.snacking.json
@@ -8,29 +8,9 @@
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "items": {
-      "type": "array",
-      "description": "Items that we are interested in snacking on",
-      "$ref": "../../../../general/item/identifier.json",
-      "title": "TODO title"
-    },
-    "snacking_cooldown": {
-      "type": "number",
-      "default": 7.5,
-      "description": "The cooldown time in seconds before the mob is able to snack again",
-      "title": "TODO title"
-    },
-    "snacking_cooldown_min": {
-      "type": "number",
-      "default": 0.5,
-      "description": "The minimum time in seconds before the mob is able to snack again",
-      "title": "TODO title"
-    },
-    "snacking_stop_chance": {
-      "type": "number",
-      "default": 0.0017,
-      "description": "This is the chance that the mob will stop snacking, from 0 to 1",
-      "title": "TODO title"
-    }
+    "items": { "type": "array", "description": "Items that we are interested in snacking on", "$ref": "../../../../general/item/identifier.json", "title": "TODO Title" },
+    "snacking_cooldown": { "type": "number", "default": 7.5, "description": "The cooldown time in seconds before the mob is able to snack again", "title": "TODO Title" },
+    "snacking_cooldown_min": { "type": "number", "default": 0.5, "description": "The minimum time in seconds before the mob is able to snack again", "title": "TODO Title" },
+    "snacking_stop_chance": { "type": "number", "default": 0.0017, "description": "This is the chance that the mob will stop snacking, from 0 to 1", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sneeze.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sneeze.json
index 797e08f3..0183dc8c 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sneeze.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.sneeze.json
@@ -8,60 +8,19 @@
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "TODO title"
-    },
-    "drop_item_chance": {
-      "type": "number",
-      "default": 1,
-      "description": "The probability that the mob will drop an item when it sneezes.",
-      "title": "TODO title"
-    },
-    "entity_types": {
-      "$ref": "../types/entity_types.json",
-      "description": "List of entity types this mob will startle (cause to jump) when it sneezes.",
-      "title": "TODO title"
-    },
-    "loot_table": {
-      "type": "string",
-      "default": "",
-      "description": "Loot table to select dropped items from.",
-      "title": "Loot table"
-    },
-    "prepare_sound": {
-      "type": "string",
-      "default": "",
-      "description": "Sound to play when the sneeze is about to happen.",
-      "title": "Prepare sound"
-    },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "TODO Title" },
+    "drop_item_chance": { "type": "number", "default": 1, "description": "The probability that the mob will drop an item when it sneezes.", "title": "TODO Title" },
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entity types this mob will startle (cause to jump) when it sneezes.", "title": "TODO Title" },
+    "loot_table": { "type": "string", "default": "", "description": "Loot table to select dropped items from.", "title": "Loot Table" },
+    "prepare_sound": { "type": "string", "default": "", "description": "Sound to play when the sneeze is about to happen.", "title": "Prepare Sound" },
     "prepare_time": {
       "type": "number",
       "default": 1,
       "description": "The time in seconds that the mob takes to prepare to sneeze (while the prepare_sound is playing).",
-      "title": "Prepare time"
+      "title": "Prepare Time"
     },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "minimum": 0,
-      "maximum": 1,
-      "description": "The probability of sneezing. A value of 1.00 is 100%",
-      "title": "Probability"
-    },
-    "sound": {
-      "type": "string",
-      "default": "",
-      "description": "Sound to play when the sneeze occurs.",
-      "title": "Sound"
-    },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks that mobs will be startled.",
-      "title": "Within radius"
-    }
+    "probability": { "type": "number", "default": 0.02, "minimum": 0, "maximum": 1, "description": "The probability of sneezing. A value of 1.00 is 100%", "title": "Probability" },
+    "sound": { "type": "string", "default": "", "description": "Sound to play when the sneeze occurs.", "title": "Sound" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks that mobs will be startled.", "title": "Within Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_dive.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_dive.json
index 93302db3..1bc48682 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_dive.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_dive.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.squid_dive",
   "description": "Allows the squid to dive down in water. Can only be used by the Squid.",
   "type": "object",
-  "title": "Squid dive 1.8.0",
+  "title": "Squid Dive 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_flee.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_flee.json
index 281cef3a..a49812aa 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_flee.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_flee.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.squid_flee",
   "description": "Allows the squid to swim away. Can only be used by the Squid.",
   "type": "object",
-  "title": "Squid flee 1.8.0",
+  "title": "Squid Flee 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_idle.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_idle.json
index a2632c4d..c1262581 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_idle.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_idle.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.squid_idle",
   "description": "Allows the squid to swim in place idly. Can only be used by the Squid.",
   "type": "object",
-  "title": "Squid idle 1.8.0",
+  "title": "Squid Idle 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_move_away_from_ground.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_move_away_from_ground.json
index e6b40815..72db2298 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_move_away_from_ground.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_move_away_from_ground.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.squid_move_away_from_ground",
   "description": "Allows the squid to move away from ground blocks and back to water. Can only be used by the Squid.",
   "type": "object",
-  "title": "Squid move away from ground 1.8.0",
+  "title": "Squid Move Away From Ground 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_out_of_water.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_out_of_water.json
index cd230689..4a675295 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_out_of_water.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.squid_out_of_water.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.squid_out_of_water",
   "description": "Allows the squid to stick to the ground when outside water. Can only be used by the Squid.",
   "type": "object",
-  "title": "Squid out of water 1.8.0",
+  "title": "Squid Out Of Water 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
index 1a25ac93..2ce2e509 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stalk_and_pounce_on_target.json
@@ -3,66 +3,44 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stalk_and_pounce_on_target",
   "description": "Allows the mob to stay at a certain level when in liquid.",
   "type": "object",
-  "title": "Stalk and pounce on target 1.8.0",
+  "title": "Stalk And Pounce On Target 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
     "interest_time": {
       "type": "number",
       "default": 2,
       "description": "The amount of time the mob will be interested before pouncing. This happens when the mob is within range of pouncing",
-      "title": "Interest time"
-    },
-    "leap_distance": {
-      "type": "number",
-      "default": 0.8,
-      "description": "The distance in blocks the mob jumps in the direction of its target",
-      "title": "Leap distance"
-    },
-    "leap_height": {
-      "type": "number",
-      "default": 0.9,
-      "description": "The height in blocks the mob jumps when leaping at its target",
-      "title": "Leap height"
+      "title": "Interest Time"
     },
+    "leap_distance": { "type": "number", "default": 0.8, "description": "The distance in blocks the mob jumps in the direction of its target", "title": "Leap Distance" },
+    "leap_height": { "type": "number", "default": 0.9, "description": "The height in blocks the mob jumps when leaping at its target", "title": "Leap Height" },
     "max_stalk_dist": {
       "type": "number",
       "default": 10,
       "description": "The maximum distance away a target can be before the mob gives up on stalking",
-      "title": "Max stalk dist"
+      "title": "Max Stalk Dist"
     },
     "pounce_max_dist": {
       "type": "number",
       "default": 5,
       "description": "The maximum distance away from the target in blocks to begin pouncing at the target",
-      "title": "Pounce max dist"
-    },
-    "set_persistent": {
-      "type": "boolean",
-      "default": false,
-      "description": "Allows the actor to be set to persist upon targeting a player",
-      "title": "Set persistent"
-    },
-    "stalk_speed": {
-      "type": "number",
-      "default": 1.2,
-      "description": "The movement speed in which you stalk your target",
-      "title": "Stalk speed"
+      "title": "Pounce Max Dist"
     },
+    "set_persistent": { "type": "boolean", "default": false, "description": "Allows the actor to be set to persist upon targeting a player", "title": "Set Persistent" },
+    "stalk_speed": { "type": "number", "default": 1.2, "description": "The movement speed in which you stalk your target", "title": "Stalk Speed" },
     "strike_dist": {
       "type": "number",
       "default": 2,
       "description": "The max distance away from the target when landing from the pounce that will still result in damaging the target",
-      "title": "Strike dist"
+      "title": "Strike Dist"
     },
     "stuck_time": {
       "type": "number",
       "default": 2,
       "description": "The amount of time the mob will be stuck if they fail and land on a block they can be stuck on",
-      "title": "Stuck time"
+      "title": "Stuck Time"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stay_while_sitting.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stay_while_sitting.json
index 7698fa92..13e9df2c 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stay_while_sitting.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stay_while_sitting.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stay_while_sitting",
   "description": "Allows the mob to stay put while it is in a sitting state instead of doing something else.",
   "type": "object",
-  "title": "Stay while sitting 1.8.0",
+  "title": "Stay While Sitting 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_attack.json
index 0fdc27ca..62edc1e9 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_attack.json
@@ -3,68 +3,31 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stomp_attack",
   "description": "Allows the mob to use the polar bear's melee attack.",
   "type": "object",
-  "title": "Stomp attack 1.8.0",
+  "title": "Stomp Attack 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "attack_once": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will attack only one time.",
-      "title": "TODO title"
-    },
-    "attack_types": {
-      "type": "string",
-      "default": "",
-      "description": "Defines the entity types this mob will attack",
-      "title": "TODO title"
-    },
-    "probability": {
-      "type": "number",
-      "default": 0.02,
-      "description": "The probability of sneezing. A value of 1.00 is 100%",
-      "title": "TODO title"
-    },
+    "attack_once": { "type": "boolean", "default": false, "description": "If true, this mob will attack only one time.", "title": "TODO Title" },
+    "attack_types": { "type": "string", "default": "", "description": "Defines the entity types this mob will attack", "title": "TODO Title" },
+    "probability": { "type": "number", "default": 0.02, "description": "The probability of sneezing. A value of 1.00 is 100%", "title": "TODO Title" },
     "random_stop_interval": {
       "type": "integer",
       "default": 0,
       "description": "Defines the probability the mob will stop fighting. A value of 0 disables randomly stopping, while a value of 1 defines a 50% chance",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "reach_multiplier": {
       "type": "number",
       "default": 2,
       "description": "Multiplier for how far outside its box the mob can reach its target (this can be used to simulate a mob with longer arms by making this bigger)",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "require_complete_path": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this goal will only trigger if the mob can reach its target.",
-      "title": "TODO title"
-    },
-    "sound": {
-      "type": "string",
-      "description": "Sound to play when the sneeze occurs.",
-      "title": "TODO title"
-    },
-    "track_target": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this mob will chase after the target as long as it's a valid target",
-      "title": "TODO title"
-    },
-    "stomp_range_multiplier": {
-      "type": "number",
-      "title": "Stomp range multiplier",
-      "description": "UNDOCUMENTATED"
-    },
-    "no_damage_range_multiplier": {
-      "type": "number",
-      "title": "No damage range multiplier",
-      "description": "UNDOCUMENTATED"
-    }
+    "require_complete_path": { "type": "boolean", "default": false, "description": "If true, this goal will only trigger if the mob can reach its target.", "title": "TODO Title" },
+    "sound": { "type": "string", "description": "Sound to play when the sneeze occurs.", "title": "TODO Title" },
+    "track_target": { "type": "boolean", "default": false, "description": "If true, this mob will chase after the target as long as it's a valid target", "title": "TODO Title" },
+    "stomp_range_multiplier": { "type": "number", "title": "Stomp Range Multiplier", "description": "UNDOCUMENTATED" },
+    "no_damage_range_multiplier": { "type": "number", "title": "No Damage Range Multiplier", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_turtle_egg.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
index 061d8341..fa663906 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stomp_turtle_egg.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stomp_turtle_egg",
   "description": "Allows this mob to stomp turtle eggs",
   "type": "object",
-  "title": "Stomp turtle egg 1.8.0",
+  "title": "Stomp Turtle Egg 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -13,25 +13,15 @@
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "interval": {
       "type": "integer",
       "default": 120,
       "description": "A random value to determine when to randomly move somewhere. This has a 1/interval chance to choose this goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "search_height": {
-      "type": "integer",
-      "default": 1,
-      "description": "Height in blocks the mob will look for turtle eggs to move towards",
-      "title": "TODO title"
-    },
-    "search_range": {
-      "type": "integer",
-      "default": 0,
-      "description": "The distance in blocks it will look for turtle eggs to move towards",
-      "title": "TODO title"
-    }
+    "search_height": { "type": "integer", "default": 1, "description": "Height in blocks the mob will look for turtle eggs to move towards", "title": "TODO Title" },
+    "search_range": { "type": "integer", "default": 0, "description": "The distance in blocks it will look for turtle eggs to move towards", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stroll_towards_village.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stroll_towards_village.json
index 19e0aa03..dacffa10 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stroll_towards_village.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.stroll_towards_village.json
@@ -3,42 +3,25 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stroll_towards_village",
   "description": "Allows the mob to stay at a certain level when in liquid.",
   "type": "object",
-  "title": "Stroll towards village 1.8.0",
+  "title": "Stroll Towards Village 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "cooldown_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds the mob has to wait before using the goal again",
-      "title": "Cooldown time"
-    },
+    "priority": { "$ref": "types/base_priority.json" },
+    "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the goal again", "title": "Cooldown Time" },
     "goal_radius": {
       "type": "number",
       "default": 0.5,
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the \"wiggle room\" to stop the AI from bouncing back and forth trying to reach a specific spot",
-      "title": "Goal radius"
+      "title": "Goal Radius"
     },
     "search_range": {
       "type": "integer",
       "default": 0,
       "description": "The distance in blocks to search for points inside villages. If <= 0, find the closest village regardless of distance.",
-      "title": "Search range"
+      "title": "Search Range"
     },
-    "speed_multiplier": {
-      "type": "number",
-      "default": 1,
-      "description": "Movement speed multiplier of the mob when using this AI Goal",
-      "title": "Speed multiplier"
-    },
-    "start_chance": {
-      "type": "number",
-      "default": 0.1,
-      "description": "This is the chance that the mob will start this goal, from 0 to 1",
-      "title": "Start chance"
-    }
+    "speed_multiplier": { "type": "number", "default": 1, "description": "Movement speed multiplier of the mob when using this AI Goal", "title": "Speed Multiplier" },
+    "start_chance": { "type": "number", "default": 0.1, "description": "This is the chance that the mob will start this goal, from 0 to 1", "title": "Start Chance" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
index 96b8e420..d1488648 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stay_while_sitting",
   "description": "Allows the mob to attack the player by summoning other entities.",
-  "title": "Stay while sitting 1.8.0",
+  "title": "Stay While Sitting 1.8.0",
   "type": "object",
   "additionalProperties": false,
   "required": [],
@@ -15,45 +15,18 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "cast_duration": {
-            "type": "number",
-            "description": "Time in seconds the spell casting will take"
-          },
-          "cooldown_time": {
-            "type": "number",
-            "default": 0,
-            "description": "Time in seconds the mob has to wait before using the spell again"
-          },
-          "do_casting": {
-            "type": "boolean",
-            "default": true,
-            "description": "If true, the mob will do the casting animations and render spell particles"
-          },
-          "filters": {
-            "$ref": "../filters.json"
-          },
-          "max_activation_range": {
-            "type": "number",
-            "default": -1,
-            "description": "Upper bound of the activation distance in blocks for this spell"
-          },
-          "min_activation_range": {
-            "type": "number",
-            "default": 1,
-            "description": "Lower bound of the activation distance in blocks for this spell"
-          },
+          "cast_duration": { "type": "number", "description": "Time in seconds the spell casting will take" },
+          "cooldown_time": { "type": "number", "default": 0, "description": "Time in seconds the mob has to wait before using the spell again" },
+          "do_casting": { "type": "boolean", "default": true, "description": "If true, the mob will do the casting animations and render spell particles" },
+          "filters": { "$ref": "../filters.json" },
+          "max_activation_range": { "type": "number", "default": -1, "description": "Upper bound of the activation distance in blocks for this spell" },
+          "min_activation_range": { "type": "number", "default": 1, "description": "Lower bound of the activation distance in blocks for this spell" },
           "particle_color": {
             "description": "The color of the particles for this spell",
-            "title": "Particle color",
+            "title": "Particle Color",
             "oneOf": [
-              {
-                "type": "integer",
-                "default": 0
-              },
-              {
-                "type": "string",
-                "format": "color-hex"
-              }
+              { "type": "integer", "default": 0 },
+              { "type": "string", "format": "color-hex" }
             ]
           },
           "sequence": {
@@ -63,54 +36,20 @@
               "type": "object",
               "additionalProperties": false,
               "properties": {
-                "base_delay": {
-                  "type": "number",
-                  "default": 0,
-                  "description": "Amount of time in seconds to wait before this step starts"
-                },
-                "delay_per_summon": {
-                  "type": "number",
-                  "default": 0,
-                  "description": "Amount of time in seconds before each entity is summoned in this step"
-                },
+                "base_delay": { "type": "number", "default": 0, "description": "Amount of time in seconds to wait before this step starts" },
+                "delay_per_summon": { "type": "number", "default": 0, "description": "Amount of time in seconds before each entity is summoned in this step" },
                 "entity_lifespan": {
                   "type": "number",
                   "default": -1,
                   "description": "Amount of time in seconds that the spawned entity will be alive for. A value of -1.0 means it will remain alive for as long as it can"
                 },
-                "entity_type": {
-                  "type": "string",
-                  "description": "The entity type of the entities we will spawn in this step"
-                },
-                "num_entities_spawned": {
-                  "type": "integer",
-                  "default": 1,
-                  "description": "Number of entities that will be spawned in this step"
-                },
-                "shape": {
-                  "type": "string",
-                  "default": "line",
-                  "description": "The base shape of this step. Valid values are circle and line"
-                },
-                "size": {
-                  "type": "number",
-                  "default": 1,
-                  "description": "The base size of the entity"
-                },
-                "sound_event": {
-                  "type": "string",
-                  "description": "The sound event to play for this step"
-                },
-                "summon_cap": {
-                  "type": "integer",
-                  "default": 0,
-                  "description": "Maximum number of summoned entities at any given time"
-                },
-                "summon_cap_radius": {
-                  "type": "number",
-                  "default": 0,
-                  "description": ""
-                },
+                "entity_type": { "type": "string", "description": "The entity type of the entities we will spawn in this step" },
+                "num_entities_spawned": { "type": "integer", "default": 1, "description": "Number of entities that will be spawned in this step" },
+                "shape": { "type": "string", "default": "line", "description": "The base shape of this step. Valid values are circle and line" },
+                "size": { "type": "number", "default": 1, "description": "The base size of the entity" },
+                "sound_event": { "type": "string", "description": "The sound event to play for this step" },
+                "summon_cap": { "type": "integer", "default": 0, "description": "Maximum number of summoned entities at any given time" },
+                "summon_cap_radius": { "type": "number", "default": 0, "description": "" },
                 "target": {
                   "type": "string",
                   "default": "self",
@@ -119,18 +58,11 @@
               }
             }
           },
-          "start_sound_event": {
-            "type": "string",
-            "description": "The sound event to play when using this spell"
-          },
-          "weight": {
-            "type": "number",
-            "default": 0,
-            "description": "The weight of this spell. Controls how likely the mob is to choose this spell when casting one"
-          }
+          "start_sound_event": { "type": "string", "description": "The sound event to play when using this spell" },
+          "weight": { "type": "number", "default": 0, "description": "The weight of this spell. Controls how likely the mob is to choose this spell when casting one" }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swell.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swell.json
index 00f01e30..8109663e 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swell.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swell.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.stay_while_sitting",
   "description": "Allows the creeper to swell up when a player is nearby. It can only be used by Creepers.",
-  "title": "Stay while sitting 1.8.0",
+  "title": "Stay While Sitting 1.8.0",
   "type": "object",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "start_distance": {
-      "type": "number",
-      "default": 10,
-      "description": "This mob starts swelling when a target is at least this many blocks away",
-      "title": "TODO title"
-    },
-    "stop_distance": {
-      "type": "number",
-      "default": 2,
-      "description": "This mob stops swelling when a target has moved away at least this many blocks",
-      "title": "TODO title"
-    }
+    "start_distance": { "type": "number", "default": 10, "description": "This mob starts swelling when a target is at least this many blocks away", "title": "TODO Title" },
+    "stop_distance": { "type": "number", "default": 2, "description": "This mob stops swelling when a target has moved away at least this many blocks", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_idle.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_idle.json
index df4d3c20..8484b56f 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_idle.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_idle.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.swim_idle",
   "type": "object",
-  "title": "Swim idle 1.8.0",
+  "title": "Swim Idle 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "idle_time": {
-      "title": "TODO",
-      "description": "TODO Description",
-      "type": "number"
-    },
-    "success_rate": {
-      "title": "TODO",
-      "description": "TODO Description",
-      "type": "number"
-    }
+    "idle_time": { "title": "TODO", "description": "TODO Description", "type": "number" },
+    "success_rate": { "title": "TODO", "description": "TODO Description", "type": "number" }
   },
   "description": "TODO description"
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json
index ece5ae3b..9a5f125f 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json
@@ -3,26 +3,14 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.swim_idle",
   "description": "Has the fish swim around when they can't pathfind",
   "type": "object",
-  "title": "Swim idle 1.8.0",
+  "title": "Swim Idle 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "interval": {
-      "type": "number",
-      "title": "Interval",
-      "description": "UNDOCUMENTATED"
-    },
-    "look_ahead": {
-      "type": "number",
-      "title": "Look ahead",
-      "description": "UNDOCUMENTATED"
-    },
-    "wander_time": {
-      "type": "number",
-      "title": "Wander time",
-      "description": "UNDOCUMENTATED"
-    }
+    "interval": { "type": "number", "title": "Interval", "description": "UNDOCUMENTATED" },
+    "look_ahead": { "type": "number", "title": "Look Ahead", "description": "UNDOCUMENTATED" },
+    "wander_time": { "type": "number", "title": "Wander Time", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_with_entity.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_with_entity.json
index 8c25250e..bb5ee797 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_with_entity.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swim_with_entity.json
@@ -2,53 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.swim_with_entity",
   "type": "object",
-  "title": "Swim with entity 1.8.0",
+  "title": "Swim With Entity 1.8.0",
   "description": "UNDOCUMENTATED",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "success_rate": {
-      "type": "number",
-      "title": "Success rate",
-      "description": "UNDOCUMENTATED"
-    },
-    "chance_to_stop": {
-      "type": "number",
-      "title": "Chance to stop",
-      "description": "UNDOCUMENTATED"
-    },
-    "state_check_interval": {
-      "type": "number",
-      "title": "State check interval",
-      "description": "UNDOCUMENTATED"
-    },
-    "catch_up_threshold": {
-      "type": "number",
-      "title": "Catch up threshold",
-      "description": "UNDOCUMENTATED"
-    },
-    "match_direction_threshold": {
-      "type": "number",
-      "title": "Match direction threshold",
-      "description": "UNDOCUMENTATED"
-    },
-    "catch_up_multiplier": {
-      "type": "number",
-      "title": "Catch up multiplier",
-      "description": "UNDOCUMENTATED"
-    },
-    "search_range": {
-      "type": "number",
-      "title": "Search range",
-      "description": "UNDOCUMENTATED"
-    },
-    "stop_distance": {
-      "type": "number",
-      "title": "Stop distance",
-      "description": "UNDOCUMENTATED"
-    },
-    "entity_types": { "$ref": "../types/entity_types.json", "title": "Entity types", "description": "UNDOCUMENTATED" }
+    "success_rate": { "type": "number", "title": "Success Rate", "description": "UNDOCUMENTATED" },
+    "chance_to_stop": { "type": "number", "title": "Chance To Stop", "description": "UNDOCUMENTATED" },
+    "state_check_interval": { "type": "number", "title": "State Check Interval", "description": "UNDOCUMENTATED" },
+    "catch_up_threshold": { "type": "number", "title": "Catch Up Threshold", "description": "UNDOCUMENTATED" },
+    "match_direction_threshold": { "type": "number", "title": "Match Direction Threshold", "description": "UNDOCUMENTATED" },
+    "catch_up_multiplier": { "type": "number", "title": "Catch Up Multiplier", "description": "UNDOCUMENTATED" },
+    "search_range": { "type": "number", "title": "Search Range", "description": "UNDOCUMENTATED" },
+    "stop_distance": { "type": "number", "title": "Stop Distance", "description": "UNDOCUMENTATED" },
+    "entity_types": { "$ref": "../types/entity_types.json", "title": "Entity Types", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swoop_attack.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swoop_attack.json
index 90168dae..6c9a9588 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swoop_attack.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.swoop_attack.json
@@ -3,22 +3,18 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.swoop_attack",
   "description": "Allows the mob to move to attack a target. The goal ends if it has a horizontal collision or gets hit. Built to be used with flying mobs.",
   "type": "object",
-  "title": "Swoop attack 1.8.0",
+  "title": "Swoop Attack 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/base_priority.json" },
     "speed_multiplier": { "$ref": "types/base_speed_multiplier.json" },
-    "damage_reach": {
-      "type": "number",
-      "title": "Damage reach",
-      "description": "UNDOCUMENTATED"
-    },
+    "damage_reach": { "type": "number", "title": "Damage Reach", "description": "UNDOCUMENTATED" },
     "delay_range": {
       "$ref": "../types/range_number_type.json",
       "default": [10.0, 20.0],
       "description": "Range of time in seconds between uses of this goal.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.take_flower.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.take_flower.json
index 6b9aad64..b83dd2c2 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.take_flower.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.take_flower.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.take_flower",
   "description": "Can only be used by Villagers. Allows the mob to accept flowers from Iron Golems.",
   "type": "object",
-  "title": "Take flower 1.8.0",
+  "title": "Take Flower 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.target_when_pushed.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.target_when_pushed.json
index ce511845..d3788a16 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.target_when_pushed.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.target_when_pushed.json
@@ -3,18 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.target_when_pushed",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "title": "Target when pushed 1.8.0",
+  "title": "Target When Pushed 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "priority": {
-      "$ref": "types/base_priority.json"
-    },
-    "entity_types": { "$ref": "../types/entity_types.json", "title": "Entity types", "description": "UNDOCUMENTATED" },
-    "percent_chance": {
-      "type": "number",
-      "title": "Percent chance",
-      "description": "UNDOCUMENTATED"
-    }
+    "priority": { "$ref": "types/base_priority.json" },
+    "entity_types": { "$ref": "../types/entity_types.json", "title": "Entity Types", "description": "UNDOCUMENTATED" },
+    "percent_chance": { "type": "number", "title": "Percent Chance", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.tempt.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.tempt.json
index 48a61dfc..4ca0a805 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.tempt.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.tempt.json
@@ -13,26 +13,10 @@
       "type": "boolean",
       "default": false,
       "description": "If true, the mob can stop being tempted if the player moves too fast while close to this mob",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "can_tempt_while_ridden": {
-      "type": "boolean",
-      "title": "Can tempt while ridden",
-      "description": "UNDOCUMENTATED"
-    },
-    "items": {
-      "type": "array",
-      "description": "List of items this mob is tempted by",
-      "items": {
-        "$ref": "../../../../general/item/identifier.json"
-      },
-      "title": "TODO title"
-    },
-    "within_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "Distance in blocks this mob can get tempted by a player holding an item they like",
-      "title": "TODO title"
-    }
+    "can_tempt_while_ridden": { "type": "boolean", "title": "Can Tempt While Ridden", "description": "UNDOCUMENTATED" },
+    "items": { "type": "array", "description": "List of items this mob is tempted by", "items": { "$ref": "../../../../general/item/identifier.json" }, "title": "TODO Title" },
+    "within_radius": { "type": "number", "default": 0, "description": "Distance in blocks this mob can get tempted by a player holding an item they like", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json
index 05e5a296..118752a8 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_interest.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.trade_interest",
   "description": "Allows the mob to look at a player that is holding a tradable item.",
   "type": "object",
-  "title": "Trade interest 1.8.0",
+  "title": "Trade Interest 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -12,14 +12,9 @@
       "type": "number",
       "default": 2,
       "description": "The max time in seconds that the trader will hold an item before attempting to switch for a different item that takes the same trade",
-      "title": "Carried item switch time"
-    },
-    "cooldown": {
-      "type": "number",
-      "default": 2,
-      "description": "The time in seconds before the trader can use this goal again",
-      "title": "Cooldown"
+      "title": "Carried Item Switch Time"
     },
+    "cooldown": { "type": "number", "default": 2, "description": "The time in seconds before the trader can use this goal again", "title": "Cooldown" },
     "interest_time": {
       "type": "number",
       "default": 45,
@@ -30,13 +25,13 @@
       "type": "number",
       "default": 1,
       "description": "The max time in seconds that the trader will wait when you no longer have items to trade",
-      "title": "Remove item time"
+      "title": "Remove Item Time"
     },
     "within_radius": {
       "type": "number",
       "default": 0,
       "description": "Distance in blocks this mob can be interested by a player holding an item they like",
-      "title": "Within radius"
+      "title": "Within Radius"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_with_player.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_with_player.json
index ffa0d796..872849ca 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_with_player.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.trade_with_player.json
@@ -3,10 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.trade_with_player",
   "description": "Allows the player to trade with this mob.",
   "type": "object",
-  "title": "Trade with player 1.8.0",
+  "title": "Trade With Player 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_copy_owner_target.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_copy_owner_target.json
index 4f7fd298..8efdd57a 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_copy_owner_target.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_copy_owner_target.json
@@ -4,14 +4,10 @@
   "description": "Allows the mob to target the same entity its owner is targeting.",
   "additionalProperties": false,
   "type": "object",
-  "title": "Vex copy owner target 1.8.0",
+  "title": "Vex Copy Owner Target 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "$ref": "../types/entity_types.json",
-      "description": "List of entities this mob can copy the owner from.",
-      "title": "TODO title"
-    }
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entities this mob can copy the owner from.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_random_move.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_random_move.json
index 11e195cd..2b1e6605 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_random_move.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.vex_random_move.json
@@ -4,14 +4,10 @@
   "description": "Allows the mob to target the same entity its owner is targeting.",
   "additionalProperties": false,
   "type": "object",
-  "title": "Vex random move 1.8.0",
+  "title": "Vex Random Move 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
-    "entity_types": {
-      "$ref": "../types/entity_types.json",
-      "description": "List of entities this mob can copy the owner from.",
-      "title": "TODO title"
-    }
+    "entity_types": { "$ref": "../types/entity_types.json", "description": "List of entities this mob can copy the owner from.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_random_attack_pos_goal.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_random_attack_pos_goal.json
index 3d7bba06..cb7ce0ac 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_random_attack_pos_goal.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_random_attack_pos_goal.json
@@ -4,9 +4,7 @@
   "description": "Allows the wither to launch random attacks. Can only be used by the Wither Boss.",
   "additionalProperties": false,
   "type": "object",
-  "title": "Wither random attack pos goal 1.8.0",
+  "title": "Wither Random Attack Pos Goal 1.8.0",
   "required": [],
-  "properties": {
-    "priority": { "$ref": "./types/base_priority.json" }
-  }
+  "properties": { "priority": { "$ref": "./types/base_priority.json" } }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_target_highest_damage.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_target_highest_damage.json
index 0117f767..3651ec36 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_target_highest_damage.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.wither_target_highest_damage.json
@@ -4,14 +4,14 @@
   "description": "Allows the wither to launch random attacks. Can only be used by the Wither Boss.",
   "additionalProperties": false,
   "type": "object",
-  "title": "Wither target highest damage 1.8.0",
+  "title": "Wither Target Highest Damage 1.8.0",
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "entity_types": {
       "$ref": "../types/entity_types.json",
       "description": "List of entity types the wither takes into account to find who dealt the most damage to it",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.work.json b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.work.json
index c7cd2e48..2b2f7e87 100644
--- a/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.work.json
+++ b/source/behaviour/entities/1.8.0/behaviors/minecraft.behavior.work.json
@@ -8,46 +8,17 @@
   "properties": {
     "priority": { "$ref": "./types/base_priority.json" },
     "speed_multiplier": { "$ref": "./types/base_speed_multiplier.json" },
-    "active_time": {
-      "type": "integer",
-      "default": 0,
-      "description": "The amount of ticks the NPC will stay in their the work location",
-      "title": "TODO title"
-    },
-    "can_work_in_rain": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can work when their jobsite POI is being rained on.",
-      "title": "TODO title"
-    },
-    "goal_cooldown": {
-      "type": "integer",
-      "default": 0,
-      "description": "The amount of ticks the goal will be on cooldown before it can be used again",
-      "title": "TODO title"
-    },
-    "on_arrival": {
-      "$ref": "../types/event.json",
-      "description": "Event to run when the mob reaches their jobsite and finishes working.",
-      "title": "TODO title"
-    },
-    "sound_delay_max": {
-      "type": "integer",
-      "default": 0,
-      "description": "The max interval in which a sound will play",
-      "title": "TODO title"
-    },
-    "sound_delay_min": {
-      "type": "integer",
-      "default": 0,
-      "description": "The min interval in which a sound will play",
-      "title": "TODO title"
-    },
+    "active_time": { "type": "integer", "default": 0, "description": "The amount of ticks the NPC will stay in their the work location", "title": "TODO Title" },
+    "can_work_in_rain": { "type": "boolean", "default": false, "description": "If true, this entity can work when their jobsite POI is being rained on.", "title": "TODO Title" },
+    "goal_cooldown": { "type": "integer", "default": 0, "description": "The amount of ticks the goal will be on cooldown before it can be used again", "title": "TODO Title" },
+    "on_arrival": { "$ref": "../types/event.json", "description": "Event to run when the mob reaches their jobsite and finishes working.", "title": "TODO Title" },
+    "sound_delay_max": { "type": "integer", "default": 0, "description": "The max interval in which a sound will play", "title": "TODO Title" },
+    "sound_delay_min": { "type": "integer", "default": 0, "description": "The min interval in which a sound will play", "title": "TODO Title" },
     "work_in_rain_tolerance": {
       "type": "integer",
       "default": -1,
       "description": "If \"can_work_in_rain\" is false, this is the maximum number of ticks left in the goal where rain will not interrupt the goal",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   },
   "description": "TODO description"
diff --git a/source/behaviour/entities/1.8.0/behaviors/types/base_speed_multiplier.json b/source/behaviour/entities/1.8.0/behaviors/types/base_speed_multiplier.json
index 6b1cbf86..0e6ed740 100644
--- a/source/behaviour/entities/1.8.0/behaviors/types/base_speed_multiplier.json
+++ b/source/behaviour/entities/1.8.0/behaviors/types/base_speed_multiplier.json
@@ -5,5 +5,5 @@
   "default": 1.0,
   "description": "Movement speed multiplier of the mob when using this AI Goal.",
   "type": "number",
-  "title": "Speed multiplier"
+  "title": "Speed Multiplier"
 }
diff --git a/source/behaviour/entities/1.8.0/components.json b/source/behaviour/entities/1.8.0/components.json
index 4e0a89ca..d6c6da66 100644
--- a/source/behaviour/entities/1.8.0/components.json
+++ b/source/behaviour/entities/1.8.0/components.json
@@ -154,7 +154,6 @@
     "minecraft:walk_animation_speed": { "$ref": "./components/minecraft.walk_animation_speed.json" },
     "minecraft:wants_jockey": { "$ref": "./components/minecraft.wants_jockey.json" },
     "minecraft:water_movement": { "$ref": "./components/minecraft.water_movement.json" },
-
     "minecraft:behavior.hide": { "$ref": "./behaviors/minecraft.behavior.hide.json" },
     "minecraft:behavior.move_to_poi": { "$ref": "./behaviors/minecraft.behavior.move_to_poi.json" },
     "minecraft:behavior.scared": { "$ref": "./behaviors/minecraft.behavior.scared.json" },
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.addrider.json b/source/behaviour/entities/1.8.0/components/minecraft.addrider.json
index 1aee21c3..36a61b37 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.addrider.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.addrider.json
@@ -7,15 +7,7 @@
   "description": "Adds a rider to the entity. Requires minecraft:rideable.",
   "required": ["entity_type"],
   "properties": {
-    "entity_type": {
-      "type": "string",
-      "description": "The entity type that will be riding this entity",
-      "title": "Entity Type"
-    },
-    "spawn_event": {
-      "type": "string",
-      "description": "The spawn event that will be used when the riding entity is created",
-      "title": "Spawn Event"
-    }
+    "entity_type": { "type": "string", "description": "The entity type that will be riding this entity", "title": "Entity Type" },
+    "spawn_event": { "type": "string", "description": "The spawn event that will be used when the riding entity is created", "title": "Spawn Event" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.admire_item.json b/source/behaviour/entities/1.8.0/components/minecraft.admire_item.json
index f2d12aa0..9caea881 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.admire_item.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.admire_item.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.admire_item",
   "type": "object",
-  "title": "Admire item 1.8.0",
+  "title": "Admire Item 1.8.0",
   "description": "Causes the mob to ignore attackable targets for a given duration.",
   "additionalProperties": false,
   "properties": {
@@ -10,13 +10,8 @@
       "type": "integer",
       "default": 0,
       "description": "Duration, in seconds, for which mob won't admire items if it was hurt",
-      "title": "Cooldown after being attacked"
+      "title": "Cooldown After Being Attacked"
     },
-    "duration": {
-      "type": "integer",
-      "default": 10,
-      "description": "Duration, in seconds, that the mob is pacified.",
-      "title": "Duration"
-    }
+    "duration": { "type": "integer", "default": 10, "description": "Duration, in seconds, that the mob is pacified.", "title": "Duration" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.ageable.json b/source/behaviour/entities/1.8.0/components/minecraft.ageable.json
index c3541df9..0b760fa8 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.ageable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.ageable.json
@@ -7,12 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "duration": {
-      "type": "number",
-      "default": 1200.0,
-      "description": "Amount of time before the entity grows up, -1 for always a baby.",
-      "title": "Duration"
-    },
+    "duration": { "type": "number", "default": 1200.0, "description": "Amount of time before the entity grows up, -1 for always a baby.", "title": "Duration" },
     "feedItems": {
       "description": "List of items that can be fed to the entity. Includes 'item' for the item name and 'growth' to define how much time it grows up by",
       "items": {
@@ -20,23 +15,11 @@
           {
             "type": "object",
             "properties": {
-              "item": {
-                "type": "string",
-                "description": "The item name that can be used to feed",
-                "title": "Item",
-                "$ref": "../../../../general/item/identifier.json"
-              },
-              "growth": {
-                "type": "integer",
-                "description": "The amount that counts for aging",
-                "title": "Growth"
-              }
+              "item": { "type": "string", "description": "The item name that can be used to feed", "title": "Item", "$ref": "../../../../general/item/identifier.json" },
+              "growth": { "type": "integer", "description": "The amount that counts for aging", "title": "Growth" }
             }
           },
-          {
-            "type": "string",
-            "$ref": "../../../../general/item/identifier.json"
-          }
+          { "type": "string", "$ref": "../../../../general/item/identifier.json" }
         ],
         "description": "TODO description: feedItems",
         "title": "Feed Items"
@@ -46,33 +29,13 @@
     "drop_items": {
       "type": "array",
       "description": "List of items that the entity drops when it grows up.",
-      "items": {
-        "type": "string",
-        "description": "Item names",
-        "title": "Drop Items",
-        "$ref": "../../../../general/item/identifier.json"
-      },
+      "items": { "type": "string", "description": "Item names", "title": "Drop Items", "$ref": "../../../../general/item/identifier.json" },
       "title": "Drop Items"
     },
     "grow_up": {
       "description": "Event to run when this entity grows up",
-      "oneOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "event": {
-              "type": "string"
-            },
-            "target": {
-              "$ref": "../filters/types/base_subject.json"
-            }
-          }
-        }
-      ],
-      "title": "TODO title"
+      "oneOf": [{ "type": "string" }, { "type": "object", "properties": { "event": { "type": "string" }, "target": { "$ref": "../filters/types/base_subject.json" } } }],
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.ambient_sound_interval.json b/source/behaviour/entities/1.8.0/components/minecraft.ambient_sound_interval.json
index ae9ca0ab..11877279 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.ambient_sound_interval.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.ambient_sound_interval.json
@@ -3,27 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.ambient_sound_interval",
   "additionalProperties": false,
   "type": "object",
-  "title": "Ambient sound interval 1.8.0",
+  "title": "Ambient Sound Interval 1.8.0",
   "description": "Sets the entity's delay between playing its ambient sound.",
   "required": ["event_name"],
   "properties": {
-    "event_name": {
-      "type": "string",
-      "default": "ambient",
-      "description": "Level sound event to be played as the ambient sound.",
-      "title": "TODO title"
-    },
-    "max": {
-      "type": "number",
-      "default": 16,
-      "description": "Maximum time in seconds to randomly add to the ambient sound delay time.",
-      "title": "TODO title"
-    },
-    "min": {
-      "type": "number",
-      "default": 8,
-      "description": "Minimum time in seconds before the entity plays its ambient sound again",
-      "title": "TODO title"
-    }
+    "event_name": { "type": "string", "default": "ambient", "description": "Level sound event to be played as the ambient sound.", "title": "TODO Title" },
+    "max": { "type": "number", "default": 16, "description": "Maximum time in seconds to randomly add to the ambient sound delay time.", "title": "TODO Title" },
+    "min": { "type": "number", "default": 8, "description": "Minimum time in seconds before the entity plays its ambient sound again", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.angry.json b/source/behaviour/entities/1.8.0/components/minecraft.angry.json
index bdf68789..8725fbcb 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.angry.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.angry.json
@@ -13,11 +13,7 @@
       "description": "If true, other entities of the same entity definition within the broadcastRange will also become angry",
       "title": "Broadcast Anger"
     },
-    "broadcast_filters": {
-      "$ref": "../filters.json",
-      "description": "Conditions that make this entry in the list valid",
-      "title": "Broadcast Filters"
-    },
+    "broadcast_filters": { "$ref": "../filters.json", "description": "Conditions that make this entry in the list valid", "title": "Broadcast Filters" },
     "broadcast_range": {
       "type": "integer",
       "default": 20,
@@ -27,12 +23,7 @@
     "broadcast_targets": {
       "type": "array",
       "description": "A list of entity families to broadcast anger to",
-      "items": {
-        "type": "string",
-        "description": "An entity family",
-        "pattern": "^.+$",
-        "title": "Broadcast Targets"
-      },
+      "items": { "type": "string", "description": "An entity family", "pattern": "^.+$", "title": "Broadcast Targets" },
       "title": "Broadcast Targets"
     },
     "calm_event": {
@@ -40,27 +31,9 @@
       "description": "Event to run after the number of seconds specified in duration expires (when the entity stops being 'angry')",
       "title": "Calm Event"
     },
-    "duration": {
-      "type": "integer",
-      "default": 25,
-      "description": "The amount of time in seconds that the entity will be angry",
-      "title": "Duration"
-    },
-    "duration_delta": {
-      "type": "integer",
-      "default": 0,
-      "description": "Variance in seconds added to the duration [-delta, delta]",
-      "title": "Duration Delta"
-    },
-    "broadcastAnger": {
-      "type": "boolean",
-      "description": "TODO",
-      "title": "TODO"
-    },
-    "broadcastRange": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "TODO"
-    }
+    "duration": { "type": "integer", "default": 25, "description": "The amount of time in seconds that the entity will be angry", "title": "Duration" },
+    "duration_delta": { "type": "integer", "default": 0, "description": "Variance in seconds added to the duration [-delta, delta]", "title": "Duration Delta" },
+    "broadcastAnger": { "type": "boolean", "description": "TODO", "title": "TODO" },
+    "broadcastRange": { "type": "integer", "description": "TODO", "title": "TODO" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.annotation.break_door.json b/source/behaviour/entities/1.8.0/components/minecraft.annotation.break_door.json
index cccfd6e1..a6589fea 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.annotation.break_door.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.annotation.break_door.json
@@ -4,20 +4,15 @@
   "additionalProperties": false,
   "description": "Allows the actor to break doors assuming that that flags set up for the component to use in navigation",
   "type": "object",
-  "title": "Annotation.break door 1.8.0",
+  "title": "Annotation.break Door 1.8.0",
   "required": [],
   "properties": {
-    "break_time": {
-      "type": "number",
-      "default": 12,
-      "description": "The time in seconds required to break through doors.",
-      "title": "TODO title"
-    },
+    "break_time": { "type": "number", "default": 12, "description": "The time in seconds required to break through doors.", "title": "TODO Title" },
     "min_difficulty": {
       "type": "string",
       "default": "hard",
       "description": "The minimum difficulty that the world must be on for this entity to break doors.",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.annotation.floats_in_liquid.json b/source/behaviour/entities/1.8.0/components/minecraft.annotation.floats_in_liquid.json
index 47f34a66..3543f5e0 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.annotation.floats_in_liquid.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.annotation.floats_in_liquid.json
@@ -4,7 +4,7 @@
   "additionalProperties": false,
   "description": "Sets that this entity can float in liquid blocks.",
   "type": "object",
-  "title": "Annotation.floats in liquid 1.8.0",
+  "title": "Annotation.floats In Liquid 1.8.0",
   "required": [],
   "properties": {}
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.annotation.open_door.json b/source/behaviour/entities/1.8.0/components/minecraft.annotation.open_door.json
index 15d5f500..46798e25 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.annotation.open_door.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.annotation.open_door.json
@@ -4,7 +4,7 @@
   "additionalProperties": false,
   "description": "Allows the actor to open doors assuming that that flags set up for the component to use in navigation",
   "type": "object",
-  "title": "Annotation.open door 1.8.0",
+  "title": "Annotation.open Door 1.8.0",
   "required": [],
   "properties": {}
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.area_attack.json b/source/behaviour/entities/1.8.0/components/minecraft.area_attack.json
index 59647817..c53e8721 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.area_attack.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.area_attack.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.area_attack",
   "type": "object",
-  "title": "Area attack 1.8.0",
+  "title": "Area Attack 1.8.0",
   "description": "A component that does damage to entities that get within range.",
   "additionalProperties": false,
   "properties": {
@@ -10,20 +10,10 @@
       "type": "integer",
       "default": 2,
       "description": "How much damage per tick is applied to entities that enter the damage range.",
-      "title": "Damage per tick"
-    },
-    "damage_range": {
-      "type": "number",
-      "default": 0.2,
-      "description": "How close a hostile entity must be to have the damage applied.",
-      "title": "Damage range"
+      "title": "Damage Per Tick"
     },
+    "damage_range": { "type": "number", "default": 0.2, "description": "How close a hostile entity must be to have the damage applied.", "title": "Damage Range" },
     "entity_filter": { "$ref": "../filters.json", "description": "Entity_filter", "title": "Filter" },
-    "cause": {
-      "type": "string",
-      "description": "TODO",
-      "title": "Cause",
-      "$ref": "../../../../general/entity/damage_source.json"
-    }
+    "cause": { "type": "string", "description": "TODO", "title": "Cause", "$ref": "../../../../general/entity/damage_source.json" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.attack.json b/source/behaviour/entities/1.8.0/components/minecraft.attack.json
index 89689712..cf176a17 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.attack.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.attack.json
@@ -18,10 +18,6 @@
       "examples": ["wither", "hunger"],
       "title": "Effect Name"
     },
-    "effect_duration": {
-      "type": "number",
-      "description": "Duration in seconds of the status ailment applied to the damaged entity",
-      "title": "Effect Duration"
-    }
+    "effect_duration": { "type": "number", "description": "Duration in seconds of the status ailment applied to the damaged entity", "title": "Effect Duration" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.attack_cooldown.json b/source/behaviour/entities/1.8.0/components/minecraft.attack_cooldown.json
index 4946a173..92421d57 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.attack_cooldown.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.attack_cooldown.json
@@ -2,36 +2,28 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.attack_cooldown",
   "type": "object",
-  "title": "Attack cooldown 1.8.0",
+  "title": "Attack Cooldown 1.8.0",
   "description": "Adds a cooldown to a mob. The intention of this cooldown is to be used to prevent the mob from attempting to aquire new attack targets.",
   "additionalProperties": false,
   "properties": {
     "attack_cooldown_complete_event": {
       "$ref": "../types/trigger.json",
       "description": "Event to be runned when the cooldown is complete.",
-      "title": "Attack cooldown complete event"
+      "title": "Attack Cooldown Complete Event"
     },
     "attack_cooldown_time": {
       "default": [0.0, 1.0],
       "description": "Amount of time in seconds for the cooldown. Can be specified as a number or a pair of numbers (min and max).",
-      "title": "Attack cooldown time",
+      "title": "Attack Cooldown Time",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        }
+        { "type": "number" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.attack_damage.json b/source/behaviour/entities/1.8.0/components/minecraft.attack_damage.json
index 202140a6..13636ffe 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.attack_damage.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.attack_damage.json
@@ -2,15 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.attack_damage",
   "type": "object",
-  "title": "Attack damage 1.8.0",
+  "title": "Attack Damage 1.8.0",
   "additionalProperties": false,
   "required": ["value"],
-  "properties": {
-    "value": {
-      "type": "number",
-      "description": "TODO description: value",
-      "title": "Value"
-    }
-  },
+  "properties": { "value": { "type": "number", "description": "TODO description: value", "title": "Value" } },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.balloonable.json b/source/behaviour/entities/1.8.0/components/minecraft.balloonable.json
index 0948d749..d0b70f39 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.balloonable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.balloonable.json
@@ -5,12 +5,6 @@
   "type": "object",
   "title": "Balloonable 1.8.0",
   "required": [],
-  "properties": {
-    "mass": {
-      "type": "number",
-      "description": "TODO description: mass",
-      "title": "Mass"
-    }
-  },
+  "properties": { "mass": { "type": "number", "description": "TODO description: mass", "title": "Mass" } },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.barter.json b/source/behaviour/entities/1.8.0/components/minecraft.barter.json
index 9feb7e70..d894f359 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.barter.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.barter.json
@@ -6,16 +6,12 @@
   "description": "Enables the component to drop an item as a barter exchange.",
   "additionalProperties": false,
   "properties": {
-    "barter_table": {
-      "type": "string",
-      "description": "Loot table that's used to drop a random item.",
-      "title": "Barter table"
-    },
+    "barter_table": { "type": "string", "description": "Loot table that's used to drop a random item.", "title": "Barter Table" },
     "cooldown_after_being_attacked": {
       "type": "integer",
       "default": 0,
       "description": "Duration, in seconds, for which mob won't barter items if it was hurt",
-      "title": "Cooldown after being attacked"
+      "title": "Cooldown After Being Attacked"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.block_sensor.json b/source/behaviour/entities/1.8.0/components/minecraft.block_sensor.json
index ecaf66d1..5f5272e9 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.block_sensor.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.block_sensor.json
@@ -2,38 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.block_sensor",
   "type": "object",
-  "title": "Block sensor 1.8.0",
+  "title": "Block Sensor 1.8.0",
   "description": "Fires off a specified event when a block in the block list is broken within the sensor range.",
   "additionalProperties": false,
   "properties": {
-    "sensor_radius": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Sensor radius",
-      "minimum": 0
-    },
+    "sensor_radius": { "type": "integer", "description": "TODO", "title": "Sensor Radius", "minimum": 0 },
     "on_break": {
       "type": "array",
-      "title": "On break",
+      "title": "On Break",
       "items": {
         "type": "object",
-        "title": "On block broken",
+        "title": "On Block Broken",
         "additionalProperties": false,
         "properties": {
-          "block_list": {
-            "type": "array",
-            "title": "Block list",
-            "description": "TODO",
-            "items": {
-              "type": "string",
-              "title": "Block ID"
-            }
-          },
-          "on_block_broken": {
-            "type": "string",
-            "title": "On block broken",
-            "description": "On block broken"
-          }
+          "block_list": { "type": "array", "title": "Block List", "description": "TODO", "items": { "type": "string", "title": "Block ID" } },
+          "on_block_broken": { "type": "string", "title": "On Block Broken", "description": "On block broken" }
         }
       },
       "description": "TODO description"
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.boostable.json b/source/behaviour/entities/1.8.0/components/minecraft.boostable.json
index 4fa64513..8ad19e9b 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.boostable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.boostable.json
@@ -7,17 +7,12 @@
   "description": "Defines the conditions and behavior of a rideable entity's boost",
   "required": [],
   "properties": {
-    "duration": {
-      "type": "number",
-      "default": 3,
-      "description": "Time in seconds for the boost",
-      "title": "TODO title"
-    },
+    "duration": { "type": "number", "default": 3, "description": "Time in seconds for the boost", "title": "TODO Title" },
     "speed_multiplier": {
       "type": "number",
       "default": 1,
       "description": "Factor by which the entity's normal speed increases. E.g. 2.0 means go twice as fast",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "boost_items": {
       "type": "array",
@@ -25,25 +20,13 @@
         "type": "object",
         "description": "List of items that can be used to boost while riding this entity.",
         "properties": {
-          "damage": {
-            "type": "integer",
-            "default": 1,
-            "description": "This is the damage that the item will take each time it is used"
-          },
-          "item": {
-            "type": "string",
-            "$ref": "../../../../general/item/identifier.json",
-            "description": "Name of the item that can be used to boost"
-          },
-          "replaceItem": {
-            "type": "string",
-            "$ref": "../../../../general/item/identifier.json",
-            "description": "The item used to boost will become this item once it is used up"
-          }
+          "damage": { "type": "integer", "default": 1, "description": "This is the damage that the item will take each time it is used" },
+          "item": { "type": "string", "$ref": "../../../../general/item/identifier.json", "description": "Name of the item that can be used to boost" },
+          "replaceItem": { "type": "string", "$ref": "../../../../general/item/identifier.json", "description": "The item used to boost will become this item once it is used up" }
         }
       },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.boss.json b/source/behaviour/entities/1.8.0/components/minecraft.boss.json
index 0d65cd72..312497f3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.boss.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.boss.json
@@ -11,19 +11,9 @@
       "type": "integer",
       "default": 55,
       "description": "The max distance from the boss at which the boss's health bar is present on the players screen.",
-      "title": "Hud range"
+      "title": "Hud Range"
     },
-    "name": {
-      "type": "string",
-      "default": "",
-      "description": "The name that will be displayed above the boss's health bar.",
-      "title": "Name"
-    },
-    "should_darken_sky": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether the sky should darken in the presence of the boss.",
-      "title": "Should darken sky"
-    }
+    "name": { "type": "string", "default": "", "description": "The name that will be displayed above the boss's health bar.", "title": "Name" },
+    "should_darken_sky": { "type": "boolean", "default": false, "description": "Whether the sky should darken in the presence of the boss.", "title": "Should Darken Sky" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.break_blocks.json b/source/behaviour/entities/1.8.0/components/minecraft.break_blocks.json
index dceeb943..a57a48c6 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.break_blocks.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.break_blocks.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.behavior.break_blocks",
   "type": "object",
-  "title": "Break blocks 1.8.0",
+  "title": "Break Blocks 1.8.0",
   "additionalProperties": false,
   "description": "Specifies the blocks that this entity can break as it moves around.",
   "required": [],
@@ -11,9 +11,7 @@
       "type": "array",
       "title": "Breakable Blocks",
       "description": "A list of the blocks that can be broken as this entity moves around",
-      "items": {
-        "$ref": "../../../../general/blocks_item.json"
-      }
+      "items": { "$ref": "../../../../general/blocks_item.json" }
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.breathable.json b/source/behaviour/entities/1.8.0/components/minecraft.breathable.json
index 87ac1f2e..0c12f238 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.breathable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.breathable.json
@@ -7,133 +7,45 @@
   "description": "Defines what blocks this entity can breathe in and gives them the ability to suffocate.",
   "required": [],
   "properties": {
-    "totalSupply": {
-      "type": "integer",
-      "default": 15,
-      "description": "Time in seconds the entity can hold its breath",
-      "title": "TODO title"
-    },
-    "total_supply": {
-      "type": "integer",
-      "default": 15,
-      "description": "Time in seconds the entity can hold its breath",
-      "title": "TODO title"
-    },
-    "suffocateTime": {
-      "type": "integer",
-      "default": -20,
-      "description": "Time in seconds between suffocation damage",
-      "title": "TODO title"
-    },
-    "suffocate_time": {
-      "type": "integer",
-      "default": -20,
-      "description": "Time in seconds between suffocation damage",
-      "title": "TODO title"
-    },
-    "inhaleTime": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds to recover breath to maximum",
-      "title": "TODO title"
-    },
-    "inhale_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds to recover breath to maximum",
-      "title": "TODO title"
-    },
-    "breathesAir": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity can breathe in air",
-      "title": "TODO title"
-    },
-    "breathes_air": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity can breathe in air",
-      "title": "TODO title"
-    },
-    "breathesWater": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can breathe in water",
-      "title": "TODO title"
-    },
-    "breathes_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can breathe in water",
-      "title": "TODO title"
-    },
-    "breathesLava": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can breathe in lava",
-      "title": "TODO title"
-    },
-    "breathes_lava": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can breathe in lava",
-      "title": "TODO title"
-    },
-    "breathesSolids": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can breathe in solid blocks",
-      "title": "TODO title"
-    },
-    "breathes_solids": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity can breathe in solid blocks",
-      "title": "TODO title"
-    },
-    "generatesBubbles": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity will have visible bubbles while in water",
-      "title": "TODO title"
-    },
-    "generates_bubbles": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity will have visible bubbles while in water",
-      "title": "TODO title"
-    },
+    "totalSupply": { "type": "integer", "default": 15, "description": "Time in seconds the entity can hold its breath", "title": "TODO Title" },
+    "total_supply": { "type": "integer", "default": 15, "description": "Time in seconds the entity can hold its breath", "title": "TODO Title" },
+    "suffocateTime": { "type": "integer", "default": -20, "description": "Time in seconds between suffocation damage", "title": "TODO Title" },
+    "suffocate_time": { "type": "integer", "default": -20, "description": "Time in seconds between suffocation damage", "title": "TODO Title" },
+    "inhaleTime": { "type": "number", "default": 0, "description": "Time in seconds to recover breath to maximum", "title": "TODO Title" },
+    "inhale_time": { "type": "number", "default": 0, "description": "Time in seconds to recover breath to maximum", "title": "TODO Title" },
+    "breathesAir": { "type": "boolean", "default": true, "description": "If true, this entity can breathe in air", "title": "TODO Title" },
+    "breathes_air": { "type": "boolean", "default": true, "description": "If true, this entity can breathe in air", "title": "TODO Title" },
+    "breathesWater": { "type": "boolean", "default": false, "description": "If true, this entity can breathe in water", "title": "TODO Title" },
+    "breathes_water": { "type": "boolean", "default": false, "description": "If true, this entity can breathe in water", "title": "TODO Title" },
+    "breathesLava": { "type": "boolean", "default": false, "description": "If true, this entity can breathe in lava", "title": "TODO Title" },
+    "breathes_lava": { "type": "boolean", "default": false, "description": "If true, this entity can breathe in lava", "title": "TODO Title" },
+    "breathesSolids": { "type": "boolean", "default": false, "description": "If true, this entity can breathe in solid blocks", "title": "TODO Title" },
+    "breathes_solids": { "type": "boolean", "default": false, "description": "If true, this entity can breathe in solid blocks", "title": "TODO Title" },
+    "generatesBubbles": { "type": "boolean", "default": true, "description": "If true, this entity will have visible bubbles while in water", "title": "TODO Title" },
+    "generates_bubbles": { "type": "boolean", "default": true, "description": "If true, this entity will have visible bubbles while in water", "title": "TODO Title" },
     "breatheBlocks": {
       "type": "array",
       "description": "List of blocks this entity can breathe in, in addition to the above",
-      "items": {
-        "$ref": "../../../../general/blocks_identifiers.json"
-      },
-      "title": "TODO title"
+      "items": { "$ref": "../../../../general/blocks_identifiers.json" },
+      "title": "TODO Title"
     },
     "breathe_blocks": {
       "type": "array",
       "description": "List of blocks this entity can breathe in, in addition to the above",
-      "items": {
-        "$ref": "../../../../general/blocks_identifiers.json"
-      },
-      "title": "TODO title"
+      "items": { "$ref": "../../../../general/blocks_identifiers.json" },
+      "title": "TODO Title"
     },
     "nonBreatheBlocks": {
       "type": "array",
       "description": "List of blocks this entity can't breathe in, in addition to the above",
-      "items": {
-        "$ref": "../../../../general/blocks_identifiers.json"
-      },
-      "title": "TODO title"
+      "items": { "$ref": "../../../../general/blocks_identifiers.json" },
+      "title": "TODO Title"
     },
     "non_breathe_blocks": {
       "type": "array",
       "description": "List of blocks this entity can't breathe in, in addition to the above",
-      "items": {
-        "$ref": "../../../../general/blocks_identifiers.json"
-      },
-      "title": "TODO title"
+      "items": { "$ref": "../../../../general/blocks_identifiers.json" },
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.breedable.json b/source/behaviour/entities/1.8.0/components/minecraft.breedable.json
index 75ec627c..ddd4b6b1 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.breedable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.breedable.json
@@ -12,44 +12,22 @@
       "additionalItems": false,
       "required": [],
       "properties": {
-        "baby_type": {
-          "type": "string",
-          "description": "The entity definition of this entity's babies.",
-          "title": "Baby Type"
-        },
-        "breed_event": {
-          "$ref": "../types/event.json",
-          "description": "Event to run when this entity breeds.",
-          "title": "Breed Event"
-        },
-        "mate_type": {
-          "type": "string",
-          "description": "The entity definition of this entity's mate.",
-          "title": "Mate Type"
-        }
+        "baby_type": { "type": "string", "description": "The entity definition of this entity's babies.", "title": "Baby Type" },
+        "breed_event": { "$ref": "../types/event.json", "description": "Event to run when this entity breeds.", "title": "Breed Event" },
+        "mate_type": { "type": "string", "description": "The entity definition of this entity's mate.", "title": "Mate Type" }
       }
     }
   },
   "required": [],
   "properties": {
-    "allow_sitting": {
-      "description": "If true, entities can breed while sitting.",
-      "type": "boolean",
-      "default": false,
-      "title": "Allow Sitting"
-    },
+    "allow_sitting": { "description": "If true, entities can breed while sitting.", "type": "boolean", "default": false, "title": "Allow Sitting" },
     "blend_attributes": {
       "description": "If true, the entities will blend their attributes in the offspring after they breed. For example, horses blend their health, movement, and jump_strength in their offspring.",
       "type": "boolean",
       "default": true,
       "title": "Blend Attributes"
     },
-    "breed_cooldown": {
-      "description": "Time in seconds before the Entity can breed again.",
-      "type": "number",
-      "default": 60.0,
-      "title": "Breed Cooldown"
-    },
+    "breed_cooldown": { "description": "Time in seconds before the Entity can breed again.", "type": "number", "default": 60.0, "title": "Breed Cooldown" },
     "breed_items": {
       "description": "The list of items that can be used to get the entity into the 'love' state",
       "title": "Breed Items",
@@ -60,63 +38,29 @@
             "type": "string",
             "description": "An item that can be used to get the entity into the 'love' state",
             "$ref": "../../../../general/item/identifier.json",
-            "title": "TODO title"
+            "title": "TODO Title"
           }
         },
-        {
-          "type": "string",
-          "$ref": "../../../../general/item/identifier.json",
-          "title": "TODO title"
-        }
+        { "type": "string", "$ref": "../../../../general/item/identifier.json", "title": "TODO Title" }
       ]
     },
     "breeds_with": {
       "description": "The list of entity definitions that this entity can breed with.",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/breeds_with_spec"
-        },
-        {
-          "uniqueItems": true,
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/breeds_with_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/breeds_with_spec" },
+        { "uniqueItems": true, "type": "array", "items": { "type": "object", "$ref": "#/definitions/breeds_with_spec" } }
       ],
-      "title": "TODO title"
-    },
-    "causes_pregnancy": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity will become pregnant instead of spawning a baby.",
-      "title": "Causes Pregnancy"
+      "title": "TODO Title"
     },
+    "causes_pregnancy": { "type": "boolean", "default": false, "description": "If true, the entity will become pregnant instead of spawning a baby.", "title": "Causes Pregnancy" },
     "deny_parents_variant": {
       "type": "object",
       "description": "Determines how likely the baby of parents with the same variant will deny that variant and take a random variant within the given range instead.",
       "additionalProperties": false,
       "properties": {
-        "chance": {
-          "type": "number",
-          "default": 0,
-          "description": "The percentage chance of denying the parents' variant.",
-          "title": "Chance"
-        },
-        "max_variant": {
-          "type": "integer",
-          "default": 0,
-          "description": "The inclusive maximum of the variant range.",
-          "title": "Max Variant"
-        },
-        "min_variant": {
-          "type": "integer",
-          "default": 0,
-          "description": "The inclusive minimum of the variant range.",
-          "title": "Min Variant"
-        }
+        "chance": { "type": "number", "default": 0, "description": "The percentage chance of denying the parents' variant.", "title": "Chance" },
+        "max_variant": { "type": "integer", "default": 0, "description": "The inclusive maximum of the variant range.", "title": "Max Variant" },
+        "min_variant": { "type": "integer", "default": 0, "description": "The inclusive minimum of the variant range.", "title": "Min Variant" }
       },
       "title": "Deny Parents Variant"
     },
@@ -138,11 +82,7 @@
             },
             "title": "Blocks"
           },
-          "count": {
-            "type": "number",
-            "description": "The number of the required block types nearby for the entity to breed.",
-            "title": "Count"
-          },
+          "count": { "type": "number", "description": "The number of the required block types nearby for the entity to breed.", "title": "Count" },
           "radius": {
             "type": "number",
             "description": "How many blocks radius from the mob's center to search in for the required blocks. Bounded between 0 and 16.",
@@ -162,26 +102,14 @@
       "maximum": 1.0,
       "title": "Extra Baby Chance"
     },
-    "inherit_tamed": {
-      "description": "If true, the babies will be automatically tamed if its parents are",
-      "type": "boolean",
-      "default": true,
-      "title": "Inherit Tamed"
-    },
+    "inherit_tamed": { "description": "If true, the babies will be automatically tamed if its parents are", "type": "boolean", "default": true, "title": "Inherit Tamed" },
     "love_filters": { "$ref": "../filters.json", "description": "The filters to run when attempting to fall in love.", "title": "Love Filters" },
     "mutation_factor": {
       "type": "object",
       "description": "Determines how likely the babies are to NOT inherit one of their parent's variances. Values are between 0.0 and 1.0, with a higher number meaning more likely to mutate.",
       "additionalProperties": false,
       "properties": {
-        "color": {
-          "type": "number",
-          "default": 0,
-          "minimum": 0.0,
-          "maximum": 1.0,
-          "description": "The percentage chance of a mutation on the entity's color.",
-          "title": "Color"
-        },
+        "color": { "type": "number", "default": 0, "minimum": 0.0, "maximum": 1.0, "description": "The percentage chance of a mutation on the entity's color.", "title": "Color" },
         "extra_variant": {
           "type": "number",
           "default": 0,
@@ -201,11 +129,6 @@
       },
       "title": "Mutation Factor"
     },
-    "require_tame": {
-      "type": "boolean",
-      "description": "If true, the entities need to be tamed first before they can breed.",
-      "default": true,
-      "title": "Require Tame"
-    }
+    "require_tame": { "type": "boolean", "description": "If true, the entities need to be tamed first before they can breed.", "default": true, "title": "Require Tame" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.bribeable.json b/source/behaviour/entities/1.8.0/components/minecraft.bribeable.json
index 755923cf..89e45e46 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.bribeable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.bribeable.json
@@ -7,20 +7,11 @@
   "description": "Specifies if/how a mob burns in daylight.",
   "required": [],
   "properties": {
-    "bribe_cooldown": {
-      "type": "number",
-      "default": 2,
-      "description": "Time in seconds before the Entity can be bribed again",
-      "title": "Bribe Cooldown"
-    },
+    "bribe_cooldown": { "type": "number", "default": 2, "description": "Time in seconds before the Entity can be bribed again", "title": "Bribe Cooldown" },
     "bribe_items": {
       "type": "array",
       "description": "The list of items that can be used to bribe the entity",
-      "items": {
-        "description": "An item that can be used to bribe the entity",
-        "$ref": "../../../../general/item/identifier.json",
-        "title": "Bribe Items"
-      },
+      "items": { "description": "An item that can be used to bribe the entity", "$ref": "../../../../general/item/identifier.json", "title": "Bribe Items" },
       "title": "Bribe Items"
     }
   }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.buoyant.json b/source/behaviour/entities/1.8.0/components/minecraft.buoyant.json
index c7c52545..70fbca17 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.buoyant.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.buoyant.json
@@ -10,46 +10,33 @@
       "type": "boolean",
       "default": true,
       "description": "Applies gravity each tick. Causes more of a wave simulation, but will cause more gravity to be applied outside liquids.",
-      "title": "Apply gravity"
-    },
-    "base_buoyancy": {
-      "type": "number",
-      "default": 1,
-      "description": "Base buoyancy used to calculate how much will a mob float.",
-      "title": "Base buoyancy"
+      "title": "Apply Gravity"
     },
+    "base_buoyancy": { "type": "number", "default": 1, "description": "Base buoyancy used to calculate how much will a mob float.", "title": "Base Buoyancy" },
     "big_wave_probability": {
       "type": "number",
       "default": 0.03,
       "description": "Probability for a big wave hitting the entity. Only used if `simulate_waves` is true.",
-      "title": "Big wave probability"
+      "title": "Big Wave Probability"
     },
     "big_wave_speed": {
       "type": "number",
       "default": 10,
       "description": "Multiplier for the speed to make a big wave. Triggered depending on 'big_wave_probability'.",
-      "title": "Big wave speed"
+      "title": "Big Wave Speed"
     },
     "drag_down_on_buoyancy_removed": {
       "type": "number",
       "default": 0,
       "description": "How much an actor will be dragged down when the Buoyancy Component is removed.",
-      "title": "Drag down on buoyancy removed"
+      "title": "Drag Down On Buoyancy Removed"
     },
     "liquid_blocks": {
       "type": "array",
       "description": "List of blocks this entity can float on. Must be a liquid block.",
-      "title": "Liquid blocks",
-      "items": {
-        "type": "string",
-        "title": "Block ID"
-      }
+      "title": "Liquid Blocks",
+      "items": { "type": "string", "title": "Block ID" }
     },
-    "simulate_waves": {
-      "type": "boolean",
-      "default": true,
-      "description": "Should the movement simulate waves going through.",
-      "title": "Simulate waves"
-    }
+    "simulate_waves": { "type": "boolean", "default": true, "description": "Should the movement simulate waves going through.", "title": "Simulate Waves" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.burns_in_daylight.json b/source/behaviour/entities/1.8.0/components/minecraft.burns_in_daylight.json
index f19d5ff2..f08bc9dc 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.burns_in_daylight.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.burns_in_daylight.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.burns_in_daylight",
-  "title": "Burns in daylight 1.8.0",
+  "title": "Burns In Daylight 1.8.0",
   "additionalProperties": false,
   "description": "Specifies if/how a mob burns in daylight.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.can_climb.json b/source/behaviour/entities/1.8.0/components/minecraft.can_climb.json
index c1418725..58cab197 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.can_climb.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.can_climb.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.can_climb",
   "type": "object",
-  "title": "Can climb 1.8.0",
+  "title": "Can Climb 1.8.0",
   "additionalProperties": false,
   "description": "Allows this entity to climb up ladders.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.can_fly.json b/source/behaviour/entities/1.8.0/components/minecraft.can_fly.json
index 0cd9c577..c5f8a391 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.can_fly.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.can_fly.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.can_fly",
   "type": "object",
-  "title": "Can fly 1.8.0",
+  "title": "Can Fly 1.8.0",
   "additionalProperties": false,
   "description": "Marks the entity as being able to fly, the pathfinder won't be restricted to paths where a solid block is required underneath it.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "boolean",
-      "default": true,
-      "description": "TODO description: value",
-      "title": "Value"
-    }
-  }
+  "properties": { "value": { "type": "boolean", "default": true, "description": "TODO description: value", "title": "Value" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.can_power_jump.json b/source/behaviour/entities/1.8.0/components/minecraft.can_power_jump.json
index c805f561..b0f6c4c6 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.can_power_jump.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.can_power_jump.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.can_power_jump",
   "type": "object",
-  "title": "Can power jump 1.8.0",
+  "title": "Can Power Jump 1.8.0",
   "additionalProperties": false,
   "description": "Allows the entity to power jump like the horse does in vanilla.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.celebrate_hunt.json b/source/behaviour/entities/1.8.0/components/minecraft.celebrate_hunt.json
index 99dc5619..a826d4f0 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.celebrate_hunt.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.celebrate_hunt.json
@@ -2,33 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.celebrate_hunt",
   "type": "object",
-  "title": "Celebrate hunt 1.8.0",
+  "title": "Celebrate Hunt 1.8.0",
   "description": "Specifies hunt celebration behaviour.",
   "additionalProperties": false,
   "properties": {
-    "broadcast": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, celebration will be broadcasted to other entities in the radius.",
-      "title": "Broadcast"
-    },
+    "broadcast": { "type": "boolean", "default": true, "description": "If true, celebration will be broadcasted to other entities in the radius.", "title": "Broadcast" },
     "celeberation_targets": {
       "$ref": "../filters.json",
       "description": "The list of conditions that target of hunt must satisfy to initiate celebration.",
-      "title": "Celeberation targets"
-    },
-    "celebrate_sound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound event to play when the mob is celebrating",
-      "title": "Celebrate sound"
-    },
-    "duration": {
-      "type": "integer",
-      "default": 4,
-      "description": "Duration, in seconds, of celebration",
-      "title": "Duration"
+      "title": "Celeberation Targets"
     },
+    "celebrate_sound": { "type": "string", "default": "", "description": "The sound event to play when the mob is celebrating", "title": "Celebrate Sound" },
+    "duration": { "type": "integer", "default": 4, "description": "Duration, in seconds, of celebration", "title": "Duration" },
     "radius": {
       "type": "number",
       "default": 16,
@@ -38,24 +23,16 @@
     "sound_interval": {
       "default": 0,
       "description": "The range of time in seconds to randomly wait before playing the sound again",
-      "title": "Sound interval",
+      "title": "Sound Interval",
       "oneOf": [
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        }
+        { "type": "number" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.collision_box.json b/source/behaviour/entities/1.8.0/components/minecraft.collision_box.json
index c4f97d0d..cd0000d3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.collision_box.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.collision_box.json
@@ -2,22 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.collision_box",
   "type": "object",
-  "title": "Collision box 1.8.0",
+  "title": "Collision Box 1.8.0",
   "additionalProperties": false,
   "description": "Sets the width and height of the Entity's collision box.",
   "required": [],
   "properties": {
-    "height": {
-      "type": "number",
-      "default": 1,
-      "description": "Height of the collision box in blocks. A negative value will be assumed to be 0",
-      "title": "Height"
-    },
-    "width": {
-      "type": "number",
-      "default": 1,
-      "description": "Width and Depth of the collision box in blocks. A negative value will be assumed to be 0",
-      "title": "Width"
-    }
+    "height": { "type": "number", "default": 1, "description": "Height of the collision box in blocks. A negative value will be assumed to be 0", "title": "Height" },
+    "width": { "type": "number", "default": 1, "description": "Width and Depth of the collision box in blocks. A negative value will be assumed to be 0", "title": "Width" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.color.json b/source/behaviour/entities/1.8.0/components/minecraft.color.json
index 5e823a1e..d4f4d9f1 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.color.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.color.json
@@ -6,12 +6,5 @@
   "additionalProperties": false,
   "description": "Defines the entity's color. Only works on vanilla entities that have predefined color values (sheep, llama, shulker).",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "integer",
-      "default": 0,
-      "description": "The Palette Color value of the entity",
-      "title": "Value"
-    }
-  }
+  "properties": { "value": { "type": "integer", "default": 0, "description": "The Palette Color value of the entity", "title": "Value" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.color2.json b/source/behaviour/entities/1.8.0/components/minecraft.color2.json
index 9fd9b8de..ada82eec 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.color2.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.color2.json
@@ -6,12 +6,5 @@
   "additionalProperties": false,
   "description": "Defines the entity's second texture color. Only works on vanilla entities that have a second predefined color values (tropical fish).",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "integer",
-      "default": 0,
-      "description": "The second Palette Color value of the entity",
-      "title": "Value"
-    }
-  }
+  "properties": { "value": { "type": "integer", "default": 0, "description": "The second Palette Color value of the entity", "title": "Value" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json b/source/behaviour/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json
index 84b9a4a9..4bfc3624 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.conditional_bandwidth_optimization.json
@@ -3,62 +3,60 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.conditional_bandwidth_optimization",
   "additionalProperties": false,
   "type": "object",
-  "title": "Conditional bandwidth optimization 1.8.0",
+  "title": "Conditional Bandwidth Optimization 1.8.0",
   "description": "Defines the Conditional Spatial Update Bandwidth Optimizations of this entity.",
   "properties": {
     "conditional_values": {
-      "title": "Conditional values",
+      "title": "Conditional Values",
       "description": "The object containing the conditional bandwidth optimization values.",
       "type": "array",
       "items": {
-        "title": "Conditional value",
+        "title": "Conditional Value",
         "description": "The object containing the conditional bandwidth optimization values.",
         "additionalProperties": false,
         "properties": {
           "max_dropped_ticks": {
-            "title": "Max dropped ticks",
+            "title": "Max Dropped Ticks",
             "description": "In relation to the optimization value, determines the maximum ticks spatial update packets can be not sent.",
             "type": "integer"
           },
           "max_optimized_distance": {
-            "title": "Max optimized distance",
+            "title": "Max Optimized Distance",
             "description": "The maximum distance considered during bandwidth optimizations. Any value below the max is interpolated to find optimization, and any value greater than or equal to this max results in max optimization.",
             "type": "number"
           },
           "use_motion_prediction_hints": {
-            "title": "Use motion prediction hints",
+            "title": "Use Motion Prediction Hints",
             "description": "When set to true, smaller motion packets will be sent during drop packet intervals, resulting in the same amount of packets being sent as without optimizations but with much less data being sent. This should be used when actors are travelling very quickly or teleporting to prevent visual oddities.",
             "type": "boolean"
           },
           "conditional_values": {
-            "title": "Conditional values",
+            "title": "Conditional Values",
             "description": "Conditions that must be met for these optimization values to be used.",
             "type": "array",
-            "items": {
-              "$ref": "../filters.json"
-            }
+            "items": { "$ref": "../filters.json" }
           }
         }
       }
     },
     "default_values": {
-      "title": "Default values",
+      "title": "Default Values",
       "description": "The object containing the default bandwidth optimization values.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
         "max_dropped_ticks": {
-          "title": "Max dropped ticks",
+          "title": "Max Dropped Ticks",
           "description": "In relation to the optimization value, determines the maximum ticks spatial update packets can be not sent.",
           "type": "integer"
         },
         "max_optimized_distance": {
-          "title": "Max optimized distance",
+          "title": "Max Optimized Distance",
           "description": "The maximum distance considered during bandwidth optimizations. Any value below the max is interpolated to find optimization, and any value greater than or equal to this max results in max optimization.",
           "type": "number"
         },
         "use_motion_prediction_hints": {
-          "title": "Use motion prediction hints",
+          "title": "Use Motion Prediction Hints",
           "description": "When set to true, smaller motion packets will be sent during drop packet intervals, resulting in the same amount of packets being sent as without optimizations but with much less data being sent. This should be used when actors are travelling very quickly or teleporting to prevent visual oddities.",
           "type": "boolean"
         }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.custom_hit_test.json b/source/behaviour/entities/1.8.0/components/minecraft.custom_hit_test.json
index 00db8e36..c5edb3e8 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.custom_hit_test.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.custom_hit_test.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.custom_hit_test",
   "type": "object",
-  "title": "Custom hit test 1.8.0",
+  "title": "Custom Hit Test 1.8.0",
   "description": "List of hitboxes for melee and ranged hits against the entity.",
   "additionalProperties": false,
   "properties": {
@@ -16,32 +16,9 @@
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "width": {
-            "type": "number",
-            "title": "Width",
-            "description": "TODO"
-          },
-          "height": {
-            "type": "number",
-            "title": "Height",
-            "description": "TODO"
-          },
-          "pivot": {
-            "type": "array",
-            "title": "Pivot",
-            "description": "TODO",
-            "items": [
-              {
-                "type": "number"
-              },
-              {
-                "type": "number"
-              },
-              {
-                "type": "number"
-              }
-            ]
-          }
+          "width": { "type": "number", "title": "Width", "description": "TODO" },
+          "height": { "type": "number", "title": "Height", "description": "TODO" },
+          "pivot": { "type": "array", "title": "Pivot", "description": "TODO", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] }
         }
       }
     }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.damage_over_time.json b/source/behaviour/entities/1.8.0/components/minecraft.damage_over_time.json
index e43043f7..eb0e6db3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.damage_over_time.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.damage_over_time.json
@@ -2,22 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.damage_over_time",
   "type": "object",
-  "title": "Damage over time 1.8.0",
+  "title": "Damage Over Time 1.8.0",
   "additionalProperties": false,
   "description": "Applies defined amount of damage to the entity at specified intervals.",
   "required": [],
   "properties": {
-    "damage_per_hurt": {
-      "type": "integer",
-      "default": 1,
-      "description": "Amount of damage caused each hurt.",
-      "title": "Damage Per Hurt"
-    },
-    "time_between_hurt": {
-      "type": "number",
-      "default": 0,
-      "description": "Time in seconds between damage.",
-      "title": "Time Between Hurt"
-    }
+    "damage_per_hurt": { "type": "integer", "default": 1, "description": "Amount of damage caused each hurt.", "title": "Damage Per Hurt" },
+    "time_between_hurt": { "type": "number", "default": 0, "description": "Time in seconds between damage.", "title": "Time Between Hurt" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.damage_sensor.json b/source/behaviour/entities/1.8.0/components/minecraft.damage_sensor.json
index 12cce14a..98f9d41d 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.damage_sensor.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.damage_sensor.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.damage_sensor",
-  "title": "Damage sensor 1.8.0",
+  "title": "Damage Sensor 1.8.0",
   "additionalProperties": false,
   "description": "Defines what events to call when this entity is damaged by specific entities or items.",
   "definitions": {
@@ -28,17 +28,8 @@
           "type": "object",
           "properties": {
             "filters": { "$ref": "../filters.json" },
-            "event": {
-              "type": "string",
-              "pattern": "^.*$",
-              "description": "TODO description: event",
-              "title": "Event"
-            },
-            "target": {
-              "$ref": "../filters/types/base_subject.json",
-              "description": "TODO description: target",
-              "title": "Target"
-            }
+            "event": { "type": "string", "pattern": "^.*$", "description": "TODO description: event", "title": "Event" },
+            "target": { "$ref": "../filters/types/base_subject.json", "description": "TODO description: target", "title": "Target" }
           },
           "description": "Specifies filters for entity definitions and events.",
           "title": "On Damage"
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.default_look_angle.json b/source/behaviour/entities/1.8.0/components/minecraft.default_look_angle.json
index 94e50b13..427ca43f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.default_look_angle.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.default_look_angle.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.default_look_angle",
   "type": "object",
-  "title": "Default look angle 1.8.0",
+  "title": "Default Look Angle 1.8.0",
   "additionalProperties": false,
   "description": "Sets this entity's default head rotation angle.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 0.0,
-      "description": "Angle in degrees",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 0.0, "description": "Angle in degrees", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.despawn.json b/source/behaviour/entities/1.8.0/components/minecraft.despawn.json
index 9628e5fb..f5b41d99 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.despawn.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.despawn.json
@@ -7,52 +7,38 @@
   "description": "Despawns the associated Actor immediately or when the optional filter evaluates to true.",
   "required": [],
   "properties": {
-    "filters": {
-      "$ref": "../filters.json",
-      "description": "The list of conditions that must be satisfied before the Actor is despawned",
-      "title": "Filters"
-    },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions that must be satisfied before the Actor is despawned", "title": "Filters" },
     "despawn_from_chance": {
       "type": "boolean",
       "default": true,
       "description": "Determines if \"min_range_random_chance\" is used in the standard despawn rules",
-      "title": "Despawn from chance"
+      "title": "Despawn From Chance"
     },
     "despawn_from_inactivity": {
       "type": "boolean",
       "default": true,
       "description": "Determines if the \"min_range_inactivity_timer\" is used in the standard despawn rules.",
-      "title": "Despawn from inactivity"
-    },
-    "despawn_from_distance": {
-      "type": "object",
-      "description": "UNDOCUMENTATED",
-      "title": "UNDOCUMENTATED",
-      "additionalProperties": false
+      "title": "Despawn From Inactivity"
     },
+    "despawn_from_distance": { "type": "object", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED", "additionalProperties": false },
     "despawn_from_simulation_edge": {
       "type": "boolean",
       "default": true,
       "description": "Determines if the mob is instantly despawned at the edge of simulation distance in the standard despawn rules.",
-      "title": "Despawn from simulation edge"
+      "title": "Despawn From Simulation Edge"
     },
     "min_range_inactivity_timer": {
       "type": "integer",
       "default": 30,
       "description": "The amount of time in seconds that the mob must be inactive.",
-      "title": "Min range inactivity timer"
-    },
-    "min_range_random_chance": {
-      "type": "integer",
-      "default": 800,
-      "description": "A random chance between 1 and the given value.",
-      "title": "Min range random chance"
+      "title": "Min Range Inactivity Timer"
     },
+    "min_range_random_chance": { "type": "integer", "default": 800, "description": "A random chance between 1 and the given value.", "title": "Min Range Random Chance" },
     "remove_child_entities": {
       "type": "boolean",
       "default": false,
       "description": "If true, all entities linked to this entity in a child relationship (eg. leashed) will also be despawned.",
-      "title": "Remove child entities"
+      "title": "Remove Child Entities"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.dweller.json b/source/behaviour/entities/1.8.0/components/minecraft.dweller.json
index e5c69d42..bf899581 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.dweller.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.dweller.json
@@ -6,45 +6,13 @@
   "description": "UNDOCUMENTATED",
   "additionalProperties": false,
   "properties": {
-    "dwelling_type": {
-      "type": "string",
-      "title": "Dwelling type",
-      "description": "UNDOCUMENTATED"
-    },
-    "dweller_role": {
-      "type": "string",
-      "title": "Dwelling role",
-      "description": "UNDOCUMENTATED"
-    },
-    "update_interval_base": {
-      "type": "integer",
-      "title": "Update interval base",
-      "description": "UNDOCUMENTATED"
-    },
-    "update_interval_variant": {
-      "type": "integer",
-      "title": "Update interval variant",
-      "description": "UNDOCUMENTATED"
-    },
-    "preferred_profession": {
-      "type": "string",
-      "title": "Preferred profession",
-      "description": "UNDOCUMENTATED"
-    },
-    "can_find_poi": {
-      "type": "boolean",
-      "title": "Can find poi",
-      "description": "UNDOCUMENTATED"
-    },
-    "can_migrate": {
-      "type": "boolean",
-      "title": "Can migrate",
-      "description": "UNDOCUMENTATED"
-    },
-    "first_founding_reward": {
-      "type": "integer",
-      "title": "First founding reward",
-      "description": "UNDOCUMENTATED"
-    }
+    "dwelling_type": { "type": "string", "title": "Dwelling Type", "description": "UNDOCUMENTATED" },
+    "dweller_role": { "type": "string", "title": "Dwelling Role", "description": "UNDOCUMENTATED" },
+    "update_interval_base": { "type": "integer", "title": "Update Interval Base", "description": "UNDOCUMENTATED" },
+    "update_interval_variant": { "type": "integer", "title": "Update Interval Variant", "description": "UNDOCUMENTATED" },
+    "preferred_profession": { "type": "string", "title": "Preferred Profession", "description": "UNDOCUMENTATED" },
+    "can_find_poi": { "type": "boolean", "title": "Can Find Poi", "description": "UNDOCUMENTATED" },
+    "can_migrate": { "type": "boolean", "title": "Can Migrate", "description": "UNDOCUMENTATED" },
+    "first_founding_reward": { "type": "integer", "title": "First Founding Reward", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json b/source/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json
index f1dcbe33..46eb002e 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.economy_trade_table.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.economy_trade_table",
   "type": "object",
-  "title": "Economy trade table 1.8.0",
+  "title": "Economy Trade Table 1.8.0",
   "additionalProperties": false,
   "description": "Defines this entity's ability to trade with players.",
   "required": [],
@@ -11,35 +11,30 @@
       "type": "boolean",
       "default": false,
       "description": "Determines when the mob transforms, if the trades should be converted when the new mob has a economy_trade_table. When the trades are converted, the mob will generate a new trade list with their new trade table, but then it will try to convert any of the same trades over to have the same enchantments and user data. For example, if the original has a Emerald to Enchanted Iron Sword (Sharpness 1), and the new trade also has an Emerald for Enchanted Iron Sword, then the enchantment will be Sharpness 1.",
-      "title": "convert trades economy"
+      "title": "Convert Trades Economy"
     },
     "cured_discount": {
       "type": "array",
       "default": [-5, -20],
       "description": "How much should the discount be modified by when the player has cured the Zombie Villager. Can be specified as a pair of numbers (low-tier trade discount and high-tier trade discount)",
-      "title": "cured discount",
+      "title": "Cured Discount",
       "items": [
         { "type": "integer", "title": "A", "description": "" },
         { "type": "integer", "title": "B", "description": "" }
       ]
     },
-    "display_name": {
-      "type": "string",
-      "default": "",
-      "description": "Name to be displayed while trading with this entity",
-      "title": "display name"
-    },
+    "display_name": { "type": "string", "default": "", "description": "Name to be displayed while trading with this entity", "title": "Display Name" },
     "hero_demand_discount": {
       "type": "integer",
       "default": -4,
       "description": "Used in legacy prices to determine how much should Demand be modified by when the player has the Hero of the Village mob effect",
-      "title": "hero demand discount"
+      "title": "Hero Demand Discount"
     },
     "max_cured_discount": {
       "type": "array",
       "default": [-25, -63],
       "description": "The max the discount can be modified by when the player has cured the Zombie Villager. Can be specified as a pair of numbers (low-tier trade discount and high-tier trade discount)",
-      "title": "max cured discount",
+      "title": "Max Cured Discount",
       "items": [
         { "type": "integer", "title": "A", "description": "" },
         { "type": "integer", "title": "B", "description": "" }
@@ -49,43 +44,28 @@
       "type": "integer",
       "default": -200,
       "description": "The max the discount can be modified by when the player has cured a nearby Zombie Villager",
-      "title": "max nearby cured discount"
+      "title": "Max Nearby Cured Discount"
     },
     "nearby_cured_discount": {
       "type": "integer",
       "default": -25,
       "description": "How much should the discount be modified by when the player has cured a nearby Zombie Villager",
-      "title": "nearby cured discount"
-    },
-    "new_screen": {
-      "type": "boolean",
-      "default": false,
-      "description": "Used to determine if trading with entity opens the new trade screen",
-      "title": "new screen"
+      "title": "Nearby Cured Discount"
     },
+    "new_screen": { "type": "boolean", "default": false, "description": "Used to determine if trading with entity opens the new trade screen", "title": "New Screen" },
     "persist_trades": {
       "type": "boolean",
       "default": false,
       "description": "Determines if the trades should persist when the mob transforms. This makes it so that the next time the mob is transformed to something with a trade_table or economy_trade_table, then it keeps their trades.",
-      "title": "persist trades"
-    },
-    "show_trade_screen": {
-      "type": "boolean",
-      "default": true,
-      "description": "Show an in game trade screen when interacting with the mob.",
-      "title": "show trade screen"
-    },
-    "table": {
-      "type": "string",
-      "default": "",
-      "description": "File path relative to the resource pack root for this entity's trades",
-      "title": "table"
+      "title": "Persist Trades"
     },
+    "show_trade_screen": { "type": "boolean", "default": true, "description": "Show an in game trade screen when interacting with the mob.", "title": "Show Trade Screen" },
+    "table": { "type": "string", "default": "", "description": "File path relative to the resource pack root for this entity's trades", "title": "table" },
     "use_legacy_price_formula": {
       "type": "boolean",
       "default": false,
       "description": "Determines whether the legacy formula is used to determines the trade prices.",
-      "title": "use legacy price formula"
+      "title": "Use Legacy Price Formula"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.entity_sensor.json b/source/behaviour/entities/1.8.0/components/minecraft.entity_sensor.json
index 51466b39..71a8c4f6 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.entity_sensor.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.entity_sensor.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.entity_sensor",
   "type": "object",
-  "title": "Entity sensor 1.8.0",
+  "title": "Entity Sensor 1.8.0",
   "description": "A component that fires an event when a set of conditions are met by other entities within the defined range.",
   "additionalProperties": false,
   "properties": {
@@ -10,37 +10,28 @@
       "type": "integer",
       "default": -1,
       "description": "The maximum number of entities that must pass the filter conditions for the event to send.",
-      "title": "Maximum count"
+      "title": "Maximum Count"
     },
     "minimum_count": {
       "type": "integer",
       "default": 1,
       "description": "The minimum number of entities that must pass the filter conditions for the event to send.",
-      "title": "Minimum count"
-    },
-    "relative_range": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true the sensor range is additive on top of the entity's size.",
-      "title": "Relative range"
+      "title": "Minimum Count"
     },
+    "relative_range": { "type": "boolean", "default": true, "description": "If true the sensor range is additive on top of the entity's size.", "title": "Relative Range" },
     "require_all": {
       "type": "boolean",
       "default": false,
       "description": "If true requires all nearby entities to pass the filter conditions for the event to send.",
-      "title": "Require all"
+      "title": "Require All"
     },
     "sensor_range": {
       "type": "number",
       "default": 10,
       "description": "The maximum distance another entity can be from this and have the filters checked against it.",
-      "title": "Sensor range"
+      "title": "Sensor Range"
     },
     "event_filters": { "$ref": "../filters.json" },
-    "event": {
-      "title": "Event",
-      "description": "event",
-      "type": "string"
-    }
+    "event": { "title": "Event", "description": "event", "type": "string" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.environment_sensor.json b/source/behaviour/entities/1.8.0/components/minecraft.environment_sensor.json
index 0c5f8ea5..17e19373 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.environment_sensor.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.environment_sensor.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.environment_sensor",
-  "title": "Environment sensor 1.8.0",
+  "title": "Environment Sensor 1.8.0",
   "additionalProperties": false,
   "description": "Allows the entity to power jump like the horse does in vanilla.",
   "definitions": {
@@ -11,21 +11,9 @@
       "description": "TODO description: on environement",
       "title": "On Environement",
       "properties": {
-        "filters": {
-          "$ref": "../filters.json",
-          "description": "The filters to evualate for this environment sensor",
-          "title": "Filters"
-        },
-        "event": {
-          "type": "string",
-          "pattern": "^.+$",
-          "description": "The event to trigger if the filters are true",
-          "title": "Event"
-        },
-        "target": {
-          "description": "The target of the event",
-          "$ref": "../filters/types/base_subject.json"
-        }
+        "filters": { "$ref": "../filters.json", "description": "The filters to evualate for this environment sensor", "title": "Filters" },
+        "event": { "type": "string", "pattern": "^.+$", "description": "The event to trigger if the filters are true", "title": "Event" },
+        "target": { "description": "The target of the event", "$ref": "../filters/types/base_subject.json" }
       }
     }
   },
@@ -34,17 +22,7 @@
     { "type": "object", "$ref": "#/definitions/on_environement" },
     {
       "type": "array",
-      "items": {
-        "oneOf": [
-          { "$ref": "#/definitions/on_environement" },
-          {
-            "type": "object",
-            "properties": {
-              "on_environment": { "$ref": "#/definitions/on_environement" }
-            }
-          }
-        ]
-      }
+      "items": { "oneOf": [{ "$ref": "#/definitions/on_environement" }, { "type": "object", "properties": { "on_environment": { "$ref": "#/definitions/on_environement" } } }] }
     }
   ]
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.equip_item.json b/source/behaviour/entities/1.8.0/components/minecraft.equip_item.json
index be0d45e7..d3831022 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.equip_item.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.equip_item.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.equip_item",
   "type": "object",
-  "title": "Equip item 1.8.0",
+  "title": "Equip Item 1.8.0",
   "description": "The entity puts on the desired equipment.",
   "additionalProperties": false,
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.equipment.json b/source/behaviour/entities/1.8.0/components/minecraft.equipment.json
index 40e91f9a..f9bd7874 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.equipment.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.equipment.json
@@ -6,32 +6,17 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "table": {
-      "type": "string",
-      "pattern": ".*\\.json$",
-      "description": "TODO description: table",
-      "title": "Table"
-    },
+    "table": { "type": "string", "pattern": ".*\\.json$", "description": "TODO description: table", "title": "Table" },
     "slot_drop_chance": {
       "type": "array",
-      "title": "Slot drop chance",
+      "title": "Slot Drop Chance",
       "description": "A list of slots with the chance to drop an equipped item from that slot",
       "items": {
         "type": "object",
-        "title": "Slot drop chance",
+        "title": "Slot Drop Chance",
         "description": "UNDOCUMENTATED",
         "additionalProperties": false,
-        "properties": {
-          "drop_chance": {
-            "type": "number",
-            "title": "Drop chance"
-          },
-          "slot": {
-            "type": "string",
-            "title": "Slot",
-            "pattern": "slot\\.[a-z\\.0-9]+"
-          }
-        }
+        "properties": { "drop_chance": { "type": "number", "title": "Drop Chance" }, "slot": { "type": "string", "title": "Slot", "pattern": "slot\\.[a-z\\.0-9]+" } }
       }
     }
   },
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.equippable.json b/source/behaviour/entities/1.8.0/components/minecraft.equippable.json
index a31c2f96..9f26d430 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.equippable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.equippable.json
@@ -14,47 +14,22 @@
         "description": "A slot and the item that can be equipped",
         "type": "object",
         "properties": {
-          "slot": {
-            "type": "integer",
-            "default": 0,
-            "description": "The slot number of this slot",
-            "title": "Slot"
-          },
+          "slot": { "type": "integer", "default": 0, "description": "The slot number of this slot", "title": "Slot" },
           "accepted_items": {
             "type": "array",
             "description": "The list of items that can go in this slot",
-            "items": {
-              "type": "string",
-              "description": "A item name",
-              "$ref": "../../../../general/item/identifier.json",
-              "title": "Accepted Items"
-            },
+            "items": { "type": "string", "description": "A item name", "$ref": "../../../../general/item/identifier.json", "title": "Accepted Items" },
             "title": "Accepted Items"
           },
-          "item": {
-            "type": "string",
-            "default": 0,
-            "description": "Identifier of the item that can be equipped for this slot",
-            "title": "Item"
-          },
+          "item": { "type": "string", "default": 0, "description": "Identifier of the item that can be equipped for this slot", "title": "Item" },
           "interact_text": {
             "type": "string",
             "default": 0,
             "description": "Text to be displayed when the entity can be equipped with this item when playing with Touch-screen controls",
             "title": "Interact Text"
           },
-          "on_equip": {
-            "type": "string",
-            "default": 0,
-            "description": "Event to trigger when this entity is equipped with this item",
-            "title": "On Equip"
-          },
-          "on_unequip": {
-            "type": "string",
-            "default": 0,
-            "description": "Event to trigger when this item is removed from this entity",
-            "title": "On Unequip"
-          }
+          "on_equip": { "type": "string", "default": 0, "description": "Event to trigger when this entity is equipped with this item", "title": "On Equip" },
+          "on_unequip": { "type": "string", "default": 0, "description": "Event to trigger when this item is removed from this entity", "title": "On Unequip" }
         },
         "title": "Slots"
       },
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.experience_reward.json b/source/behaviour/entities/1.8.0/components/minecraft.experience_reward.json
index 819165aa..1cf6c57c 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.experience_reward.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.experience_reward.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.experience_reward",
   "type": "object",
-  "title": "Experience reward 1.8.0",
+  "title": "Experience Reward 1.8.0",
   "description": "TODO",
   "additionalProperties": false,
   "properties": {
@@ -10,13 +10,13 @@
       "type": "string",
       "default": 0,
       "description": "A molang expression defining the amount of experience rewarded when this entity is successfully bred. An array of expressions adds each expression's result together for a final total.",
-      "title": "On bred"
+      "title": "On Bred"
     },
     "on_death": {
       "type": "string",
       "default": 0,
       "description": "A molang expression defining the amount of experience rewarded when this entity dies. An array of expressions adds each expression's result together for a final total.",
-      "title": "On death"
+      "title": "On Death"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.explode.json b/source/behaviour/entities/1.8.0/components/minecraft.explode.json
index b9bba54f..d52ba60c 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.explode.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.explode.json
@@ -13,35 +13,11 @@
       "description": "The range for the random amount of time the fuse will be lit before exploding, a negative value means the explosion will be immediate",
       "title": "Fuse Length"
     },
-    "power": {
-      "type": "number",
-      "default": 3,
-      "description": "The radius of the explosion in blocks and the amount of damage the explosion deals",
-      "title": "Power"
-    },
-    "maxResistance": {
-      "type": "number",
-      "description": "A blocks explosion resistance will be capped at this value when an explosion occurs",
-      "title": "Max Resistance"
-    },
-    "fuseLit": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the fuse is already lit when this component is added to the entity",
-      "title": "Fuse Lit"
-    },
-    "causesFire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, blocks in the explosion radius will be set on fire",
-      "title": "Causes Fire"
-    },
-    "breaks_blocks": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the explosion will destroy blocks in the explosion radius",
-      "title": "Breaks Blocks"
-    },
+    "power": { "type": "number", "default": 3, "description": "The radius of the explosion in blocks and the amount of damage the explosion deals", "title": "Power" },
+    "maxResistance": { "type": "number", "description": "A blocks explosion resistance will be capped at this value when an explosion occurs", "title": "Max Resistance" },
+    "fuseLit": { "type": "boolean", "default": false, "description": "If true, the fuse is already lit when this component is added to the entity", "title": "Fuse Lit" },
+    "causesFire": { "type": "boolean", "default": false, "description": "If true, blocks in the explosion radius will be set on fire", "title": "Causes Fire" },
+    "breaks_blocks": { "type": "boolean", "default": true, "description": "If true, the explosion will destroy blocks in the explosion radius", "title": "Breaks Blocks" },
     "fireAffectedByGriefing": {
       "type": "boolean",
       "default": false,
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.fall_damage.json b/source/behaviour/entities/1.8.0/components/minecraft.fall_damage.json
index 81d0a75f..ba6ea037 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.fall_damage.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.fall_damage.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.fall_damage",
   "type": "object",
-  "title": "Fall damage 1.8.0",
+  "title": "Fall Damage 1.8.0",
   "additionalProperties": false,
   "description": "TODO",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 1,
-      "description": "TODO description: value",
-      "title": "Value"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 1, "description": "TODO description: value", "title": "Value" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.fire_immune.json b/source/behaviour/entities/1.8.0/components/minecraft.fire_immune.json
index 4abb79ac..b9c1078c 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.fire_immune.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.fire_immune.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.fire_immune",
-  "title": "Fire immune 1.8.0",
+  "title": "Fire Immune 1.8.0",
   "additionalProperties": false,
   "description": "Sets that this entity doesn't take damage from fire.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.floats_in_liquid.json b/source/behaviour/entities/1.8.0/components/minecraft.floats_in_liquid.json
index e192032e..c68009e4 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.floats_in_liquid.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.floats_in_liquid.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.floats_in_liquid",
   "description": "Sets that this entity can float in liquid blocks.",
   "type": "object",
-  "title": "Floats in liquid 1.8.0",
+  "title": "Floats In Liquid 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.flocking.json b/source/behaviour/entities/1.8.0/components/minecraft.flocking.json
index 32a895d0..3098f5df 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.flocking.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.flocking.json
@@ -6,113 +6,63 @@
   "description": "Allows entities to flock in groups in water or not.",
   "additionalProperties": false,
   "properties": {
-    "block_distance": {
-      "type": "number",
-      "default": 0,
-      "description": "The amount of blocks away the entity will look at to push away from.",
-      "title": "Block distance"
-    },
-    "block_weight": {
-      "type": "number",
-      "default": 0,
-      "description": "The weight of the push back away from blocks.",
-      "title": "Block weight"
-    },
+    "block_distance": { "type": "number", "default": 0, "description": "The amount of blocks away the entity will look at to push away from.", "title": "Block Distance" },
+    "block_weight": { "type": "number", "default": 0, "description": "The weight of the push back away from blocks.", "title": "Block Weight" },
     "breach_influence": {
       "type": "number",
       "default": 0,
       "description": "The amount of push back given to a flocker that breaches out of the water.",
-      "title": "Breach influence"
-    },
-    "cohesion_threshold": {
-      "type": "number",
-      "default": 1,
-      "description": "The threshold in which to start applying cohesion.",
-      "title": "Cohesion threshold"
-    },
-    "cohesion_weight": {
-      "type": "number",
-      "default": 1,
-      "description": "The weight applied for the cohesion steering of the flock.",
-      "title": "Cohesion weight"
-    },
-    "goal_weight": {
-      "type": "number",
-      "default": 0,
-      "description": "The weight on which to apply on the goal output.",
-      "title": "Goal weight"
+      "title": "Breach Influence"
     },
+    "cohesion_threshold": { "type": "number", "default": 1, "description": "The threshold in which to start applying cohesion.", "title": "Cohesion Threshold" },
+    "cohesion_weight": { "type": "number", "default": 1, "description": "The weight applied for the cohesion steering of the flock.", "title": "Cohesion Weight" },
+    "goal_weight": { "type": "number", "default": 0, "description": "The weight on which to apply on the goal output.", "title": "Goal Weight" },
     "high_flock_limit": {
       "type": "integer",
       "default": 0,
       "description": "Determines the high bound amount of entities that can be allowed in the flock.",
-      "title": "High flock limit"
-    },
-    "in_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the Flocking Component if the entity exists in water.",
-      "title": "In water"
-    },
-    "influence_radius": {
-      "type": "number",
-      "default": 0,
-      "description": "The area around the entity that allows others to be added to the flock.",
-      "title": "Influence radius"
+      "title": "High Flock Limit"
     },
+    "in_water": { "type": "boolean", "default": false, "description": "Tells the Flocking Component if the entity exists in water.", "title": "In Water" },
+    "influence_radius": { "type": "number", "default": 0, "description": "The area around the entity that allows others to be added to the flock.", "title": "Influence Radius" },
     "innner_cohesion_threshold": {
       "type": "number",
       "default": 0,
       "description": "The distance in which the flocker will stop applying cohesion.",
-      "title": "Innner cohesion threshold"
+      "title": "Innner Cohesion Threshold"
     },
     "loner_chance": {
       "type": "number",
       "default": 0,
       "description": "The percentage chance between 0-1 that a fish will spawn and not want to join flocks. Invalid values will be capped at the end points.",
-      "title": "Loner chance"
+      "title": "Loner Chance"
     },
     "low_flock_limit": {
       "type": "integer",
       "default": 0,
       "description": "Determines the low bound amount of entities that can be allowed in the flock.",
-      "title": "Low flock limit"
+      "title": "Low Flock Limit"
     },
     "match_variants": {
       "type": "boolean",
       "default": false,
       "description": "Tells the flockers that they can only match similar entities that also match the variant, mark variants, and color data of the other potential flockers.",
-      "title": "Match variants"
-    },
-    "max_height": {
-      "type": "number",
-      "default": 0,
-      "description": "The max height allowable in the air or water.",
-      "title": "Max height"
-    },
-    "min_height": {
-      "type": "number",
-      "default": 0,
-      "description": "The min height allowable in the air or water.",
-      "title": "Min height"
+      "title": "Match Variants"
     },
+    "max_height": { "type": "number", "default": 0, "description": "The max height allowable in the air or water.", "title": "Max Height" },
+    "min_height": { "type": "number", "default": 0, "description": "The min height allowable in the air or water.", "title": "Min Height" },
     "separation_threshold": {
       "type": "number",
       "default": 2,
       "description": "The distance that is determined to be to close to another flocking and to start applying separation.",
-      "title": "Separation threshold"
-    },
-    "separation_weight": {
-      "type": "number",
-      "default": 1,
-      "description": "The weight applied to the separation of the flock.",
-      "title": "Separation weight"
+      "title": "Separation Threshold"
     },
+    "separation_weight": { "type": "number", "default": 1, "description": "The weight applied to the separation of the flock.", "title": "Separation Weight" },
     "use_center_of_mass": {
       "type": "boolean",
       "default": false,
       "description": "Tells the flockers that they will follow flocks based on the center of mass.",
-      "title": "Use center of mass"
+      "title": "Use Center Of Mass"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.flying_speed.json b/source/behaviour/entities/1.8.0/components/minecraft.flying_speed.json
index a41ba1e8..b981250f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.flying_speed.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.flying_speed.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.flying_speed",
   "type": "object",
-  "title": "Flying speed 1.8.0",
+  "title": "Flying Speed 1.8.0",
   "additionalProperties": false,
   "description": "Speed in Blocks that this entity flies at.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 0.02,
-      "description": "Flying speed in blocks per tick",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 0.02, "description": "Flying speed in blocks per tick", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.follow_range.json b/source/behaviour/entities/1.8.0/components/minecraft.follow_range.json
index c6dbdff9..d784ed6f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.follow_range.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.follow_range.json
@@ -2,20 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.follow_range",
   "type": "object",
-  "title": "Follow range 1.8.0",
+  "title": "Follow Range 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "value": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Value"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    }
-  },
+  "properties": { "value": { "type": "integer", "description": "TODO", "title": "Value" }, "max": { "type": "integer", "description": "TODO", "title": "Max" } },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.foot_size.json b/source/behaviour/entities/1.8.0/components/minecraft.foot_size.json
index d38bea27..9f01ce66 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.foot_size.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.foot_size.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.foot_size",
   "type": "object",
-  "title": "Foot size 1.8.0",
+  "title": "Foot Size 1.8.0",
   "additionalProperties": false,
   "description": "Sets the number of blocks the entity can step without jumping.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 0.5,
-      "description": "The value of the size of the entity's step",
-      "title": "Value"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 0.5, "description": "The value of the size of the entity's step", "title": "Value" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.friction_modifier.json b/source/behaviour/entities/1.8.0/components/minecraft.friction_modifier.json
index 5421dcb6..47c4cf2f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.friction_modifier.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.friction_modifier.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.friction_modifier",
   "type": "object",
-  "title": "Friction modifier 1.8.0",
+  "title": "Friction Modifier 1.8.0",
   "additionalProperties": false,
   "description": "Defines how much does friction affect this entity.",
   "required": [],
@@ -11,7 +11,7 @@
       "type": "number",
       "default": 1.0,
       "description": "The higher the number, the more the friction affects this entity. A value of 1.0 means regular friction, while 2.0 means twice as much",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.genetics.json b/source/behaviour/entities/1.8.0/components/minecraft.genetics.json
index 62276858..3001fb35 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.genetics.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.genetics.json
@@ -11,7 +11,7 @@
       "type": "number",
       "default": 0.03125,
       "description": "Chance that an allele will be replaced with a random one instead of the parent's allele during birth.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "genes": {
       "type": "array",
@@ -22,21 +22,11 @@
           "allele_range": {
             "description": "The range of positive integer allele values for this gene. Spawned mobs will have a random number in this range assigned to them.",
             "oneOf": [
-              {
-                "type": "integer"
-              },
+              { "type": "integer" },
               {
                 "properties": {
-                  "range_min": {
-                    "type": "integer",
-                    "default": 0,
-                    "description": "Lower bound of the allele values for this gene."
-                  },
-                  "range_max": {
-                    "type": "integer",
-                    "default": 0,
-                    "description": "Upper bound of the allele values for this gene."
-                  }
+                  "range_min": { "type": "integer", "default": 0, "description": "Lower bound of the allele values for this gene." },
+                  "range_max": { "type": "integer", "default": 0, "description": "Upper bound of the allele values for this gene." }
                 }
               }
             ]
@@ -46,32 +36,19 @@
             "description": "The list of genetic variants for this gene. These check for particular allele combinations and fire events when all of them are satisfied.",
             "items": {
               "properties": {
-                "birth_event": {
-                  "$ref": "../types/event.json",
-                  "description": "Event to run when this mob is created and matches the above allele conditions."
-                },
+                "birth_event": { "$ref": "../types/event.json", "description": "Event to run when this mob is created and matches the above allele conditions." },
                 "both_allele": {
                   "description": "If this value is non-negative, compare both the mob's main and hidden alleles with this value for a match with both. Can also be a range of integers.",
                   "oneOf": [
-                    {
-                      "type": "integer"
-                    },
+                    { "type": "integer" },
                     {
                       "type": "object",
                       "description": "UNDOCUMENTATED",
                       "title": "UNDOCUMENTATED",
                       "additionalProperties": false,
                       "properties": {
-                        "range_min": {
-                          "type": "integer",
-                          "description": "UNDOCUMENTATED",
-                          "title": "UNDOCUMENTATED"
-                        },
-                        "range_max": {
-                          "type": "integer",
-                          "description": "UNDOCUMENTATED",
-                          "title": "UNDOCUMENTATED"
-                        }
+                        "range_min": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+                        "range_max": { "type": "integer", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
                       }
                     }
                   ]
@@ -97,7 +74,7 @@
         }
       },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.giveable.json b/source/behaviour/entities/1.8.0/components/minecraft.giveable.json
index b5b994b3..6a82ca35 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.giveable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.giveable.json
@@ -7,12 +7,7 @@
   "title": "Giveable 1.8.0",
   "required": [],
   "properties": {
-    "cooldown": {
-      "type": "number",
-      "default": 0,
-      "description": "An optional cool down in seconds to prevent spamming interactions.",
-      "title": "Cooldown"
-    },
+    "cooldown": { "type": "number", "default": 0, "description": "An optional cool down in seconds to prevent spamming interactions.", "title": "Cooldown" },
     "items": {
       "type": "array",
       "description": "The list of items that can be given to the entity to place in their inventory.",
@@ -23,11 +18,6 @@
       },
       "title": "Properties"
     },
-    "on_give": {
-      "type": "string",
-      "default": 0,
-      "description": "Event to fire when the correct item is given.",
-      "title": "On Give"
-    }
+    "on_give": { "type": "string", "default": 0, "description": "Event to fire when the correct item is given.", "title": "On Give" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.ground_offset.json b/source/behaviour/entities/1.8.0/components/minecraft.ground_offset.json
index 01df7ede..aa7dc95d 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.ground_offset.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.ground_offset.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.ground_offset",
   "type": "object",
-  "title": "Ground offset 1.8.0",
+  "title": "Ground Offset 1.8.0",
   "additionalProperties": false,
   "description": "Sets the offset from the ground that the entity is actually at.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 0.0,
-      "description": "The value of the entity's offset from the terrain, in blocks",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 0.0, "description": "The value of the entity's offset from the terrain, in blocks", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.group_size.json b/source/behaviour/entities/1.8.0/components/minecraft.group_size.json
index 205f2392..8a202202 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.group_size.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.group_size.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.group_size",
   "type": "object",
-  "title": "Group size 1.8.0",
+  "title": "Group Size 1.8.0",
   "description": "Keeps track of entity group size in the given radius.",
   "additionalProperties": false,
   "properties": {
@@ -11,11 +11,6 @@
       "description": "The list of conditions that must be satisfied for other entities to be counted towards group size.",
       "title": "Filters"
     },
-    "radius": {
-      "type": "number",
-      "default": 16,
-      "description": "Radius from center of entity.",
-      "title": "Radius"
-    }
+    "radius": { "type": "number", "default": 16, "description": "Radius from center of entity.", "title": "Radius" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.grows_crop.json b/source/behaviour/entities/1.8.0/components/minecraft.grows_crop.json
index a3c1ee40..3a49e699 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.grows_crop.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.grows_crop.json
@@ -2,23 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.grows_crop",
   "type": "object",
-  "title": "Grows crop 1.8.0",
+  "title": "Grows Crop 1.8.0",
   "description": "Could increase crop growth when entity walks over crop.",
   "additionalProperties": false,
   "properties": {
-    "chance": {
-      "type": "number",
-      "default": 0,
-      "description": "Value between 0-1. Chance of success per tick.",
-      "minimum": 0,
-      "maximum": 1,
-      "title": "Chance"
-    },
-    "charges": {
-      "type": "integer",
-      "default": 10,
-      "description": "Number of charges",
-      "title": "Charges"
-    }
+    "chance": { "type": "number", "default": 0, "description": "Value between 0-1. Chance of success per tick.", "minimum": 0, "maximum": 1, "title": "Chance" },
+    "charges": { "type": "integer", "default": 10, "description": "Number of charges", "title": "Charges" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.healable.json b/source/behaviour/entities/1.8.0/components/minecraft.healable.json
index bd662546..a5b9ad19 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.healable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.healable.json
@@ -8,34 +8,19 @@
   "required": [],
   "properties": {
     "filters": { "$ref": "../filters.json", "description": "The filter group that defines the conditions for this trigger", "title": "Filters" },
-    "force_use": {
-      "type": "boolean",
-      "default": false,
-      "description": "Determines if item can be used regardless of entity being at full health",
-      "title": "TODO title"
-    },
+    "force_use": { "type": "boolean", "default": false, "description": "Determines if item can be used regardless of entity being at full health", "title": "TODO Title" },
     "items": {
       "description": "The array of items that can be used to heal this entity",
       "type": "array",
       "items": {
         "type": "object",
         "properties": {
-          "filters": {
-            "$ref": "../filters.json",
-            "description": "The filter group that defines the conditions for using this item to heal the entity"
-          },
-          "heal_amount": {
-            "type": "integer",
-            "default": 1,
-            "description": "The amount of health this entity gains when fed this item"
-          },
-          "item": {
-            "type": "string",
-            "description": "Item identifier that can be used to heal this entity"
-          }
+          "filters": { "$ref": "../filters.json", "description": "The filter group that defines the conditions for using this item to heal the entity" },
+          "heal_amount": { "type": "integer", "default": 1, "description": "The amount of health this entity gains when fed this item" },
+          "item": { "type": "string", "description": "Item identifier that can be used to heal this entity" }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.health.json b/source/behaviour/entities/1.8.0/components/minecraft.health.json
index 5acdd445..1633641f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.health.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.health.json
@@ -10,7 +10,5 @@
     "value": { "type": "integer", "description": "Current health of the entity", "title": "Value" },
     "max": { "type": "integer", "description": "The maximum health the entity can heal", "title": "Maximum" }
   },
-  "dependencies": {
-    "max": ["value"]
-  }
+  "dependencies": { "max": ["value"] }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.home.json b/source/behaviour/entities/1.8.0/components/minecraft.home.json
index bed1967c..a803e61a 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.home.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.home.json
@@ -7,7 +7,7 @@
   "additionalProperties": false,
   "properties": {
     "restriction_radius": {
-      "title": "Restriction radius",
+      "title": "Restriction Radius",
       "description": "The radius that the entity will be restricted to in relation to its home",
       "type": "integer",
       "default": -1
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.hurt_on_condition.json b/source/behaviour/entities/1.8.0/components/minecraft.hurt_on_condition.json
index aee827e7..90d1f20f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.hurt_on_condition.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.hurt_on_condition.json
@@ -2,34 +2,23 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.hurt_on_condition",
   "type": "object",
-  "title": "Hurt on condition 1.8.0",
+  "title": "Hurt On Condition 1.8.0",
   "description": "Defines a set of conditions under which an entity should take damage.",
   "additionalProperties": false,
   "properties": {
     "damage_conditions": {
       "type": "array",
-      "title": "Damage conditions",
+      "title": "Damage Conditions",
       "description": "TODO",
       "items": {
         "type": "object",
-        "title": "Damage condition",
+        "title": "Damage Condition",
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "filters": {
-            "$ref": "../filters.json"
-          },
-          "cause": {
-            "type": "string",
-            "title": "Cause",
-            "description": "Damage cause",
-            "$ref": "../../../../general/entity/damage_source.json"
-          },
-          "damage_per_tick": {
-            "type": "integer",
-            "title": "Damage per tick",
-            "description": "TODO"
-          }
+          "filters": { "$ref": "../filters.json" },
+          "cause": { "type": "string", "title": "Cause", "description": "Damage cause", "$ref": "../../../../general/entity/damage_source.json" },
+          "damage_per_tick": { "type": "integer", "title": "Damage Per Tick", "description": "TODO" }
         }
       }
     }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.hurt_when_wet.json b/source/behaviour/entities/1.8.0/components/minecraft.hurt_when_wet.json
index 8933444f..9b434ec1 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.hurt_when_wet.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.hurt_when_wet.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.hurt_when_wet",
   "type": "object",
-  "title": "Hurt when wet 1.8.0",
+  "title": "Hurt When Wet 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {},
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.input_ground_controlled.json b/source/behaviour/entities/1.8.0/components/minecraft.input_ground_controlled.json
index dfe2df9e..b1ae50dc 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.input_ground_controlled.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.input_ground_controlled.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.input_ground_controlled",
   "description": "When configured as a rideable entity, the entity will be controlled using WASD controls.",
   "type": "object",
-  "title": "Input ground controlled 1.8.0",
+  "title": "Input Ground Controlled 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.inside_block_notifier.json b/source/behaviour/entities/1.8.0/components/minecraft.inside_block_notifier.json
index a3c8cbad..a2463df2 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.inside_block_notifier.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.inside_block_notifier.json
@@ -2,13 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.inside_block_notifier",
   "type": "object",
-  "title": "Inside block notifier 1.8.0",
+  "title": "Inside Block Notifier 1.8.0",
   "additionalProperties": false,
   "description": "Verifies whether the entity is inside any of the listed blocks.",
   "required": [],
   "properties": {
     "block_list": {
-      "title": "Block list",
+      "title": "Block List",
       "description": "List of blocks, with certain block states, that we are monitoring to see if the entity is inside.",
       "type": "array",
       "items": {
@@ -17,19 +17,9 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "block": {
-            "$ref": "../../../../general/block_definition.json"
-          },
-          "entered_block_event": {
-            "title": "Entered block event",
-            "description": "UNDOCUMENTATED",
-            "$ref": "../types/event.json"
-          },
-          "exited_block_event": {
-            "title": "Exited block event",
-            "description": "UNDOCUMENTATED",
-            "$ref": "../types/event.json"
-          }
+          "block": { "$ref": "../../../../general/block_definition.json" },
+          "entered_block_event": { "title": "Entered Block Event", "description": "UNDOCUMENTATED", "$ref": "../types/event.json" },
+          "exited_block_event": { "title": "Exited Block Event", "description": "UNDOCUMENTATED", "$ref": "../types/event.json" }
         }
       }
     }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.insomnia.json b/source/behaviour/entities/1.8.0/components/minecraft.insomnia.json
index a90d782b..0ca0411a 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.insomnia.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.insomnia.json
@@ -7,11 +7,6 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "days_until_insomnia": {
-      "type": "number",
-      "default": 3,
-      "description": "Number of days the mob has to stay up until the insomnia effect begins.",
-      "title": "TODO title"
-    }
+    "days_until_insomnia": { "type": "number", "default": 3, "description": "Number of days the mob has to stay up until the insomnia effect begins.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.instant_despawn.json b/source/behaviour/entities/1.8.0/components/minecraft.instant_despawn.json
index cf71fe7c..b6eb2510 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.instant_despawn.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.instant_despawn.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.instant_despawn",
   "type": "object",
-  "title": "Instant despawn 1.8.0",
+  "title": "Instant Despawn 1.8.0",
   "description": "Despawns the Actor immediately.",
   "additionalProperties": false,
   "properties": {
@@ -10,7 +10,7 @@
       "type": "boolean",
       "default": false,
       "description": "If true, all entities linked to this entity in a child relationship (eg. leashed) will also be despawned.",
-      "title": "Remove child entities"
+      "title": "Remove Child Entities"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.interact.json b/source/behaviour/entities/1.8.0/components/minecraft.interact.json
index f945e349..86f13bd0 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.interact.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.interact.json
@@ -13,18 +13,9 @@
         "add_items": {
           "type": "object",
           "description": "Loot table with items to add to the player's inventory upon successful interaction",
-          "properties": {
-            "table": {
-              "type": "string",
-              "description": "File path, relative to the Behavior Pack's path, to the loot table file"
-            }
-          }
-        },
-        "cooldown": {
-          "type": "number",
-          "default": 0,
-          "description": "Time in seconds before this entity can be interacted with again"
+          "properties": { "table": { "type": "string", "description": "File path, relative to the Behavior Pack's path, to the loot table file" } }
         },
+        "cooldown": { "type": "number", "default": 0, "description": "Time in seconds before this entity can be interacted with again" },
         "hurt_item": {
           "type": "integer",
           "default": 0,
@@ -40,54 +31,21 @@
           "type": "object",
           "description": "Particle effect that will be triggered at the start of the interaction",
           "properties": {
-            "particle_type": {
-              "type": "string",
-              "description": "The type of particle that will be spawned"
-            },
-            "particle_y_offset": {
-              "type": "string",
-              "description": "Will offset the particle this amount in the y direction"
-            },
-            "particle_offset_towards_interactor": {
-              "type": "string",
-              "description": "Whether or not the particle will appear closer to who performed the interaction"
-            }
+            "particle_type": { "type": "string", "description": "The type of particle that will be spawned" },
+            "particle_y_offset": { "type": "string", "description": "Will offset the particle this amount in the y direction" },
+            "particle_offset_towards_interactor": { "type": "string", "description": "Whether or not the particle will appear closer to who performed the interaction" }
           }
         },
-        "play_sounds": {
-          "type": "string",
-          "default": "",
-          "description": "List of sounds to play when the interaction occurs"
-        },
-        "spawn_entities": {
-          "type": "string",
-          "default": "",
-          "description": "List of entities to spawn when the interaction occurs"
-        },
+        "play_sounds": { "type": "string", "default": "", "description": "List of sounds to play when the interaction occurs" },
+        "spawn_entities": { "type": "string", "default": "", "description": "List of entities to spawn when the interaction occurs" },
         "spawn_items": {
           "type": "object",
           "description": "Loot table with items to drop on the ground upon successful interaction",
-          "properties": {
-            "table": {
-              "type": "string",
-              "description": "File path, relative to the Behavior Pack's path, to the loot table file"
-            }
-          }
+          "properties": { "table": { "type": "string", "description": "File path, relative to the Behavior Pack's path, to the loot table file" } }
         },
-        "swing": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, the player will do the 'swing' animation when interacting with this entity"
-        },
-        "transform_to_item": {
-          "type": "string",
-          "description": "The item used will transform to this item upon successful interaction. Format: itemName:auxValue"
-        },
-        "use_item": {
-          "type": "boolean",
-          "default": false,
-          "description": "If true, the interaction will use an item"
-        }
+        "swing": { "type": "boolean", "default": false, "description": "If true, the player will do the 'swing' animation when interacting with this entity" },
+        "transform_to_item": { "type": "string", "description": "The item used will transform to this item upon successful interaction. Format: itemName:auxValue" },
+        "use_item": { "type": "boolean", "default": false, "description": "If true, the interaction will use an item" }
       }
     }
   },
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.inventory.json b/source/behaviour/entities/1.8.0/components/minecraft.inventory.json
index fe42a8c4..e2ed0612 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.inventory.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.inventory.json
@@ -7,42 +7,22 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "additional_slots_per_strength": {
-      "type": "integer",
-      "default": 0,
-      "description": "Number of slots that this entity can gain per extra strength",
-      "title": "TODO title"
-    },
-    "can_be_siphoned_from": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the contents of this inventory can be removed by a hopper",
-      "title": "TODO title"
-    },
+    "additional_slots_per_strength": { "type": "integer", "default": 0, "description": "Number of slots that this entity can gain per extra strength", "title": "TODO Title" },
+    "can_be_siphoned_from": { "type": "boolean", "default": false, "description": "If true, the contents of this inventory can be removed by a hopper", "title": "TODO Title" },
     "container_type": {
       "type": "string",
       "default": "none",
       "description": "Type of container this entity has. Can be horse, minecart_chest, minecart_hopper, inventory, container or hopper",
       "enum": ["horse", "minecart_chest", "minecart_hopper", "inventory", "container", "hopper"],
-      "title": "TODO title"
-    },
-    "inventory_size": {
-      "type": "integer",
-      "default": 5,
-      "description": "Number of slots the container has",
-      "title": "TODO title"
-    },
-    "private": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, only the entity can access the inventory",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "inventory_size": { "type": "integer", "default": 5, "description": "Number of slots the container has", "title": "TODO Title" },
+    "private": { "type": "boolean", "default": false, "description": "If true, only the entity can access the inventory", "title": "TODO Title" },
     "restrict_to_owner": {
       "type": "boolean",
       "default": false,
       "description": "If true, the entity's inventory can only be accessed by its owner or itself",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_baby.json b/source/behaviour/entities/1.8.0/components/minecraft.is_baby.json
index 47aec72b..8c7f532a 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_baby.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_baby.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_baby",
   "description": "Sets that this entity is a baby.",
   "type": "object",
-  "title": "Is baby 1.8.0",
+  "title": "Is Baby 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_charged.json b/source/behaviour/entities/1.8.0/components/minecraft.is_charged.json
index 8d14df84..58a2c226 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_charged.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_charged.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_charged",
   "description": "Sets that this entity is charged.",
   "type": "object",
-  "title": "Is charged 1.8.0",
+  "title": "Is Charged 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_chested.json b/source/behaviour/entities/1.8.0/components/minecraft.is_chested.json
index 1f0248d1..3fe0ca89 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_chested.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_chested.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_chested",
   "description": "Sets that this entity is currently carrying a chest.",
   "type": "object",
-  "title": "Is chested 1.8.0",
+  "title": "Is Chested 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_dyeable.json b/source/behaviour/entities/1.8.0/components/minecraft.is_dyeable.json
index 463646f5..9ca758fd 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_dyeable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_dyeable.json
@@ -3,14 +3,14 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_dyeable",
   "description": "Allows dyes to be used on this entity to change its color.",
   "type": "object",
-  "title": "Is dyeable 1.8.0",
+  "title": "Is Dyeable 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "interact_text": {
       "type": "string",
       "description": "The text that will display when interacting with this entity with a dye when playing with Touch-screen controls",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_hidden_when_invisible.json b/source/behaviour/entities/1.8.0/components/minecraft.is_hidden_when_invisible.json
index bd0400ac..8825afbd 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_hidden_when_invisible.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_hidden_when_invisible.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_hidden_when_invisible",
   "type": "object",
-  "title": "Is hidden when invisible 1.8.0",
+  "title": "Is Hidden When Invisible 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {},
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_ignited.json b/source/behaviour/entities/1.8.0/components/minecraft.is_ignited.json
index 41e326f7..becc67a8 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_ignited.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_ignited.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_ignited",
   "description": "Sets that this entity is currently on fire.",
   "type": "object",
-  "title": "Is ignited 1.8.0",
+  "title": "Is Ignited 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_illager_captain.json b/source/behaviour/entities/1.8.0/components/minecraft.is_illager_captain.json
index 9060a48f..7d3e38ce 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_illager_captain.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_illager_captain.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_illager_captain",
   "description": "Sets that this entity is an illager captain.",
   "type": "object",
-  "title": "Is illager captain 1.8.0",
+  "title": "Is Illager Captain 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_saddled.json b/source/behaviour/entities/1.8.0/components/minecraft.is_saddled.json
index 8ddf8b48..dab01d83 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_saddled.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_saddled.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_saddled",
   "description": "Sets that this entity is currently saddled.",
   "type": "object",
-  "title": "Is saddled 1.8.0",
+  "title": "Is Saddled 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_shaking.json b/source/behaviour/entities/1.8.0/components/minecraft.is_shaking.json
index fbf8b3a8..e1396ec1 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_shaking.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_shaking.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_shaking",
   "description": "Sets that this entity is currently shaking.",
   "type": "object",
-  "title": "Is shaking 1.8.0",
+  "title": "Is Shaking 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_sheared.json b/source/behaviour/entities/1.8.0/components/minecraft.is_sheared.json
index 52788557..1d79a542 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_sheared.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_sheared.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_sheared",
   "description": "Sets that this entity is currently sheared.",
   "type": "object",
-  "title": "Is sheared 1.8.0",
+  "title": "Is Sheared 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_stackable.json b/source/behaviour/entities/1.8.0/components/minecraft.is_stackable.json
index 7a5f6685..862d17a9 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_stackable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_stackable.json
@@ -3,14 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_stackable",
   "description": "Sets that this entity can be stacked.",
   "type": "object",
-  "title": "Is stackable 1.8.0",
+  "title": "Is Stackable 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "value": {
-      "type": "boolean",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "boolean", "description": "TODO description", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_stunned.json b/source/behaviour/entities/1.8.0/components/minecraft.is_stunned.json
index 6fd75b07..711e1c8f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_stunned.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_stunned.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_stunned",
   "description": "Sets that this entity is currently stunned.",
   "type": "object",
-  "title": "Is stunned 1.8.0",
+  "title": "Is Stunned 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.is_tamed.json b/source/behaviour/entities/1.8.0/components/minecraft.is_tamed.json
index 272c5131..a892e3ee 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.is_tamed.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.is_tamed.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.is_tamed",
   "description": "Sets that this entity is currently tamed.",
   "type": "object",
-  "title": "Is tamed 1.8.0",
+  "title": "Is Tamed 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.item_controllable.json b/source/behaviour/entities/1.8.0/components/minecraft.item_controllable.json
index 34432855..d0c8e9eb 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.item_controllable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.item_controllable.json
@@ -3,26 +3,14 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.item_controllable",
   "description": "Efines what items can be used to control this entity while ridden",
   "type": "object",
-  "title": "Item controllable 1.8.0",
+  "title": "Item Controllable 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "control_items": {
       "description": "List of items that can be used to control this entity",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "description": "An item that can be used to control this entity",
-            "title": "Item"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ],
-      "title": "TODO title"
+      "oneOf": [{ "type": "array", "items": { "type": "string", "description": "An item that can be used to control this entity", "title": "Item" } }, { "type": "string" }],
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.item_hopper.json b/source/behaviour/entities/1.8.0/components/minecraft.item_hopper.json
index 507e5fcf..db3bb9e6 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.item_hopper.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.item_hopper.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.item_hopper",
   "type": "object",
-  "title": "Item hopper 1.8.0",
+  "title": "Item Hopper 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {},
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.jump.static.json b/source/behaviour/entities/1.8.0/components/minecraft.jump.static.json
index c08bff0a..ecf9e3b3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.jump.static.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.jump.static.json
@@ -6,12 +6,5 @@
   "title": "Jump.static 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "jump_power": {
-      "type": "number",
-      "default": 0.42,
-      "description": "The initial vertical velocity for the jump",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "jump_power": { "type": "number", "default": 0.42, "description": "The initial vertical velocity for the jump", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.knockback_resistance.json b/source/behaviour/entities/1.8.0/components/minecraft.knockback_resistance.json
index 3d27087f..ed44b3b3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.knockback_resistance.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.knockback_resistance.json
@@ -2,20 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.knockback_resistance",
   "type": "object",
-  "title": "Knockback resistance 1.8.0",
+  "title": "Knockback Resistance 1.8.0",
   "additionalProperties": false,
   "description": "UNDOCUMENTATED",
   "required": [],
   "properties": {
-    "value": {
-      "type": "number",
-      "description": "UNDOCUMENTATED",
-      "title": "Value"
-    },
-    "max": {
-      "type": "number",
-      "description": "UNDOCUMENTATED",
-      "title": "Maximum"
-    }
+    "value": { "type": "number", "description": "UNDOCUMENTATED", "title": "Value" },
+    "max": { "type": "number", "description": "UNDOCUMENTATED", "title": "Maximum" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.lava_movement.json b/source/behaviour/entities/1.8.0/components/minecraft.lava_movement.json
index 8220cd8e..7baa32ae 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.lava_movement.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.lava_movement.json
@@ -3,14 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.lava_movement",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "title": "Lava movement 1.8.0",
+  "title": "Lava Movement 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "title": "Value",
-      "description": "UNDOCUMENTATED"
-    }
-  }
+  "properties": { "value": { "type": "number", "title": "Value", "description": "UNDOCUMENTATED" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.leashable.json b/source/behaviour/entities/1.8.0/components/minecraft.leashable.json
index 3a738e58..7ed57106 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.leashable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.leashable.json
@@ -11,37 +11,17 @@
       "type": "boolean",
       "default": false,
       "description": "If true, players can leash this entity even if it is already leashed to another mob",
-      "title": "TODO title"
-    },
-    "hard_distance": {
-      "type": "number",
-      "default": 6,
-      "description": "Distance in blocks at which the leash stiffens, restricting movement",
-      "title": "TODO title"
-    },
-    "max_distance": {
-      "type": "number",
-      "default": 10,
-      "description": "Distance in blocks at which the leash breaks",
-      "title": "TODO title"
-    },
-    "on_leash": {
-      "type": "string",
-      "default": "",
-      "description": "Event to call when this entity is leashed",
-      "title": "TODO title"
-    },
-    "on_unleash": {
-      "type": "string",
-      "default": "",
-      "description": "Event to call when this entity is unleashed",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "hard_distance": { "type": "number", "default": 6, "description": "Distance in blocks at which the leash stiffens, restricting movement", "title": "TODO Title" },
+    "max_distance": { "type": "number", "default": 10, "description": "Distance in blocks at which the leash breaks", "title": "TODO Title" },
+    "on_leash": { "type": "string", "default": "", "description": "Event to call when this entity is leashed", "title": "TODO Title" },
+    "on_unleash": { "type": "string", "default": "", "description": "Event to call when this entity is unleashed", "title": "TODO Title" },
     "soft_distance": {
       "type": "number",
       "default": 4,
       "description": "Distance in blocks at which the 'spring' effect starts acting to keep this entity close to the entity that leashed it",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.lookat.json b/source/behaviour/entities/1.8.0/components/minecraft.lookat.json
index 929c6b2b..a3a55c82 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.lookat.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.lookat.json
@@ -7,35 +7,21 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "filters": { "$ref": "../filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO title" },
+    "filters": { "$ref": "../filters.json", "description": "Defines the entities that can trigger this component", "title": "TODO Title" },
     "look_cooldown": {
       "$ref": "../types/range_number_type.json",
       "default": [0.0, 0.0],
       "description": "The range for the random amount of time during which the entity is 'cooling down' and won't get angered or look for a target",
-      "title": "TODO title"
-    },
-    "look_event": {
-      "type": "string",
-      "description": "The event identifier to run when the entities specified in filters look at this entity",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "look_event": { "type": "string", "description": "The event identifier to run when the entities specified in filters look at this entity", "title": "TODO Title" },
     "mAllowInvulnerable": {
       "type": "boolean",
       "default": false,
       "description": "If true, invulnerable entities (e.g. Players in creative mode) are considered valid targets",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "searchRadius": {
-      "type": "number",
-      "default": 10,
-      "description": "Maximum distance this entity will look for another entity looking at it",
-      "title": "TODO title"
-    },
-    "setTarget": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity will set the attack target as the entity that looked at it",
-      "title": "TODO title"
-    }
+    "searchRadius": { "type": "number", "default": 10, "description": "Maximum distance this entity will look for another entity looking at it", "title": "TODO Title" },
+    "setTarget": { "type": "boolean", "default": true, "description": "If true, this entity will set the attack target as the entity that looked at it", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.loot.json b/source/behaviour/entities/1.8.0/components/minecraft.loot.json
index 44cb1050..3b7f2275 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.loot.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.loot.json
@@ -5,13 +5,6 @@
   "title": "Loot 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "table": {
-      "type": "string",
-      "pattern": ".*\\.json$",
-      "description": "TODO description: table",
-      "title": "Table"
-    }
-  },
+  "properties": { "table": { "type": "string", "pattern": ".*\\.json$", "description": "TODO description: table", "title": "Table" } },
   "description": "TODO description: "
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.managed_wandering_trader.json b/source/behaviour/entities/1.8.0/components/minecraft.managed_wandering_trader.json
index 44da5a7e..2b7e9947 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.managed_wandering_trader.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.managed_wandering_trader.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.managed_wandering_trader",
   "type": "object",
-  "title": "Managed wandering trader 1.8.0",
+  "title": "Managed Wandering Trader 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {},
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.mark_variant.json b/source/behaviour/entities/1.8.0/components/minecraft.mark_variant.json
index 1b54fe6e..1bd9998d 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.mark_variant.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.mark_variant.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.mark_variant",
   "type": "object",
-  "title": "Mark variant 1.8.0",
+  "title": "Mark Variant 1.8.0",
   "description": "Additional variant value. Can be used to further differentiate variants.",
   "required": ["value"],
-  "properties": {
-    "value": {
-      "type": "integer",
-      "default": 0,
-      "description": "The ID of the variant. By convention, 0 is the ID of the base entity",
-      "title": "Value"
-    }
-  },
+  "properties": { "value": { "type": "integer", "default": 0, "description": "The ID of the variant. By convention, 0 is the ID of the base entity", "title": "Value" } },
   "additionalProperties": false
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.mob_effect.json b/source/behaviour/entities/1.8.0/components/minecraft.mob_effect.json
index 07df9e5a..b4959d16 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.mob_effect.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.mob_effect.json
@@ -2,28 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.mob_effect",
   "type": "object",
-  "title": "Mob effect 1.8.0",
+  "title": "Mob Effect 1.8.0",
   "description": "A component that applies a mob effect to entities that get within range.",
   "additionalProperties": false,
   "properties": {
-    "effect_range": {
-      "type": "number",
-      "default": 0.2,
-      "description": "How close a hostile entity must be to have the mob effect applied.",
-      "title": "Effect range"
-    },
-    "effect_time": {
-      "type": "integer",
-      "default": 10,
-      "description": "How long the applied mob effect lasts in seconds.",
-      "title": "Effect time"
-    },
-    "mob_effect": {
-      "type": "string",
-      "default": "",
-      "description": "The mob effect that is applied to entities that enter this entities effect range.",
-      "title": "Mob effect"
-    },
-    "entity_filter": { "$ref": "../filters.json", "title": "Entity filter", "description": "TODO" }
+    "effect_range": { "type": "number", "default": 0.2, "description": "How close a hostile entity must be to have the mob effect applied.", "title": "Effect Range" },
+    "effect_time": { "type": "integer", "default": 10, "description": "How long the applied mob effect lasts in seconds.", "title": "Effect Time" },
+    "mob_effect": { "type": "string", "default": "", "description": "The mob effect that is applied to entities that enter this entities effect range.", "title": "Mob Effect" },
+    "entity_filter": { "$ref": "../filters.json", "title": "Entity Filter", "description": "TODO" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.amphibious.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.amphibious.json
index c9c904ea..443d1d78 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.amphibious.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.amphibious.json
@@ -5,13 +5,6 @@
   "title": "Movement.amphibious 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "TODO title"
-    }
-  },
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "TODO Title" } },
   "description": "This move control allows the mob to swim in water and walk on land."
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.basic.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.basic.json
index 99b45ec0..45e13ab1 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.basic.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.basic.json
@@ -5,13 +5,6 @@
   "title": "Movement.basic 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "TODO title"
-    }
-  },
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "TODO Title" } },
   "description": "TODO description"
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.fly.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.fly.json
index 906ea991..ddec8d20 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.fly.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.fly.json
@@ -5,13 +5,6 @@
   "title": "Movement.fly 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "TODO title"
-    }
-  },
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "TODO Title" } },
   "description": "This move control causes the mob to fly."
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.generic.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.generic.json
index baa8574f..259837cd 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.generic.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.generic.json
@@ -6,12 +6,5 @@
   "title": "Movement.generic 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.glide.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.glide.json
index df2a151d..99e3421f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.glide.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.glide.json
@@ -7,15 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "start_speed": {
-      "type": "number",
-      "title": "Start speed",
-      "description": "UNDOCUMENTATED"
-    },
-    "speed_when_turning": {
-      "type": "number",
-      "title": "Speed when turning",
-      "description": "UNDOCUMENTATED"
-    }
+    "start_speed": { "type": "number", "title": "Start Speed", "description": "UNDOCUMENTATED" },
+    "speed_when_turning": { "type": "number", "title": "Speed When Turning", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.hover.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.hover.json
index 9d6c8bb2..679f4392 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.hover.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.hover.json
@@ -5,12 +5,5 @@
   "description": "This move control causes the mob to hover.",
   "type": "object",
   "additionalProperties": false,
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "Max turn"
-    }
-  }
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "Max Turn" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.json
index 3a94fc48..aab72f33 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.json
@@ -13,38 +13,15 @@
         {
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "title": "Maximum"
-            },
-            {
-              "type": "number",
-              "title": "Maximum"
-            }
+            { "type": "number", "title": "Maximum" },
+            { "type": "number", "title": "Maximum" }
           ]
         },
-        {
-          "type": "number"
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "range_min": {
-              "type": "number"
-            },
-            "range_max": {
-              "type": "number"
-            }
-          }
-        }
+        { "type": "number" },
+        { "type": "object", "additionalProperties": false, "properties": { "range_min": { "type": "number" }, "range_max": { "type": "number" } } }
       ]
     },
-    "max": {
-      "type": "number",
-      "title": "Maximum",
-      "description": "UNDOCUMENTATED"
-    }
+    "max": { "type": "number", "title": "Maximum", "description": "UNDOCUMENTATED" }
   },
   "description": "TODO description"
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.skip.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.skip.json
index cd097d54..d5709078 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.skip.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.skip.json
@@ -6,12 +6,5 @@
   "additionalProperties": false,
   "required": [],
   "description": "This move control causes the mob to hop as it moves.",
-  "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.movement.sway.json b/source/behaviour/entities/1.8.0/components/minecraft.movement.sway.json
index b089b27c..a7594636 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.movement.sway.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.movement.sway.json
@@ -7,16 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "max_turn": {
-      "type": "number",
-      "default": 30,
-      "description": "The maximum number in degrees the mob can turn per tick.",
-      "title": "TODO title"
-    },
-    "sway_amplitude": {
-      "type": "number",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "max_turn": { "type": "number", "default": 30, "description": "The maximum number in degrees the mob can turn per tick.", "title": "TODO Title" },
+    "sway_amplitude": { "type": "number", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.nameable.json b/source/behaviour/entities/1.8.0/components/minecraft.nameable.json
index acbb3503..58086ddd 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.nameable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.nameable.json
@@ -11,46 +11,16 @@
       "type": "object",
       "description": "Describes the special names for this entity and the events to call when the entity acquires those names",
       "properties": {
-        "on_named": {
-          "type": "string",
-          "description": "Event to be called when this entity acquires the name specified in 'name_filter'"
-        },
-        "name_filter": {
-          "type": "string",
-          "description": "List of special names that will cause the events defined in 'on_named' to fire"
-        }
+        "on_named": { "type": "string", "description": "Event to be called when this entity acquires the name specified in 'name_filter'" },
+        "name_filter": { "type": "string", "description": "List of special names that will cause the events defined in 'on_named' to fire" }
       },
-      "title": "TODO title",
+      "title": "TODO Title",
       "additionalProperties": false
     },
-    "default_trigger": {
-      "type": "string",
-      "description": "Trigger to run when the entity gets named",
-      "title": "TODO title"
-    },
-    "alwaysShow": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the name will always be shown",
-      "title": "TODO title"
-    },
-    "allowNameTagRenaming": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity can be renamed with name tags",
-      "title": "TODO title"
-    },
-    "allow_name_tag_renaming": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, this entity can be renamed with name tags",
-      "title": "Allow name tag renaming"
-    },
-    "always_show": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the name will always be shown",
-      "title": "Always show"
-    }
+    "default_trigger": { "type": "string", "description": "Trigger to run when the entity gets named", "title": "TODO Title" },
+    "alwaysShow": { "type": "boolean", "default": false, "description": "If true, the name will always be shown", "title": "TODO Title" },
+    "allowNameTagRenaming": { "type": "boolean", "default": true, "description": "If true, this entity can be renamed with name tags", "title": "TODO Title" },
+    "allow_name_tag_renaming": { "type": "boolean", "default": true, "description": "If true, this entity can be renamed with name tags", "title": "Allow Name Tag Renaming" },
+    "always_show": { "type": "boolean", "default": false, "description": "If true, the name will always be shown", "title": "Always Show" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.climb.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.climb.json
index 9ed2ccf7..e8105140 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.climb.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.climb.json
@@ -11,119 +11,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.float.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.float.json
index ba76d865..8369157a 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.float.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.float.json
@@ -11,119 +11,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.fly.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.fly.json
index 11e08943..58aca3fa 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.fly.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.fly.json
@@ -11,119 +11,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.generic.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.generic.json
index 463cf20b..8d607590 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.generic.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.generic.json
@@ -11,119 +11,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.hover.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.hover.json
index 787a23f4..25a30354 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.hover.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.hover.json
@@ -10,119 +10,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.swim.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.swim.json
index 5f1994e8..4e38de64 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.swim.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.swim.json
@@ -11,119 +11,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.navigation.walk.json b/source/behaviour/entities/1.8.0/components/minecraft.navigation.walk.json
index 4fb8d92c..abd94973 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.navigation.walk.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.navigation.walk.json
@@ -11,119 +11,75 @@
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid blocks that cause damage when finding a path",
-      "title": "avoid damage blocks"
+      "title": "Avoid Damage Blocks"
     },
     "avoid_portals": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder to avoid portals (like nether portals) when finding a path",
-      "title": "avoid portals"
+      "title": "Avoid Portals"
     },
     "avoid_sun": {
       "type": "boolean",
       "default": false,
       "description": "Whether or not the pathfinder should avoid tiles that are exposed to the sun when creating paths",
-      "title": "avoid sun"
-    },
-    "avoid_water": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder to avoid water when creating a path",
-      "title": "avoid water"
+      "title": "Avoid Sun"
     },
+    "avoid_water": { "type": "boolean", "default": false, "description": "Tells the pathfinder to avoid water when creating a path", "title": "Avoid Water" },
     "blocks_to_avoid": {
       "type": "array",
       "description": "Tells the pathfinder which blocks to avoid when creating a path",
-      "title": "blocks to avoid",
-      "items": {
-        "title": "Block",
-        "description": "UNDOCUMENTATED",
-        "$ref": "../../../../general/block/identifier.json"
-      }
-    },
-    "can_breach": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)",
-      "title": "can breach"
+      "title": "Blocks To Avoid",
+      "items": { "title": "Block", "description": "UNDOCUMENTATED", "$ref": "../../../../general/block/identifier.json" }
     },
+    "can_breach": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can jump out of water (like a dolphin)", "title": "Can Breach" },
     "can_break_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door and break it",
-      "title": "can break doors"
-    },
-    "can_jump": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can jump up blocks",
-      "title": "can jump"
+      "title": "Can Break Doors"
     },
+    "can_jump": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can jump up blocks", "title": "Can Jump" },
     "can_open_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed door assuming the AI will open the door",
-      "title": "can open doors"
+      "title": "Can Open Doors"
     },
     "can_open_iron_doors": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder that it can path through a closed iron door assuming the AI will open the door",
-      "title": "can open iron doors"
-    },
-    "can_pass_doors": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether a path can be created through a door",
-      "title": "can pass doors"
-    },
-    "can_path_from_air": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder that it can start pathing when in the air",
-      "title": "can path from air"
+      "title": "Can Open Iron Doors"
     },
+    "can_pass_doors": { "type": "boolean", "default": true, "description": "Whether a path can be created through a door", "title": "Can Pass Doors" },
+    "can_path_from_air": { "type": "boolean", "default": false, "description": "Tells the pathfinder that it can start pathing when in the air", "title": "Can Path From Air" },
     "can_path_over_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the lava",
-      "title": "can path over lava"
+      "title": "Can Path Over Lava"
     },
     "can_path_over_water": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel on the surface of the water",
-      "title": "can path over water"
-    },
-    "can_sink": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water",
-      "title": "can sink"
+      "title": "Can Path Over Water"
     },
+    "can_sink": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it will be pulled down by gravity while in water", "title": "Can Sink" },
     "can_swim": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can path anywhere through water and plays swimming animation along that path",
-      "title": "can swim"
-    },
-    "can_walk": {
-      "type": "boolean",
-      "default": true,
-      "description": "Tells the pathfinder whether or not it can walk on the ground outside water",
-      "title": "can walk"
+      "title": "Can Swim"
     },
+    "can_walk": { "type": "boolean", "default": true, "description": "Tells the pathfinder whether or not it can walk on the ground outside water", "title": "Can Walk" },
     "can_walk_in_lava": {
       "type": "boolean",
       "default": false,
       "description": "Tells the pathfinder whether or not it can travel in lava like walking on ground",
-      "title": "can walk in lava"
+      "title": "Can Walk In Lava"
     },
-    "is_amphibious": {
-      "type": "boolean",
-      "default": false,
-      "description": "Tells the pathfinder whether or not it can walk on the ground underwater",
-      "title": "is amphibious"
-    }
+    "is_amphibious": { "type": "boolean", "default": false, "description": "Tells the pathfinder whether or not it can walk on the ground underwater", "title": "Is Amphibious" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.npc.json b/source/behaviour/entities/1.8.0/components/minecraft.npc.json
index cd718f22..130c5f4a 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.npc.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.npc.json
@@ -18,63 +18,40 @@
   "properties": {
     "npc_data": {
       "type": "object",
-      "title": "Npc data",
+      "title": "Npc Data",
       "description": "UNDOCUMENTATED",
       "additionalProperties": false,
       "properties": {
         "portrait_offsets": {
           "type": "object",
-          "title": "Portrait offsets",
+          "title": "Portrait Offsets",
           "description": "UNDOCUMENTATED",
           "additionalProperties": false,
           "properties": {
-            "translate": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Translate",
-              "description": "UNDOCUMENTATED"
-            },
-            "scale": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Scale",
-              "description": "UNDOCUMENTATED"
-            }
+            "translate": { "$ref": "#/definitions/rangeXYZ", "title": "Translate", "description": "UNDOCUMENTATED" },
+            "scale": { "$ref": "#/definitions/rangeXYZ", "title": "Scale", "description": "UNDOCUMENTATED" }
           }
         },
         "picker_offsets": {
           "type": "object",
-          "title": "Picker offsets",
+          "title": "Picker Offsets",
           "description": "UNDOCUMENTATED",
           "additionalProperties": false,
           "properties": {
-            "translate": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Translate",
-              "description": "UNDOCUMENTATED"
-            },
-            "scale": {
-              "$ref": "#/definitions/rangeXYZ",
-              "title": "Scale",
-              "description": "UNDOCUMENTATED"
-            }
+            "translate": { "$ref": "#/definitions/rangeXYZ", "title": "Translate", "description": "UNDOCUMENTATED" },
+            "scale": { "$ref": "#/definitions/rangeXYZ", "title": "Scale", "description": "UNDOCUMENTATED" }
           }
         },
         "skin_list": {
           "type": "array",
-          "title": "Skin list",
+          "title": "Skin List",
           "description": "UNDOCUMENTATED",
           "items": {
             "type": "object",
             "title": "Skin",
             "description": "UNDOCUMENTATED",
             "additionalProperties": false,
-            "properties": {
-              "variant": {
-                "title": "Variant",
-                "description": "UNDOCUMENTATED",
-                "type": "integer",
-                "minimum": 0
-              }
-            }
+            "properties": { "variant": { "title": "Variant", "description": "UNDOCUMENTATED", "type": "integer", "minimum": 0 } }
           }
         }
       }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_death.json b/source/behaviour/entities/1.8.0/components/minecraft.on_death.json
index d597c766..e8319a22 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_death.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_death.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_death",
   "description": "Only usable by the Ender Dragon. Adds a trigger to call on this entity's death.",
   "type": "object",
-  "title": "On death 1.8.0",
+  "title": "On Death 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_friendly_anger.json b/source/behaviour/entities/1.8.0/components/minecraft.on_friendly_anger.json
index 81493f43..9cc8216b 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_friendly_anger.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_friendly_anger.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_friendly_anger",
   "description": "Adds a trigger that will run when a nearby entity of the same type as this entity becomes Angry.",
   "type": "object",
-  "title": "On friendly anger 1.8.0",
+  "title": "On Friendly Anger 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_hurt.json b/source/behaviour/entities/1.8.0/components/minecraft.on_hurt.json
index c0a408d3..ac498511 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_hurt.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_hurt.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_hurt",
   "description": "Adds a trigger to call when this entity takes damage.",
   "type": "object",
-  "title": "On hurt 1.8.0",
+  "title": "On Hurt 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_hurt_by_player.json b/source/behaviour/entities/1.8.0/components/minecraft.on_hurt_by_player.json
index 8b6fe2ac..505ce7c3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_hurt_by_player.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_hurt_by_player.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_hurt_by_player",
   "description": "Adds a trigger to call when this entity is attacked by the player.",
   "type": "object",
-  "title": "On hurt by player 1.8.0",
+  "title": "On Hurt By Player 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_ignite.json b/source/behaviour/entities/1.8.0/components/minecraft.on_ignite.json
index b957995c..3adc6fb4 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_ignite.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_ignite.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_ignite",
   "description": "Adds a trigger to call when this entity is set on fire.",
   "type": "object",
-  "title": "On ignite 1.8.0",
+  "title": "On Ignite 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_start_landing.json b/source/behaviour/entities/1.8.0/components/minecraft.on_start_landing.json
index 2f21f1c8..ca4cf2b9 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_start_landing.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_start_landing.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_start_landing",
   "description": "Only usable by the Ender Dragon. Adds a trigger to call when this entity lands.",
   "type": "object",
-  "title": "On start landing 1.8.0",
+  "title": "On Start Landing 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_start_takeoff.json b/source/behaviour/entities/1.8.0/components/minecraft.on_start_takeoff.json
index 193586b6..ab7906a8 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_start_takeoff.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_start_takeoff.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_start_takeoff",
   "description": "Only usable by the Ender Dragon. Adds a trigger to call when this entity starts flying.",
   "type": "object",
-  "title": "On start takeoff 1.8.0",
+  "title": "On Start Takeoff 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_target_acquired.json b/source/behaviour/entities/1.8.0/components/minecraft.on_target_acquired.json
index 84532a56..f38a24df 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_target_acquired.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_target_acquired.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_target_acquired",
   "description": "Adds a trigger to call when this entity finds a target.",
   "type": "object",
-  "title": "On target acquired 1.8.0",
+  "title": "On Target Acquired 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_target_escape.json b/source/behaviour/entities/1.8.0/components/minecraft.on_target_escape.json
index 5659bd23..01e32e47 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_target_escape.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_target_escape.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_target_escape",
   "description": "Adds a trigger to call when this entity loses the target it currently has.",
   "type": "object",
-  "title": "On target escape 1.8.0",
+  "title": "On Target Escape 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.on_wake_with_owner.json b/source/behaviour/entities/1.8.0/components/minecraft.on_wake_with_owner.json
index c44275b0..319775c4 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.on_wake_with_owner.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.on_wake_with_owner.json
@@ -3,22 +3,12 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.on_wake_with_owner",
   "description": "Adds a trigger to call when this pet's owner awakes after sleeping with the pet.",
   "type": "object",
-  "title": "On wake with owner 1.8.0",
+  "title": "On Wake With Owner 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "The event to run when the conditions for this trigger are met",
-      "title": "TODO title"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO title" },
-    "target": {
-      "type": "string",
-      "$ref": "../filters/types/base_subject.json",
-      "default": "self",
-      "description": "The target of the event",
-      "title": "TODO title"
-    }
+    "event": { "type": "string", "description": "The event to run when the conditions for this trigger are met", "title": "TODO Title" },
+    "filters": { "$ref": "../filters.json", "description": "The list of conditions for this trigger", "title": "TODO Title" },
+    "target": { "type": "string", "$ref": "../filters/types/base_subject.json", "default": "self", "description": "The target of the event", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.out_of_control.json b/source/behaviour/entities/1.8.0/components/minecraft.out_of_control.json
index c75f069f..8346e003 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.out_of_control.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.out_of_control.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.out_of_control",
   "type": "object",
-  "title": "Out of control",
+  "title": "Out Of Control",
   "additionalProperties": false,
   "description": "Defines the entity's 'out of control' state.",
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.peek.json b/source/behaviour/entities/1.8.0/components/minecraft.peek.json
index 9f726c95..647e2baa 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.peek.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.peek.json
@@ -7,12 +7,8 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "on_close": { "$ref": "../types/event.json", "description": "Event to call when the entity is done peeking", "title": "TODO title" },
-    "on_open": { "$ref": "../types/event.json", "description": "Event to call when the entity starts peeking", "title": "TODO title" },
-    "on_target_open": {
-      "$ref": "../types/event.json",
-      "description": "Event to call when the entity's target entity starts peeking",
-      "title": "TODO title"
-    }
+    "on_close": { "$ref": "../types/event.json", "description": "Event to call when the entity is done peeking", "title": "TODO Title" },
+    "on_open": { "$ref": "../types/event.json", "description": "Event to call when the entity starts peeking", "title": "TODO Title" },
+    "on_target_open": { "$ref": "../types/event.json", "description": "Event to call when the entity's target entity starts peeking", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.physics.json b/source/behaviour/entities/1.8.0/components/minecraft.physics.json
index e0b695be..e832f403 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.physics.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.physics.json
@@ -7,17 +7,7 @@
   "description": "Defines a dynamic type jump control that will change jump properties based on the speed modifier of the mob.",
   "required": [],
   "properties": {
-    "has_collision": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether or not the object collides with things.",
-      "title": "TODO title"
-    },
-    "has_gravity": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether or not the entity is affected by gravity.",
-      "title": "TODO title"
-    }
+    "has_collision": { "type": "boolean", "default": true, "description": "Whether or not the object collides with things.", "title": "TODO Title" },
+    "has_gravity": { "type": "boolean", "default": true, "description": "Whether or not the entity is affected by gravity.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.player.exhaustion.json b/source/behaviour/entities/1.8.0/components/minecraft.player.exhaustion.json
index bec58c60..bd1289e7 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.player.exhaustion.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.player.exhaustion.json
@@ -7,17 +7,7 @@
   "description": "UNDOCUMENTATED",
   "required": [],
   "properties": {
-    "value": {
-      "type": "number",
-      "default": true,
-      "title": "Value",
-      "description": "UNDOCUMENTATED"
-    },
-    "max": {
-      "type": "number",
-      "default": true,
-      "title": "Maximum",
-      "description": "UNDOCUMENTATED"
-    }
+    "value": { "type": "number", "default": true, "title": "Value", "description": "UNDOCUMENTATED" },
+    "max": { "type": "number", "default": true, "title": "Maximum", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.player.experience.json b/source/behaviour/entities/1.8.0/components/minecraft.player.experience.json
index 223cf49f..777d0e17 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.player.experience.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.player.experience.json
@@ -7,17 +7,7 @@
   "description": "UNDOCUMENTATED",
   "required": [],
   "properties": {
-    "value": {
-      "type": "number",
-      "default": true,
-      "title": "Value",
-      "description": "UNDOCUMENTATED"
-    },
-    "max": {
-      "type": "number",
-      "default": true,
-      "title": "Maximum",
-      "description": "UNDOCUMENTATED"
-    }
+    "value": { "type": "number", "default": true, "title": "Value", "description": "UNDOCUMENTATED" },
+    "max": { "type": "number", "default": true, "title": "Maximum", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.player.level.json b/source/behaviour/entities/1.8.0/components/minecraft.player.level.json
index fb5d373a..bf120464 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.player.level.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.player.level.json
@@ -7,17 +7,7 @@
   "description": "UNDOCUMENTATED",
   "required": [],
   "properties": {
-    "value": {
-      "type": "number",
-      "default": true,
-      "title": "Value",
-      "description": "UNDOCUMENTATED"
-    },
-    "max": {
-      "type": "number",
-      "default": true,
-      "title": "Maximum",
-      "description": "UNDOCUMENTATED"
-    }
+    "value": { "type": "number", "default": true, "title": "Value", "description": "UNDOCUMENTATED" },
+    "max": { "type": "number", "default": true, "title": "Maximum", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.player.saturation.json b/source/behaviour/entities/1.8.0/components/minecraft.player.saturation.json
index 304b356f..6e5b9813 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.player.saturation.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.player.saturation.json
@@ -6,12 +6,5 @@
   "title": "Player.saturation 1.8.0",
   "description": "UNDOCUMENTATED",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": true,
-      "title": "Value",
-      "description": "UNDOCUMENTATED"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": true, "title": "Value", "description": "UNDOCUMENTATED" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.preferred_path.json b/source/behaviour/entities/1.8.0/components/minecraft.preferred_path.json
index ef43e39b..eed6aa11 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.preferred_path.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.preferred_path.json
@@ -2,29 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.preferred_path",
   "type": "object",
-  "title": "Preferred path 1.8.0",
+  "title": "Preferred Path 1.8.0",
   "description": "Specifies costing information for mobs that prefer to walk on preferred paths.",
   "additionalProperties": false,
   "required": ["preferred_path_blocks"],
   "properties": {
-    "default_block_cost": {
-      "type": "number",
-      "default": 0,
-      "description": "Cost for non-preferred blocks",
-      "title": "TODO title"
-    },
-    "jump_cost": {
-      "type": "integer",
-      "default": 0,
-      "description": "Added cost for jumping up a node",
-      "title": "TODO title"
-    },
-    "max_fall_blocks": {
-      "type": "integer",
-      "default": 3,
-      "description": "Distance mob can fall without taking damage",
-      "title": "TODO title"
-    },
+    "default_block_cost": { "type": "number", "default": 0, "description": "Cost for non-preferred blocks", "title": "TODO Title" },
+    "jump_cost": { "type": "integer", "default": 0, "description": "Added cost for jumping up a node", "title": "TODO Title" },
+    "max_fall_blocks": { "type": "integer", "default": 3, "description": "Distance mob can fall without taking damage", "title": "TODO Title" },
     "preferred_path_blocks": {
       "type": "array",
       "description": "A list of blocks with their associated cost",
@@ -32,19 +17,9 @@
         "additionalProperties": false,
         "type": "object",
         "description": "Blocks cost",
-        "properties": {
-          "cost": {
-            "type": "number"
-          },
-          "blocks": {
-            "type": "array",
-            "items": {
-              "$ref": "../../../../general/blocks_item.json"
-            }
-          }
-        }
+        "properties": { "cost": { "type": "number" }, "blocks": { "type": "array", "items": { "$ref": "../../../../general/blocks_item.json" } } }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.projectile.json b/source/behaviour/entities/1.8.0/components/minecraft.projectile.json
index 5a4989b2..b760ec56 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.projectile.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.projectile.json
@@ -7,173 +7,69 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "angleoffset": {
-      "type": "number",
-      "default": 0,
-      "description": "Determines the angle at which the projectile is thrown",
-      "title": "TODO title"
-    },
-    "catchFire": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be set on fire",
-      "title": "TODO title"
-    },
+    "angleoffset": { "type": "number", "default": 0, "description": "Determines the angle at which the projectile is thrown", "title": "TODO Title" },
+    "catchFire": { "type": "boolean", "default": false, "description": "If true, the entity hit will be set on fire", "title": "TODO Title" },
     "critParticleOnHurt": {
       "type": "boolean",
       "default": false,
       "description": "If true, the projectile will produce additional particles when a critical hit happens",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "destroyOnHurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be destroyed when hit",
-      "title": "TODO title"
-    },
-    "filter": { "$ref": "../filters.json", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "TODO title" },
+    "destroyOnHurt": { "type": "boolean", "default": false, "description": "If true, this entity will be destroyed when hit", "title": "TODO Title" },
+    "filter": { "$ref": "../filters.json", "description": "Entity Definitions defined here can't be hurt by the projectile", "title": "TODO Title" },
     "fireAffectedByGriefing": {
       "type": "boolean",
       "default": false,
       "description": "If true, whether the projectile causes fire is affected by the mob griefing game rule",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "gravity": {
       "type": "number",
       "default": 0.05,
       "description": "The gravity applied to this entity when thrown. The higher the value, the faster the entity falls",
-      "title": "TODO title"
-    },
-    "hitSound": {
-      "type": "string",
-      "default": "",
-      "description": "The sound that plays when the projectile hits something",
-      "title": "TODO title"
-    },
-    "homing": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile homes in to the nearest entity",
-      "title": "TODO title"
-    },
-    "inertia": {
-      "type": "number",
-      "default": 0.99,
-      "description": "The fraction of the projectile's speed maintained every frame while traveling in air",
-      "title": "TODO title"
-    },
-    "isdangerous": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated as dangerous to the players",
-      "title": "TODO title"
-    },
-    "knockback": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile will knock back the entity it hits",
-      "title": "TODO title"
-    },
-    "lightning": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the entity hit will be struck by lightning",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "hitSound": { "type": "string", "default": "", "description": "The sound that plays when the projectile hits something", "title": "TODO Title" },
+    "homing": { "type": "boolean", "default": false, "description": "If true, the projectile homes in to the nearest entity", "title": "TODO Title" },
+    "inertia": { "type": "number", "default": 0.99, "description": "The fraction of the projectile's speed maintained every frame while traveling in air", "title": "TODO Title" },
+    "isdangerous": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated as dangerous to the players", "title": "TODO Title" },
+    "knockback": { "type": "boolean", "default": true, "description": "If true, the projectile will knock back the entity it hits", "title": "TODO Title" },
+    "lightning": { "type": "boolean", "default": false, "description": "If true, the entity hit will be struck by lightning", "title": "TODO Title" },
     "liquid_inertia": {
       "type": "number",
       "default": 0.6,
       "description": "The fraction of the projectile's speed maintained every frame while traveling in water",
-      "title": "TODO title"
-    },
-    "multipletargets": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile can hit multiple entities per flight",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "multipletargets": { "type": "boolean", "default": true, "description": "If true, the projectile can hit multiple entities per flight", "title": "TODO Title" },
     "offset": {
       "$ref": "../../../../general/array_3_number.json",
       "default": [0.0, 0.5, 0.0],
       "description": "The offset from the entity's anchor where the projectile will spawn",
-      "title": "TODO title"
-    },
-    "onFireTime": {
-      "type": "number",
-      "default": 5,
-      "description": "Time in seconds that the entity hit will be on fire for",
-      "title": "TODO title"
-    },
-    "particle": {
-      "type": "string",
-      "default": "iconcrack",
-      "description": "Particle to use upon collision",
-      "title": "TODO title"
-    },
-    "potionEffect": {
-      "type": "integer",
-      "default": -1,
-      "description": "Defines the effect the arrow will apply to the entity it hits",
-      "title": "TODO title"
-    },
-    "power": {
-      "type": "number",
-      "default": 1.3,
-      "description": "Determines the velocity of the projectile",
-      "title": "TODO title"
-    },
-    "reflectOnHurt": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be reflected back when hit",
-      "title": "TODO title"
-    },
-    "semirandomdiffdamage": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, damage will be randomized based on damage and speed",
-      "title": "TODO title"
-    },
-    "shootSound": {
-      "type": "string",
-      "description": "The sound that plays when the projectile is shot",
-      "title": "TODO title"
-    },
-    "shoottarget": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the projectile will be shot towards the target of the entity firing it",
-      "title": "TODO title"
-    },
-    "shouldbounce": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will bounce upon hit",
-      "title": "TODO title"
-    },
-    "splashPotion": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, the projectile will be treated like a splash potion",
-      "title": "TODO title"
-    },
-    "splashRange": {
-      "type": "number",
-      "default": 4,
-      "description": "Radius in blocks of the 'splash' effect",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "onFireTime": { "type": "number", "default": 5, "description": "Time in seconds that the entity hit will be on fire for", "title": "TODO Title" },
+    "particle": { "type": "string", "default": "iconcrack", "description": "Particle to use upon collision", "title": "TODO Title" },
+    "potionEffect": { "type": "integer", "default": -1, "description": "Defines the effect the arrow will apply to the entity it hits", "title": "TODO Title" },
+    "power": { "type": "number", "default": 1.3, "description": "Determines the velocity of the projectile", "title": "TODO Title" },
+    "reflectOnHurt": { "type": "boolean", "default": false, "description": "If true, this entity will be reflected back when hit", "title": "TODO Title" },
+    "semirandomdiffdamage": { "type": "boolean", "default": false, "description": "If true, damage will be randomized based on damage and speed", "title": "TODO Title" },
+    "shootSound": { "type": "string", "description": "The sound that plays when the projectile is shot", "title": "TODO Title" },
+    "shoottarget": { "type": "boolean", "default": true, "description": "If true, the projectile will be shot towards the target of the entity firing it", "title": "TODO Title" },
+    "shouldbounce": { "type": "boolean", "default": false, "description": "If true, the projectile will bounce upon hit", "title": "TODO Title" },
+    "splashPotion": { "type": "boolean", "default": false, "description": "If true, the projectile will be treated like a splash potion", "title": "TODO Title" },
+    "splashRange": { "type": "number", "default": 4, "description": "Radius in blocks of the 'splash' effect", "title": "TODO Title" },
     "uncertaintyBase": {
       "type": "number",
       "default": 0,
       "description": "The base accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "uncertaintyMultiplier": {
       "type": "number",
       "default": 0,
       "description": "Determines how much difficulty affects accuracy. Accuracy is determined by the formula uncertaintyBase - difficultyLevel * uncertaintyMultiplier",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.push_through.json b/source/behaviour/entities/1.8.0/components/minecraft.push_through.json
index 9d72439a..a03337ef 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.push_through.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.push_through.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.push_through",
   "type": "object",
-  "title": "Push through 1.8.0",
+  "title": "Push Through 1.8.0",
   "additionalProperties": false,
   "description": "Sets the distance through which the entity can push through.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 0.0,
-      "description": "The value of the entity's push-through, in blocks",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 0.0, "description": "The value of the entity's push-through, in blocks", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.pushable.json b/source/behaviour/entities/1.8.0/components/minecraft.pushable.json
index 6afe9b86..727d217d 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.pushable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.pushable.json
@@ -7,17 +7,7 @@
   "description": "Defines what can push an entity between other entities and pistons.",
   "required": [],
   "properties": {
-    "is_pushable": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether the entity can be pushed by other entities.",
-      "title": "TODO title"
-    },
-    "is_pushable_by_piston": {
-      "type": "boolean",
-      "default": true,
-      "description": "Whether the entity can be pushed by pistons safely.",
-      "title": "TODO title"
-    }
+    "is_pushable": { "type": "boolean", "default": true, "description": "Whether the entity can be pushed by other entities.", "title": "TODO Title" },
+    "is_pushable_by_piston": { "type": "boolean", "default": true, "description": "Whether the entity can be pushed by pistons safely.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.raid_trigger.json b/source/behaviour/entities/1.8.0/components/minecraft.raid_trigger.json
index 1a82886d..0eba78eb 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.raid_trigger.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.raid_trigger.json
@@ -2,15 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.raid_trigger",
   "type": "object",
-  "title": "Raid trigger 1.8.0",
+  "title": "Raid Trigger 1.8.0",
   "additionalProperties": false,
   "description": "Attempts to trigger a raid at the entity's location.",
   "required": [],
-  "properties": {
-    "triggered_event": {
-      "$ref": "../types/event.json",
-      "description": "Event to run we attempt to trigger a raid on the village.",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "triggered_event": { "$ref": "../types/event.json", "description": "Event to run we attempt to trigger a raid on the village.", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.rail_movement.json b/source/behaviour/entities/1.8.0/components/minecraft.rail_movement.json
index b2fd7a53..0a67c8e4 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.rail_movement.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.rail_movement.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.rail_movement",
   "type": "object",
-  "title": "Rail movement 1.8.0",
+  "title": "Rail Movement 1.8.0",
   "description": "Defines the entity's movement on the rails. An entity with this component is only allowed to move on the rail.",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "max_speed": {
-      "type": "number",
-      "default": 0.4,
-      "description": "Maximum speed that this entity will move at when on the rail",
-      "title": "Max Speed"
-    }
-  }
+  "properties": { "max_speed": { "type": "number", "default": 0.4, "description": "Maximum speed that this entity will move at when on the rail", "title": "Max Speed" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.rail_sensor.json b/source/behaviour/entities/1.8.0/components/minecraft.rail_sensor.json
index 70e6abb1..ed8fa686 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.rail_sensor.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.rail_sensor.json
@@ -3,41 +3,36 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.rail_sensor",
   "description": "Defines the behavior of the entity when the rail gets activated or deactivated.",
   "type": "object",
-  "title": "Rail sensor 1.8.0",
+  "title": "Rail Sensor 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "check_block_types": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, on tick this entity will trigger its on_deactivate behavior",
-      "title": "TODO title"
-    },
+    "check_block_types": { "type": "boolean", "default": false, "description": "If true, on tick this entity will trigger its on_deactivate behavior", "title": "TODO Title" },
     "eject_on_activate": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity will eject all of its riders when it passes over an activated rail",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "eject_on_deactivate": {
       "type": "boolean",
       "default": false,
       "description": "If true, this entity will eject all of its riders when it passes over a deactivated rail",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "on_activate": { "$ref": "../types/event.json", "description": "Event to call when the rail is activated", "title": "TODO title" },
-    "on_deactivate": { "$ref": "../types/event.json", "description": "Event to call when the rail is deactivated", "title": "TODO title" },
+    "on_activate": { "$ref": "../types/event.json", "description": "Event to call when the rail is activated", "title": "TODO Title" },
+    "on_deactivate": { "$ref": "../types/event.json", "description": "Event to call when the rail is deactivated", "title": "TODO Title" },
     "tick_command_block_on_activate": {
       "type": "boolean",
       "default": true,
       "description": "If true, command blocks will start ticking when passing over an activated rail",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "tick_command_block_on_deactivate": {
       "type": "boolean",
       "default": false,
       "description": "If false, command blocks will stop ticking when passing over a deactivated rail",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.ravager_blocked.json b/source/behaviour/entities/1.8.0/components/minecraft.ravager_blocked.json
index ae58ee5b..afbe6d0d 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.ravager_blocked.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.ravager_blocked.json
@@ -3,16 +3,11 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.ravager_blocked",
   "description": "Defines the ravager's response to their melee attack being blocked.",
   "type": "object",
-  "title": "Ravager blocked 1.8.0",
+  "title": "Ravager Blocked 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "knockback_strength": {
-      "type": "number",
-      "default": 3,
-      "description": "The strength with which blocking entities should be knocked back",
-      "title": "TODO title"
-    },
+    "knockback_strength": { "type": "number", "default": 3, "description": "The strength with which blocking entities should be knocked back", "title": "TODO Title" },
     "reaction_choices": {
       "type": "array",
       "description": "A list of weighted responses to the melee attack being blocked",
@@ -20,25 +15,15 @@
         "additionalProperties": false,
         "type": "object",
         "properties": {
-          "weight": {
-            "type": "integer"
-          },
+          "weight": { "type": "integer" },
           "value": {
             "additionalProperties": false,
             "type": "object",
-            "properties": {
-              "event": {
-                "type": "string"
-              },
-              "target": {
-                "type": "string",
-                "$ref": "../filters/types/base_subject.json"
-              }
-            }
+            "properties": { "event": { "type": "string" }, "target": { "type": "string", "$ref": "../filters/types/base_subject.json" } }
           }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.rideable.json b/source/behaviour/entities/1.8.0/components/minecraft.rideable.json
index 4a896a35..ccf47495 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.rideable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.rideable.json
@@ -15,90 +15,48 @@
           "default": 181,
           "description": "Angle in degrees that a rider is allowed to rotate while riding this entity. Omit this property for no limit"
         },
-        "max_rider_count": {
-          "type": "integer",
-          "default": 0,
-          "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid"
-        },
+        "max_rider_count": { "type": "integer", "default": 0, "description": "Defines the maximum number of riders that can be riding this entity for this seat to be valid" },
         "min_rider_count": {
           "type": "integer",
           "default": 0,
           "description": "Defines the minimum number of riders that need to be riding this entity before this seat can be used"
         },
-        "position": {
-          "$ref": "../../../../general/array_3_number.json",
-          "default": [0.0, 0.0, 0.0],
-          "description": "Position of this seat relative to this entity's position"
-        },
-        "rotate_rider_by": {
-          "type": "number",
-          "default": 0,
-          "description": "Offset to rotate riders by"
-        }
+        "position": { "$ref": "../../../../general/array_3_number.json", "default": [0.0, 0.0, 0.0], "description": "Position of this seat relative to this entity's position" },
+        "rotate_rider_by": { "type": "number", "default": 0, "description": "Offset to rotate riders by" }
       }
     }
   },
   "required": [],
   "properties": {
-    "controlling_seat": {
-      "type": "integer",
-      "default": 0,
-      "description": "The seat that designates the driver of the entity",
-      "title": "TODO title"
-    },
+    "controlling_seat": { "type": "integer", "default": 0, "description": "The seat that designates the driver of the entity", "title": "TODO Title" },
     "crouching_skip_interact": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity can't be interacted with if the entity interacting with it is crouching",
-      "title": "TODO title"
-    },
-    "family_types": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "List of entities that can ride this entity",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "family_types": { "type": "array", "items": { "type": "string" }, "description": "List of entities that can ride this entity", "title": "TODO Title" },
     "interact_text": {
       "type": "string",
       "default": "",
       "description": "The text to display when the player can interact with the entity when playing with Touch-screen controls",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "pull_in_entities": {
       "type": "boolean",
       "default": false,
       "description": "If true, this entity will pull in entities that are in the correct family_types into any available seats",
-      "title": "TODO title"
-    },
-    "rider_can_interact": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this entity will be picked when looked at by the rider",
-      "title": "TODO title"
-    },
-    "seat_count": {
-      "type": "integer",
-      "default": 1,
-      "description": "The number of entities that can ride this entity at the same time",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "rider_can_interact": { "type": "boolean", "default": false, "description": "If true, this entity will be picked when looked at by the rider", "title": "TODO Title" },
+    "seat_count": { "type": "integer", "default": 1, "description": "The number of entities that can ride this entity at the same time", "title": "TODO Title" },
     "seats": {
       "description": "The list of positions and number of riders for each position for entities riding this entity",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/seats_spec"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/seats_spec"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/seats_spec" },
+        { "type": "array", "items": { "$ref": "#/definitions/seats_spec" } }
       ],
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.scaffolding_climber.json b/source/behaviour/entities/1.8.0/components/minecraft.scaffolding_climber.json
index 29f33c0b..2734074f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.scaffolding_climber.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.scaffolding_climber.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.scaffolding_climber",
   "type": "object",
-  "title": "Scaffolding climber 1.8.0",
+  "title": "Scaffolding Climber 1.8.0",
   "description": "Allows the player to detect and manuever on the scaffolding block.",
   "additionalProperties": false,
   "required": [],
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.scale.json b/source/behaviour/entities/1.8.0/components/minecraft.scale.json
index cf822417..4294b524 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.scale.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.scale.json
@@ -11,7 +11,7 @@
       "type": "number",
       "default": 0.0,
       "description": "The value of the scale. 1.0 means the entity will appear at the scale they are defined in their model. Higher numbers make the entity bigger",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.scale_by_age.json b/source/behaviour/entities/1.8.0/components/minecraft.scale_by_age.json
index d5e765af..b4bfd571 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.scale_by_age.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.scale_by_age.json
@@ -2,22 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.scale_by_age",
   "type": "object",
-  "title": "Scale by age 1.8.0",
+  "title": "Scale By Age 1.8.0",
   "additionalProperties": false,
   "description": "Defines the entity's size interpolation based on the entity's age.",
   "required": [],
   "properties": {
-    "end_scale": {
-      "type": "number",
-      "default": 1,
-      "description": "Ending scale of the entity when it's fully grown",
-      "title": "TODO title"
-    },
-    "start_scale": {
-      "type": "number",
-      "default": 1,
-      "description": "Initial scale of the newborn entity",
-      "title": "TODO title"
-    }
+    "end_scale": { "type": "number", "default": 1, "description": "Ending scale of the entity when it's fully grown", "title": "TODO Title" },
+    "start_scale": { "type": "number", "default": 1, "description": "Initial scale of the newborn entity", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.scheduler.json b/source/behaviour/entities/1.8.0/components/minecraft.scheduler.json
index 37135b3e..59c56557 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.scheduler.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.scheduler.json
@@ -10,11 +10,8 @@
     "scheduled_event": {
       "type": "array",
       "description": "The list of triggers that fire when the conditions match the given filter criteria. If any filter criteria overlap the first defined event will be picked",
-      "items": {
-        "type": "object",
-        "description": "UNKNOWN STRUCTURE"
-      },
-      "title": "TODO title"
+      "items": { "type": "object", "description": "UNKNOWN STRUCTURE" },
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.shareables.json b/source/behaviour/entities/1.8.0/components/minecraft.shareables.json
index da4b4bad..3be6b8c3 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.shareables.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.shareables.json
@@ -13,26 +13,16 @@
       "items": {
         "type": "object",
         "properties": {
-          "item": {
-            "type": "string",
-            "description": "The name of the item",
-            "$ref": "../../../../general/item/identifier.json"
-          },
-          "want_amount": {
-            "type": "integer",
-            "description": "Number of this item this entity wants to share"
-          },
-          "surplus_amount": {
-            "type": "integer",
-            "description": "Number of this item considered extra that the entity wants to share"
-          },
+          "item": { "type": "string", "description": "The name of the item", "$ref": "../../../../general/item/identifier.json" },
+          "want_amount": { "type": "integer", "description": "Number of this item this entity wants to share" },
+          "surplus_amount": { "type": "integer", "description": "Number of this item considered extra that the entity wants to share" },
           "craft_info": {
             "$ref": "../../../../general/item/identifier.json",
             "description": "Defines the item this entity wants to craft with the item defined above. Should be an item name"
           }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.shooter.json b/source/behaviour/entities/1.8.0/components/minecraft.shooter.json
index 848442a3..6423646c 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.shooter.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.shooter.json
@@ -7,21 +7,12 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "auxVal": {
-      "type": "integer",
-      "title": "Aux val",
-      "default": -1,
-      "description": "ID of the Potion effect to be applied on hit"
-    },
+    "auxVal": { "type": "integer", "title": "Aux Val", "default": -1, "description": "ID of the Potion effect to be applied on hit" },
     "def": {
       "title": "Def",
       "type": "string",
       "description": "Actor definition to use as projectile for the ranged attack. The actor definition must have the projectile component to be able to be shot as a projectile"
     },
-    "type": {
-      "title": "Type",
-      "type": "string",
-      "description": "TODO description"
-    }
+    "type": { "title": "Type", "type": "string", "description": "TODO description" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.sittable.json b/source/behaviour/entities/1.8.0/components/minecraft.sittable.json
index af4f391a..e99fec87 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.sittable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.sittable.json
@@ -7,7 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "sit_event": { "$ref": "../types/event.json", "description": "Event to run when the entity enters the 'sit' state", "title": "TODO title" },
-    "stand_event": { "$ref": "../types/event.json", "description": "Event to run when the entity exits the 'sit' state", "title": "TODO title" }
+    "sit_event": { "$ref": "../types/event.json", "description": "Event to run when the entity enters the 'sit' state", "title": "TODO Title" },
+    "stand_event": { "$ref": "../types/event.json", "description": "Event to run when the entity exits the 'sit' state", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.skin_id.json b/source/behaviour/entities/1.8.0/components/minecraft.skin_id.json
index 5a6df7fa..64c9f6db 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.skin_id.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.skin_id.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.skin_id",
   "type": "object",
-  "title": "Skin id 1.8.0",
+  "title": "Skin Id 1.8.0",
   "additionalProperties": false,
   "description": "Skin ID value. Can be used to differentiate skins, such as base skins for villagers.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "integer",
-      "default": 0,
-      "description": "The ID of the skin. By convention, 0 is the ID of the base skin",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "integer", "default": 0, "description": "The ID of the skin. By convention, 0 is the ID of the base skin", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.sound_volume.json b/source/behaviour/entities/1.8.0/components/minecraft.sound_volume.json
index c5428a15..0db199c5 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.sound_volume.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.sound_volume.json
@@ -2,16 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.sound_volume",
   "type": "object",
-  "title": "Sound volume 1.8.0",
+  "title": "Sound Volume 1.8.0",
   "additionalProperties": false,
   "description": "Sets the entity's base volume for sound effects.",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "default": 1.0,
-      "description": "The value of the volume the entity uses for sound effects",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "value": { "type": "number", "default": 1.0, "description": "The value of the volume the entity uses for sound effects", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.spawn_entity.json b/source/behaviour/entities/1.8.0/components/minecraft.spawn_entity.json
index e5db1d6d..94128255 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.spawn_entity.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.spawn_entity.json
@@ -2,75 +2,36 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.spawn_entity",
   "type": "object",
-  "title": "Spawn entity 1.8.0",
+  "title": "Spawn Entity 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "should_leash": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this the spawned entity will be leashed to the parent",
-      "title": "TODO title"
-    },
-    "num_to_spawn": {
-      "type": "integer",
-      "default": 1,
-      "description": "The number of entities of this type to spawn each time that this triggers",
-      "title": "TODO title"
-    },
+    "should_leash": { "type": "boolean", "default": false, "description": "If true, this the spawned entity will be leashed to the parent", "title": "TODO Title" },
+    "num_to_spawn": { "type": "integer", "default": 1, "description": "The number of entities of this type to spawn each time that this triggers", "title": "TODO Title" },
     "min_wait_time": {
       "type": "integer",
       "default": 300,
       "description": "Minimum amount of time to randomly wait in seconds before another entity is spawned",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "max_wait_time": {
       "type": "integer",
       "default": 600,
       "description": "Maximum amount of time to randomly wait in seconds before another entity is spawned",
-      "title": "TODO title"
-    },
-    "spawn_sound": {
-      "type": "string",
-      "default": "plop",
-      "description": "Identifier of the sound effect to play when the entity is spawned",
-      "title": "TODO title"
-    },
-    "spawn_item": {
-      "type": "string",
-      "default": "egg",
-      "description": "Item identifier of the item to spawn",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "spawn_sound": { "type": "string", "default": "plop", "description": "Identifier of the sound effect to play when the entity is spawned", "title": "TODO Title" },
+    "spawn_item": { "type": "string", "default": "egg", "description": "Item identifier of the item to spawn", "title": "TODO Title" },
     "spawn_entity": {
       "type": "string",
       "default": "",
       "description": "Identifier of the entity to spawn, leave empty to spawn the item defined above instead",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "spawn_method": {
-      "type": "string",
-      "default": "born",
-      "description": "Method to use to spawn the entity",
-      "title": "TODO title"
-    },
-    "spawn_event": {
-      "type": "string",
-      "default": "minecraft:entity_born",
-      "description": "Event to call when the entity is spawned",
-      "title": "TODO title"
-    },
-    "filters": {
-      "description": "If present, the specified entity will only spawn if the filter evaluates to true",
-      "$ref": "../filters.json",
-      "title": "TODO title"
-    },
-    "single_use": {
-      "type": "boolean",
-      "default": false,
-      "description": "If true, this component will only ever spawn the specified entity once",
-      "title": "TODO title"
-    }
+    "spawn_method": { "type": "string", "default": "born", "description": "Method to use to spawn the entity", "title": "TODO Title" },
+    "spawn_event": { "type": "string", "default": "minecraft:entity_born", "description": "Event to call when the entity is spawned", "title": "TODO Title" },
+    "filters": { "description": "If present, the specified entity will only spawn if the filter evaluates to true", "$ref": "../filters.json", "title": "TODO Title" },
+    "single_use": { "type": "boolean", "default": false, "description": "If true, this component will only ever spawn the specified entity once", "title": "TODO Title" }
   },
   "description": "Adds a timer after which this entity will spawn another entity or item (similar to vanilla's chicken's egg-laying behavior)."
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.spell_effects.json b/source/behaviour/entities/1.8.0/components/minecraft.spell_effects.json
index 882cd26b..add61800 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.spell_effects.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.spell_effects.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.spell_effects",
   "type": "object",
-  "title": "Spell effects 1.8.0",
+  "title": "Spell Effects 1.8.0",
   "additionalProperties": false,
   "description": "Defines what mob effects to add and remove to the entity when adding this component.",
   "required": [],
@@ -12,31 +12,12 @@
       "description": "List of effects to add to this entity after adding this component",
       "items": {
         "oneOf": [
-          {
-            "type": "string"
-          },
-          {
-            "type": "object",
-            "properties": {
-              "effect": {
-                "type": "string"
-              },
-              "duration": {
-                "type": "integer"
-              },
-              "display_on_screen_animation": {
-                "type": "boolean"
-              }
-            }
-          }
+          { "type": "string" },
+          { "type": "object", "properties": { "effect": { "type": "string" }, "duration": { "type": "integer" }, "display_on_screen_animation": { "type": "boolean" } } }
         ]
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "remove_effects": {
-      "type": "string",
-      "description": "List of identifiers of effects to be removed from this entity after adding this component",
-      "title": "TODO title"
-    }
+    "remove_effects": { "type": "string", "description": "List of identifiers of effects to be removed from this entity after adding this component", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.strength.json b/source/behaviour/entities/1.8.0/components/minecraft.strength.json
index b0682f85..ae161cac 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.strength.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.strength.json
@@ -7,17 +7,7 @@
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "max": {
-      "type": "integer",
-      "default": 5,
-      "description": "The maximum strength of this entity",
-      "title": "Maximum"
-    },
-    "value": {
-      "type": "integer",
-      "default": 1,
-      "description": "The initial value of the strength",
-      "title": "Value"
-    }
+    "max": { "type": "integer", "default": 5, "description": "The maximum strength of this entity", "title": "Maximum" },
+    "value": { "type": "integer", "default": 1, "description": "The initial value of the strength", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.tameable.json b/source/behaviour/entities/1.8.0/components/minecraft.tameable.json
index c109bcf3..f898fd6c 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.tameable.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.tameable.json
@@ -13,27 +13,13 @@
       "description": "The chance of taming the entity with each item use between 0.0 and 1.0, where 1.0 is 100%",
       "minimum": 0,
       "maximum": 1,
-      "title": "TODO title"
-    },
-    "tame_event": {
-      "title": "Tame Event",
-      "$ref": "../types/event.json",
-      "description": "Event to run when this entity becomes tamed"
+      "title": "TODO Title"
     },
+    "tame_event": { "title": "Tame Event", "$ref": "../types/event.json", "description": "Event to run when this entity becomes tamed" },
     "tame_items": {
       "title": "Tame Items",
       "description": "The list of items that can be used to tame this entity",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "$ref": "../../../../general/item/identifier.json"
-          }
-        },
-        {
-          "$ref": "../../../../general/item/identifier.json"
-        }
-      ]
+      "oneOf": [{ "type": "array", "items": { "$ref": "../../../../general/item/identifier.json" } }, { "$ref": "../../../../general/item/identifier.json" }]
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.tamemount.json b/source/behaviour/entities/1.8.0/components/minecraft.tamemount.json
index 95c8054a..79c2668c 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.tamemount.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.tamemount.json
@@ -10,92 +10,42 @@
       "type": "object",
       "description": "The list of items that can be used to increase the entity's temper and speed up the taming process",
       "properties": {
-        "item": {
-          "$ref": "../../../../general/item/identifier.json",
-          "description": "Name of the item this entity likes and can be used to increase this entity's temper"
-        },
-        "temperMod": {
-          "type": "number",
-          "default": 0,
-          "description": "The amount of temper this entity gains when fed this item"
-        }
+        "item": { "$ref": "../../../../general/item/identifier.json", "description": "Name of the item this entity likes and can be used to increase this entity's temper" },
+        "temperMod": { "type": "number", "default": 0, "description": "The amount of temper this entity gains when fed this item" }
       }
     },
     "auto_reject_items": {
       "type": "object",
       "description": "The list of items that can be used to increase the entity's temper and speed up the taming process",
       "properties": {
-        "item": {
-          "$ref": "../../../../general/item/identifier.json",
-          "description": "Name of the item this entity dislikes and will cause it to get angry if used while untamed"
-        }
+        "item": { "$ref": "../../../../general/item/identifier.json", "description": "Name of the item this entity dislikes and will cause it to get angry if used while untamed" }
       }
     }
   },
   "required": [],
   "properties": {
-    "attemptTemperMod": {
-      "type": "integer",
-      "default": 5,
-      "description": "The amount the entity's temper will increase when mounted",
-      "title": "TODO title"
-    },
+    "attemptTemperMod": { "type": "integer", "default": 5, "description": "The amount the entity's temper will increase when mounted", "title": "TODO Title" },
     "autoRejectItems": {
       "description": "The list of items that, if carried while interacting with the entity, will anger it",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/auto_reject_items"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/auto_reject_items"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/auto_reject_items" },
+        { "type": "array", "items": { "$ref": "#/definitions/auto_reject_items" } }
       ],
-      "title": "TODO title"
-    },
-    "feed_text": {
-      "type": "string",
-      "default": "",
-      "description": "The text that shows in the feeding interact button",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "feed_text": { "type": "string", "default": "", "description": "The text that shows in the feeding interact button", "title": "TODO Title" },
     "feedItems": {
       "type": "object",
       "description": "The list of items that can be used to increase the entity's temper and speed up the taming process",
       "oneOf": [
-        {
-          "type": "object",
-          "$ref": "#/definitions/feed_items"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/feed_items"
-          }
-        }
+        { "type": "object", "$ref": "#/definitions/feed_items" },
+        { "type": "array", "items": { "$ref": "#/definitions/feed_items" } }
       ],
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "maxTemper": {
-      "type": "integer",
-      "default": 100,
-      "description": "The maximum value for the entity's random starting temper",
-      "title": "TODO title"
-    },
-    "minTemper": {
-      "type": "integer",
-      "default": 0,
-      "description": "The minimum value for the entity's random starting temper",
-      "title": "TODO title"
-    },
-    "ride_text": {
-      "type": "string",
-      "description": "The text that shows in the riding interact button",
-      "title": "TODO title"
-    },
-    "tame_event": { "$ref": "../types/event.json", "description": "Event that triggers when the entity becomes tamed", "title": "TODO title" }
+    "maxTemper": { "type": "integer", "default": 100, "description": "The maximum value for the entity's random starting temper", "title": "TODO Title" },
+    "minTemper": { "type": "integer", "default": 0, "description": "The minimum value for the entity's random starting temper", "title": "TODO Title" },
+    "ride_text": { "type": "string", "description": "The text that shows in the riding interact button", "title": "TODO Title" },
+    "tame_event": { "$ref": "../types/event.json", "description": "Event that triggers when the entity becomes tamed", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.target_nearby_sensor.json b/source/behaviour/entities/1.8.0/components/minecraft.target_nearby_sensor.json
index 545c24cf..47cb6cc4 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.target_nearby_sensor.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.target_nearby_sensor.json
@@ -3,42 +3,37 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.target_nearby_sensor",
   "description": "Defines the entity's range within which it can see or sense other entities to target them.",
   "type": "object",
-  "title": "Target nearby sensor 1.8.0",
+  "title": "Target Nearby Sensor 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
-    "must_see": {
-      "type": "boolean",
-      "default": false,
-      "description": "Whether the other entity needs to be visible to trigger 'inside' events",
-      "title": "TODO title"
-    },
+    "must_see": { "type": "boolean", "default": false, "description": "Whether the other entity needs to be visible to trigger 'inside' events", "title": "TODO Title" },
     "inside_range": {
       "type": "number",
       "default": 1,
       "description": "Maximum distance in blocks that another entity will be considered in the 'inside' range",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "on_inside_range": {
       "$ref": "../types/event.json",
       "description": "Event to call when an entity gets in the inside range. Can specify 'event' for the name of the event and 'target' for the target of the event",
-      "title": "On inside range"
+      "title": "On Inside Range"
     },
     "on_outside_range": {
       "$ref": "../types/event.json",
       "description": "Event to call when an entity gets in the outside range. Can specify 'event' for the name of the event and 'target' for the target of the event",
-      "title": "On outside range"
+      "title": "On Outside Range"
     },
     "on_vision_lost_inside_range": {
       "$ref": "../types/event.json",
       "description": "Event to call when an entity exits visual range. Can specify 'event' for the name of the event and 'target' for the target of the event",
-      "title": "On vision lost inside range"
+      "title": "On Vision Lost Inside Range"
     },
     "outside_range": {
       "type": "number",
       "default": 5,
       "description": "Maximum distance in blocks that another entity will be considered in the 'outside' range",
-      "title": "Outside range"
+      "title": "Outside Range"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.teleport.json b/source/behaviour/entities/1.8.0/components/minecraft.teleport.json
index 572d5e4c..56c2e808 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.teleport.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.teleport.json
@@ -11,63 +11,34 @@
       "type": "number",
       "default": 0.01,
       "description": "Modifies the chance that the entity will teleport if the entity is in darkness",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "light_teleport_chance": {
       "type": "number",
       "default": 0.01,
       "description": "Modifies the chance that the entity will teleport if the entity is in daylight",
-      "title": "TODO title"
-    },
-    "max_random_teleport_time": {
-      "type": "number",
-      "default": 20,
-      "description": "Maximum amount of time in seconds between random teleports",
-      "title": "TODO title"
-    },
-    "min_random_teleport_time": {
-      "type": "number",
-      "default": 0,
-      "description": "Minimum amount of time in seconds between random teleports",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "max_random_teleport_time": { "type": "number", "default": 20, "description": "Maximum amount of time in seconds between random teleports", "title": "TODO Title" },
+    "min_random_teleport_time": { "type": "number", "default": 0, "description": "Minimum amount of time in seconds between random teleports", "title": "TODO Title" },
     "random_teleport_cube": {
       "type": "array",
       "default": [32.0, 16.0, 32.0],
       "items": [
-        {
-          "type": "number",
-          "title": "A"
-        },
-        {
-          "type": "number",
-          "title": "B"
-        },
-        {
-          "type": "number",
-          "title": "C"
-        }
+        { "type": "number", "title": "A" },
+        { "type": "number", "title": "B" },
+        { "type": "number", "title": "C" }
       ],
       "description": "Entity will teleport to a random position within the area defined by this cube",
-      "title": "TODO title"
-    },
-    "random_teleports": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the entity will teleport randomly",
-      "title": "TODO title"
-    },
-    "target_distance": {
-      "type": "number",
-      "default": 16,
-      "description": "Maximum distance the entity will teleport when chasing a target",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "random_teleports": { "type": "boolean", "default": true, "description": "If true, the entity will teleport randomly", "title": "TODO Title" },
+    "target_distance": { "type": "number", "default": 16, "description": "Maximum distance the entity will teleport when chasing a target", "title": "TODO Title" },
     "target_teleport_chance": {
       "type": "number",
       "default": 1,
       "description": "The chance that the entity will teleport between 0.0 and 1.0. 1.0 means 100%",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.tick_world.json b/source/behaviour/entities/1.8.0/components/minecraft.tick_world.json
index 9c12a2d6..be11d3de 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.tick_world.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.tick_world.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.tick_world",
   "description": "Defines if the entity ticks the world and the radius around it to tick.",
   "type": "object",
-  "title": "Tick world 1.8.0",
+  "title": "Tick World 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -12,13 +12,13 @@
       "default": 128,
       "description": "The distance at which the closest player has to be before this entity despawns. This option will be ignored if never_despawn is true. Min: 128 blocks.",
       "minimum": 128,
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "never_despawn": {
       "type": "boolean",
       "default": true,
       "description": "If true, this entity will not despawn even if players are far away. If false, distance_to_players will be used to determine when to despawn.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "radius": {
       "type": "integer",
@@ -26,7 +26,7 @@
       "description": "The area around the entity to tick. Default: 2. Allowed range: 2-6.",
       "minimum": 2,
       "maximum": 6,
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.timer.json b/source/behaviour/entities/1.8.0/components/minecraft.timer.json
index 08d9a762..9755289f 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.timer.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.timer.json
@@ -7,12 +7,7 @@
   "required": [],
   "additionalProperties": false,
   "properties": {
-    "looping": {
-      "type": "boolean",
-      "default": true,
-      "description": "If true, the timer will restart every time after it fires",
-      "title": "Looping"
-    },
+    "looping": { "type": "boolean", "default": true, "description": "If true, the timer will restart every time after it fires", "title": "Looping" },
     "randomInterval": {
       "type": "boolean",
       "default": true,
@@ -27,44 +22,23 @@
           "type": "array",
           "default": [0.0, 0.0],
           "items": [
-            {
-              "type": "number",
-              "title": "A"
-            },
-            {
-              "type": "number",
-              "title": "B"
-            }
+            { "type": "number", "title": "A" },
+            { "type": "number", "title": "B" }
           ],
-          "title": "TODO title"
+          "title": "TODO Title"
         },
-        {
-          "type": "number",
-          "default": 0
-        }
+        { "type": "number", "default": 0 }
       ]
     },
-    "time_down_event": {
-      "description": "Event to fire when the time on the timer runs out",
-      "title": "TODO",
-      "$ref": "../types/event.json"
-    },
+    "time_down_event": { "description": "Event to fire when the time on the timer runs out", "title": "TODO", "$ref": "../types/event.json" },
     "random_time_choices": {
       "type": "array",
       "default": [],
       "description": "This is a list of objects, representing one value in seconds that can be picked before firing the event and an optional weight. Incompatible with time.",
       "items": {
         "properties": {
-          "weight": {
-            "type": "integer",
-            "description": "TODO description: weight",
-            "title": "Weight"
-          },
-          "value": {
-            "type": "integer",
-            "description": "TODO description: value",
-            "title": "Value"
-          }
+          "weight": { "type": "integer", "description": "TODO description: weight", "title": "Weight" },
+          "value": { "type": "integer", "description": "TODO description: value", "title": "Value" }
         },
         "description": "TODO description: random time choices",
         "title": "Random Time Choices"
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.trade_table.json b/source/behaviour/entities/1.8.0/components/minecraft.trade_table.json
index c9b49a3d..5441cdd0 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.trade_table.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.trade_table.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.trade_table",
   "description": "Defines this entity's ability to trade with players.",
   "type": "object",
-  "title": "Trade table 1.8.0",
+  "title": "Trade Table 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
@@ -11,29 +11,16 @@
       "type": "boolean",
       "default": false,
       "description": "Determines when the mob transforms, if the trades should be converted when the new mob has a economy_trade_table. When the trades are converted, the mob will generate a new trade list with their new trade table, but then it will try to convert any of the same trades over to have the same enchantments and user data. For example, if the original has a Emerald to Enchanted Iron Sword (Sharpness 1), and the new trade also has an Emerald for Enchanted Iron Sword, then the enchantment will be Sharpness 1.",
-      "title": "TODO title"
-    },
-    "display_name": {
-      "type": "string",
-      "description": "Name to be displayed while trading with this entity.",
-      "title": "TODO title"
-    },
-    "new_screen": {
-      "type": "boolean",
-      "default": false,
-      "description": "Used to determine if trading with entity opens the new trade screen.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
+    "display_name": { "type": "string", "description": "Name to be displayed while trading with this entity.", "title": "TODO Title" },
+    "new_screen": { "type": "boolean", "default": false, "description": "Used to determine if trading with entity opens the new trade screen.", "title": "TODO Title" },
     "persist_trades": {
       "type": "boolean",
       "default": false,
       "description": "Determines if the trades should persist when the mob transforms. This makes it so that the next time the mob is transformed to something with a trade_table or economy_trade_table, then it keeps their trades.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "table": {
-      "type": "string",
-      "description": "File path relative to the resource pack root for this entity's trades.",
-      "title": "TODO title"
-    }
+    "table": { "type": "string", "description": "File path relative to the resource pack root for this entity's trades.", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.trail.json b/source/behaviour/entities/1.8.0/components/minecraft.trail.json
index 8157b7f2..805a7c30 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.trail.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.trail.json
@@ -11,31 +11,22 @@
       "type": "string",
       "default": "air",
       "description": "The type of block you wish to be spawned by the entity as it move about the world. Solid blocks may not be spawned at an offset of (0,0,0).",
-      "title": "Block type"
+      "title": "Block Type"
     },
     "spawn_filter": {
       "$ref": "../filters.json",
       "description": "One or more conditions that must be met in order to cause the chosen block type to spawn.",
-      "title": "Spawn filter"
+      "title": "Spawn Filter"
     },
     "spawn_offset": {
       "type": "array",
       "default": [0, 0, 0],
       "description": "The distance from the entities current position to spawn the block. Capped at up to 16 blocks away. The X value is left/right(-/+), the Z value is backward/forward(-/+), the Y value is below/above(-/+).",
-      "title": "Spawn offset",
+      "title": "Spawn Offset",
       "items": [
-        {
-          "type": "number",
-          "title": "X"
-        },
-        {
-          "type": "number",
-          "title": "Y"
-        },
-        {
-          "type": "number",
-          "title": "Z"
-        }
+        { "type": "number", "title": "X" },
+        { "type": "number", "title": "Y" },
+        { "type": "number", "title": "Z" }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.transformation.json b/source/behaviour/entities/1.8.0/components/minecraft.transformation.json
index 4548386d..f0acf2f6 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.transformation.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.transformation.json
@@ -10,23 +10,11 @@
     "add": {
       "type": "object",
       "description": "List of components to add to the entity after the transformation",
-      "properties": {
-        "component_groups": {
-          "type": "array",
-          "description": "Names of component groups to add",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "title": "TODO title",
+      "properties": { "component_groups": { "type": "array", "description": "Names of component groups to add", "items": { "type": "string" } } },
+      "title": "TODO Title",
       "additionalProperties": false
     },
-    "begin_transform_sound": {
-      "type": "string",
-      "description": "Sound to play when the transformation starts",
-      "title": "TODO title"
-    },
+    "begin_transform_sound": { "type": "string", "description": "Sound to play when the transformation starts", "title": "TODO Title" },
     "delay": {
       "type": "object",
       "description": "Defines the properties of the delay for the transformation",
@@ -36,64 +24,37 @@
           "default": 0,
           "description": "Chance that the entity will look for nearby blocks that can speed up the transformation. Value must be between 0.0 and 1.0"
         },
-        "block_chance": {
-          "type": "number",
-          "default": 0,
-          "description": "Chance that, once a block is found, will help speed up the transformation"
-        },
+        "block_chance": { "type": "number", "default": 0, "description": "Chance that, once a block is found, will help speed up the transformation" },
         "block_max": {
           "type": "integer",
           "default": 0,
           "description": "Maximum number of blocks the entity will look for to aid in the transformation. If not defined or set to 0, it will be set to the block radius"
         },
-        "block_radius": {
-          "type": "integer",
-          "default": 0,
-          "description": "Distance in Blocks that the entity will search for blocks that can help the transformation"
-        },
+        "block_radius": { "type": "integer", "default": 0, "description": "Distance in Blocks that the entity will search for blocks that can help the transformation" },
         "block_types": {
           "type": "array",
           "description": "List of blocks that can help the transformation of this entity",
-          "items": {
-            "$ref": "../../../../general/blocks_item.json"
-          }
+          "items": { "$ref": "../../../../general/blocks_item.json" }
         },
-        "value": {
-          "type": "number",
-          "default": 0,
-          "description": "Time in seconds before the entity transforms"
-        }
+        "value": { "type": "number", "default": 0, "description": "Time in seconds before the entity transforms" }
       },
-      "title": "TODO title",
+      "title": "TODO Title",
       "additionalProperties": false
     },
-    "drop_equipment": {
-      "type": "boolean",
-      "default": false,
-      "description": "Cause the entity to drop all equipment upon transformation",
-      "title": "TODO title"
-    },
-    "into": {
-      "type": "string",
-      "description": "Entity Definition that this entity will transform into",
-      "title": "TODO title"
-    },
+    "drop_equipment": { "type": "boolean", "default": false, "description": "Cause the entity to drop all equipment upon transformation", "title": "TODO Title" },
+    "into": { "type": "string", "description": "Entity Definition that this entity will transform into", "title": "TODO Title" },
     "keep_level": {
       "type": "boolean",
       "default": false,
       "description": "If this entity has trades and has leveled up, it should maintain that level after transformation.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "keep_owner": {
       "type": "boolean",
       "default": false,
       "description": "If this entity is owned by another entity, it should remain owned after transformation.",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "transformation_sound": {
-      "type": "string",
-      "description": "Sound to play when the entity is done transforming",
-      "title": "TODO title"
-    }
+    "transformation_sound": { "type": "string", "description": "Sound to play when the entity is done transforming", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.trusting.json b/source/behaviour/entities/1.8.0/components/minecraft.trusting.json
index 9567f8eb..74dc416d 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.trusting.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.trusting.json
@@ -11,16 +11,14 @@
       "type": "number",
       "default": 1,
       "description": "The chance of the entity trusting with each item use between 0.0 and 1.0, where 1.0 is 100%",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "trust_event": { "$ref": "../types/event.json", "description": "Event to run when this entity becomes trusting", "title": "TODO title" },
+    "trust_event": { "$ref": "../types/event.json", "description": "Event to run when this entity becomes trusting", "title": "TODO Title" },
     "trust_items": {
       "type": "array",
       "description": "The list of items that can be used to get the entity to trust players",
-      "items": {
-        "$ref": "../../../../general/item/identifier.json"
-      },
-      "title": "TODO title"
+      "items": { "$ref": "../../../../general/item/identifier.json" },
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.type_family.json b/source/behaviour/entities/1.8.0/components/minecraft.type_family.json
index da140474..9474dd36 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.type_family.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.type_family.json
@@ -2,20 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.type_family",
   "type": "object",
-  "title": "Type family 1.8.0",
+  "title": "Type Family 1.8.0",
   "additionalProperties": false,
   "description": "Defines the families this entity belongs to.",
   "required": ["family"],
   "properties": {
-    "family": {
-      "type": "array",
-      "items": {
-        "type": "string",
-        "description": "Family name",
-        "title": "Family"
-      },
-      "description": "List of family names",
-      "title": "Family"
-    }
+    "family": { "type": "array", "items": { "type": "string", "description": "Family name", "title": "Family" }, "description": "List of family names", "title": "Family" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.underwater_movement.json b/source/behaviour/entities/1.8.0/components/minecraft.underwater_movement.json
index a52ef6ab..b0eedf7b 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.underwater_movement.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.underwater_movement.json
@@ -3,14 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.underwater_movement",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "title": "Underwater movement 1.8.0",
+  "title": "Underwater Movement 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "value": {
-      "type": "number",
-      "title": "Value",
-      "description": "UNDOCUMENTATED"
-    }
-  }
+  "properties": { "value": { "type": "number", "title": "Value", "description": "UNDOCUMENTATED" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.variant.json b/source/behaviour/entities/1.8.0/components/minecraft.variant.json
index e3a9fc9c..026614df 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.variant.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.variant.json
@@ -6,12 +6,5 @@
   "title": "Variant 1.8.0",
   "description": "Used to differentiate the component group of a variant of an entity from others (e.g. ocelot, villager) Parameters",
   "required": [],
-  "properties": {
-    "value": {
-      "type": "integer",
-      "default": 0,
-      "description": "The ID of the variant. By convention, 0 is the ID of the base entity",
-      "title": "Value"
-    }
-  }
+  "properties": { "value": { "type": "integer", "default": 0, "description": "The ID of the variant. By convention, 0 is the ID of the base entity", "title": "Value" } }
 }
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.walk_animation_speed.json b/source/behaviour/entities/1.8.0/components/minecraft.walk_animation_speed.json
index 89afdd8b..f8e6f1a7 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.walk_animation_speed.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.walk_animation_speed.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.walk_animation_speed",
   "additionalProperties": false,
   "type": "object",
-  "title": "Walk animation speed 1.8.0",
+  "title": "Walk Animation Speed 1.8.0",
   "description": "Sets the speed multiplier for this entity's walk animation speed.",
   "required": [],
   "properties": {
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.wants_jockey.json b/source/behaviour/entities/1.8.0/components/minecraft.wants_jockey.json
index 3cf6c485..f1ae8ebd 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.wants_jockey.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.wants_jockey.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.wants_jockey",
   "description": "Sets that this entity wants to become a jockey.",
   "type": "object",
-  "title": "Wants jockey 1.8.0",
+  "title": "Wants Jockey 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {}
diff --git a/source/behaviour/entities/1.8.0/components/minecraft.water_movement.json b/source/behaviour/entities/1.8.0/components/minecraft.water_movement.json
index dc20d9c1..d37d72e0 100644
--- a/source/behaviour/entities/1.8.0/components/minecraft.water_movement.json
+++ b/source/behaviour/entities/1.8.0/components/minecraft.water_movement.json
@@ -3,15 +3,8 @@
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.minecraft.water_movement",
   "description": "TODO description",
   "type": "object",
-  "title": "Water movement 1.8.0",
+  "title": "Water Movement 1.8.0",
   "additionalProperties": false,
   "required": [],
-  "properties": {
-    "drag_factor": {
-      "type": "number",
-      "default": 0.8,
-      "description": "Drag factor to determine movement speed when in water.",
-      "title": "TODO title"
-    }
-  }
+  "properties": { "drag_factor": { "type": "number", "default": 0.8, "description": "Drag factor to determine movement speed when in water.", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/entities/1.8.0/entities.json b/source/behaviour/entities/1.8.0/entities.json
index 772eeeb8..e114d61b 100644
--- a/source/behaviour/entities/1.8.0/entities.json
+++ b/source/behaviour/entities/1.8.0/entities.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entity.1.8.0",
   "type": "object",
-  "title": "The minecraft behaviour entity 1.8.0",
+  "title": "Behaviour Entity 1.8.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "const": "1.8.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
diff --git a/source/behaviour/entities/1.8.0/events.json b/source/behaviour/entities/1.8.0/events.json
index aec2fd0c..587d7c50 100644
--- a/source/behaviour/entities/1.8.0/events.json
+++ b/source/behaviour/entities/1.8.0/events.json
@@ -7,19 +7,15 @@
   "definitions": {
     "addremove": {
       "additionalProperties": false,
-      "title": "The add/remove schema",
+      "title": "Add/remove Schema",
       "description": "The components groups to add or remove",
       "type": "object",
       "properties": {
         "component_groups": {
-          "title": "The component groups schema",
+          "title": "Component Groups Schema",
           "description": "The components groups to add or remove",
           "type": "array",
-          "items": {
-            "type": "string",
-            "description": "TODO description: component groups",
-            "title": "Component Groups"
-          }
+          "items": { "type": "string", "description": "TODO description: component groups", "title": "Component Groups" }
         }
       }
     },
@@ -27,41 +23,17 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "add": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: add",
-          "title": "Add"
-        },
-        "remove": {
-          "$ref": "#/definitions/addremove",
-          "description": "TODO description: remove",
-          "title": "Remove"
-        },
+        "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+        "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
         "randomize": {
           "type": "array",
           "items": {
             "required": ["weight"],
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "trigger": {
-                "type": "string",
-                "description": "UNDOCUMENTATED",
-                "title": "UNDOCUMENTATED"
-              },
-              "weight": {
-                "type": "number",
-                "description": "TODO description: weight",
-                "title": "Weight"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" },
+              "weight": { "type": "number", "description": "TODO description: weight", "title": "Weight" }
             },
             "description": "TODO description: randomize",
             "title": "Randomize"
@@ -76,32 +48,16 @@
             "title": "Sequence",
             "type": "object",
             "properties": {
-              "add": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: add",
-                "title": "Add"
-              },
-              "remove": {
-                "$ref": "#/definitions/addremove",
-                "description": "TODO description: remove",
-                "title": "Remove"
-              },
-              "filters": {
-                "$ref": "./filters.json"
-              }
+              "add": { "$ref": "#/definitions/addremove", "description": "TODO description: add", "title": "Add" },
+              "remove": { "$ref": "#/definitions/addremove", "description": "TODO description: remove", "title": "Remove" },
+              "filters": { "$ref": "./filters.json" }
             }
           },
           "description": "A series of filters and components to be added",
           "title": "Sequences"
         },
-        "filters": {
-          "$ref": "./filters.json"
-        },
-        "trigger": {
-          "type": "string",
-          "description": "UNDOCUMENTATED",
-          "title": "UNDOCUMENTATED"
-        }
+        "filters": { "$ref": "./filters.json" },
+        "trigger": { "type": "string", "description": "UNDOCUMENTATED", "title": "UNDOCUMENTATED" }
       }
     }
   },
@@ -116,18 +72,8 @@
       "$ref": "#/definitions/event_base",
       "title": "Entity Born"
     },
-    "minecraft:entity_spawned": {
-      "description": "Event called on an entity that is placed in the level.",
-      "$ref": "#/definitions/event_base",
-      "title": "Entity Spawned"
-    },
-    "minecraft:on_prime": {
-      "description": "Event called on an entity whose fuse is lit and is ready to explode.",
-      "$ref": "#/definitions/event_base",
-      "title": "On Prime"
-    }
+    "minecraft:entity_spawned": { "description": "Event called on an entity that is placed in the level.", "$ref": "#/definitions/event_base", "title": "Entity Spawned" },
+    "minecraft:on_prime": { "description": "Event called on an entity whose fuse is lit and is ready to explode.", "$ref": "#/definitions/event_base", "title": "On Prime" }
   },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
-  }
+  "additionalProperties": { "$ref": "#/definitions/event_base" }
 }
diff --git a/source/behaviour/entities/1.8.0/filters.json b/source/behaviour/entities/1.8.0/filters.json
index df65ce79..7c0c158d 100644
--- a/source/behaviour/entities/1.8.0/filters.json
+++ b/source/behaviour/entities/1.8.0/filters.json
@@ -6,241 +6,69 @@
     "filters_spec": {
       "oneOf": [
         {
-          "propertyNames": {
-            "enum": ["all_of", "any_of", "none_of"]
-          },
+          "propertyNames": { "enum": ["all_of", "any_of", "none_of"] },
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           }
         },
         {
           "required": ["test"],
           "properties": {
-            "all_of": {
-              "title": "All of",
-              "description": "All tests in an 'all_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "any_of": {
-              "title": "Any of",
-              "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            },
-            "none_of": {
-              "title": "None of",
-              "description": "All tests in a 'none_of' group must fail in order for the group to pass.",
-              "$ref": "#/definitions/groups_spec"
-            }
+            "all_of": { "title": "All Of", "description": "All tests in an 'all_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "any_of": { "title": "Any Of", "description": "One or more tests in an 'any_of' group must pass in order for the group to pass.", "$ref": "#/definitions/groups_spec" },
+            "none_of": { "title": "None Of", "description": "All tests in a 'none_of' group must fail in order for the group to pass.", "$ref": "#/definitions/groups_spec" }
           },
           "allOf": [
-            {
-              "if": { "properties": { "test": { "const": "clock_time" } } },
-              "then": { "$ref": "./filters/clock_time.json" }
-            },
-            {
-              "if": {
-                "properties": { "test": { "const": "distance_to_nearest_player" } }
-              },
-              "then": { "$ref": "./filters/distance_to_nearest_player.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_ability" } } },
-              "then": { "$ref": "./filters/has_ability.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_biome_tag" } } },
-              "then": { "$ref": "./filters/has_biome_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_component" } } },
-              "then": { "$ref": "./filters/has_component.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_damage" } } },
-              "then": { "$ref": "./filters/has_damage.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_equipment" } } },
-              "then": { "$ref": "./filters/has_equipment.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_mob_effect" } } },
-              "then": { "$ref": "./filters/has_mob_effect.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_tag" } } },
-              "then": { "$ref": "./filters/has_tag.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "has_trade_supply" } } },
-              "then": { "$ref": "./filters/has_trade_supply.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "hourly_clock_time" } } },
-              "then": { "$ref": "./filters/hourly_clock_time.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_caravan" } } },
-              "then": { "$ref": "./filters/in_caravan.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_clouds" } } },
-              "then": { "$ref": "./filters/in_clouds.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_lava" } } },
-              "then": { "$ref": "./filters/in_lava.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water" } } },
-              "then": { "$ref": "./filters/in_water.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "in_water_or_rain" } } },
-              "then": { "$ref": "./filters/in_water_or_rain.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_altitude" } } },
-              "then": { "$ref": "./filters/is_altitude.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } },
-              "then": { "$ref": "./filters/is_avoiding_mobs.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_biome" } } },
-              "then": { "$ref": "./filters/is_biome.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_brightness" } } },
-              "then": { "$ref": "./filters/is_brightness.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_climbing" } } },
-              "then": { "$ref": "./filters/is_climbing.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_color" } } },
-              "then": { "$ref": "./filters/is_color.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_daytime" } } },
-              "then": { "$ref": "./filters/is_daytime.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_difficulty" } } },
-              "then": { "$ref": "./filters/is_difficulty.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_family" } } },
-              "then": { "$ref": "./filters/is_family.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_game_rule" } } },
-              "then": { "$ref": "./filters/is_game_rule.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_humid" } } },
-              "then": { "$ref": "./filters/is_humid.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_immobile" } } },
-              "then": { "$ref": "./filters/is_immobile.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_in_village" } } },
-              "then": { "$ref": "./filters/is_in_village.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_leashed" } } },
-              "then": { "$ref": "./filters/is_leashed.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_mark_variant" } } },
-              "then": { "$ref": "./filters/is_mark_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_moving" } } },
-              "then": { "$ref": "./filters/is_moving.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_owner" } } },
-              "then": { "$ref": "./filters/is_owner.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_riding" } } },
-              "then": { "$ref": "./filters/is_riding.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_skin_id" } } },
-              "then": { "$ref": "./filters/is_skin_id.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_sneaking" } } },
-              "then": { "$ref": "./filters/is_sneaking.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_snow_covered" } } },
-              "then": { "$ref": "./filters/is_snow_covered.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_target" } } },
-              "then": { "$ref": "./filters/is_target.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_temperature_type" } } },
-              "then": { "$ref": "./filters/is_temperature_type.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_temperature_value" } } },
-              "then": { "$ref": "./filters/is_temperature_value.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underground" } } },
-              "then": { "$ref": "./filters/is_underground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_underwater" } } },
-              "then": { "$ref": "./filters/is_underwater.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_variant" } } },
-              "then": { "$ref": "./filters/is_variant.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "is_visible" } } },
-              "then": { "$ref": "./filters/is_visible.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_intensity" } } },
-              "then": { "$ref": "./filters/moon_intensity.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "moon_phase" } } },
-              "then": { "$ref": "./filters/moon_phase.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ground" } } },
-              "then": { "$ref": "./filters/on_ground.json" }
-            },
-            {
-              "if": { "properties": { "test": { "const": "on_ladder" } } },
-              "then": { "$ref": "./filters/on_ladder.json" }
-            }
+            { "if": { "properties": { "test": { "const": "clock_time" } } }, "then": { "$ref": "./filters/clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "distance_to_nearest_player" } } }, "then": { "$ref": "./filters/distance_to_nearest_player.json" } },
+            { "if": { "properties": { "test": { "const": "has_ability" } } }, "then": { "$ref": "./filters/has_ability.json" } },
+            { "if": { "properties": { "test": { "const": "has_biome_tag" } } }, "then": { "$ref": "./filters/has_biome_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_component" } } }, "then": { "$ref": "./filters/has_component.json" } },
+            { "if": { "properties": { "test": { "const": "has_damage" } } }, "then": { "$ref": "./filters/has_damage.json" } },
+            { "if": { "properties": { "test": { "const": "has_equipment" } } }, "then": { "$ref": "./filters/has_equipment.json" } },
+            { "if": { "properties": { "test": { "const": "has_mob_effect" } } }, "then": { "$ref": "./filters/has_mob_effect.json" } },
+            { "if": { "properties": { "test": { "const": "has_tag" } } }, "then": { "$ref": "./filters/has_tag.json" } },
+            { "if": { "properties": { "test": { "const": "has_trade_supply" } } }, "then": { "$ref": "./filters/has_trade_supply.json" } },
+            { "if": { "properties": { "test": { "const": "hourly_clock_time" } } }, "then": { "$ref": "./filters/hourly_clock_time.json" } },
+            { "if": { "properties": { "test": { "const": "in_caravan" } } }, "then": { "$ref": "./filters/in_caravan.json" } },
+            { "if": { "properties": { "test": { "const": "in_clouds" } } }, "then": { "$ref": "./filters/in_clouds.json" } },
+            { "if": { "properties": { "test": { "const": "in_lava" } } }, "then": { "$ref": "./filters/in_lava.json" } },
+            { "if": { "properties": { "test": { "const": "in_water" } } }, "then": { "$ref": "./filters/in_water.json" } },
+            { "if": { "properties": { "test": { "const": "in_water_or_rain" } } }, "then": { "$ref": "./filters/in_water_or_rain.json" } },
+            { "if": { "properties": { "test": { "const": "is_altitude" } } }, "then": { "$ref": "./filters/is_altitude.json" } },
+            { "if": { "properties": { "test": { "const": "is_avoiding_mobs" } } }, "then": { "$ref": "./filters/is_avoiding_mobs.json" } },
+            { "if": { "properties": { "test": { "const": "is_biome" } } }, "then": { "$ref": "./filters/is_biome.json" } },
+            { "if": { "properties": { "test": { "const": "is_brightness" } } }, "then": { "$ref": "./filters/is_brightness.json" } },
+            { "if": { "properties": { "test": { "const": "is_climbing" } } }, "then": { "$ref": "./filters/is_climbing.json" } },
+            { "if": { "properties": { "test": { "const": "is_color" } } }, "then": { "$ref": "./filters/is_color.json" } },
+            { "if": { "properties": { "test": { "const": "is_daytime" } } }, "then": { "$ref": "./filters/is_daytime.json" } },
+            { "if": { "properties": { "test": { "const": "is_difficulty" } } }, "then": { "$ref": "./filters/is_difficulty.json" } },
+            { "if": { "properties": { "test": { "const": "is_family" } } }, "then": { "$ref": "./filters/is_family.json" } },
+            { "if": { "properties": { "test": { "const": "is_game_rule" } } }, "then": { "$ref": "./filters/is_game_rule.json" } },
+            { "if": { "properties": { "test": { "const": "is_humid" } } }, "then": { "$ref": "./filters/is_humid.json" } },
+            { "if": { "properties": { "test": { "const": "is_immobile" } } }, "then": { "$ref": "./filters/is_immobile.json" } },
+            { "if": { "properties": { "test": { "const": "is_in_village" } } }, "then": { "$ref": "./filters/is_in_village.json" } },
+            { "if": { "properties": { "test": { "const": "is_leashed" } } }, "then": { "$ref": "./filters/is_leashed.json" } },
+            { "if": { "properties": { "test": { "const": "is_mark_variant" } } }, "then": { "$ref": "./filters/is_mark_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_moving" } } }, "then": { "$ref": "./filters/is_moving.json" } },
+            { "if": { "properties": { "test": { "const": "is_owner" } } }, "then": { "$ref": "./filters/is_owner.json" } },
+            { "if": { "properties": { "test": { "const": "is_riding" } } }, "then": { "$ref": "./filters/is_riding.json" } },
+            { "if": { "properties": { "test": { "const": "is_skin_id" } } }, "then": { "$ref": "./filters/is_skin_id.json" } },
+            { "if": { "properties": { "test": { "const": "is_sneaking" } } }, "then": { "$ref": "./filters/is_sneaking.json" } },
+            { "if": { "properties": { "test": { "const": "is_snow_covered" } } }, "then": { "$ref": "./filters/is_snow_covered.json" } },
+            { "if": { "properties": { "test": { "const": "is_target" } } }, "then": { "$ref": "./filters/is_target.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_type" } } }, "then": { "$ref": "./filters/is_temperature_type.json" } },
+            { "if": { "properties": { "test": { "const": "is_temperature_value" } } }, "then": { "$ref": "./filters/is_temperature_value.json" } },
+            { "if": { "properties": { "test": { "const": "is_underground" } } }, "then": { "$ref": "./filters/is_underground.json" } },
+            { "if": { "properties": { "test": { "const": "is_underwater" } } }, "then": { "$ref": "./filters/is_underwater.json" } },
+            { "if": { "properties": { "test": { "const": "is_variant" } } }, "then": { "$ref": "./filters/is_variant.json" } },
+            { "if": { "properties": { "test": { "const": "is_visible" } } }, "then": { "$ref": "./filters/is_visible.json" } },
+            { "if": { "properties": { "test": { "const": "moon_intensity" } } }, "then": { "$ref": "./filters/moon_intensity.json" } },
+            { "if": { "properties": { "test": { "const": "moon_phase" } } }, "then": { "$ref": "./filters/moon_phase.json" } },
+            { "if": { "properties": { "test": { "const": "on_ground" } } }, "then": { "$ref": "./filters/on_ground.json" } },
+            { "if": { "properties": { "test": { "const": "on_ladder" } } }, "then": { "$ref": "./filters/on_ladder.json" } }
           ]
         }
       ]
diff --git a/source/behaviour/entities/1.8.0/filters/clock_time.json b/source/behaviour/entities/1.8.0/filters/clock_time.json
index 31250c15..1f144992 100644
--- a/source/behaviour/entities/1.8.0/filters/clock_time.json
+++ b/source/behaviour/entities/1.8.0/filters/clock_time.json
@@ -2,33 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.clock_time",
   "type": "object",
-  "title": "Filters clock time 1.8.0",
+  "title": "Filters Clock Time 1.8.0",
   "description": "Compares the current 24 hour time with an int value in the range[0, 24000]",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Compares the current 24 hour time with an int value in the range[0, 24000]"
-    },
-    "operator": {
-      "$ref": "./types/base_operator.json",
-      "description": "(Optional) The comparison to apply with 'value'.",
-      "default": "equals",
-      "title": "Operator"
-    },
-    "subject": {
-      "$ref": "./types/base_subject.json",
-      "description": "(Optional) The subject of this filter test.",
-      "default": "self",
-      "title": "Subject"
-    },
-    "value": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 240000,
-      "description": "(Required) An integer value.",
-      "title": "Value"
-    }
+    "test": { "type": "string", "title": "Test Property", "description": "Compares the current 24 hour time with an int value in the range[0, 24000]" },
+    "operator": { "$ref": "./types/base_operator.json", "description": "(Optional) The comparison to apply with 'value'.", "default": "equals", "title": "Operator" },
+    "subject": { "$ref": "./types/base_subject.json", "description": "(Optional) The subject of this filter test.", "default": "self", "title": "Subject" },
+    "value": { "type": "number", "minimum": 0, "maximum": 240000, "description": "(Required) An integer value.", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/distance_to_nearest_player.json b/source/behaviour/entities/1.8.0/filters/distance_to_nearest_player.json
index d5543911..63552b1b 100644
--- a/source/behaviour/entities/1.8.0/filters/distance_to_nearest_player.json
+++ b/source/behaviour/entities/1.8.0/filters/distance_to_nearest_player.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.distance_to_nearest_player",
   "type": "object",
-  "title": "Filters distance to nearest player 1.8.0",
+  "title": "Filters Distance To Nearest Player 1.8.0",
   "description": "Compares the distance to the nearest Player with a float value.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Compares the distance to the nearest Player with a float value."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Compares the distance to the nearest Player with a float value." },
     "operator": { "$ref": "./types/base_operator.json", "description": "(Optional) The comparison to apply with 'value'.", "title": "Operator" },
     "subject": { "$ref": "./types/base_subject.json", "description": "(Optional) The subject of this filter test.", "title": "Subject" },
-    "value": {
-      "type": "number",
-      "description": "(Required) A floating point value.",
-      "title": "Value"
-    }
+    "value": { "type": "number", "description": "(Required) A floating point value.", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_ability.json b/source/behaviour/entities/1.8.0/filters/has_ability.json
index e0b06f21..1ffb08d1 100644
--- a/source/behaviour/entities/1.8.0/filters/has_ability.json
+++ b/source/behaviour/entities/1.8.0/filters/has_ability.json
@@ -2,15 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_ability",
   "type": "object",
-  "title": "Filters has ability 1.8.0",
+  "title": "Filters Has Ability 1.8.0",
   "description": "Returns true when the subject entity has the named ability.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity has the named ability."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity has the named ability." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
diff --git a/source/behaviour/entities/1.8.0/filters/has_biome_tag.json b/source/behaviour/entities/1.8.0/filters/has_biome_tag.json
index e9926ba1..2355beca 100644
--- a/source/behaviour/entities/1.8.0/filters/has_biome_tag.json
+++ b/source/behaviour/entities/1.8.0/filters/has_biome_tag.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_biome_tag",
   "type": "object",
-  "title": "Filters has biome tag 1.8.0",
+  "title": "Filters Has Biome Tag 1.8.0",
   "description": "Tests whether the biome the subject is in has the specified tag.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests whether the biome the subject is in has the specified tag."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests whether the biome the subject is in has the specified tag." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "(Required) The tag to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "(Required) The tag to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_component.json b/source/behaviour/entities/1.8.0/filters/has_component.json
index 9784bc3e..f5c22e51 100644
--- a/source/behaviour/entities/1.8.0/filters/has_component.json
+++ b/source/behaviour/entities/1.8.0/filters/has_component.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_component",
   "type": "object",
-  "title": "Filters has component 1.8.0",
+  "title": "Filters Has Component 1.8.0",
   "description": "Returns true when the subject entity contains the named component.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity contains the named component."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity contains the named component." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "string",
-      "description": "TODO description: value",
-      "title": "Value"
-    }
+    "value": { "type": "string", "description": "TODO description: value", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_damage.json b/source/behaviour/entities/1.8.0/filters/has_damage.json
index 34276f94..477a34a9 100644
--- a/source/behaviour/entities/1.8.0/filters/has_damage.json
+++ b/source/behaviour/entities/1.8.0/filters/has_damage.json
@@ -2,22 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_damage",
   "type": "object",
-  "title": "Filters has damage 1.8.0",
+  "title": "Filters Has Damage 1.8.0",
   "description": "Returns true when the subject entity receives the named damage type.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity receives the named damage type."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity receives the named damage type." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "string",
-      "description": "The Damage type to test",
-      "$ref": "../../../../general/entity/damage_source.json",
-      "title": "Value"
-    }
+    "value": { "type": "string", "description": "The Damage type to test", "$ref": "../../../../general/entity/damage_source.json", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_equipment.json b/source/behaviour/entities/1.8.0/filters/has_equipment.json
index 57e2193b..be617f58 100644
--- a/source/behaviour/entities/1.8.0/filters/has_equipment.json
+++ b/source/behaviour/entities/1.8.0/filters/has_equipment.json
@@ -2,29 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_equipment",
   "type": "object",
-  "title": "Filters has equipment 1.8.0",
+  "title": "Filters Has Equipment 1.8.0",
   "description": "Tests for the presence of a named item in the designated slot of the subject entity.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "const": "has_equipment",
-      "description": "Tests for the presence of a named item in the designated slot of the subject entity.",
-      "title": "Test"
-    },
-    "domain": {
-      "description": "The equipment location to test",
-      "default": "any",
-      "enum": ["any", "armor", "feet", "hand", "head", "leg", "torso"],
-      "title": "Domain"
-    },
+    "test": { "type": "string", "const": "has_equipment", "description": "Tests for the presence of a named item in the designated slot of the subject entity.", "title": "Test" },
+    "domain": { "description": "The equipment location to test", "default": "any", "enum": ["any", "armor", "feet", "hand", "head", "leg", "torso"], "title": "Domain" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The item name to look for",
-      "type": "string",
-      "$ref": "../../../../general/item/identifier.json",
-      "title": "TODO title"
-    }
+    "value": { "description": "The item name to look for", "type": "string", "$ref": "../../../../general/item/identifier.json", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_mob_effect.json b/source/behaviour/entities/1.8.0/filters/has_mob_effect.json
index bd7aaea3..0b85187c 100644
--- a/source/behaviour/entities/1.8.0/filters/has_mob_effect.json
+++ b/source/behaviour/entities/1.8.0/filters/has_mob_effect.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_mob_effect",
   "type": "object",
-  "title": "Filters has mob effect 1.8.0",
+  "title": "Filters Has Mob Effect 1.8.0",
   "description": "Tests whether the Subject has the specified mob effect.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests whether the Subject has the specified mob effect."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests whether the Subject has the specified mob effect." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "string",
-      "description": "TODO description: value",
-      "title": "Value"
-    }
+    "value": { "type": "string", "description": "TODO description: value", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_tag.json b/source/behaviour/entities/1.8.0/filters/has_tag.json
index 2010970f..006abac3 100644
--- a/source/behaviour/entities/1.8.0/filters/has_tag.json
+++ b/source/behaviour/entities/1.8.0/filters/has_tag.json
@@ -2,22 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_tag",
   "type": "object",
-  "title": "Filters has tag 1.8.0",
+  "title": "Filters Has Tag 1.8.0",
   "description": "Returns true if the subject entity has the tag provided.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true if the subject entity has the tag provided."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity has the tag provided." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "string",
-      "description": "The tag as a string",
-      "pattern": "[a-zA-Z0-9_]+",
-      "title": "Value"
-    }
+    "value": { "type": "string", "description": "The tag as a string", "pattern": "[a-zA-Z0-9_]+", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/has_trade_supply.json b/source/behaviour/entities/1.8.0/filters/has_trade_supply.json
index 025cb147..6ffd836c 100644
--- a/source/behaviour/entities/1.8.0/filters/has_trade_supply.json
+++ b/source/behaviour/entities/1.8.0/filters/has_trade_supply.json
@@ -2,12 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.has_trade_supply",
   "type": "object",
-  "title": "Filters has trade supply 1.8.0",
+  "title": "Filters Has Trade Supply 1.8.0",
   "description": "Tests whether the target has any trade supply left. Will return false if the target cannot be traded with.",
   "properties": {
     "test": {
       "type": "string",
-      "title": "The test property",
+      "title": "Test Property",
       "description": "Tests whether the target has any trade supply left. Will return false if the target cannot be traded with."
     },
     "operator": { "$ref": "./types/base_operator.json" },
@@ -16,15 +16,8 @@
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/hourly_clock_time.json b/source/behaviour/entities/1.8.0/filters/hourly_clock_time.json
index 3171641c..4740cf6b 100644
--- a/source/behaviour/entities/1.8.0/filters/hourly_clock_time.json
+++ b/source/behaviour/entities/1.8.0/filters/hourly_clock_time.json
@@ -2,24 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.hourly_clock_time",
   "type": "object",
-  "title": "Filters hourly clock time 1.8.0",
+  "title": "Filters Hourly Clock Time 1.8.0",
   "description": "Compares the current 24 hour time with an int value in the range[0, 24000]",
   "required": ["value"],
   "properties": {
     "test": {
       "type": "string",
-      "title": "The test property",
+      "title": "Test Property",
       "description": "Compares the current 24 hour time with an int value in the range[0, 24000]",
       "const": "hourly_clock_time"
     },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "integer",
-      "description": "An integer value.",
-      "minimum": 0,
-      "maximum": 24000,
-      "title": "Value"
-    }
+    "value": { "type": "integer", "description": "An integer value.", "minimum": 0, "maximum": 24000, "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/in_caravan.json b/source/behaviour/entities/1.8.0/filters/in_caravan.json
index e14caf24..08f7d52c 100644
--- a/source/behaviour/entities/1.8.0/filters/in_caravan.json
+++ b/source/behaviour/entities/1.8.0/filters/in_caravan.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.in_caravan",
   "type": "object",
-  "title": "Filters in caravan 1.8.0",
+  "title": "Filters In Caravan 1.8.0",
   "description": "Returns true if the subject entity is in a caravan.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true if the subject entity is in a caravan."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is in a caravan." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/in_clouds.json b/source/behaviour/entities/1.8.0/filters/in_clouds.json
index 5afb2313..e66e90a4 100644
--- a/source/behaviour/entities/1.8.0/filters/in_clouds.json
+++ b/source/behaviour/entities/1.8.0/filters/in_clouds.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.in_clouds",
   "type": "object",
-  "title": "Filters in clouds 1.8.0",
+  "title": "Filters In Clouds 1.8.0",
   "description": "Returns true when the subject entity is in the clouds.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity is in the clouds."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in the clouds." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/in_lava.json b/source/behaviour/entities/1.8.0/filters/in_lava.json
index 50c273d1..eba53ed8 100644
--- a/source/behaviour/entities/1.8.0/filters/in_lava.json
+++ b/source/behaviour/entities/1.8.0/filters/in_lava.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.in_lava",
   "type": "object",
-  "title": "Filters in lava 1.8.0",
+  "title": "Filters In Lava 1.8.0",
   "description": "Returns true when the subject entity is in lava.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity is in lava."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in lava." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/in_water.json b/source/behaviour/entities/1.8.0/filters/in_water.json
index 02d9947b..10e987bf 100644
--- a/source/behaviour/entities/1.8.0/filters/in_water.json
+++ b/source/behaviour/entities/1.8.0/filters/in_water.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.in_water",
   "type": "object",
-  "title": "Filters in water 1.8.0",
+  "title": "Filters In Water 1.8.0",
   "description": "Returns true when the subject entity is in water.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity is in water."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in water." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/in_water_or_rain.json b/source/behaviour/entities/1.8.0/filters/in_water_or_rain.json
index d97ad432..c0c2a564 100644
--- a/source/behaviour/entities/1.8.0/filters/in_water_or_rain.json
+++ b/source/behaviour/entities/1.8.0/filters/in_water_or_rain.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.in_water_or_rain",
   "type": "object",
-  "title": "Filters in water or rain 1.8.0",
+  "title": "Filters In Water Or Rain 1.8.0",
   "description": "Returns true when the subject entity is in water or rain.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity is in water or rain."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in water or rain." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_altitude.json b/source/behaviour/entities/1.8.0/filters/is_altitude.json
index 8a6309b1..1f8a6625 100644
--- a/source/behaviour/entities/1.8.0/filters/is_altitude.json
+++ b/source/behaviour/entities/1.8.0/filters/is_altitude.json
@@ -2,22 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_altitude",
   "type": "object",
-  "title": "Filters is altitude 1.8.0",
+  "title": "Filters Is Altitude 1.8.0",
   "description": "Tests the current altitude against a provided value. 0= bedrock elevation.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests the current altitude against a provided value. 0= bedrock elevation."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests the current altitude against a provided value. 0= bedrock elevation." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "integer",
-      "description": "The altitude value to compare with",
-      "minimum": 0,
-      "title": "Value"
-    }
+    "value": { "type": "integer", "description": "The altitude value to compare with", "minimum": 0, "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_avoiding_mobs.json b/source/behaviour/entities/1.8.0/filters/is_avoiding_mobs.json
index 288e8603..5f2e8ea4 100644
--- a/source/behaviour/entities/1.8.0/filters/is_avoiding_mobs.json
+++ b/source/behaviour/entities/1.8.0/filters/is_avoiding_mobs.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_avoiding_mobs",
   "type": "object",
-  "title": "Filters is avoiding mobs 1.8.0",
+  "title": "Filters Is Avoiding Mobs 1.8.0",
   "description": "Returns true if the subject entity is fleeing from other mobs.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true if the subject entity is fleeing from other mobs."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is fleeing from other mobs." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_biome.json b/source/behaviour/entities/1.8.0/filters/is_biome.json
index 813f3104..fd61c5ac 100644
--- a/source/behaviour/entities/1.8.0/filters/is_biome.json
+++ b/source/behaviour/entities/1.8.0/filters/is_biome.json
@@ -2,15 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_biome",
   "type": "object",
-  "title": "Filters is biome 1.8.0",
+  "title": "Filters Is Biome 1.8.0",
   "description": "Tests whether the Subject is currently in the named biome.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests whether the Subject is currently in the named biome."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests whether the Subject is currently in the named biome." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
diff --git a/source/behaviour/entities/1.8.0/filters/is_brightness.json b/source/behaviour/entities/1.8.0/filters/is_brightness.json
index b0c45ac2..3c6d7708 100644
--- a/source/behaviour/entities/1.8.0/filters/is_brightness.json
+++ b/source/behaviour/entities/1.8.0/filters/is_brightness.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_brightness",
   "type": "object",
-  "title": "Filters is brightness 1.8.0",
+  "title": "Filters Is Brightness 1.8.0",
   "description": "Tests the current brightness against a provided value in the range (0.0f, 1.0f).",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests the current brightness against a provided value in the range (0.0f, 1.0f)."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests the current brightness against a provided value in the range (0.0f, 1.0f)." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The brightness value to compare with.",
-      "type": "number",
-      "minimum": 0.0,
-      "maximum": 1.0,
-      "title": "Value"
-    }
+    "value": { "description": "The brightness value to compare with.", "type": "number", "minimum": 0.0, "maximum": 1.0, "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_climbing.json b/source/behaviour/entities/1.8.0/filters/is_climbing.json
index fbbe9eca..b582db75 100644
--- a/source/behaviour/entities/1.8.0/filters/is_climbing.json
+++ b/source/behaviour/entities/1.8.0/filters/is_climbing.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_climbing",
   "type": "object",
-  "title": "Filters is climbing 1.8.0",
+  "title": "Filters Is Climbing 1.8.0",
   "description": "Returns true if the subject entity is climbing.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true if the subject entity is climbing."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is climbing." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_color.json b/source/behaviour/entities/1.8.0/filters/is_color.json
index 20ea03fa..b1eab6c9 100644
--- a/source/behaviour/entities/1.8.0/filters/is_color.json
+++ b/source/behaviour/entities/1.8.0/filters/is_color.json
@@ -2,15 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_color",
   "type": "object",
-  "title": "Filters is color 1.8.0",
+  "title": "Filters Is Color 1.8.0",
   "description": "Returns true if the subject entity is the named color.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true if the subject entity is the named color."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is the named color." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
diff --git a/source/behaviour/entities/1.8.0/filters/is_daytime.json b/source/behaviour/entities/1.8.0/filters/is_daytime.json
index 7721ec1d..ccfa27e3 100644
--- a/source/behaviour/entities/1.8.0/filters/is_daytime.json
+++ b/source/behaviour/entities/1.8.0/filters/is_daytime.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_daytime",
   "type": "object",
-  "title": "Filters is daytime 1.8.0",
+  "title": "Filters Is Daytime 1.8.0",
   "description": "Returns true during the daylight hours.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true during the daylight hours."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true during the daylight hours." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_difficulty.json b/source/behaviour/entities/1.8.0/filters/is_difficulty.json
index 8f05f7f7..1a3c207a 100644
--- a/source/behaviour/entities/1.8.0/filters/is_difficulty.json
+++ b/source/behaviour/entities/1.8.0/filters/is_difficulty.json
@@ -2,22 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_difficulty",
   "type": "object",
-  "title": "Filters is difficulty 1.8.0",
+  "title": "Filters Is Difficulty 1.8.0",
   "description": "Tests the current difficulty level of the game.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests the current difficulty level of the game."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests the current difficulty level of the game." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The game's difficulty level to test",
-      "type": "string",
-      "enum": ["easy", "hard", "normal", "peaceful"],
-      "title": "Value"
-    }
+    "value": { "description": "The game's difficulty level to test", "type": "string", "enum": ["easy", "hard", "normal", "peaceful"], "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_family.json b/source/behaviour/entities/1.8.0/filters/is_family.json
index 9f193cc9..cc80595d 100644
--- a/source/behaviour/entities/1.8.0/filters/is_family.json
+++ b/source/behaviour/entities/1.8.0/filters/is_family.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_family",
   "type": "object",
-  "title": "Filters is family 1.8.0",
+  "title": "Filters Is Family 1.8.0",
   "description": "Returns true when the subject entity is a member of the named family.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Returns true when the subject entity is a member of the named family."
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is a member of the named family." },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Family name to look for",
-      "type": "string",
-      "title": "Value"
-    }
+    "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_game_rule.json b/source/behaviour/entities/1.8.0/filters/is_game_rule.json
index cadb1c84..541c6a6c 100644
--- a/source/behaviour/entities/1.8.0/filters/is_game_rule.json
+++ b/source/behaviour/entities/1.8.0/filters/is_game_rule.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_game_rule",
   "type": "object",
-  "title": "Filters is game rule 1.8.0",
+  "title": "Filters Is Game Rule 1.8.0",
   "description": "TODO description: ",
   "required": ["domain"],
   "properties": {
-    "domain": {
-      "description": "The Game Rule to test.",
-      "title": "Domain"
-    },
+    "domain": { "description": "The Game Rule to test.", "title": "Domain" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "Tests whether a named game rule is active.",
-      "default": true,
-      "type": "boolean",
-      "title": "Value"
-    }
+    "value": { "description": "Tests whether a named game rule is active.", "default": true, "type": "boolean", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_humid.json b/source/behaviour/entities/1.8.0/filters/is_humid.json
index 0754bdf5..480fe787 100644
--- a/source/behaviour/entities/1.8.0/filters/is_humid.json
+++ b/source/behaviour/entities/1.8.0/filters/is_humid.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_humid",
   "type": "object",
-  "title": "Filters is humid 1.8.0",
+  "title": "Filters Is Humid 1.8.0",
   "description": "Tests whether the Subject is in an area with humidity",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "Tests whether the Subject is in an area with humidity"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "Tests whether the Subject is in an area with humidity" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_immobile.json b/source/behaviour/entities/1.8.0/filters/is_immobile.json
index 8212dc86..cbeb79f1 100644
--- a/source/behaviour/entities/1.8.0/filters/is_immobile.json
+++ b/source/behaviour/entities/1.8.0/filters/is_immobile.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_immobile",
   "type": "object",
-  "title": "Filters is immobile 1.8.0",
+  "title": "Filters Is Immobile 1.8.0",
   "description": "Returns true if the subject entity is immobile. An entity is immobile if it lacks AI goals, has just changed dimensions or if it is a mob and has no health.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_in_village.json b/source/behaviour/entities/1.8.0/filters/is_in_village.json
index ae3f8acb..ad59df35 100644
--- a/source/behaviour/entities/1.8.0/filters/is_in_village.json
+++ b/source/behaviour/entities/1.8.0/filters/is_in_village.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_in_village",
   "type": "object",
-  "title": "Filters is in village 1.8.0",
+  "title": "Filters Is In Village 1.8.0",
   "description": "Tests whether the Subject is inside the bounds of a village.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_leashed.json b/source/behaviour/entities/1.8.0/filters/is_leashed.json
index 69e4dc59..ad9c596d 100644
--- a/source/behaviour/entities/1.8.0/filters/is_leashed.json
+++ b/source/behaviour/entities/1.8.0/filters/is_leashed.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_leashed",
   "type": "object",
-  "title": "Filters is leashed 1.8.0",
+  "title": "Filters Is Leashed 1.8.0",
   "description": "Returns true if the subject entity is leashed.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_mark_variant.json b/source/behaviour/entities/1.8.0/filters/is_mark_variant.json
index 71b5a03b..53f2cf17 100644
--- a/source/behaviour/entities/1.8.0/filters/is_mark_variant.json
+++ b/source/behaviour/entities/1.8.0/filters/is_mark_variant.json
@@ -2,22 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_mark_variant",
   "type": "object",
-  "title": "Filters is mark variant 1.8.0",
+  "title": "Filters Is Mark Variant 1.8.0",
   "description": "Returns true if the subject entity is the mark variant number provided.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "integer",
-      "description": "The altitude value to compare with",
-      "minimum": 0,
-      "title": "Value"
-    }
+    "value": { "type": "integer", "description": "The altitude value to compare with", "minimum": 0, "title": "Value" }
   },
   "additionalProperties": false
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_moving.json b/source/behaviour/entities/1.8.0/filters/is_moving.json
index 7a99fa2d..bb0ca47c 100644
--- a/source/behaviour/entities/1.8.0/filters/is_moving.json
+++ b/source/behaviour/entities/1.8.0/filters/is_moving.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_moving",
   "type": "object",
-  "title": "Filters is moving 1.8.0",
+  "title": "Filters Is Moving 1.8.0",
   "description": "Returns true if the subject entity is moving.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_owner.json b/source/behaviour/entities/1.8.0/filters/is_owner.json
index afba9a06..1191196c 100644
--- a/source/behaviour/entities/1.8.0/filters/is_owner.json
+++ b/source/behaviour/entities/1.8.0/filters/is_owner.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_owner",
   "type": "object",
-  "title": "Filters is owner 1.8.0",
+  "title": "Filters Is Owner 1.8.0",
   "description": "Returns true if the subject entity is the owner of the calling entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_riding.json b/source/behaviour/entities/1.8.0/filters/is_riding.json
index 757bb922..9cb02dec 100644
--- a/source/behaviour/entities/1.8.0/filters/is_riding.json
+++ b/source/behaviour/entities/1.8.0/filters/is_riding.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_riding",
   "type": "object",
-  "title": "Filters is riding 1.8.0",
+  "title": "Filters Is Riding 1.8.0",
   "description": "Returns true if the subject entity is riding on another entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_skin_id.json b/source/behaviour/entities/1.8.0/filters/is_skin_id.json
index 1c3e2d2a..c6fa2745 100644
--- a/source/behaviour/entities/1.8.0/filters/is_skin_id.json
+++ b/source/behaviour/entities/1.8.0/filters/is_skin_id.json
@@ -2,20 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_skin_id",
   "type": "object",
-  "title": "Filters is skin id 1.8.0",
+  "title": "Filters Is Skin Id 1.8.0",
   "description": "Returns true if the subject entity is the skin id number provided.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "integer",
-      "description": "The altitude value to compare with",
-      "title": "Value"
-    }
+    "value": { "type": "integer", "description": "The altitude value to compare with", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_sneaking.json b/source/behaviour/entities/1.8.0/filters/is_sneaking.json
index 294a070c..206aab43 100644
--- a/source/behaviour/entities/1.8.0/filters/is_sneaking.json
+++ b/source/behaviour/entities/1.8.0/filters/is_sneaking.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_sneaking",
   "type": "object",
-  "title": "Filters is sneaking 1.8.0",
+  "title": "Filters Is Sneaking 1.8.0",
   "description": "Returns true if the subject entity is sneaking.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_snow_covered.json b/source/behaviour/entities/1.8.0/filters/is_snow_covered.json
index 2d04dd37..75c596dd 100644
--- a/source/behaviour/entities/1.8.0/filters/is_snow_covered.json
+++ b/source/behaviour/entities/1.8.0/filters/is_snow_covered.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_snow_covered",
   "type": "object",
-  "title": "Filters is snow covered 1.8.0",
+  "title": "Filters Is Snow Covered 1.8.0",
   "description": "Tests whether the Subject is in an area with snow cover",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_target.json b/source/behaviour/entities/1.8.0/filters/is_target.json
index 9beecef3..81e64fa7 100644
--- a/source/behaviour/entities/1.8.0/filters/is_target.json
+++ b/source/behaviour/entities/1.8.0/filters/is_target.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_target",
   "type": "object",
-  "title": "Filters is target 1.8.0",
+  "title": "Filters Is Target 1.8.0",
   "description": "Returns true if the subject entity is the target of the calling entity.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_temperature_type.json b/source/behaviour/entities/1.8.0/filters/is_temperature_type.json
index 73786902..6505a592 100644
--- a/source/behaviour/entities/1.8.0/filters/is_temperature_type.json
+++ b/source/behaviour/entities/1.8.0/filters/is_temperature_type.json
@@ -2,22 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_target",
   "type": "object",
-  "title": "Filters is target 1.8.0",
+  "title": "Filters Is Target 1.8.0",
   "description": "Tests whether the current temperature is a given type.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Biome temperature catagory to test",
-      "type": "string",
-      "enum": ["cold", "mild", "ocean", "warm"],
-      "title": "Value"
-    }
+    "value": { "description": "The Biome temperature catagory to test", "type": "string", "enum": ["cold", "mild", "ocean", "warm"], "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_temperature_value.json b/source/behaviour/entities/1.8.0/filters/is_temperature_value.json
index d81fed83..9cb04fb2 100644
--- a/source/behaviour/entities/1.8.0/filters/is_temperature_value.json
+++ b/source/behaviour/entities/1.8.0/filters/is_temperature_value.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_temperature_value",
   "type": "object",
-  "title": "Filters is temperature value 1.8.0",
+  "title": "Filters Is Temperature Value 1.8.0",
   "description": "Tests the current temperature against a provided value in the range (0.0, 1.0) where 0.0f is the coldest temp and 1.0f is the hottest.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "The Biome temperature value to compare with.",
-      "type": "number",
-      "minimum": 0.0,
-      "maximum": 1.0,
-      "title": "Value"
-    }
+    "value": { "description": "The Biome temperature value to compare with.", "type": "number", "minimum": 0.0, "maximum": 1.0, "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_underground.json b/source/behaviour/entities/1.8.0/filters/is_underground.json
index bba0da5c..0bded959 100644
--- a/source/behaviour/entities/1.8.0/filters/is_underground.json
+++ b/source/behaviour/entities/1.8.0/filters/is_underground.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_underground",
   "type": "object",
-  "title": "Filters is underground 1.8.0",
+  "title": "Filters Is Underground 1.8.0",
   "description": "Returns true when the subject entity is underground. An entity is considered underground if there are non-solid blocks above it.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_underwater.json b/source/behaviour/entities/1.8.0/filters/is_underwater.json
index d7477500..ebd00cfc 100644
--- a/source/behaviour/entities/1.8.0/filters/is_underwater.json
+++ b/source/behaviour/entities/1.8.0/filters/is_underwater.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_underwater",
   "type": "object",
-  "title": "Filters is underwater 1.8.0",
+  "title": "Filters Is Underwater 1.8.0",
   "description": "Returns true when the subject entity is under water. An entity is considered underwater if it is completely submerged in water blocks.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/is_variant.json b/source/behaviour/entities/1.8.0/filters/is_variant.json
index fc9750be..27bcc748 100644
--- a/source/behaviour/entities/1.8.0/filters/is_variant.json
+++ b/source/behaviour/entities/1.8.0/filters/is_variant.json
@@ -2,21 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_variant",
   "type": "object",
-  "title": "Filters is variant 1.8.0",
+  "title": "Filters Is Variant 1.8.0",
   "description": "Returns true if the subject entity is the variant number provided.",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "integer",
-      "description": "The altitude value to compare with",
-      "title": "Value"
-    }
+    "value": { "type": "integer", "description": "The altitude value to compare with", "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/is_visible.json b/source/behaviour/entities/1.8.0/filters/is_visible.json
index d5ff2086..2347bdcc 100644
--- a/source/behaviour/entities/1.8.0/filters/is_visible.json
+++ b/source/behaviour/entities/1.8.0/filters/is_visible.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.is_visible",
   "type": "object",
-  "title": "Filters is visible 1.8.0",
+  "title": "Filters Is Visible 1.8.0",
   "description": "Returns true if the subject entity is visible.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/moon_intensity.json b/source/behaviour/entities/1.8.0/filters/moon_intensity.json
index 838f584f..6d1d2c42 100644
--- a/source/behaviour/entities/1.8.0/filters/moon_intensity.json
+++ b/source/behaviour/entities/1.8.0/filters/moon_intensity.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.moon_intensity",
   "type": "object",
-  "title": "Filters moon intensity 1.8.0",
+  "title": "Filters Moon Intensity 1.8.0",
   "description": "Compares the current moon intensity with a float value in the range (0.0, 1.0)",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "description": "A floating point value.",
-      "type": "number",
-      "minimum": 0,
-      "maximum": 1,
-      "title": "Value"
-    }
+    "value": { "description": "A floating point value.", "type": "number", "minimum": 0, "maximum": 1, "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/moon_phase.json b/source/behaviour/entities/1.8.0/filters/moon_phase.json
index 07ff9d7e..eedcb9a6 100644
--- a/source/behaviour/entities/1.8.0/filters/moon_phase.json
+++ b/source/behaviour/entities/1.8.0/filters/moon_phase.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.moon_phase",
   "type": "object",
-  "title": "Filters moon phase 1.8.0",
+  "title": "Filters Moon Phase 1.8.0",
   "description": "Compares the current moon phase with an integer value in the range (0, 7).",
   "required": ["value"],
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
-    "value": {
-      "type": "integer",
-      "description": "An integer value.",
-      "minimum": 0,
-      "maximum": 7,
-      "title": "Value"
-    }
+    "value": { "type": "integer", "description": "An integer value.", "minimum": 0, "maximum": 7, "title": "Value" }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/filters/on_ground.json b/source/behaviour/entities/1.8.0/filters/on_ground.json
index 936bbbf1..5ad21ac9 100644
--- a/source/behaviour/entities/1.8.0/filters/on_ground.json
+++ b/source/behaviour/entities/1.8.0/filters/on_ground.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.on_ground",
   "type": "object",
-  "title": "Filters on ground 1.8.0",
+  "title": "Filters On Ground 1.8.0",
   "description": "Returns true when the subject entity is on ground.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/on_ladder.json b/source/behaviour/entities/1.8.0/filters/on_ladder.json
index 3955c9e4..7f99fb4c 100644
--- a/source/behaviour/entities/1.8.0/filters/on_ladder.json
+++ b/source/behaviour/entities/1.8.0/filters/on_ladder.json
@@ -2,29 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.1.8.0.filters.on_ladder",
   "type": "object",
-  "title": "Filters on ladder 1.8.0",
+  "title": "Filters On Ladder 1.8.0",
   "description": "Returns true when the subject entity is on a ladder.",
   "properties": {
-    "test": {
-      "type": "string",
-      "title": "The test property",
-      "description": "The test property"
-    },
+    "test": { "type": "string", "title": "Test Property", "description": "The test property" },
     "operator": { "$ref": "./types/base_operator.json" },
     "subject": { "$ref": "./types/base_subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",
       "oneOf": [
-        {
-          "type": "boolean",
-          "default": true
-        },
-        {
-          "type": "string",
-          "default": "true",
-          "enum": ["true", "false"]
-        }
+        { "type": "boolean", "default": true },
+        { "type": "string", "default": "true", "enum": ["true", "false"] }
       ]
     }
   }
diff --git a/source/behaviour/entities/1.8.0/filters/types/base_operator.json b/source/behaviour/entities/1.8.0/filters/types/base_operator.json
index ae04530c..84d4c67a 100644
--- a/source/behaviour/entities/1.8.0/filters/types/base_operator.json
+++ b/source/behaviour/entities/1.8.0/filters/types/base_operator.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_operator",
-  "title": "Filters operator 1.8.0",
+  "title": "Filters Operator 1.8.0",
   "type": "string",
   "description": "The comparison to apply with 'value'.",
   "default": "equals",
diff --git a/source/behaviour/entities/1.8.0/filters/types/base_subject.json b/source/behaviour/entities/1.8.0/filters/types/base_subject.json
index f481a45f..e0b1e791 100644
--- a/source/behaviour/entities/1.8.0/filters/types/base_subject.json
+++ b/source/behaviour/entities/1.8.0/filters/types/base_subject.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_subject",
-  "title": "Filters subject 1.8.0",
+  "title": "Filters Subject 1.8.0",
   "type": "string",
   "description": "The subject of this filter test.",
   "default": "self",
diff --git a/source/behaviour/entities/1.8.0/filters/types/base_test.json b/source/behaviour/entities/1.8.0/filters/types/base_test.json
index b1dbea81..83b1bad2 100644
--- a/source/behaviour/entities/1.8.0/filters/types/base_test.json
+++ b/source/behaviour/entities/1.8.0/filters/types/base_test.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_test",
-  "title": "Filters test 1.8.0",
+  "title": "Filters Test 1.8.0",
   "type": "string",
   "description": "The test operation",
   "enum": [
diff --git a/source/behaviour/entities/1.8.0/minecraft.entity.json b/source/behaviour/entities/1.8.0/minecraft.entity.json
index 446e6033..5efd7c33 100644
--- a/source/behaviour/entities/1.8.0/minecraft.entity.json
+++ b/source/behaviour/entities/1.8.0/minecraft.entity.json
@@ -15,35 +15,23 @@
           "title": "Animations",
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
-          "additionalProperties": {
-            "title": "Animation (controller)",
-            "description": "The name of the animation controller / animation",
-            "type": "string"
-          }
-        },
-        "identifier": {
-          "$ref": "../../../general/entity/identifier.json",
-          "description": "Sets the identifier for this entity's description.",
-          "title": "Identifier"
-        },
-        "is_spawnable": {
-          "type": "boolean",
-          "title": "Is spawnable",
-          "description": "Sets whether or not this entity has a spawn egg in the creative ui."
+          "additionalProperties": { "title": "Animation (controller)", "description": "The name of the animation controller / animation", "type": "string" }
         },
+        "identifier": { "$ref": "../../../general/entity/identifier.json", "description": "Sets the identifier for this entity's description.", "title": "Identifier" },
+        "is_spawnable": { "type": "boolean", "title": "Is Spawnable", "description": "Sets whether or not this entity has a spawn egg in the creative ui." },
         "is_summonable": {
           "type": "boolean",
-          "title": "The is summonable property",
+          "title": "Is Summonable Property",
           "description": "Sets whether or not we can summon this entity using commands such as /summon."
         },
         "is_experimental": {
           "type": "boolean",
-          "title": "Is experimental",
+          "title": "Is Experimental",
           "description": "Sets whether or not this entity is experimental. Experimental entities are only enabled when the experimental toggle is enabled."
         },
         "runtime_identifier": {
           "type": "string",
-          "title": "Runtime identifier",
+          "title": "Runtime Identifier",
           "description": "Sets the name for the Vanilla Minecraft identifier this entity will use to build itself from."
         },
         "scripts": {
@@ -57,20 +45,8 @@
               "description": "Tells minecraft to run which animation / animation controllers and under what conditions",
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string",
-                    "title": "Animation",
-                    "description": "The name of an animation controller referenced in animations"
-                  },
-                  {
-                    "type": "object",
-                    "title": "Conditional Animation",
-                    "description": "TODO",
-                    "additionalProperties": {
-                      "type": "string",
-                      "title": "Animation"
-                    }
-                  }
+                  { "type": "string", "title": "Animation", "description": "The name of an animation controller referenced in animations" },
+                  { "type": "object", "title": "Conditional Animation", "description": "TODO", "additionalProperties": { "type": "string", "title": "Animation" } }
                 ]
               }
             }
@@ -79,7 +55,7 @@
       }
     },
     "component_groups": {
-      "title": "Component groups",
+      "title": "Component Groups",
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
@@ -87,20 +63,20 @@
         "$ref": "./components.json",
         "uniqueItems": true,
         "description": "The components that are added as the foundation of the entity",
-        "title": "The component schema"
+        "title": "Component Schema"
       }
     },
     "components": {
       "$ref": "./components.json",
       "uniqueItems": true,
       "description": "The components that are added as the foundation of the entity",
-      "title": "The component schema"
+      "title": "Component Schema"
     },
     "events": {
       "$ref": "./events.json",
       "uniqueItems": true,
       "description": "The events that the entity can run, these add or remove components_groups",
-      "title": "The events schema"
+      "title": "Events Schema"
     }
   }
 }
diff --git a/source/behaviour/entities/1.8.0/types/base_operator.json b/source/behaviour/entities/1.8.0/types/base_operator.json
index ae04530c..84d4c67a 100644
--- a/source/behaviour/entities/1.8.0/types/base_operator.json
+++ b/source/behaviour/entities/1.8.0/types/base_operator.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_operator",
-  "title": "Filters operator 1.8.0",
+  "title": "Filters Operator 1.8.0",
   "type": "string",
   "description": "The comparison to apply with 'value'.",
   "default": "equals",
diff --git a/source/behaviour/entities/1.8.0/types/base_subject.json b/source/behaviour/entities/1.8.0/types/base_subject.json
index f481a45f..e0b1e791 100644
--- a/source/behaviour/entities/1.8.0/types/base_subject.json
+++ b/source/behaviour/entities/1.8.0/types/base_subject.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_subject",
-  "title": "Filters subject 1.8.0",
+  "title": "Filters Subject 1.8.0",
   "type": "string",
   "description": "The subject of this filter test.",
   "default": "self",
diff --git a/source/behaviour/entities/1.8.0/types/base_test.json b/source/behaviour/entities/1.8.0/types/base_test.json
index b1dbea81..83b1bad2 100644
--- a/source/behaviour/entities/1.8.0/types/base_test.json
+++ b/source/behaviour/entities/1.8.0/types/base_test.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.filters.1.8.0.base_test",
-  "title": "Filters test 1.8.0",
+  "title": "Filters Test 1.8.0",
   "type": "string",
   "description": "The test operation",
   "enum": [
diff --git a/source/behaviour/entities/1.8.0/types/entity_types.json b/source/behaviour/entities/1.8.0/types/entity_types.json
index 2d48ecc0..ec6ed968 100644
--- a/source/behaviour/entities/1.8.0/types/entity_types.json
+++ b/source/behaviour/entities/1.8.0/types/entity_types.json
@@ -1,24 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.entity_types.1.8.0",
-  "title": "Entity types 1.8.0",
-
+  "title": "Entity Types 1.8.0",
   "definitions": {
     "entity_definition": {
       "description": "The entity type",
-      "title": "The entity type",
+      "title": "Entity Type",
       "type": "object",
       "properties": {
-        "filters": {
-          "type": "object",
-          "$ref": "../filters.json"
-        },
-        "max_dist": {
-          "type": "number",
-          "description": "Maximum distance this mob can be away to be a valid choice",
-          "default": 16,
-          "title": "Max Dist"
-        },
+        "filters": { "type": "object", "$ref": "../filters.json" },
+        "max_dist": { "type": "number", "description": "Maximum distance this mob can be away to be a valid choice", "default": 16, "title": "Max Dist" },
         "walk_speed_multiplier": {
           "type": "number",
           "description": "Multiplier for the walking speed. A value of 1.0 means the speed is unchanged",
@@ -31,12 +22,7 @@
           "default": 16,
           "title": "Sprint Speed Multiplier"
         },
-        "must_see": {
-          "type": "boolean",
-          "description": "If true, the mob has to be visible to be a valid choice",
-          "default": false,
-          "title": "Must See"
-        },
+        "must_see": { "type": "boolean", "description": "If true, the mob has to be visible to be a valid choice", "default": false, "title": "Must See" },
         "must_see_forget_duration": {
           "type": "number",
           "description": "Determines the amount of time in seconds that this mob will look for a target before forgetting about it and looking for a new one when the target isn't visible any more",
diff --git a/source/behaviour/entities/1.8.0/types/event.json b/source/behaviour/entities/1.8.0/types/event.json
index 11b48eb3..75b8b115 100644
--- a/source/behaviour/entities/1.8.0/types/event.json
+++ b/source/behaviour/entities/1.8.0/types/event.json
@@ -4,25 +4,12 @@
   "title": "Event",
   "description": "Minecraft behaviour event 1.8.0",
   "oneOf": [
-    {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_\\-:]+$",
-      "description": "The event to fire"
-    },
+    { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire" },
     {
       "type": "object",
       "properties": {
-        "event": {
-          "type": "string",
-          "pattern": "^[a-zA-Z0-9_\\-:]+$",
-          "description": "The event to fire",
-          "title": "Event"
-        },
-        "target": {
-          "type": "string",
-          "description": "The target of the event",
-          "enum": ["block", "damager", "other", "parent", "player", "self", "target"]
-        }
+        "event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire", "title": "Event" },
+        "target": { "type": "string", "description": "The target of the event", "enum": ["block", "damager", "other", "parent", "player", "self", "target"] }
       }
     }
   ]
diff --git a/source/behaviour/entities/1.8.0/types/range_number_type.json b/source/behaviour/entities/1.8.0/types/range_number_type.json
index 9a7277e6..2a3c151c 100644
--- a/source/behaviour/entities/1.8.0/types/range_number_type.json
+++ b/source/behaviour/entities/1.8.0/types/range_number_type.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.entities.type.range_number_type.1.8.0",
-  "title": "Range [a, b]",
+  "title": "Range [a, B]",
   "description": "A described range",
   "items": [
     { "type": "number", "title": "Range: A", "description": "The first value of the range" },
diff --git a/source/behaviour/entities/1.8.0/types/trigger.json b/source/behaviour/entities/1.8.0/types/trigger.json
index 661304c8..07c98563 100644
--- a/source/behaviour/entities/1.8.0/types/trigger.json
+++ b/source/behaviour/entities/1.8.0/types/trigger.json
@@ -6,12 +6,8 @@
   "description": "Trigger to fire",
   "minProperties": 1,
   "properties": {
-    "event": {
-      "type": "string",
-      "description": "Event",
-      "title": "The event to fire"
-    },
-    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO title" },
+    "event": { "type": "string", "description": "Event", "title": "Event To Fire" },
+    "filters": { "$ref": "../filters.json", "description": "The filters to check to determine if the event should be fired", "title": "TODO Title" },
     "target": { "$ref": "../filters/types/base_subject.json", "description": "The entity to target", "title": "Target" }
   },
   "additionalProperties": false
diff --git a/source/behaviour/entities/entities.json b/source/behaviour/entities/entities.json
index e567b458..040117d9 100644
--- a/source/behaviour/entities/entities.json
+++ b/source/behaviour/entities/entities.json
@@ -6,11 +6,7 @@
     {
       "format_version": "1.16.0",
       "minecraft:entity": {
-        "description": {
-          "identifier": "namespace:entity",
-          "is_spawnable": true,
-          "is_summonable": true
-        },
+        "description": { "identifier": "namespace:entity", "is_spawnable": true, "is_summonable": true },
         "component_groups": {},
         "components": {},
         "events": {}
@@ -18,37 +14,13 @@
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.11.0" } } },
-      "then": { "$ref": "./1.11.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } },
-      "then": { "$ref": "./1.12.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.13.0" } } },
-      "then": { "$ref": "./1.13.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } },
-      "then": { "$ref": "./1.14.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.16.0" } } },
-      "then": { "$ref": "./1.16.0/entities.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.16.100" } } },
-      "then": { "$ref": "./1.16.100/entities.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.11.0" } } }, "then": { "$ref": "./1.11.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } }, "then": { "$ref": "./1.12.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.13.0" } } }, "then": { "$ref": "./1.13.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } }, "then": { "$ref": "./1.14.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.16.0" } } }, "then": { "$ref": "./1.16.0/entities.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.16.100" } } }, "then": { "$ref": "./1.16.100/entities.json" } }
   ]
 }
diff --git a/source/behaviour/items/1.10.0/items.json b/source/behaviour/items/1.10.0/items.json
index 61d59426..6a9f07c5 100644
--- a/source/behaviour/items/1.10.0/items.json
+++ b/source/behaviour/items/1.10.0/items.json
@@ -5,11 +5,7 @@
   "required": ["format_version", "minecraft:item"],
   "title": "Item",
   "properties": {
-    "format_version": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "minecraft:item": {
       "additionalProperties": false,
       "required": ["description"],
@@ -19,14 +15,7 @@
         "description": {
           "additionalProperties": false,
           "type": "object",
-          "properties": {
-            "identifier": {
-              "title": "Identifier",
-              "type": "string",
-              "description": "TODO",
-              "$ref": "../../../general/item/identifier.json"
-            }
-          }
+          "properties": { "identifier": { "title": "Identifier", "type": "string", "description": "TODO", "$ref": "../../../general/item/identifier.json" } }
         },
         "components": {
           "additionalProperties": false,
@@ -38,128 +27,46 @@
               "description": "UNDOCUMANTED",
               "title": "UNDOCUMANTED",
               "properties": {
-                "black_bars_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "black_bars_screen_ratio": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "shutter_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "picture_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "slide_away_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                }
+                "black_bars_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "black_bars_screen_ratio": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "shutter_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "picture_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "slide_away_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
               }
             },
-            "minecraft:max_damage": {
-              "type": "integer",
-              "description": "Max damage item has, this is used like item max health."
-            },
-            "minecraft:hand_equipped": {
-              "type": "boolean",
-              "title": "Hand equipped",
-              "description": "Is this a hand equipped item."
-            },
-            "minecraft:stacked_by_data": {
-              "type": "boolean",
-              "description": "Stacked by data aux value or not?"
-            },
-            "minecraft:foil": {
-              "type": "boolean",
-              "description": "Foil or glint."
-            },
-            "minecraft:block": {
-              "type": "string",
-              "description": "Block name, leave blank for no block."
-            },
-            "minecraft:max_stack_size": {
-              "type": "integer",
-              "description": "Max stack size.",
-              "minimum": 0
-            },
-            "minecraft:use_duration": {
-              "type": "integer",
-              "description": "How long to use before item is done being used."
-            },
+            "minecraft:max_damage": { "type": "integer", "description": "Max damage item has, this is used like item max health." },
+            "minecraft:hand_equipped": { "type": "boolean", "title": "Hand Equipped", "description": "Is this a hand equipped item." },
+            "minecraft:stacked_by_data": { "type": "boolean", "description": "Stacked by data aux value or not?" },
+            "minecraft:foil": { "type": "boolean", "description": "Foil or glint." },
+            "minecraft:block": { "type": "string", "description": "Block name, leave blank for no block." },
+            "minecraft:max_stack_size": { "type": "integer", "description": "Max stack size.", "minimum": 0 },
+            "minecraft:use_duration": { "type": "integer", "description": "How long to use before item is done being used." },
             "minecraft:food": {
               "type": "object",
               "description": "Food settings of the item",
               "properties": {
-                "nutrition": {
-                  "type": "integer",
-                  "description": "Nutrition amount."
-                },
+                "nutrition": { "type": "integer", "description": "Nutrition amount." },
                 "saturation_modifier": {
                   "type": "string",
                   "description": "Choose: poor, low, normal, good, max, supernatural.",
                   "enum": ["poor", "low", "normal", "good", "max", "supernatural"]
                 },
-                "using_converts_to": {
-                  "type": "string",
-                  "description": "After using,  item converts it to this item.",
-                  "$ref": "../../../general/item/identifier.json"
-                },
-                "on_use_action": {
-                  "type": "string",
-                  "description": "'chorus_teleport' or 'none'.",
-                  "enum": ["chorus_teleport", "suspicious_stew_effect", "none"]
-                },
-                "on_use_range": {
-                  "$ref": "../../../general/array_3_number.json"
-                },
-                "cooldown_type": {
-                  "type": "string",
-                  "description": "'chorusfruit' or 'none'.",
-                  "enum": ["chorusfruit", "none"]
-                },
-                "cooldown_time": {
-                  "type": "integer",
-                  "description": "Cooldown time in ticks."
-                },
-                "can_always_eat": {
-                  "type": "boolean",
-                  "description": "Can always eat this item? true or false."
-                },
+                "using_converts_to": { "type": "string", "description": "After using,  item converts it to this item.", "$ref": "../../../general/item/identifier.json" },
+                "on_use_action": { "type": "string", "description": "'chorus_teleport' or 'none'.", "enum": ["chorus_teleport", "suspicious_stew_effect", "none"] },
+                "on_use_range": { "$ref": "../../../general/array_3_number.json" },
+                "cooldown_type": { "type": "string", "description": "'chorusfruit' or 'none'.", "enum": ["chorusfruit", "none"] },
+                "cooldown_time": { "type": "integer", "description": "Cooldown time in ticks." },
+                "can_always_eat": { "type": "boolean", "description": "Can always eat this item? true or false." },
                 "effects": {
                   "type": "array",
                   "items": {
                     "additionalProperties": false,
                     "type": "object",
                     "properties": {
-                      "name": {
-                        "type": "string",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "chance": {
-                        "type": "number",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "duration": {
-                        "type": "integer",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "amplifier": {
-                        "type": "integer",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      }
+                      "name": { "type": "string", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "chance": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "duration": { "type": "integer", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "amplifier": { "type": "integer", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
                     }
                   }
                 }
@@ -169,23 +76,12 @@
               "additionalProperties": false,
               "type": "object",
               "properties": {
-                "crop_result": {
-                  "type": "string"
-                },
+                "crop_result": { "type": "string" },
                 "plant_at": {
                   "description": "Valid blocks you can plant this item at.",
                   "oneOf": [
-                    {
-                      "type": "string",
-                      "$ref": "../../../general/blocks_item.json"
-                    },
-                    {
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "$ref": "../../../general/blocks_item.json"
-                      }
-                    }
+                    { "type": "string", "$ref": "../../../general/blocks_item.json" },
+                    { "type": "array", "items": { "type": "string", "$ref": "../../../general/blocks_item.json" } }
                   ]
                 }
               }
@@ -193,7 +89,7 @@
           }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/items/1.14.0/items.json b/source/behaviour/items/1.14.0/items.json
index 4050943b..910ba26e 100644
--- a/source/behaviour/items/1.14.0/items.json
+++ b/source/behaviour/items/1.14.0/items.json
@@ -5,11 +5,7 @@
   "required": ["format_version", "minecraft:item"],
   "title": "Item",
   "properties": {
-    "format_version": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "minecraft:item": {
       "additionalProperties": false,
       "required": ["description"],
@@ -21,14 +17,7 @@
           "type": "object",
           "title": "Description",
           "description": "TODO",
-          "properties": {
-            "identifier": {
-              "title": "Identifier",
-              "type": "string",
-              "description": "TODO",
-              "$ref": "../../../general/item/identifier.json"
-            }
-          }
+          "properties": { "identifier": { "title": "Identifier", "type": "string", "description": "TODO", "$ref": "../../../general/item/identifier.json" } }
         },
         "components": {
           "additionalProperties": false,
@@ -40,79 +29,26 @@
               "description": "UNDOCUMANTED",
               "title": "UNDOCUMANTED",
               "properties": {
-                "black_bars_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "black_bars_screen_ratio": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "shutter_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "picture_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "slide_away_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                }
+                "black_bars_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "black_bars_screen_ratio": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "shutter_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "picture_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "slide_away_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
               }
             },
-            "minecraft:max_damage": {
-              "type": "integer",
-              "description": "Max damage item has, this is used like item max health.",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:hand_equipped": {
-              "type": "boolean",
-              "title": "Hand equipped",
-              "description": "Is this a hand equipped item."
-            },
-            "minecraft:stacked_by_data": {
-              "type": "boolean",
-              "description": "Stacked by data aux value or not?",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:foil": {
-              "type": "boolean",
-              "description": "Foil or glint.",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:block": {
-              "type": "string",
-              "description": "Block name, leave blank for no block.",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:max_stack_size": {
-              "type": "integer",
-              "description": "Max stack size.",
-              "title": "UNDOCUMANTED",
-              "minimum": 0
-            },
-            "minecraft:use_duration": {
-              "type": "integer",
-              "description": "How long to use before item is done being used.",
-              "title": "UNDOCUMANTED"
-            },
+            "minecraft:max_damage": { "type": "integer", "description": "Max damage item has, this is used like item max health.", "title": "UNDOCUMANTED" },
+            "minecraft:hand_equipped": { "type": "boolean", "title": "Hand Equipped", "description": "Is this a hand equipped item." },
+            "minecraft:stacked_by_data": { "type": "boolean", "description": "Stacked by data aux value or not?", "title": "UNDOCUMANTED" },
+            "minecraft:foil": { "type": "boolean", "description": "Foil or glint.", "title": "UNDOCUMANTED" },
+            "minecraft:block": { "type": "string", "description": "Block name, leave blank for no block.", "title": "UNDOCUMANTED" },
+            "minecraft:max_stack_size": { "type": "integer", "description": "Max stack size.", "title": "UNDOCUMANTED", "minimum": 0 },
+            "minecraft:use_duration": { "type": "integer", "description": "How long to use before item is done being used.", "title": "UNDOCUMANTED" },
             "minecraft:food": {
               "type": "object",
               "description": "Food settings of the item",
               "additionalProperties": false,
               "properties": {
-                "nutrition": {
-                  "type": "integer",
-                  "description": "Nutrition amount.",
-                  "title": "UNDOCUMANTED"
-                },
+                "nutrition": { "type": "integer", "description": "Nutrition amount.", "title": "UNDOCUMANTED" },
                 "saturation_modifier": {
                   "type": "string",
                   "description": "Choose: poor, low, normal, good, max, supernatural.",
@@ -131,64 +67,28 @@
                   "title": "UNDOCUMANTED",
                   "enum": ["chorus_teleport", "suspicious_stew_effect", "none"]
                 },
-                "on_use_range": {
-                  "$ref": "../../../general/array_3_number.json",
-                  "title": "UNDOCUMANTED"
-                },
-                "cooldown_type": {
-                  "type": "string",
-                  "description": "'chorusfruit' or 'none'.",
-                  "title": "UNDOCUMANTED",
-                  "enum": ["chorusfruit", "none"]
-                },
-                "cooldown_time": {
-                  "type": "integer",
-                  "description": "Cooldown time in ticks.",
-                  "title": "UNDOCUMANTED"
-                },
-                "can_always_eat": {
-                  "type": "boolean",
-                  "description": "Can always eat this item? true or false.",
-                  "title": "UNDOCUMANTED"
-                },
+                "on_use_range": { "$ref": "../../../general/array_3_number.json", "title": "UNDOCUMANTED" },
+                "cooldown_type": { "type": "string", "description": "'chorusfruit' or 'none'.", "title": "UNDOCUMANTED", "enum": ["chorusfruit", "none"] },
+                "cooldown_time": { "type": "integer", "description": "Cooldown time in ticks.", "title": "UNDOCUMANTED" },
+                "can_always_eat": { "type": "boolean", "description": "Can always eat this item? true or false.", "title": "UNDOCUMANTED" },
                 "effects": {
                   "type": "array",
                   "items": {
                     "additionalProperties": false,
                     "type": "object",
                     "properties": {
-                      "name": {
-                        "type": "string",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "chance": {
-                        "type": "number",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "duration": {
-                        "type": "integer",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "amplifier": {
-                        "type": "integer",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      }
+                      "name": { "type": "string", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "chance": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "duration": { "type": "integer", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "amplifier": { "type": "integer", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
                     }
                   }
                 },
                 "remove_effects": {
                   "type": "array",
                   "description": "Can always eat this item? true or false.",
-                  "title": "Remove effects",
-                  "items": {
-                    "type": "string",
-                    "description": "UNDOCUMANTED",
-                    "title": "UNDOCUMANTED"
-                  }
+                  "title": "Remove Effects",
+                  "items": { "type": "string", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
                 }
               }
             },
@@ -196,26 +96,13 @@
               "additionalProperties": false,
               "type": "object",
               "properties": {
-                "crop_result": {
-                  "type": "string",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
+                "crop_result": { "type": "string", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
                 "plant_at": {
                   "description": "Valid blocks you can plant this item at.",
                   "title": "UNDOCUMANTED",
                   "oneOf": [
-                    {
-                      "type": "string",
-                      "$ref": "../../../general/blocks_item.json"
-                    },
-                    {
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "$ref": "../../../general/blocks_item.json"
-                      }
-                    }
+                    { "type": "string", "$ref": "../../../general/blocks_item.json" },
+                    { "type": "array", "items": { "type": "string", "$ref": "../../../general/blocks_item.json" } }
                   ]
                 }
               }
@@ -223,7 +110,7 @@
           }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/items/1.16.0/items.json b/source/behaviour/items/1.16.0/items.json
index 4907cd47..6fbce30b 100644
--- a/source/behaviour/items/1.16.0/items.json
+++ b/source/behaviour/items/1.16.0/items.json
@@ -5,11 +5,7 @@
   "required": ["format_version", "minecraft:item"],
   "title": "Item",
   "properties": {
-    "format_version": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "minecraft:item": {
       "additionalProperties": false,
       "required": ["description"],
@@ -38,7 +34,7 @@
               "type": "boolean",
               "default": false,
               "description": "If this item is experimental, it will only be registered if the world is marked as experimental.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             }
           }
         },
@@ -52,78 +48,25 @@
               "description": "UNDOCUMANTED",
               "title": "UNDOCUMANTED",
               "properties": {
-                "black_bars_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "black_bars_screen_ratio": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "shutter_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "picture_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
-                "slide_away_duration": {
-                  "type": "number",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                }
+                "black_bars_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "black_bars_screen_ratio": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "shutter_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "picture_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                "slide_away_duration": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
               }
             },
-            "minecraft:max_damage": {
-              "type": "integer",
-              "description": "Max damage item has, this is used like item max health.",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:hand_equipped": {
-              "type": "boolean",
-              "title": "Hand equipped",
-              "description": "Is this a hand equipped item."
-            },
-            "minecraft:stacked_by_data": {
-              "type": "boolean",
-              "description": "Stacked by data aux value or not?",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:foil": {
-              "type": "boolean",
-              "description": "Foil or glint.",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:block": {
-              "type": "string",
-              "description": "Block name, leave blank for no block.",
-              "title": "UNDOCUMANTED"
-            },
-            "minecraft:max_stack_size": {
-              "type": "integer",
-              "description": "Max stack size.",
-              "title": "UNDOCUMANTED",
-              "minimum": 0
-            },
-            "minecraft:use_duration": {
-              "type": "integer",
-              "description": "How long to use before item is done being used.",
-              "title": "UNDOCUMANTED"
-            },
+            "minecraft:max_damage": { "type": "integer", "description": "Max damage item has, this is used like item max health.", "title": "UNDOCUMANTED" },
+            "minecraft:hand_equipped": { "type": "boolean", "title": "Hand Equipped", "description": "Is this a hand equipped item." },
+            "minecraft:stacked_by_data": { "type": "boolean", "description": "Stacked by data aux value or not?", "title": "UNDOCUMANTED" },
+            "minecraft:foil": { "type": "boolean", "description": "Foil or glint.", "title": "UNDOCUMANTED" },
+            "minecraft:block": { "type": "string", "description": "Block name, leave blank for no block.", "title": "UNDOCUMANTED" },
+            "minecraft:max_stack_size": { "type": "integer", "description": "Max stack size.", "title": "UNDOCUMANTED", "minimum": 0 },
+            "minecraft:use_duration": { "type": "integer", "description": "How long to use before item is done being used.", "title": "UNDOCUMANTED" },
             "minecraft:food": {
               "type": "object",
               "description": "Food settings of the item",
               "properties": {
-                "nutrition": {
-                  "type": "integer",
-                  "description": "Nutrition amount.",
-                  "title": "UNDOCUMANTED"
-                },
+                "nutrition": { "type": "integer", "description": "Nutrition amount.", "title": "UNDOCUMANTED" },
                 "saturation_modifier": {
                   "type": "string",
                   "description": "Choose: poor, low, normal, good, max, supernatural.",
@@ -142,25 +85,10 @@
                   "title": "UNDOCUMANTED",
                   "enum": ["chorus_teleport", "suspicious_stew_effect", "none"]
                 },
-                "on_use_range": {
-                  "$ref": "../../../general/array_3_number.json"
-                },
-                "cooldown_type": {
-                  "type": "string",
-                  "description": "'chorusfruit' or 'none'.",
-                  "title": "UNDOCUMANTED",
-                  "enum": ["chorusfruit", "none"]
-                },
-                "cooldown_time": {
-                  "type": "integer",
-                  "description": "Cooldown time in ticks.",
-                  "title": "UNDOCUMANTED"
-                },
-                "can_always_eat": {
-                  "type": "boolean",
-                  "description": "Can always eat this item? true or false.",
-                  "title": "UNDOCUMANTED"
-                },
+                "on_use_range": { "$ref": "../../../general/array_3_number.json" },
+                "cooldown_type": { "type": "string", "description": "'chorusfruit' or 'none'.", "title": "UNDOCUMANTED", "enum": ["chorusfruit", "none"] },
+                "cooldown_time": { "type": "integer", "description": "Cooldown time in ticks.", "title": "UNDOCUMANTED" },
+                "can_always_eat": { "type": "boolean", "description": "Can always eat this item? true or false.", "title": "UNDOCUMANTED" },
                 "effects": {
                   "type": "array",
                   "description": "UNDOCUMANTED",
@@ -169,26 +97,10 @@
                     "additionalProperties": false,
                     "type": "object",
                     "properties": {
-                      "name": {
-                        "type": "string",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "chance": {
-                        "type": "number",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "duration": {
-                        "type": "integer",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      },
-                      "amplifier": {
-                        "type": "integer",
-                        "description": "UNDOCUMANTED",
-                        "title": "UNDOCUMANTED"
-                      }
+                      "name": { "type": "string", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "chance": { "type": "number", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "duration": { "type": "integer", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
+                      "amplifier": { "type": "integer", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" }
                     }
                   }
                 }
@@ -198,26 +110,13 @@
               "additionalProperties": false,
               "type": "object",
               "properties": {
-                "crop_result": {
-                  "type": "string",
-                  "description": "UNDOCUMANTED",
-                  "title": "UNDOCUMANTED"
-                },
+                "crop_result": { "type": "string", "description": "UNDOCUMANTED", "title": "UNDOCUMANTED" },
                 "plant_at": {
                   "description": "Valid blocks you can plant this item at.",
                   "title": "UNDOCUMANTED",
                   "oneOf": [
-                    {
-                      "type": "string",
-                      "$ref": "../../../general/blocks_item.json"
-                    },
-                    {
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "$ref": "../../../general/blocks_item.json"
-                      }
-                    }
+                    { "type": "string", "$ref": "../../../general/blocks_item.json" },
+                    { "type": "array", "items": { "type": "string", "$ref": "../../../general/blocks_item.json" } }
                   ]
                 }
               }
@@ -225,7 +124,7 @@
           }
         }
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.armor.json b/source/behaviour/items/1.16.100/components/minecraft.armor.json
index 444fffde..86db5b67 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.armor.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.armor.json
@@ -7,16 +7,12 @@
   "additionalProperties": false,
   "required": ["protection", "texture_type"],
   "properties": {
-    "protection": {
-      "type": "number",
-      "description": "How much protection does the armor item have.",
-      "title": "Protection"
-    },
+    "protection": { "type": "number", "description": "How much protection does the armor item have.", "title": "Protection" },
     "texture_type": {
       "type": "string",
       "default": "",
       "description": "Texture Type to apply for the armor. Note that Horse armor is restricted to leather, iron, gold, or diamond.",
-      "title": "Texture type"
+      "title": "Texture Type"
     }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.block_placer.json b/source/behaviour/items/1.16.100/components/minecraft.block_placer.json
index 8c910714..63464f7e 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.block_placer.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.block_placer.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:block_placer",
-  "title": "Block placer",
+  "title": "Block Placer",
   "description": "Planter item component. planter items are items that can be planted.",
   "type": "object",
   "additionalProperties": false,
@@ -9,30 +9,18 @@
   "definitions": {
     "use_on_item": {
       "type": "object",
-      "title": "Allowed block",
+      "title": "Allowed Block",
       "description": "A block descriptor that allows to be placed",
-      "properties": {
-        "tags": {
-          "title": "Tags",
-          "description": "Tags",
-          "$ref": "../../../../molang/1.8.0/string.json"
-        }
-      }
+      "properties": { "tags": { "title": "Tags", "description": "Tags", "$ref": "../../../../molang/1.8.0/string.json" } }
     }
   },
   "properties": {
-    "block": {
-      "type": "string",
-      "description": "Set the placement block name for the planter item.",
-      "title": "Protection"
-    },
+    "block": { "type": "string", "description": "Set the placement block name for the planter item.", "title": "Protection" },
     "use_on": {
       "description": "List of block descriptors that contain blocks that this item can be used on. If left empty, all blocks will be allowed.",
-      "title": "Use on",
+      "title": "Use On",
       "type": "array",
-      "items": {
-        "$ref": "#/definitions/use_on_item"
-      }
+      "items": { "$ref": "#/definitions/use_on_item" }
     }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.cooldown.json b/source/behaviour/items/1.16.100/components/minecraft.cooldown.json
index 834b7230..cffc0c45 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.cooldown.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.cooldown.json
@@ -7,15 +7,7 @@
   "additionalProperties": false,
   "required": ["category", "duration"],
   "properties": {
-    "category": {
-      "type": "string",
-      "description": "The type of cool down for this item.",
-      "title": "Category"
-    },
-    "duration": {
-      "description": "The duration of time this item will spend cooling down before becoming usable again.",
-      "title": "Duration",
-      "type": "number"
-    }
+    "category": { "type": "string", "description": "The type of cool down for this item.", "title": "Category" },
+    "duration": { "description": "The duration of time this item will spend cooling down before becoming usable again.", "title": "Duration", "type": "number" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.digger.json b/source/behaviour/items/1.16.100/components/minecraft.digger.json
index 233c9f53..a5740e62 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.digger.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.digger.json
@@ -7,54 +7,28 @@
   "additionalProperties": false,
   "required": ["destroy_speeds"],
   "properties": {
-    "use_efficiency": {
-      "title": "Use efficiency",
-      "type": "boolean",
-      "description": "Use efficiency? Default is set to false.",
-      "default": "false"
-    },
+    "use_efficiency": { "title": "Use Efficiency", "type": "boolean", "description": "Use efficiency? Default is set to false.", "default": "false" },
     "destroy_speeds": {
       "type": "array",
-      "title": "Destroy speeds",
+      "title": "Destroy Speeds",
       "description": "Destroy speed per block.",
       "items": {
-        "title": "Destroy speed",
+        "title": "Destroy Speed",
         "description": "Destroy speed per block.",
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "speed": {
-            "title": "Speed",
-            "description": "Speed",
-            "type": "number"
-          },
-          "on_dig": {
-            "type": "string",
-            "title": "On dig",
-            "description": "Trigger for when you dig a block that isn't listed in destroy_speeds"
-          },
+          "speed": { "title": "Speed", "description": "Speed", "type": "number" },
+          "on_dig": { "type": "string", "title": "On Dig", "description": "Trigger for when you dig a block that isn't listed in destroy_speeds" },
           "block": {
             "title": "Block",
             "oneOf": [
-              {
-                "type": "string",
-                "description": "The block identifier"
-              },
+              { "type": "string", "description": "The block identifier" },
               {
                 "type": "object",
                 "additionalProperties": false,
                 "description": "Block descriptor",
-                "properties": {
-                  "any_tag": {
-                    "type": "array",
-                    "title": "Any block tag",
-                    "description": "The block tag",
-                    "items": {
-                      "type": "string",
-                      "title": "Block tag"
-                    }
-                  }
-                }
+                "properties": { "any_tag": { "type": "array", "title": "Any Block Tag", "description": "The block tag", "items": { "type": "string", "title": "Block Tag" } } }
               }
             ]
           }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.display_name.json b/source/behaviour/items/1.16.100/components/minecraft.display_name.json
index bb132544..1cbdd9fa 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.display_name.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.display_name.json
@@ -1,16 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:display_name",
-  "title": "Display name",
+  "title": "Display Name",
   "description": "Display Name item component. Display Names display the name of an item.",
   "type": "object",
   "additionalProperties": false,
   "required": ["value"],
-  "properties": {
-    "value": {
-      "type": "string",
-      "title": "Value",
-      "description": "Set the display name for an item."
-    }
-  }
+  "properties": { "value": { "type": "string", "title": "Value", "description": "Set the display name for an item." } }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.durability.json b/source/behaviour/items/1.16.100/components/minecraft.durability.json
index dd9f9dc9..804089d6 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.durability.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.durability.json
@@ -9,27 +9,12 @@
   "properties": {
     "damage_chance": {
       "type": "object",
-      "title": "Damange chance",
+      "title": "Damange Chance",
       "description": "Damange chance",
       "additionalProperties": false,
       "required": ["min", "max"],
-      "properties": {
-        "min": {
-          "title": "Min",
-          "type": "integer",
-          "description": "The minimum"
-        },
-        "max": {
-          "title": "Max",
-          "type": "integer",
-          "description": "The minimum"
-        }
-      }
+      "properties": { "min": { "title": "Min", "type": "integer", "description": "The minimum" }, "max": { "title": "Max", "type": "integer", "description": "The minimum" } }
     },
-    "max_durability": {
-      "title": "Max durability",
-      "description": "Max durability is the amount of damage that this item can take before breaking.",
-      "type": "number"
-    }
+    "max_durability": { "title": "Max Durability", "description": "Max durability is the amount of damage that this item can take before breaking.", "type": "number" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.dye_powder.json b/source/behaviour/items/1.16.100/components/minecraft.dye_powder.json
index 1e0bb832..4604ca6b 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.dye_powder.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.dye_powder.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:dye_powder",
-  "title": "Dye powder",
+  "title": "Dye Powder",
   "description": "Dye powder, there are 16 kinds of dye.",
   "type": "object",
   "additionalProperties": false,
diff --git a/source/behaviour/items/1.16.100/components/minecraft.entity_placer.json b/source/behaviour/items/1.16.100/components/minecraft.entity_placer.json
index c4fba8e3..315cd6ac 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.entity_placer.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.entity_placer.json
@@ -1,34 +1,24 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:entity_placer",
-  "title": "Entity placer",
+  "title": "Entity Placer",
   "description": "Entity placer item component. You can specifiy allowed blocks that the item is restricted to.",
   "type": "object",
   "additionalProperties": false,
   "required": ["entity"],
   "properties": {
-    "entity": {
-      "type": "string",
-      "title": "Entity",
-      "description": "The entity to be placed in the world."
-    },
+    "entity": { "type": "string", "title": "Entity", "description": "The entity to be placed in the world." },
     "dispense_on": {
       "type": "array",
-      "title": "Dispense on",
+      "title": "Dispense On",
       "description": "List of block descriptors that contain blocks that this item can be dispensed on. If left empty, all blocks will be allowed.",
-      "items": {
-        "title": "UNDOCUMENTATED",
-        "description": "UNDOCUMENTATED"
-      }
+      "items": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" }
     },
     "use_on": {
       "type": "array",
-      "title": "Use on",
+      "title": "Use On",
       "description": "List of block descriptors that contain blocks that this item can be used on. If left empty, all blocks will be allowed.",
-      "items": {
-        "title": "UNDOCUMENTATED",
-        "description": "UNDOCUMENTATED"
-      }
+      "items": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" }
     }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.food.json b/source/behaviour/items/1.16.100/components/minecraft.food.json
index 4cf629a1..45a5495b 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.food.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.food.json
@@ -7,44 +7,27 @@
   "additionalProperties": false,
   "properties": {
     "can_always_eat": {
-      "title": "Can always eat",
+      "title": "Can Always Eat",
       "description": "If true you can always eat this item (even when not hungry), defaults to false.",
       "type": "boolean",
       "default": false
     },
-    "nutrition": {
-      "title": "Nutrition",
-      "description": "How much nutrition does this food item give the player when eaten.",
-      "type": "number"
-    },
+    "nutrition": { "title": "Nutrition", "description": "How much nutrition does this food item give the player when eaten.", "type": "number" },
     "on_consume": {
-      "title": "On consume",
+      "title": "On Consume",
       "description": "UNDOCUMENATED",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "event": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED"
-        },
-        "target": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED",
-          "enum": ["self"]
-        }
+        "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+        "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
       }
     },
     "saturation_modifier": {
-      "title": "Saturation modifier",
+      "title": "Saturation Modifier",
       "description": "Saturation Modifier is used in this formula: (nutrition * saturation_modifier * 2) when appling the saturation buff. Which happens when you eat the item.",
       "type": "number"
     },
-    "using_converts_to": {
-      "title": "Using converts to",
-      "description": "When used, convert the *this* item to the one specified by 'using_converts_to'.",
-      "type": "string"
-    }
+    "using_converts_to": { "title": "Using Converts To", "description": "When used, convert the *this* item to the one specified by 'using_converts_to'.", "type": "string" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.fuel.json b/source/behaviour/items/1.16.100/components/minecraft.fuel.json
index 92c2c9a3..e53a46e0 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.fuel.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.fuel.json
@@ -6,11 +6,5 @@
   "type": "object",
   "additionalProperties": false,
   "required": ["duration"],
-  "properties": {
-    "duration": {
-      "type": "number",
-      "title": "Duration",
-      "description": "How long in seconds will this fuel cook items for."
-    }
-  }
+  "properties": { "duration": { "type": "number", "title": "Duration", "description": "How long in seconds will this fuel cook items for." } }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.icon.json b/source/behaviour/items/1.16.100/components/minecraft.icon.json
index e52831da..371516dc 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.icon.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.icon.json
@@ -7,17 +7,8 @@
   "additionalProperties": false,
   "required": ["texture"],
   "properties": {
-    "frame": {
-      "type": "string",
-      "title": "Frame",
-      "description": "An index or expression for which frame of the icon to display. Default resolves to 0.",
-      "default": 0
-    },
-    "legacy_id": {
-      "type": "string",
-      "title": "Texture",
-      "description": "Legacy texture id for older item icons."
-    },
+    "frame": { "type": "string", "title": "Frame", "description": "An index or expression for which frame of the icon to display. Default resolves to 0.", "default": 0 },
+    "legacy_id": { "type": "string", "title": "Texture", "description": "Legacy texture id for older item icons." },
     "texture": {
       "type": "string",
       "title": "Texture",
diff --git a/source/behaviour/items/1.16.100/components/minecraft.knockback_resistance.json b/source/behaviour/items/1.16.100/components/minecraft.knockback_resistance.json
index edfd0747..4c1bbb00 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.knockback_resistance.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.knockback_resistance.json
@@ -1,16 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:knockback_resistance",
-  "title": "Knockback resistance",
+  "title": "Knockback Resistance",
   "description": "Knockback Resistance Item. Component put on items that provide knockback resistance.",
   "type": "object",
   "additionalProperties": false,
   "required": ["protection"],
-  "properties": {
-    "protection": {
-      "title": "Protection",
-      "description": "Amount of knockback resistance provided with the total maximum protection being 1.0",
-      "type": "number"
-    }
-  }
+  "properties": { "protection": { "title": "Protection", "description": "Amount of knockback resistance provided with the total maximum protection being 1.0", "type": "number" } }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.on_use.json b/source/behaviour/items/1.16.100/components/minecraft.on_use.json
index d1cd6f5e..2992faae 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.on_use.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.on_use.json
@@ -1,29 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:on_use",
-  "title": "On use",
+  "title": "On Use",
   "description": "The on_use item component allows you to receive an event when the item is used.",
   "type": "object",
   "additionalProperties": false,
   "required": ["on_use"],
   "properties": {
     "on_use": {
-      "title": "On use",
+      "title": "On Use",
       "description": "Event trigger for when the item is used.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "event": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED"
-        },
-        "target": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED",
-          "enum": ["self"]
-        }
+        "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+        "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
       }
     }
   }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.on_use_on.json b/source/behaviour/items/1.16.100/components/minecraft.on_use_on.json
index 3acb2d2b..e9c8b17f 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.on_use_on.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.on_use_on.json
@@ -1,29 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:",
-  "title": "On use on",
+  "title": "On Use On",
   "description": "The on_use_on item component allows you to receive an event when the item is used on a block in the world.",
   "type": "object",
   "additionalProperties": false,
   "required": ["on_use_on"],
   "properties": {
     "on_use": {
-      "title": "On use",
+      "title": "On Use",
       "description": "Event trigger for when the item is used.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "event": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED"
-        },
-        "target": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED",
-          "enum": ["block"]
-        }
+        "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+        "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["block"] }
       }
     }
   }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.projectile.json b/source/behaviour/items/1.16.100/components/minecraft.projectile.json
index cfcc5ee5..06ce8bd5 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.projectile.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.projectile.json
@@ -7,15 +7,7 @@
   "additionalProperties": false,
   "required": ["projectile_entity"],
   "properties": {
-    "minimum_critical_power": {
-      "type": "number",
-      "title": "Minimum critical power",
-      "description": "How long you must charge a projectile for it to critically hit."
-    },
-    "projectile_entity": {
-      "title": "Projectile entity",
-      "description": "The entity to be fired as a projectile.",
-      "type": "string"
-    }
+    "minimum_critical_power": { "type": "number", "title": "Minimum Critical Power", "description": "How long you must charge a projectile for it to critically hit." },
+    "projectile_entity": { "title": "Projectile Entity", "description": "The entity to be fired as a projectile.", "type": "string" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.render_offsets.json b/source/behaviour/items/1.16.100/components/minecraft.render_offsets.json
index a30384b8..93a4292a 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.render_offsets.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.render_offsets.json
@@ -1,20 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.minecraft:render_offsets",
-  "title": "Render offsets",
+  "title": "Render Offsets",
   "description": "Render offsets component: optional values can be given to offset the way the item is rendered.",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "main_hand": {
-      "title": "Main hand",
-      "description": "Right hand transform data.",
-      "type": "string"
-    },
-    "off_hand": {
-      "title": "Off hand",
-      "description": "Left hand transform data.",
-      "type": "string"
-    }
+    "main_hand": { "title": "Main Hand", "description": "Right hand transform data.", "type": "string" },
+    "off_hand": { "title": "Off Hand", "description": "Left hand transform data.", "type": "string" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.repairable.json b/source/behaviour/items/1.16.100/components/minecraft.repairable.json
index 4f5c3b7d..f98724f4 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.repairable.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.repairable.json
@@ -6,13 +6,9 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "on_repaired": {
-      "title": "On repaired",
-      "description": "Event that is called when this item has been repaired.",
-      "type": "object"
-    },
+    "on_repaired": { "title": "On Repaired", "description": "Event that is called when this item has been repaired.", "type": "object" },
     "repair_items": {
-      "title": "Repair items",
+      "title": "Repair Items",
       "description": "Repair item entries.",
       "type": "array",
       "items": {
@@ -21,21 +17,8 @@
         "description": "UNDOCUMENATED",
         "additionalProperties": false,
         "properties": {
-          "items": {
-            "title": "Items",
-            "description": "UNDOCUMENATED",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "title": "Item",
-              "description": "UNDOCUMENATED"
-            }
-          },
-          "repair_amount": {
-            "title": "Repair amount",
-            "description": "UNDOCUMENATED",
-            "$ref": "../../../../molang/1.8.0/number.json"
-          }
+          "items": { "title": "Items", "description": "UNDOCUMENATED", "type": "array", "items": { "type": "string", "title": "Item", "description": "UNDOCUMENATED" } },
+          "repair_amount": { "title": "Repair Amount", "description": "UNDOCUMENATED", "$ref": "../../../../molang/1.8.0/number.json" }
         }
       }
     }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.shooter.json b/source/behaviour/items/1.16.100/components/minecraft.shooter.json
index a3f870c2..d999df52 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.shooter.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.shooter.json
@@ -16,55 +16,19 @@
         "description": "UNDOCUMENTATED",
         "additionalProperties": false,
         "properties": {
-          "item": {
-            "title": "Item",
-            "description": "UNDOCUMENTATED",
-            "type": "string"
-          },
-          "use_offhand": {
-            "title": "Use offhand",
-            "description": "UNDOCUMENTATED",
-            "type": "boolean"
-          },
-          "search_inventory": {
-            "title": "Search inventory",
-            "description": "UNDOCUMENTATED",
-            "type": "boolean"
-          },
-          "use_in_creative": {
-            "title": "Use in creative",
-            "description": "UNDOCUMENTATED",
-            "type": "boolean"
-          }
+          "item": { "title": "Item", "description": "UNDOCUMENTATED", "type": "string" },
+          "use_offhand": { "title": "Use Offhand", "description": "UNDOCUMENTATED", "type": "boolean" },
+          "search_inventory": { "title": "Search Inventory", "description": "UNDOCUMENTATED", "type": "boolean" },
+          "use_in_creative": { "title": "Use In Creative", "description": "UNDOCUMENTATED", "type": "boolean" }
         }
       }
     },
-    "charge_on_draw": {
-      "title": "Charge on draw",
-      "description": "Charge on draw? Default is set to false.",
-      "default": false,
-      "type": "boolean"
-    },
-    "launch_power_scale": {
-      "title": "Launch power scale",
-      "description": "Launch power scale. Default is set to 1.0.",
-      "default": 1.0,
-      "type": "number"
-    },
-    "max_draw_duration": {
-      "title": "Max draw duration",
-      "description": "Draw Duration. Default is set to 0.",
-      "default": 0,
-      "type": "number"
-    },
-    "max_launch_power": {
-      "title": "Max launch power",
-      "description": "Launch power. Default is set to 1.0.",
-      "default": 0,
-      "type": "number"
-    },
+    "charge_on_draw": { "title": "Charge On Draw", "description": "Charge on draw? Default is set to false.", "default": false, "type": "boolean" },
+    "launch_power_scale": { "title": "Launch Power Scale", "description": "Launch power scale. Default is set to 1.0.", "default": 1.0, "type": "number" },
+    "max_draw_duration": { "title": "Max Draw Duration", "description": "Draw Duration. Default is set to 0.", "default": 0, "type": "number" },
+    "max_launch_power": { "title": "Max Launch Power", "description": "Launch power. Default is set to 1.0.", "default": 0, "type": "number" },
     "scale_power_by_draw_duration": {
-      "title": "Scale power by draw duration",
+      "title": "Scale Power By Draw Duration",
       "description": "Scale power by draw duration? Default is set to false.",
       "default": false,
       "type": "boolean"
diff --git a/source/behaviour/items/1.16.100/components/minecraft.throwable.json b/source/behaviour/items/1.16.100/components/minecraft.throwable.json
index 7f69bdef..e5c812da 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.throwable.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.throwable.json
@@ -7,37 +7,22 @@
   "additionalProperties": false,
   "properties": {
     "do_swing_animation": {
-      "title": "Do swing animation",
+      "title": "Do Swing Animation",
       "description": "Whether the item should use the swing animation when thrown. Default is set to false.",
       "default": false,
       "type": "boolean"
     },
     "launch_power_scale": {
-      "title": "Launch power scale",
+      "title": "Launch Power Scale",
       "description": "The scale at which the power of the throw increases. Default is set to 1.0.",
       "default": 1.0,
       "type": "number"
     },
-    "max_draw_duration": {
-      "title": "Max draw duration",
-      "description": "The maximum duration to draw a throwable item. Default is set to 0.0.",
-      "default": 0,
-      "type": "number"
-    },
-    "min_draw_duration": {
-      "title": "Min draw duration",
-      "description": "The minimum duration to draw a throwable item. Default is set to 0.0.",
-      "default": 0,
-      "type": "number"
-    },
-    "max_launch_power": {
-      "title": "Max launch power",
-      "description": "The maximum power to launch the throwable item. Default is set to 1.0.",
-      "default": 1.0,
-      "type": "number"
-    },
+    "max_draw_duration": { "title": "Max Draw Duration", "description": "The maximum duration to draw a throwable item. Default is set to 0.0.", "default": 0, "type": "number" },
+    "min_draw_duration": { "title": "Min Draw Duration", "description": "The minimum duration to draw a throwable item. Default is set to 0.0.", "default": 0, "type": "number" },
+    "max_launch_power": { "title": "Max Launch Power", "description": "The maximum power to launch the throwable item. Default is set to 1.0.", "default": 1.0, "type": "number" },
     "scale_power_by_draw_duration": {
-      "title": "Scale power by draw duration",
+      "title": "Scale Power By Draw Duration",
       "description": "Whether or not the power of the throw increases with duration charged. Default is set to false.",
       "default": false,
       "type": "boolean"
diff --git a/source/behaviour/items/1.16.100/components/minecraft.weapon.json b/source/behaviour/items/1.16.100/components/minecraft.weapon.json
index dd26f042..b76156a1 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.weapon.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.weapon.json
@@ -7,55 +7,28 @@
   "additionalProperties": false,
   "properties": {
     "on_hit_block": {
-      "title": "On hit block",
+      "title": "On Hit Block",
       "description": "Trigger for letting you know when this item is used to hit a block",
       "type": "object",
       "additionalProperties": false,
-      "event": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED"
-      },
-      "target": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED",
-        "enum": ["self"]
-      }
+      "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+      "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
     },
     "on_hurt_entity": {
-      "title": "On hurt entity",
+      "title": "On Hurt Entity",
       "description": "Trigger for letting you know when this item is used to hurt another mob",
       "type": "object",
       "additionalProperties": false,
-      "event": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED"
-      },
-      "target": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED",
-        "enum": ["self", "holder"]
-      }
+      "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+      "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self", "holder"] }
     },
     "on_not_hurt_entity": {
-      "title": "On not hurt entity",
+      "title": "On Not Hurt Entity",
       "description": "Trigger for letting you know when this item hit another actor, but didn't do damage",
       "type": "object",
       "additionalProperties": false,
-      "event": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED"
-      },
-      "target": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED",
-        "enum": ["self"]
-      }
+      "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+      "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
     }
   }
 }
diff --git a/source/behaviour/items/1.16.100/components/minecraft.wearable.json b/source/behaviour/items/1.16.100/components/minecraft.wearable.json
index ccf57ebe..a6b5c604 100644
--- a/source/behaviour/items/1.16.100/components/minecraft.wearable.json
+++ b/source/behaviour/items/1.16.100/components/minecraft.wearable.json
@@ -6,11 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "dispensable": {
-      "title": "Dispensable",
-      "description": "",
-      "type": "boolean"
-    },
+    "dispensable": { "title": "Dispensable", "description": "", "type": "boolean" },
     "slot": {
       "title": "Slot",
       "description": "equipment_slot: slot.weapon.mainhand, slot.weapon.offhand, slot.armor.head, slot.armor.chest, slot.armor.legs, slot.armor.feet, slot.hotbar, slot.inventory, slot.enderchest, slot.saddle, slot.armor, slot.chest",
diff --git a/source/behaviour/items/1.16.100/events.json b/source/behaviour/items/1.16.100/events.json
index ee58a934..3dca95a9 100644
--- a/source/behaviour/items/1.16.100/events.json
+++ b/source/behaviour/items/1.16.100/events.json
@@ -4,14 +4,8 @@
   "title": "Events",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "properties": {
-    "on_consume": {
-      "$ref": "#/definitions/event_base"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
-  },
+  "properties": { "on_consume": { "$ref": "#/definitions/event_base" } },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "definitions": {
     "event_base": {
       "title": "Event",
@@ -24,12 +18,7 @@
           "title": "Sequence",
           "description": "UNDOCUMENTATED",
           "type": "array",
-          "items": {
-            "title": "Sequence",
-            "description": "UNDOCUMENTATED",
-            "type": "object",
-            "$ref": "#/definitions/event_functions"
-          }
+          "items": { "title": "Sequence", "description": "UNDOCUMENTATED", "type": "object", "$ref": "#/definitions/event_functions" }
         },
         "randomize": {
           "title": "Randomize",
@@ -41,38 +30,17 @@
             "type": "object",
             "$ref": "#/definitions/event_functions",
             "required": ["weight"],
-            "properties": {
-              "weight": {
-                "title": "Weight",
-                "description": "UNDOCUMENTATED",
-                "type": "integer",
-                "minimum": 0
-              }
-            }
+            "properties": { "weight": { "title": "Weight", "description": "UNDOCUMENTATED", "type": "integer", "minimum": 0 } }
           }
         },
         "run_command": {
-          "title": "Run command",
+          "title": "Run Command",
           "description": "UNDOCUMENTATED",
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "command": {
-              "title": "Command",
-              "description": "UNDOCUMENTATED",
-              "type": "array",
-              "items": {
-                "type": "string",
-                "title": "Command",
-                "description": "UNDOCUMENTATED"
-              }
-            },
-            "target": {
-              "type": "string",
-              "title": "Target",
-              "description": "UNDOCUMENTATED",
-              "enum": ["other"]
-            }
+            "command": { "title": "Command", "description": "UNDOCUMENTATED", "type": "array", "items": { "type": "string", "title": "Command", "description": "UNDOCUMENTATED" } },
+            "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["other"] }
           }
         }
       }
diff --git a/source/behaviour/items/1.16.100/events/add_mob_effect.json b/source/behaviour/items/1.16.100/events/add_mob_effect.json
index 3f9df267..578aea41 100644
--- a/source/behaviour/items/1.16.100/events/add_mob_effect.json
+++ b/source/behaviour/items/1.16.100/events/add_mob_effect.json
@@ -1,31 +1,14 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.events.add_mob_effect",
-  "title": "Add mob effect",
+  "title": "Add Mob Effect",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "effect": {
-      "type": "string",
-      "title": "Effect",
-      "description": "UNDOCUMENTATED"
-    },
-    "target": {
-      "type": "string",
-      "title": "Target",
-      "description": "UNDOCUMENTATED",
-      "enum": ["holder"]
-    },
-    "duration": {
-      "type": "number",
-      "title": "Duration",
-      "description": "UNDOCUMENTATED"
-    },
-    "amplifier": {
-      "type": "number",
-      "title": "Amplifier",
-      "description": "UNDOCUMENTATED"
-    }
+    "effect": { "type": "string", "title": "Effect", "description": "UNDOCUMENTATED" },
+    "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["holder"] },
+    "duration": { "type": "number", "title": "Duration", "description": "UNDOCUMENTATED" },
+    "amplifier": { "type": "number", "title": "Amplifier", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/events/damage.json b/source/behaviour/items/1.16.100/events/damage.json
index a4027f2d..ad036e3d 100644
--- a/source/behaviour/items/1.16.100/events/damage.json
+++ b/source/behaviour/items/1.16.100/events/damage.json
@@ -6,16 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "type": {
-      "type": "string",
-      "title": "Type",
-      "description": "UNDOCUMENTATED",
-      "enum": ["magic"]
-    },
-    "amount": {
-      "type": "number",
-      "title": "Amount",
-      "description": "UNDOCUMENTATED"
-    }
+    "type": { "type": "string", "title": "Type", "description": "UNDOCUMENTATED", "enum": ["magic"] },
+    "amount": { "type": "number", "title": "Amount", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/events/decrement_stack.json b/source/behaviour/items/1.16.100/events/decrement_stack.json
index b5e50d7b..21cca969 100644
--- a/source/behaviour/items/1.16.100/events/decrement_stack.json
+++ b/source/behaviour/items/1.16.100/events/decrement_stack.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.events.decrement_stack",
-  "title": "Decrement stack",
+  "title": "Decrement Stack",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false
diff --git a/source/behaviour/items/1.16.100/events/remove_mob_effect.json b/source/behaviour/items/1.16.100/events/remove_mob_effect.json
index caf855f7..6fd997f0 100644
--- a/source/behaviour/items/1.16.100/events/remove_mob_effect.json
+++ b/source/behaviour/items/1.16.100/events/remove_mob_effect.json
@@ -1,21 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.events.remove_mob_effect",
-  "title": "Remove mob effect",
+  "title": "Remove Mob Effect",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "effect": {
-      "type": "string",
-      "title": "Effect",
-      "description": "UNDOCUMENTATED"
-    },
-    "target": {
-      "type": "string",
-      "title": "Target",
-      "description": "UNDOCUMENTATED",
-      "enum": ["holder"]
-    }
+    "effect": { "type": "string", "title": "Effect", "description": "UNDOCUMENTATED" },
+    "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["holder"] }
   }
 }
diff --git a/source/behaviour/items/1.16.100/events/shoot.json b/source/behaviour/items/1.16.100/events/shoot.json
index 301a62f3..4cead732 100644
--- a/source/behaviour/items/1.16.100/events/shoot.json
+++ b/source/behaviour/items/1.16.100/events/shoot.json
@@ -6,20 +6,8 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "angle_offset": {
-      "type": "number",
-      "title": "Angle offset",
-      "description": "UNDOCUMENTATED"
-    },
-    "launch_power": {
-      "type": "number",
-      "title": "Launch power",
-      "description": "UNDOCUMENTATED"
-    },
-    "projectile": {
-      "type": "string",
-      "title": "Projectile",
-      "description": "UNDOCUMENTATED"
-    }
+    "angle_offset": { "type": "number", "title": "Angle Offset", "description": "UNDOCUMENTATED" },
+    "launch_power": { "type": "number", "title": "Launch Power", "description": "UNDOCUMENTATED" },
+    "projectile": { "type": "string", "title": "Projectile", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/items/1.16.100/events/teleport.json b/source/behaviour/items/1.16.100/events/teleport.json
index a42c3f45..56202901 100644
--- a/source/behaviour/items/1.16.100/events/teleport.json
+++ b/source/behaviour/items/1.16.100/events/teleport.json
@@ -6,15 +6,10 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "target": {
-      "type": "string",
-      "title": "Target",
-      "description": "UNDOCUMENTATED",
-      "enum": ["holder"]
-    },
+    "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["holder"] },
     "max_range": {
       "type": "array",
-      "title": "Max range",
+      "title": "Max Range",
       "description": "UNDOCUMENTATED",
       "items": [
         { "type": "number", "title": "X", "description": "UNDOCUMENTATED" },
diff --git a/source/behaviour/items/1.16.100/events/transform_item.json b/source/behaviour/items/1.16.100/events/transform_item.json
index ad8d3469..94b08a89 100644
--- a/source/behaviour/items/1.16.100/events/transform_item.json
+++ b/source/behaviour/items/1.16.100/events/transform_item.json
@@ -1,15 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.100.items.events.transform_item",
-  "title": "Transform item",
+  "title": "Transform Item",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false,
-  "properties": {
-    "transform": {
-      "title": "Transform",
-      "description": "UNDOCUMENTATED",
-      "type": "string"
-    }
-  }
+  "properties": { "transform": { "title": "Transform", "description": "UNDOCUMENTATED", "type": "string" } }
 }
diff --git a/source/behaviour/items/1.16.100/items.json b/source/behaviour/items/1.16.100/items.json
index f07da040..8dcc51bb 100644
--- a/source/behaviour/items/1.16.100/items.json
+++ b/source/behaviour/items/1.16.100/items.json
@@ -5,11 +5,7 @@
   "required": ["format_version", "minecraft:item"],
   "title": "Item",
   "properties": {
-    "format_version": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "minecraft:item": {
       "additionalProperties": false,
       "required": ["description"],
@@ -39,7 +35,7 @@
               "type": "boolean",
               "default": false,
               "description": "If this item is experimental, it will only be registered if the world is marked as experimental.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             }
           }
         },
@@ -71,9 +67,7 @@
             "minecraft:wearable": { "$ref": "./components/minecraft.wearable.json" }
           }
         },
-        "events": {
-          "$ref": "./events.json"
-        }
+        "events": { "$ref": "./events.json" }
       }
     }
   }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.armor.json b/source/behaviour/items/1.16.200/components/minecraft.armor.json
index 4d81774d..41b9ad38 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.armor.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.armor.json
@@ -7,16 +7,12 @@
   "additionalProperties": false,
   "required": ["protection", "texture_type"],
   "properties": {
-    "protection": {
-      "type": "number",
-      "description": "How much protection does the armor item have.",
-      "title": "Protection"
-    },
+    "protection": { "type": "number", "description": "How much protection does the armor item have.", "title": "Protection" },
     "texture_type": {
       "type": "string",
       "default": "",
       "description": "Texture Type to apply for the armor. Note that Horse armor is restricted to leather, iron, gold, or diamond.",
-      "title": "Texture type"
+      "title": "Texture Type"
     }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.block_placer.json b/source/behaviour/items/1.16.200/components/minecraft.block_placer.json
index 23658f9d..05d5f406 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.block_placer.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.block_placer.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:block_placer",
-  "title": "Block placer",
+  "title": "Block Placer",
   "description": "Planter item component. planter items are items that can be planted.",
   "type": "object",
   "additionalProperties": false,
@@ -9,30 +9,18 @@
   "definitions": {
     "use_on_item": {
       "type": "object",
-      "title": "Allowed block",
+      "title": "Allowed Block",
       "description": "A block descriptor that allows to be placed",
-      "properties": {
-        "tags": {
-          "title": "Tags",
-          "description": "Tags",
-          "$ref": "../../../../molang/1.8.0/string.json"
-        }
-      }
+      "properties": { "tags": { "title": "Tags", "description": "Tags", "$ref": "../../../../molang/1.8.0/string.json" } }
     }
   },
   "properties": {
-    "block": {
-      "type": "string",
-      "description": "Set the placement block name for the planter item.",
-      "title": "Protection"
-    },
+    "block": { "type": "string", "description": "Set the placement block name for the planter item.", "title": "Protection" },
     "use_on": {
       "description": "List of block descriptors that contain blocks that this item can be used on. If left empty, all blocks will be allowed.",
-      "title": "Use on",
+      "title": "Use On",
       "type": "array",
-      "items": {
-        "$ref": "#/definitions/use_on_item"
-      }
+      "items": { "$ref": "#/definitions/use_on_item" }
     }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.cooldown.json b/source/behaviour/items/1.16.200/components/minecraft.cooldown.json
index dc60c95f..ab0cd221 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.cooldown.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.cooldown.json
@@ -7,15 +7,7 @@
   "additionalProperties": false,
   "required": ["category", "duration"],
   "properties": {
-    "category": {
-      "type": "string",
-      "description": "The type of cool down for this item.",
-      "title": "Category"
-    },
-    "duration": {
-      "description": "The duration of time this item will spend cooling down before becoming usable again.",
-      "title": "Duration",
-      "type": "number"
-    }
+    "category": { "type": "string", "description": "The type of cool down for this item.", "title": "Category" },
+    "duration": { "description": "The duration of time this item will spend cooling down before becoming usable again.", "title": "Duration", "type": "number" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.digger.json b/source/behaviour/items/1.16.200/components/minecraft.digger.json
index da913d49..b9981a9a 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.digger.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.digger.json
@@ -7,54 +7,28 @@
   "additionalProperties": false,
   "required": ["destroy_speeds"],
   "properties": {
-    "use_efficiency": {
-      "title": "Use efficiency",
-      "type": "boolean",
-      "description": "Use efficiency? Default is set to false.",
-      "default": "false"
-    },
+    "use_efficiency": { "title": "Use Efficiency", "type": "boolean", "description": "Use efficiency? Default is set to false.", "default": "false" },
     "destroy_speeds": {
       "type": "array",
-      "title": "Destroy speeds",
+      "title": "Destroy Speeds",
       "description": "Destroy speed per block.",
       "items": {
-        "title": "Destroy speed",
+        "title": "Destroy Speed",
         "description": "Destroy speed per block.",
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "speed": {
-            "title": "Speed",
-            "description": "Speed",
-            "type": "number"
-          },
-          "on_dig": {
-            "type": "string",
-            "title": "On dig",
-            "description": "Trigger for when you dig a block that isn't listed in destroy_speeds"
-          },
+          "speed": { "title": "Speed", "description": "Speed", "type": "number" },
+          "on_dig": { "type": "string", "title": "On Dig", "description": "Trigger for when you dig a block that isn't listed in destroy_speeds" },
           "block": {
             "title": "Block",
             "oneOf": [
-              {
-                "type": "string",
-                "description": "The block identifier"
-              },
+              { "type": "string", "description": "The block identifier" },
               {
                 "type": "object",
                 "additionalProperties": false,
                 "description": "Block descriptor",
-                "properties": {
-                  "any_tag": {
-                    "type": "array",
-                    "title": "Any block tag",
-                    "description": "The block tag",
-                    "items": {
-                      "type": "string",
-                      "title": "Block tag"
-                    }
-                  }
-                }
+                "properties": { "any_tag": { "type": "array", "title": "Any Block Tag", "description": "The block tag", "items": { "type": "string", "title": "Block Tag" } } }
               }
             ]
           }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.display_name.json b/source/behaviour/items/1.16.200/components/minecraft.display_name.json
index d8561c71..285737c9 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.display_name.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.display_name.json
@@ -1,16 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:display_name",
-  "title": "Display name",
+  "title": "Display Name",
   "description": "Display Name item component. Display Names display the name of an item.",
   "type": "object",
   "additionalProperties": false,
   "required": ["value"],
-  "properties": {
-    "value": {
-      "type": "string",
-      "title": "Value",
-      "description": "Set the display name for an item."
-    }
-  }
+  "properties": { "value": { "type": "string", "title": "Value", "description": "Set the display name for an item." } }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.durability.json b/source/behaviour/items/1.16.200/components/minecraft.durability.json
index f8644a16..58437cb6 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.durability.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.durability.json
@@ -9,27 +9,12 @@
   "properties": {
     "damage_chance": {
       "type": "object",
-      "title": "Damange chance",
+      "title": "Damange Chance",
       "description": "Damange chance",
       "additionalProperties": false,
       "required": ["min", "max"],
-      "properties": {
-        "min": {
-          "title": "Min",
-          "type": "integer",
-          "description": "The minimum"
-        },
-        "max": {
-          "title": "Max",
-          "type": "integer",
-          "description": "The minimum"
-        }
-      }
+      "properties": { "min": { "title": "Min", "type": "integer", "description": "The minimum" }, "max": { "title": "Max", "type": "integer", "description": "The minimum" } }
     },
-    "max_durability": {
-      "title": "Max durability",
-      "description": "Max durability is the amount of damage that this item can take before breaking.",
-      "type": "number"
-    }
+    "max_durability": { "title": "Max Durability", "description": "Max durability is the amount of damage that this item can take before breaking.", "type": "number" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.dye_powder.json b/source/behaviour/items/1.16.200/components/minecraft.dye_powder.json
index 87976dbf..5c28ceda 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.dye_powder.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.dye_powder.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:dye_powder",
-  "title": "Dye powder",
+  "title": "Dye Powder",
   "description": "Dye powder, there are 16 kinds of dye.",
   "type": "object",
   "additionalProperties": false,
diff --git a/source/behaviour/items/1.16.200/components/minecraft.entity_placer.json b/source/behaviour/items/1.16.200/components/minecraft.entity_placer.json
index 138297ae..9826a5c6 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.entity_placer.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.entity_placer.json
@@ -1,34 +1,24 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:entity_placer",
-  "title": "Entity placer",
+  "title": "Entity Placer",
   "description": "Entity placer item component. You can specifiy allowed blocks that the item is restricted to.",
   "type": "object",
   "additionalProperties": false,
   "required": ["entity"],
   "properties": {
-    "entity": {
-      "type": "string",
-      "title": "Entity",
-      "description": "The entity to be placed in the world."
-    },
+    "entity": { "type": "string", "title": "Entity", "description": "The entity to be placed in the world." },
     "dispense_on": {
       "type": "array",
-      "title": "Dispense on",
+      "title": "Dispense On",
       "description": "List of block descriptors that contain blocks that this item can be dispensed on. If left empty, all blocks will be allowed.",
-      "items": {
-        "title": "UNDOCUMENTATED",
-        "description": "UNDOCUMENTATED"
-      }
+      "items": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" }
     },
     "use_on": {
       "type": "array",
-      "title": "Use on",
+      "title": "Use On",
       "description": "List of block descriptors that contain blocks that this item can be used on. If left empty, all blocks will be allowed.",
-      "items": {
-        "title": "UNDOCUMENTATED",
-        "description": "UNDOCUMENTATED"
-      }
+      "items": { "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" }
     }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.food.json b/source/behaviour/items/1.16.200/components/minecraft.food.json
index 9150f3a4..0a38fad3 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.food.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.food.json
@@ -7,44 +7,27 @@
   "additionalProperties": false,
   "properties": {
     "can_always_eat": {
-      "title": "Can always eat",
+      "title": "Can Always Eat",
       "description": "If true you can always eat this item (even when not hungry), defaults to false.",
       "type": "boolean",
       "default": false
     },
-    "nutrition": {
-      "title": "Nutrition",
-      "description": "How much nutrition does this food item give the player when eaten.",
-      "type": "number"
-    },
+    "nutrition": { "title": "Nutrition", "description": "How much nutrition does this food item give the player when eaten.", "type": "number" },
     "on_consume": {
-      "title": "On consume",
+      "title": "On Consume",
       "description": "UNDOCUMENATED",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "event": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED"
-        },
-        "target": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED",
-          "enum": ["self"]
-        }
+        "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+        "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
       }
     },
     "saturation_modifier": {
-      "title": "Saturation modifier",
+      "title": "Saturation Modifier",
       "description": "Saturation Modifier is used in this formula: (nutrition * saturation_modifier * 2) when appling the saturation buff. Which happens when you eat the item.",
       "type": "number"
     },
-    "using_converts_to": {
-      "title": "Using converts to",
-      "description": "When used, convert the *this* item to the one specified by 'using_converts_to'.",
-      "type": "string"
-    }
+    "using_converts_to": { "title": "Using Converts To", "description": "When used, convert the *this* item to the one specified by 'using_converts_to'.", "type": "string" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.fuel.json b/source/behaviour/items/1.16.200/components/minecraft.fuel.json
index cf5e870d..5087f01c 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.fuel.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.fuel.json
@@ -6,11 +6,5 @@
   "type": "object",
   "additionalProperties": false,
   "required": ["duration"],
-  "properties": {
-    "duration": {
-      "type": "number",
-      "title": "Duration",
-      "description": "How long in seconds will this fuel cook items for."
-    }
-  }
+  "properties": { "duration": { "type": "number", "title": "Duration", "description": "How long in seconds will this fuel cook items for." } }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.icon.json b/source/behaviour/items/1.16.200/components/minecraft.icon.json
index cc111b4a..9f8417e0 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.icon.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.icon.json
@@ -7,17 +7,8 @@
   "additionalProperties": false,
   "required": ["texture"],
   "properties": {
-    "frame": {
-      "type": "string",
-      "title": "Frame",
-      "description": "An index or expression for which frame of the icon to display. Default resolves to 0.",
-      "default": 0
-    },
-    "legacy_id": {
-      "type": "string",
-      "title": "Texture",
-      "description": "Legacy texture id for older item icons."
-    },
+    "frame": { "type": "string", "title": "Frame", "description": "An index or expression for which frame of the icon to display. Default resolves to 0.", "default": 0 },
+    "legacy_id": { "type": "string", "title": "Texture", "description": "Legacy texture id for older item icons." },
     "texture": {
       "type": "string",
       "title": "Texture",
diff --git a/source/behaviour/items/1.16.200/components/minecraft.knockback_resistance.json b/source/behaviour/items/1.16.200/components/minecraft.knockback_resistance.json
index 7eec13d9..682044ae 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.knockback_resistance.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.knockback_resistance.json
@@ -1,16 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:knockback_resistance",
-  "title": "Knockback resistance",
+  "title": "Knockback Resistance",
   "description": "Knockback Resistance Item. Component put on items that provide knockback resistance.",
   "type": "object",
   "additionalProperties": false,
   "required": ["protection"],
-  "properties": {
-    "protection": {
-      "title": "Protection",
-      "description": "Amount of knockback resistance provided with the total maximum protection being 1.0",
-      "type": "number"
-    }
-  }
+  "properties": { "protection": { "title": "Protection", "description": "Amount of knockback resistance provided with the total maximum protection being 1.0", "type": "number" } }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.on_use.json b/source/behaviour/items/1.16.200/components/minecraft.on_use.json
index b2335d7a..dd2eb851 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.on_use.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.on_use.json
@@ -1,29 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:on_use",
-  "title": "On use",
+  "title": "On Use",
   "description": "The on_use item component allows you to receive an event when the item is used.",
   "type": "object",
   "additionalProperties": false,
   "required": ["on_use"],
   "properties": {
     "on_use": {
-      "title": "On use",
+      "title": "On Use",
       "description": "Event trigger for when the item is used.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "event": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED"
-        },
-        "target": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED",
-          "enum": ["self"]
-        }
+        "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+        "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
       }
     }
   }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.on_use_on.json b/source/behaviour/items/1.16.200/components/minecraft.on_use_on.json
index 363142ca..3e5fa759 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.on_use_on.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.on_use_on.json
@@ -1,29 +1,20 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:",
-  "title": "On use on",
+  "title": "On Use On",
   "description": "The on_use_on item component allows you to receive an event when the item is used on a block in the world.",
   "type": "object",
   "additionalProperties": false,
   "required": ["on_use_on"],
   "properties": {
     "on_use": {
-      "title": "On use",
+      "title": "On Use",
       "description": "Event trigger for when the item is used.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "event": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED"
-        },
-        "target": {
-          "type": "string",
-          "title": "UNDOCUMENATED",
-          "description": "UNDOCUMENATED",
-          "enum": ["block"]
-        }
+        "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+        "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["block"] }
       }
     }
   }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.projectile.json b/source/behaviour/items/1.16.200/components/minecraft.projectile.json
index 1dfeb01b..30765802 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.projectile.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.projectile.json
@@ -7,15 +7,7 @@
   "additionalProperties": false,
   "required": ["projectile_entity"],
   "properties": {
-    "minimum_critical_power": {
-      "type": "number",
-      "title": "Minimum critical power",
-      "description": "How long you must charge a projectile for it to critically hit."
-    },
-    "projectile_entity": {
-      "title": "Projectile entity",
-      "description": "The entity to be fired as a projectile.",
-      "type": "string"
-    }
+    "minimum_critical_power": { "type": "number", "title": "Minimum Critical Power", "description": "How long you must charge a projectile for it to critically hit." },
+    "projectile_entity": { "title": "Projectile Entity", "description": "The entity to be fired as a projectile.", "type": "string" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.render_offsets.json b/source/behaviour/items/1.16.200/components/minecraft.render_offsets.json
index 7f66453a..fbdb8a10 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.render_offsets.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.render_offsets.json
@@ -1,20 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.minecraft:render_offsets",
-  "title": "Render offsets",
+  "title": "Render Offsets",
   "description": "Render offsets component: optional values can be given to offset the way the item is rendered.",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "main_hand": {
-      "title": "Main hand",
-      "description": "Right hand transform data.",
-      "type": "string"
-    },
-    "off_hand": {
-      "title": "Off hand",
-      "description": "Left hand transform data.",
-      "type": "string"
-    }
+    "main_hand": { "title": "Main Hand", "description": "Right hand transform data.", "type": "string" },
+    "off_hand": { "title": "Off Hand", "description": "Left hand transform data.", "type": "string" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.repairable.json b/source/behaviour/items/1.16.200/components/minecraft.repairable.json
index 394e4748..fdfe537a 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.repairable.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.repairable.json
@@ -6,13 +6,9 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "on_repaired": {
-      "title": "On repaired",
-      "description": "Event that is called when this item has been repaired.",
-      "type": "object"
-    },
+    "on_repaired": { "title": "On Repaired", "description": "Event that is called when this item has been repaired.", "type": "object" },
     "repair_items": {
-      "title": "Repair items",
+      "title": "Repair Items",
       "description": "Repair item entries.",
       "type": "array",
       "items": {
@@ -21,21 +17,8 @@
         "description": "UNDOCUMENATED",
         "additionalProperties": false,
         "properties": {
-          "items": {
-            "title": "Items",
-            "description": "UNDOCUMENATED",
-            "type": "array",
-            "items": {
-              "type": "string",
-              "title": "Item",
-              "description": "UNDOCUMENATED"
-            }
-          },
-          "repair_amount": {
-            "title": "Repair amount",
-            "description": "UNDOCUMENATED",
-            "$ref": "../../../../molang/1.8.0/number.json"
-          }
+          "items": { "title": "Items", "description": "UNDOCUMENATED", "type": "array", "items": { "type": "string", "title": "Item", "description": "UNDOCUMENATED" } },
+          "repair_amount": { "title": "Repair Amount", "description": "UNDOCUMENATED", "$ref": "../../../../molang/1.8.0/number.json" }
         }
       }
     }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.shooter.json b/source/behaviour/items/1.16.200/components/minecraft.shooter.json
index 93fe7262..46adb0fc 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.shooter.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.shooter.json
@@ -16,55 +16,19 @@
         "description": "UNDOCUMENTATED",
         "additionalProperties": false,
         "properties": {
-          "item": {
-            "title": "Item",
-            "description": "UNDOCUMENTATED",
-            "type": "string"
-          },
-          "use_offhand": {
-            "title": "Use offhand",
-            "description": "UNDOCUMENTATED",
-            "type": "boolean"
-          },
-          "search_inventory": {
-            "title": "Search inventory",
-            "description": "UNDOCUMENTATED",
-            "type": "boolean"
-          },
-          "use_in_creative": {
-            "title": "Use in creative",
-            "description": "UNDOCUMENTATED",
-            "type": "boolean"
-          }
+          "item": { "title": "Item", "description": "UNDOCUMENTATED", "type": "string" },
+          "use_offhand": { "title": "Use Offhand", "description": "UNDOCUMENTATED", "type": "boolean" },
+          "search_inventory": { "title": "Search Inventory", "description": "UNDOCUMENTATED", "type": "boolean" },
+          "use_in_creative": { "title": "Use In Creative", "description": "UNDOCUMENTATED", "type": "boolean" }
         }
       }
     },
-    "charge_on_draw": {
-      "title": "Charge on draw",
-      "description": "Charge on draw? Default is set to false.",
-      "default": false,
-      "type": "boolean"
-    },
-    "launch_power_scale": {
-      "title": "Launch power scale",
-      "description": "Launch power scale. Default is set to 1.0.",
-      "default": 1.0,
-      "type": "number"
-    },
-    "max_draw_duration": {
-      "title": "Max draw duration",
-      "description": "Draw Duration. Default is set to 0.",
-      "default": 0,
-      "type": "number"
-    },
-    "max_launch_power": {
-      "title": "Max launch power",
-      "description": "Launch power. Default is set to 1.0.",
-      "default": 0,
-      "type": "number"
-    },
+    "charge_on_draw": { "title": "Charge On Draw", "description": "Charge on draw? Default is set to false.", "default": false, "type": "boolean" },
+    "launch_power_scale": { "title": "Launch Power Scale", "description": "Launch power scale. Default is set to 1.0.", "default": 1.0, "type": "number" },
+    "max_draw_duration": { "title": "Max Draw Duration", "description": "Draw Duration. Default is set to 0.", "default": 0, "type": "number" },
+    "max_launch_power": { "title": "Max Launch Power", "description": "Launch power. Default is set to 1.0.", "default": 0, "type": "number" },
     "scale_power_by_draw_duration": {
-      "title": "Scale power by draw duration",
+      "title": "Scale Power By Draw Duration",
       "description": "Scale power by draw duration? Default is set to false.",
       "default": false,
       "type": "boolean"
diff --git a/source/behaviour/items/1.16.200/components/minecraft.throwable.json b/source/behaviour/items/1.16.200/components/minecraft.throwable.json
index 44c15e10..8b06d47a 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.throwable.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.throwable.json
@@ -7,37 +7,22 @@
   "additionalProperties": false,
   "properties": {
     "do_swing_animation": {
-      "title": "Do swing animation",
+      "title": "Do Swing Animation",
       "description": "Whether the item should use the swing animation when thrown. Default is set to false.",
       "default": false,
       "type": "boolean"
     },
     "launch_power_scale": {
-      "title": "Launch power scale",
+      "title": "Launch Power Scale",
       "description": "The scale at which the power of the throw increases. Default is set to 1.0.",
       "default": 1.0,
       "type": "number"
     },
-    "max_draw_duration": {
-      "title": "Max draw duration",
-      "description": "The maximum duration to draw a throwable item. Default is set to 0.0.",
-      "default": 0,
-      "type": "number"
-    },
-    "min_draw_duration": {
-      "title": "Min draw duration",
-      "description": "The minimum duration to draw a throwable item. Default is set to 0.0.",
-      "default": 0,
-      "type": "number"
-    },
-    "max_launch_power": {
-      "title": "Max launch power",
-      "description": "The maximum power to launch the throwable item. Default is set to 1.0.",
-      "default": 1.0,
-      "type": "number"
-    },
+    "max_draw_duration": { "title": "Max Draw Duration", "description": "The maximum duration to draw a throwable item. Default is set to 0.0.", "default": 0, "type": "number" },
+    "min_draw_duration": { "title": "Min Draw Duration", "description": "The minimum duration to draw a throwable item. Default is set to 0.0.", "default": 0, "type": "number" },
+    "max_launch_power": { "title": "Max Launch Power", "description": "The maximum power to launch the throwable item. Default is set to 1.0.", "default": 1.0, "type": "number" },
     "scale_power_by_draw_duration": {
-      "title": "Scale power by draw duration",
+      "title": "Scale Power By Draw Duration",
       "description": "Whether or not the power of the throw increases with duration charged. Default is set to false.",
       "default": false,
       "type": "boolean"
diff --git a/source/behaviour/items/1.16.200/components/minecraft.weapon.json b/source/behaviour/items/1.16.200/components/minecraft.weapon.json
index 61ff695b..50aff65f 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.weapon.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.weapon.json
@@ -7,55 +7,28 @@
   "additionalProperties": false,
   "properties": {
     "on_hit_block": {
-      "title": "On hit block",
+      "title": "On Hit Block",
       "description": "Trigger for letting you know when this item is used to hit a block",
       "type": "object",
       "additionalProperties": false,
-      "event": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED"
-      },
-      "target": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED",
-        "enum": ["self"]
-      }
+      "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+      "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
     },
     "on_hurt_entity": {
-      "title": "On hurt entity",
+      "title": "On Hurt Entity",
       "description": "Trigger for letting you know when this item is used to hurt another mob",
       "type": "object",
       "additionalProperties": false,
-      "event": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED"
-      },
-      "target": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED",
-        "enum": ["self", "holder"]
-      }
+      "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+      "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self", "holder"] }
     },
     "on_not_hurt_entity": {
-      "title": "On not hurt entity",
+      "title": "On Not Hurt Entity",
       "description": "Trigger for letting you know when this item hit another actor, but didn't do damage",
       "type": "object",
       "additionalProperties": false,
-      "event": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED"
-      },
-      "target": {
-        "type": "string",
-        "title": "UNDOCUMENATED",
-        "description": "UNDOCUMENATED",
-        "enum": ["self"]
-      }
+      "event": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED" },
+      "target": { "type": "string", "title": "UNDOCUMENATED", "description": "UNDOCUMENATED", "enum": ["self"] }
     }
   }
 }
diff --git a/source/behaviour/items/1.16.200/components/minecraft.wearable.json b/source/behaviour/items/1.16.200/components/minecraft.wearable.json
index 824d5009..720a5a59 100644
--- a/source/behaviour/items/1.16.200/components/minecraft.wearable.json
+++ b/source/behaviour/items/1.16.200/components/minecraft.wearable.json
@@ -6,11 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "dispensable": {
-      "title": "Dispensable",
-      "description": "",
-      "type": "boolean"
-    },
+    "dispensable": { "title": "Dispensable", "description": "", "type": "boolean" },
     "slot": {
       "title": "Slot",
       "description": "equipment_slot: slot.weapon.mainhand, slot.weapon.offhand, slot.armor.head, slot.armor.chest, slot.armor.legs, slot.armor.feet, slot.hotbar, slot.inventory, slot.enderchest, slot.saddle, slot.armor, slot.chest",
diff --git a/source/behaviour/items/1.16.200/events.json b/source/behaviour/items/1.16.200/events.json
index c0bb23f4..ea99cda7 100644
--- a/source/behaviour/items/1.16.200/events.json
+++ b/source/behaviour/items/1.16.200/events.json
@@ -4,14 +4,8 @@
   "title": "Events",
   "description": "UNDOCUMENTATED",
   "type": "object",
-  "properties": {
-    "on_consume": {
-      "$ref": "#/definitions/event_base"
-    }
-  },
-  "additionalProperties": {
-    "$ref": "#/definitions/event_base"
-  },
+  "properties": { "on_consume": { "$ref": "#/definitions/event_base" } },
+  "additionalProperties": { "$ref": "#/definitions/event_base" },
   "definitions": {
     "event_base": {
       "title": "Event",
@@ -24,12 +18,7 @@
           "title": "Sequence",
           "description": "UNDOCUMENTATED",
           "type": "array",
-          "items": {
-            "title": "Sequence",
-            "description": "UNDOCUMENTATED",
-            "type": "object",
-            "$ref": "#/definitions/event_functions"
-          }
+          "items": { "title": "Sequence", "description": "UNDOCUMENTATED", "type": "object", "$ref": "#/definitions/event_functions" }
         },
         "randomize": {
           "title": "Randomize",
@@ -41,38 +30,17 @@
             "type": "object",
             "$ref": "#/definitions/event_functions",
             "required": ["weight"],
-            "properties": {
-              "weight": {
-                "title": "Weight",
-                "description": "UNDOCUMENTATED",
-                "type": "integer",
-                "minimum": 0
-              }
-            }
+            "properties": { "weight": { "title": "Weight", "description": "UNDOCUMENTATED", "type": "integer", "minimum": 0 } }
           }
         },
         "run_command": {
-          "title": "Run command",
+          "title": "Run Command",
           "description": "UNDOCUMENTATED",
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "command": {
-              "title": "Command",
-              "description": "UNDOCUMENTATED",
-              "type": "array",
-              "items": {
-                "type": "string",
-                "title": "Command",
-                "description": "UNDOCUMENTATED"
-              }
-            },
-            "target": {
-              "type": "string",
-              "title": "Target",
-              "description": "UNDOCUMENTATED",
-              "enum": ["other"]
-            }
+            "command": { "title": "Command", "description": "UNDOCUMENTATED", "type": "array", "items": { "type": "string", "title": "Command", "description": "UNDOCUMENTATED" } },
+            "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["other"] }
           }
         }
       }
diff --git a/source/behaviour/items/1.16.200/events/add_mob_effect.json b/source/behaviour/items/1.16.200/events/add_mob_effect.json
index 05e78877..2b67890d 100644
--- a/source/behaviour/items/1.16.200/events/add_mob_effect.json
+++ b/source/behaviour/items/1.16.200/events/add_mob_effect.json
@@ -1,31 +1,14 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.events.add_mob_effect",
-  "title": "Add mob effect",
+  "title": "Add Mob Effect",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "effect": {
-      "type": "string",
-      "title": "Effect",
-      "description": "UNDOCUMENTATED"
-    },
-    "target": {
-      "type": "string",
-      "title": "Target",
-      "description": "UNDOCUMENTATED",
-      "enum": ["holder"]
-    },
-    "duration": {
-      "type": "number",
-      "title": "Duration",
-      "description": "UNDOCUMENTATED"
-    },
-    "amplifier": {
-      "type": "number",
-      "title": "Amplifier",
-      "description": "UNDOCUMENTATED"
-    }
+    "effect": { "type": "string", "title": "Effect", "description": "UNDOCUMENTATED" },
+    "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["holder"] },
+    "duration": { "type": "number", "title": "Duration", "description": "UNDOCUMENTATED" },
+    "amplifier": { "type": "number", "title": "Amplifier", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/events/damage.json b/source/behaviour/items/1.16.200/events/damage.json
index 6f239001..29b35738 100644
--- a/source/behaviour/items/1.16.200/events/damage.json
+++ b/source/behaviour/items/1.16.200/events/damage.json
@@ -6,16 +6,7 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "type": {
-      "type": "string",
-      "title": "Type",
-      "description": "UNDOCUMENTATED",
-      "enum": ["magic"]
-    },
-    "amount": {
-      "type": "number",
-      "title": "Amount",
-      "description": "UNDOCUMENTATED"
-    }
+    "type": { "type": "string", "title": "Type", "description": "UNDOCUMENTATED", "enum": ["magic"] },
+    "amount": { "type": "number", "title": "Amount", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/events/decrement_stack.json b/source/behaviour/items/1.16.200/events/decrement_stack.json
index 9762147d..7a3ee290 100644
--- a/source/behaviour/items/1.16.200/events/decrement_stack.json
+++ b/source/behaviour/items/1.16.200/events/decrement_stack.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.events.decrement_stack",
-  "title": "Decrement stack",
+  "title": "Decrement Stack",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false
diff --git a/source/behaviour/items/1.16.200/events/remove_mob_effect.json b/source/behaviour/items/1.16.200/events/remove_mob_effect.json
index 5df30a09..eb9b3c79 100644
--- a/source/behaviour/items/1.16.200/events/remove_mob_effect.json
+++ b/source/behaviour/items/1.16.200/events/remove_mob_effect.json
@@ -1,21 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.events.remove_mob_effect",
-  "title": "Remove mob effect",
+  "title": "Remove Mob Effect",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "effect": {
-      "type": "string",
-      "title": "Effect",
-      "description": "UNDOCUMENTATED"
-    },
-    "target": {
-      "type": "string",
-      "title": "Target",
-      "description": "UNDOCUMENTATED",
-      "enum": ["holder"]
-    }
+    "effect": { "type": "string", "title": "Effect", "description": "UNDOCUMENTATED" },
+    "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["holder"] }
   }
 }
diff --git a/source/behaviour/items/1.16.200/events/shoot.json b/source/behaviour/items/1.16.200/events/shoot.json
index 87866e16..fb6a751c 100644
--- a/source/behaviour/items/1.16.200/events/shoot.json
+++ b/source/behaviour/items/1.16.200/events/shoot.json
@@ -6,20 +6,8 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "angle_offset": {
-      "type": "number",
-      "title": "Angle offset",
-      "description": "UNDOCUMENTATED"
-    },
-    "launch_power": {
-      "type": "number",
-      "title": "Launch power",
-      "description": "UNDOCUMENTATED"
-    },
-    "projectile": {
-      "type": "string",
-      "title": "Projectile",
-      "description": "UNDOCUMENTATED"
-    }
+    "angle_offset": { "type": "number", "title": "Angle Offset", "description": "UNDOCUMENTATED" },
+    "launch_power": { "type": "number", "title": "Launch Power", "description": "UNDOCUMENTATED" },
+    "projectile": { "type": "string", "title": "Projectile", "description": "UNDOCUMENTATED" }
   }
 }
diff --git a/source/behaviour/items/1.16.200/events/teleport.json b/source/behaviour/items/1.16.200/events/teleport.json
index 5b6b7600..fbf8f6b0 100644
--- a/source/behaviour/items/1.16.200/events/teleport.json
+++ b/source/behaviour/items/1.16.200/events/teleport.json
@@ -6,15 +6,10 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "target": {
-      "type": "string",
-      "title": "Target",
-      "description": "UNDOCUMENTATED",
-      "enum": ["holder"]
-    },
+    "target": { "type": "string", "title": "Target", "description": "UNDOCUMENTATED", "enum": ["holder"] },
     "max_range": {
       "type": "array",
-      "title": "Max range",
+      "title": "Max Range",
       "description": "UNDOCUMENTATED",
       "items": [
         { "type": "number", "title": "X", "description": "UNDOCUMENTATED" },
diff --git a/source/behaviour/items/1.16.200/events/transform_item.json b/source/behaviour/items/1.16.200/events/transform_item.json
index d2a196b4..e2ffb142 100644
--- a/source/behaviour/items/1.16.200/events/transform_item.json
+++ b/source/behaviour/items/1.16.200/events/transform_item.json
@@ -1,15 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.16.200.items.events.transform_item",
-  "title": "Transform item",
+  "title": "Transform Item",
   "description": "UNDOCUMENTATED",
   "type": "object",
   "additionalProperties": false,
-  "properties": {
-    "transform": {
-      "title": "Transform",
-      "description": "UNDOCUMENTATED",
-      "type": "string"
-    }
-  }
+  "properties": { "transform": { "title": "Transform", "description": "UNDOCUMENTATED", "type": "string" } }
 }
diff --git a/source/behaviour/items/1.16.200/items.json b/source/behaviour/items/1.16.200/items.json
index 87abe20b..778b0ae6 100644
--- a/source/behaviour/items/1.16.200/items.json
+++ b/source/behaviour/items/1.16.200/items.json
@@ -5,11 +5,7 @@
   "required": ["format_version", "minecraft:item"],
   "title": "Item",
   "properties": {
-    "format_version": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "minecraft:item": {
       "additionalProperties": false,
       "required": ["description"],
@@ -39,7 +35,7 @@
               "type": "boolean",
               "default": false,
               "description": "If this item is experimental, it will only be registered if the world is marked as experimental.",
-              "title": "Is experimental"
+              "title": "Is Experimental"
             }
           }
         },
@@ -71,9 +67,7 @@
             "minecraft:wearable": { "$ref": "./components/minecraft.wearable.json" }
           }
         },
-        "events": {
-          "$ref": "./events.json"
-        }
+        "events": { "$ref": "./events.json" }
       }
     }
   }
diff --git a/source/behaviour/items/items.json b/source/behaviour/items/items.json
index 04aadbea..0a9ef18e 100644
--- a/source/behaviour/items/items.json
+++ b/source/behaviour/items/items.json
@@ -1,17 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.items",
-  "examples": [
-    {
-      "format_version": "1.16.200",
-      "minecraft:item": {
-        "description": {
-          "identifier": "namespace:item"
-        },
-        "components": {}
-      }
-    }
-  ],
+  "examples": [{ "format_version": "1.16.200", "minecraft:item": { "description": { "identifier": "namespace:item" }, "components": {} } }],
   "allOf": [
     { "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } }, "then": { "$ref": "./1.10.0/items.json" } },
     { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/items.json" } },
diff --git a/source/behaviour/loot_tables/conditions.json b/source/behaviour/loot_tables/conditions.json
index a4f69276..2aeccec8 100644
--- a/source/behaviour/loot_tables/conditions.json
+++ b/source/behaviour/loot_tables/conditions.json
@@ -4,34 +4,13 @@
   "description": "A minecraft loot table condition",
   "title": "Condition",
   "allOf": [
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "entity_properties" } } },
-      "then": { "$ref": "./conditions/entity_properties.json" }
-    },
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "has_mark_variant" } } },
-      "then": { "$ref": "./conditions/has_mark_variant.json" }
-    },
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "killed_by_player" } } },
-      "then": { "$ref": "./conditions/killed_by_player.json" }
-    },
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "killed_by_player_or_pets" } } },
-      "then": { "$ref": "./conditions/killed_by_player_or_pets.json" }
-    },
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "random_chance" } } },
-      "then": { "$ref": "./conditions/random_chance.json" }
-    },
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "random_chance_with_looting" } } },
-      "then": { "$ref": "./conditions/random_chance_with_looting.json" }
-    },
-    {
-      "if": { "properties": { "condition": { "type": "string", "const": "random_difficulty_chance" } } },
-      "then": { "$ref": "./conditions/random_difficulty_chance.json" }
-    },
+    { "if": { "properties": { "condition": { "type": "string", "const": "entity_properties" } } }, "then": { "$ref": "./conditions/entity_properties.json" } },
+    { "if": { "properties": { "condition": { "type": "string", "const": "has_mark_variant" } } }, "then": { "$ref": "./conditions/has_mark_variant.json" } },
+    { "if": { "properties": { "condition": { "type": "string", "const": "killed_by_player" } } }, "then": { "$ref": "./conditions/killed_by_player.json" } },
+    { "if": { "properties": { "condition": { "type": "string", "const": "killed_by_player_or_pets" } } }, "then": { "$ref": "./conditions/killed_by_player_or_pets.json" } },
+    { "if": { "properties": { "condition": { "type": "string", "const": "random_chance" } } }, "then": { "$ref": "./conditions/random_chance.json" } },
+    { "if": { "properties": { "condition": { "type": "string", "const": "random_chance_with_looting" } } }, "then": { "$ref": "./conditions/random_chance_with_looting.json" } },
+    { "if": { "properties": { "condition": { "type": "string", "const": "random_difficulty_chance" } } }, "then": { "$ref": "./conditions/random_difficulty_chance.json" } },
     {
       "if": { "properties": { "condition": { "type": "string", "const": "random_regional_difficulty_chance" } } },
       "then": { "$ref": "./conditions/random_regional_difficulty_chance.json" }
diff --git a/source/behaviour/loot_tables/conditions/entity_properties.json b/source/behaviour/loot_tables/conditions/entity_properties.json
index 67c1368c..543b6888 100644
--- a/source/behaviour/loot_tables/conditions/entity_properties.json
+++ b/source/behaviour/loot_tables/conditions/entity_properties.json
@@ -4,37 +4,17 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Returns true if the actor properties defined were executed.",
-  "title": "Entity properties",
+  "title": "Entity Properties",
   "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    },
-    "entity": {
-      "type": "string",
-      "default": "this",
-      "description": "The entity to test. The value must be only \"this\".",
-      "title": "Entity"
-    },
+    "condition": { "type": "string", "title": "Condition", "description": "TODO" },
+    "entity": { "type": "string", "default": "this", "description": "The entity to test. The value must be only \"this\".", "title": "Entity" },
     "properties": {
       "type": "object",
       "default": {},
       "description": "The entity's properties. \"on_fire\", \"on_ground\" is used for now.",
       "title": "Properties",
       "additionalProperties": false,
-      "properties": {
-        "on_fire": {
-          "title": "On fire",
-          "description": "TODO",
-          "type": "boolean"
-        },
-        "on_ground": {
-          "title": "On fire",
-          "description": "TODO",
-          "type": "boolean"
-        }
-      }
+      "properties": { "on_fire": { "title": "On Fire", "description": "TODO", "type": "boolean" }, "on_ground": { "title": "On Fire", "description": "TODO", "type": "boolean" } }
     }
   }
 }
diff --git a/source/behaviour/loot_tables/conditions/has_mark_variant.json b/source/behaviour/loot_tables/conditions/has_mark_variant.json
index 1332c117..4b9c9d35 100644
--- a/source/behaviour/loot_tables/conditions/has_mark_variant.json
+++ b/source/behaviour/loot_tables/conditions/has_mark_variant.json
@@ -4,18 +4,9 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Returns the condition true if the actor's mark variant is matched to the value.",
-  "title": "Has mark variant",
+  "title": "Has Mark Variant",
   "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    },
-    "value": {
-      "type": "integer",
-      "default": "0",
-      "description": "Tests for the actor's mark variant (if it has one)",
-      "title": "Value"
-    }
+    "condition": { "type": "string", "title": "Condition", "description": "TODO" },
+    "value": { "type": "integer", "default": "0", "description": "Tests for the actor's mark variant (if it has one)", "title": "Value" }
   }
 }
diff --git a/source/behaviour/loot_tables/conditions/killed_by_player.json b/source/behaviour/loot_tables/conditions/killed_by_player.json
index 33476341..eb46e435 100644
--- a/source/behaviour/loot_tables/conditions/killed_by_player.json
+++ b/source/behaviour/loot_tables/conditions/killed_by_player.json
@@ -4,12 +4,6 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Returns the condition true if the actor of the loot table is killed by player or entities that has owner.",
-  "title": "Killed by player",
-  "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    }
-  }
+  "title": "Killed By Player",
+  "properties": { "condition": { "type": "string", "title": "Condition", "description": "TODO" } }
 }
diff --git a/source/behaviour/loot_tables/conditions/killed_by_player_or_pets.json b/source/behaviour/loot_tables/conditions/killed_by_player_or_pets.json
index c66f32f6..460afdbe 100644
--- a/source/behaviour/loot_tables/conditions/killed_by_player_or_pets.json
+++ b/source/behaviour/loot_tables/conditions/killed_by_player_or_pets.json
@@ -4,12 +4,6 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Returns the condition true if the actor of the loot table is killed by player or entities that has owner.",
-  "title": "Killed by player or pets or pets",
-  "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    }
-  }
+  "title": "Killed By Player Or Pets Or Pets",
+  "properties": { "condition": { "type": "string", "title": "Condition", "description": "TODO" } }
 }
diff --git a/source/behaviour/loot_tables/conditions/random_chance.json b/source/behaviour/loot_tables/conditions/random_chance.json
index 056725b5..c300094e 100644
--- a/source/behaviour/loot_tables/conditions/random_chance.json
+++ b/source/behaviour/loot_tables/conditions/random_chance.json
@@ -4,24 +4,10 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Sets a random chance of the specified value.",
-  "title": "Random chance",
+  "title": "Random Chance",
   "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    },
-    "chance": {
-      "type": "number",
-      "default": 0,
-      "description": "TODO",
-      "title": "Chance"
-    },
-    "max_chance": {
-      "type": "number",
-      "default": 0,
-      "description": "The maximum random chance value allowed.",
-      "title": "Max chance"
-    }
+    "condition": { "type": "string", "title": "Condition", "description": "TODO" },
+    "chance": { "type": "number", "default": 0, "description": "TODO", "title": "Chance" },
+    "max_chance": { "type": "number", "default": 0, "description": "The maximum random chance value allowed.", "title": "Max Chance" }
   }
 }
diff --git a/source/behaviour/loot_tables/conditions/random_chance_with_looting.json b/source/behaviour/loot_tables/conditions/random_chance_with_looting.json
index adfbf43d..bcb2bc86 100644
--- a/source/behaviour/loot_tables/conditions/random_chance_with_looting.json
+++ b/source/behaviour/loot_tables/conditions/random_chance_with_looting.json
@@ -4,24 +4,15 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Sets a random chance of the specified value. Looting enchantment increase the random chance multiplier.",
-  "title": "Random chance with looting",
+  "title": "Random Chance With Looting",
   "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    },
-    "chance": {
-      "type": "number",
-      "default": 0,
-      "description": "The random chance of the value.",
-      "title": "Chance"
-    },
+    "condition": { "type": "string", "title": "Condition", "description": "TODO" },
+    "chance": { "type": "number", "default": 0, "description": "The random chance of the value.", "title": "Chance" },
     "looting_multiplier": {
       "type": "number",
       "default": 0,
       "description": "The multiplier for the chance if the target entity has the looting enchant that affects the actor.",
-      "title": "Looting multiplier"
+      "title": "Looting Multiplier"
     }
   }
 }
diff --git a/source/behaviour/loot_tables/conditions/random_difficulty_chance.json b/source/behaviour/loot_tables/conditions/random_difficulty_chance.json
index bd72afdf..ef5de2ca 100644
--- a/source/behaviour/loot_tables/conditions/random_difficulty_chance.json
+++ b/source/behaviour/loot_tables/conditions/random_difficulty_chance.json
@@ -4,19 +4,10 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Sets a random chance of the specified value based on the level difficulty.",
-  "title": "Random difficulty chance",
+  "title": "Random Difficulty Chance",
   "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    },
-    "default_chance": {
-      "type": "number",
-      "default": 0,
-      "description": "The default random chance if the level difficulty is not assigned.",
-      "title": "Default chance"
-    },
+    "condition": { "type": "string", "title": "Condition", "description": "TODO" },
+    "default_chance": { "type": "number", "default": 0, "description": "The default random chance if the level difficulty is not assigned.", "title": "Default Chance" },
     "easy": {
       "type": "number",
       "default": 0,
diff --git a/source/behaviour/loot_tables/conditions/random_regional_difficulty_chance.json b/source/behaviour/loot_tables/conditions/random_regional_difficulty_chance.json
index 19295dea..c8e8eda3 100644
--- a/source/behaviour/loot_tables/conditions/random_regional_difficulty_chance.json
+++ b/source/behaviour/loot_tables/conditions/random_regional_difficulty_chance.json
@@ -4,24 +4,11 @@
   "type": "object",
   "additionalProperties": false,
   "description": "Sets a max regional difficulty random chance of the specified value.",
-  "title": "Random regional difficulty chance",
+  "title": "Random Regional Difficulty Chance",
   "properties": {
-    "condition": {
-      "type": "string",
-      "title": "Condition",
-      "description": "TODO"
-    },
-    "default_chance": {
-      "type": "number",
-      "default": 0,
-      "description": "The default random chance if the level difficulty is not assigned.",
-      "title": "Default chance"
-    },
-    "max_chance": {
-      "title": "Max chance",
-      "type": "number",
-      "description": "UNDOCUMENATED"
-    },
+    "condition": { "type": "string", "title": "Condition", "description": "TODO" },
+    "default_chance": { "type": "number", "default": 0, "description": "The default random chance if the level difficulty is not assigned.", "title": "Default Chance" },
+    "max_chance": { "title": "Max Chance", "type": "number", "description": "UNDOCUMENATED" },
     "easy": {
       "type": "number",
       "default": 0,
diff --git a/source/behaviour/loot_tables/functions.json b/source/behaviour/loot_tables/functions.json
index 7c2678f5..47bbc9a5 100644
--- a/source/behaviour/loot_tables/functions.json
+++ b/source/behaviour/loot_tables/functions.json
@@ -4,93 +4,27 @@
   "description": "A minecraft loot table condition",
   "title": "Functions",
   "allOf": [
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "enchant_random_gear" } } },
-      "then": { "$ref": "./functions/enchant_random_gear.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "enchant_book_for_trading" } } },
-      "then": { "$ref": "./functions/enchant_book_for_trading.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "enchant_randomly" } } },
-      "then": { "$ref": "./functions/enchant_randomly.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "enchant_with_levels" } } },
-      "then": { "$ref": "./functions/enchant_with_levels.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "exploration_map" } } },
-      "then": { "$ref": "./functions/exploration_map.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "fill_container" } } },
-      "then": { "$ref": "./functions/fill_container.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "furnace_smelt" } } },
-      "then": { "$ref": "./functions/furnace_smelt.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "looting_enchant" } } },
-      "then": { "$ref": "./functions/looting_enchant.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "random_aux_value" } } },
-      "then": { "$ref": "./functions/random_aux_value.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "random_block_state" } } },
-      "then": { "$ref": "./functions/random_block_state.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_actor_id" } } },
-      "then": { "$ref": "./functions/set_actor_id.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_banner_details" } } },
-      "then": { "$ref": "./functions/set_banner_details.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_book_contents" } } },
-      "then": { "$ref": "./functions/set_book_contents.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_count" } } },
-      "then": { "$ref": "./functions/set_count.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_damage" } } },
-      "then": { "$ref": "./functions/set_damage.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_data" } } },
-      "then": { "$ref": "./functions/set_data.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_data_from_color_index" } } },
-      "then": { "$ref": "./functions/set_data_from_color_index.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "trader_material_type" } } },
-      "then": { "$ref": "./functions/trader_material_type.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "random_dye" } } },
-      "then": { "$ref": "./functions/random_dye.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_lore" } } },
-      "then": { "$ref": "./functions/set_lore.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "set_name" } } },
-      "then": { "$ref": "./functions/set_name.json" }
-    },
-    {
-      "if": { "properties": { "function": { "type": "string", "const": "specific_enchants" } } },
-      "then": { "$ref": "./functions/specific_enchants.json" }
-    }
+    { "if": { "properties": { "function": { "type": "string", "const": "enchant_random_gear" } } }, "then": { "$ref": "./functions/enchant_random_gear.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "enchant_book_for_trading" } } }, "then": { "$ref": "./functions/enchant_book_for_trading.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "enchant_randomly" } } }, "then": { "$ref": "./functions/enchant_randomly.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "enchant_with_levels" } } }, "then": { "$ref": "./functions/enchant_with_levels.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "exploration_map" } } }, "then": { "$ref": "./functions/exploration_map.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "fill_container" } } }, "then": { "$ref": "./functions/fill_container.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "furnace_smelt" } } }, "then": { "$ref": "./functions/furnace_smelt.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "looting_enchant" } } }, "then": { "$ref": "./functions/looting_enchant.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "random_aux_value" } } }, "then": { "$ref": "./functions/random_aux_value.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "random_block_state" } } }, "then": { "$ref": "./functions/random_block_state.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_actor_id" } } }, "then": { "$ref": "./functions/set_actor_id.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_banner_details" } } }, "then": { "$ref": "./functions/set_banner_details.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_book_contents" } } }, "then": { "$ref": "./functions/set_book_contents.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_count" } } }, "then": { "$ref": "./functions/set_count.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_damage" } } }, "then": { "$ref": "./functions/set_damage.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_data" } } }, "then": { "$ref": "./functions/set_data.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_data_from_color_index" } } }, "then": { "$ref": "./functions/set_data_from_color_index.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "trader_material_type" } } }, "then": { "$ref": "./functions/trader_material_type.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "random_dye" } } }, "then": { "$ref": "./functions/random_dye.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_lore" } } }, "then": { "$ref": "./functions/set_lore.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "set_name" } } }, "then": { "$ref": "./functions/set_name.json" } },
+    { "if": { "properties": { "function": { "type": "string", "const": "specific_enchants" } } }, "then": { "$ref": "./functions/specific_enchants.json" } }
   ]
 }
diff --git a/source/behaviour/loot_tables/functions/enchant_book_for_trading.json b/source/behaviour/loot_tables/functions/enchant_book_for_trading.json
index 079004d8..0ceb4091 100644
--- a/source/behaviour/loot_tables/functions/enchant_book_for_trading.json
+++ b/source/behaviour/loot_tables/functions/enchant_book_for_trading.json
@@ -3,34 +3,13 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.enchant_book_for_trading",
   "additionalProperties": false,
   "description": "The function enchant_book_for_trading",
-  "title": "Enchant book for trading",
+  "title": "Enchant Book For Trading",
   "required": ["function", "base_cost", "base_random_cost", "per_level_random_cost", "per_level_cost"],
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "enchant_book_for_trading",
-      "title": "Function",
-      "description": "TODO description"
-    },
-    "base_cost": {
-      "type": "integer",
-      "title": "Base cost",
-      "description": "TODO description"
-    },
-    "base_random_cost": {
-      "type": "integer",
-      "title": "Base cost",
-      "description": "TODO description"
-    },
-    "per_level_random_cost": {
-      "type": "integer",
-      "title": "Base cost",
-      "description": "TODO description"
-    },
-    "per_level_cost": {
-      "type": "integer",
-      "title": "Base cost",
-      "description": "TODO description"
-    }
+    "function": { "type": "string", "const": "enchant_book_for_trading", "title": "Function", "description": "TODO description" },
+    "base_cost": { "type": "integer", "title": "Base Cost", "description": "TODO description" },
+    "base_random_cost": { "type": "integer", "title": "Base Cost", "description": "TODO description" },
+    "per_level_random_cost": { "type": "integer", "title": "Base Cost", "description": "TODO description" },
+    "per_level_cost": { "type": "integer", "title": "Base Cost", "description": "TODO description" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/enchant_random_gear.json b/source/behaviour/loot_tables/functions/enchant_random_gear.json
index 914cb62e..462b263b 100644
--- a/source/behaviour/loot_tables/functions/enchant_random_gear.json
+++ b/source/behaviour/loot_tables/functions/enchant_random_gear.json
@@ -3,14 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.enchant_random_gear",
   "additionalProperties": false,
   "description": "The function enchant_random_gear",
-  "title": "Enchant random gear",
+  "title": "Enchant Random Gear",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "enchant_random_gear",
-      "title": "Function",
-      "description": "TODO description"
-    },
+    "function": { "type": "string", "const": "enchant_random_gear", "title": "Function", "description": "TODO description" },
     "chance": {
       "type": "number",
       "description": "Takes a chance modifier to manipulate the algorithm. Note that a chance modifier of 1.0 doesn't mean a 100% chance that gear will become enchanted.",
diff --git a/source/behaviour/loot_tables/functions/enchant_randomly.json b/source/behaviour/loot_tables/functions/enchant_randomly.json
index e4df213c..21cecb95 100644
--- a/source/behaviour/loot_tables/functions/enchant_randomly.json
+++ b/source/behaviour/loot_tables/functions/enchant_randomly.json
@@ -3,14 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.enchant_randomly",
   "additionalProperties": false,
   "description": "The function enchant_randomly",
-  "title": "Enchant randomly",
+  "title": "Enchant Randomly",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "enchant_randomly",
-      "title": "Function",
-      "description": "TODO description"
-    },
+    "function": { "type": "string", "const": "enchant_randomly", "title": "Function", "description": "TODO description" },
     "treasure": {
       "type": "boolean",
       "description": "Supports the optional treasure boolean (true/false) to allow treasure enchantments to be toggled on and off.",
diff --git a/source/behaviour/loot_tables/functions/enchant_with_levels.json b/source/behaviour/loot_tables/functions/enchant_with_levels.json
index 1241fa1b..06d9e364 100644
--- a/source/behaviour/loot_tables/functions/enchant_with_levels.json
+++ b/source/behaviour/loot_tables/functions/enchant_with_levels.json
@@ -3,42 +3,22 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.enchant_with_levels",
   "additionalProperties": false,
   "description": "The function enchant_with_levels",
-  "title": "Enchant with levels",
+  "title": "Enchant With Levels",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "enchant_with_levels",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "enchant_with_levels", "description": "TODO description", "title": "TODO Title" },
     "levels": {
       "title": "Levels",
       "oneOf": [
-        {
-          "type": "integer"
-        },
+        { "type": "integer" },
         {
           "type": "object",
           "additionalProperties": false,
           "required": ["min", "max"],
-          "properties": {
-            "min": {
-              "type": "integer",
-              "title": "Minimum"
-            },
-            "max": {
-              "type": "integer",
-              "title": "Maximum"
-            }
-          }
+          "properties": { "min": { "type": "integer", "title": "Minimum" }, "max": { "type": "integer", "title": "Maximum" } }
         }
       ],
       "description": "TODO description"
     },
-    "treasure": {
-      "type": "boolean",
-      "title": "Treasure",
-      "description": "TODO description"
-    }
+    "treasure": { "type": "boolean", "title": "Treasure", "description": "TODO description" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/exploration_map.json b/source/behaviour/loot_tables/functions/exploration_map.json
index b592ee1a..9c085ad3 100644
--- a/source/behaviour/loot_tables/functions/exploration_map.json
+++ b/source/behaviour/loot_tables/functions/exploration_map.json
@@ -3,19 +3,14 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.exploration_map",
   "additionalProperties": false,
   "description": "The function exploration_map",
-  "title": "Exploration map",
+  "title": "Exploration Map",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "exploration_map",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "exploration_map", "description": "TODO description", "title": "TODO Title" },
     "destination": {
       "type": "string",
       "description": "The destination value defines what type of treasure map they receive.",
       "enum": ["endcity", "fortress", "mineshaft", "monument", "ruins", "stronghold", "temple", "village", "mansion", "shipwreck", "buriedtreasure", "pillageroutpost"],
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/fill_container.json b/source/behaviour/loot_tables/functions/fill_container.json
index f4b58bba..2e7f8512 100644
--- a/source/behaviour/loot_tables/functions/fill_container.json
+++ b/source/behaviour/loot_tables/functions/fill_container.json
@@ -3,19 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.fill_container",
   "additionalProperties": false,
   "description": "The function fill_container",
-  "title": "Fill container",
+  "title": "Fill Container",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "fill_container",
-      "title": "Function",
-      "description": "TODO description"
-    },
-    "loot_table": {
-      "type": "string",
-      "title": "Loot table",
-      "pattern": "^loot_tables/.*\\.json$",
-      "description": "TODO description"
-    }
+    "function": { "type": "string", "const": "fill_container", "title": "Function", "description": "TODO description" },
+    "loot_table": { "type": "string", "title": "Loot Table", "pattern": "^loot_tables/.*\\.json$", "description": "TODO description" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/furnace_smelt.json b/source/behaviour/loot_tables/functions/furnace_smelt.json
index 6f6a39ad..0f5bb86d 100644
--- a/source/behaviour/loot_tables/functions/furnace_smelt.json
+++ b/source/behaviour/loot_tables/functions/furnace_smelt.json
@@ -3,21 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.furnace_smelt",
   "additionalProperties": false,
   "description": "The function furnace_smelt",
-  "title": "Furnace smelt",
+  "title": "Furnace Smelt",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "furnace_smelt",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "conditions": {
-      "title": "Conditions",
-      "description": "TODO",
-      "type": "array",
-      "items": {
-        "$ref": "../conditions.json"
-      }
-    }
+    "function": { "type": "string", "const": "furnace_smelt", "description": "TODO description", "title": "TODO Title" },
+    "conditions": { "title": "Conditions", "description": "TODO", "type": "array", "items": { "$ref": "../conditions.json" } }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/looting_enchant.json b/source/behaviour/loot_tables/functions/looting_enchant.json
index d04e6350..6fd934f0 100644
--- a/source/behaviour/loot_tables/functions/looting_enchant.json
+++ b/source/behaviour/loot_tables/functions/looting_enchant.json
@@ -3,26 +3,14 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.looting_enchant",
   "additionalProperties": false,
   "description": "The function looting_enchant",
-  "title": "Looting enchant",
+  "title": "Looting Enchant",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "looting_enchant",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "looting_enchant", "description": "TODO description", "title": "TODO Title" },
     "count": {
       "type": "object",
-      "properties": {
-        "min": {
-          "type": "integer"
-        },
-        "max": {
-          "type": "integer"
-        }
-      },
+      "properties": { "min": { "type": "integer" }, "max": { "type": "integer" } },
       "description": "TODO description",
-      "title": "TODO title",
+      "title": "TODO Title",
       "additionalProperties": false
     }
   }
diff --git a/source/behaviour/loot_tables/functions/random_aux_value.json b/source/behaviour/loot_tables/functions/random_aux_value.json
index 2491d220..66ede405 100644
--- a/source/behaviour/loot_tables/functions/random_aux_value.json
+++ b/source/behaviour/loot_tables/functions/random_aux_value.json
@@ -3,26 +3,14 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.random_aux_value",
   "additionalProperties": false,
   "description": "The function random_aux_value",
-  "title": "Random aux value",
+  "title": "Random Aux Value",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "random_aux_value",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "random_aux_value", "description": "TODO description", "title": "TODO Title" },
     "values": {
       "type": "object",
-      "properties": {
-        "min": {
-          "type": "integer"
-        },
-        "max": {
-          "type": "integer"
-        }
-      },
+      "properties": { "min": { "type": "integer" }, "max": { "type": "integer" } },
       "description": "TODO description",
-      "title": "TODO title",
+      "title": "TODO Title",
       "additionalProperties": false
     }
   }
diff --git a/source/behaviour/loot_tables/functions/random_block_state.json b/source/behaviour/loot_tables/functions/random_block_state.json
index 57391b89..38d7e7de 100644
--- a/source/behaviour/loot_tables/functions/random_block_state.json
+++ b/source/behaviour/loot_tables/functions/random_block_state.json
@@ -3,33 +3,15 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.random_block_state",
   "additionalProperties": false,
   "description": "The function random_block_state",
-  "title": "Random block state",
+  "title": "Random Block State",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "random_block_state",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "block_state": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "random_block_state", "description": "TODO description", "title": "TODO Title" },
+    "block_state": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "values": {
       "type": "object",
-      "properties": {
-        "min": {
-          "title": "Min",
-          "type": "integer"
-        },
-        "max": {
-          "title": "Max",
-          "type": "integer"
-        }
-      },
+      "properties": { "min": { "title": "Min", "type": "integer" }, "max": { "title": "Max", "type": "integer" } },
       "description": "TODO description",
-      "title": "TODO title",
+      "title": "TODO Title",
       "additionalProperties": false
     }
   }
diff --git a/source/behaviour/loot_tables/functions/random_dye.json b/source/behaviour/loot_tables/functions/random_dye.json
index acf77eb9..61e8ed00 100644
--- a/source/behaviour/loot_tables/functions/random_dye.json
+++ b/source/behaviour/loot_tables/functions/random_dye.json
@@ -3,13 +3,6 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.random_dye",
   "additionalProperties": false,
   "description": "The function random_dye",
-  "title": "Trader material type",
-  "properties": {
-    "function": {
-      "type": "string",
-      "const": "random_dye",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
-  }
+  "title": "Trader Material Type",
+  "properties": { "function": { "type": "string", "const": "random_dye", "description": "TODO description", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/loot_tables/functions/set_actor_id.json b/source/behaviour/loot_tables/functions/set_actor_id.json
index 45816235..502010b6 100644
--- a/source/behaviour/loot_tables/functions/set_actor_id.json
+++ b/source/behaviour/loot_tables/functions/set_actor_id.json
@@ -3,18 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_actor_id",
   "additionalProperties": false,
   "description": "The function set_actor_id",
-  "title": "Set actor id",
+  "title": "Set Actor Id",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_actor_id",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "id": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "function": { "type": "string", "const": "set_actor_id", "description": "TODO description", "title": "TODO Title" },
+    "id": { "type": "string", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/set_banner_details.json b/source/behaviour/loot_tables/functions/set_banner_details.json
index 9844d7dc..90694fc1 100644
--- a/source/behaviour/loot_tables/functions/set_banner_details.json
+++ b/source/behaviour/loot_tables/functions/set_banner_details.json
@@ -3,18 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_banner_details",
   "additionalProperties": false,
   "description": "The function set_banner_details",
-  "title": "Set banner details",
+  "title": "Set Banner Details",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_banner_details",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "type": {
-      "type": "integer",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "function": { "type": "string", "const": "set_banner_details", "description": "TODO description", "title": "TODO Title" },
+    "type": { "type": "integer", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/set_book_contents.json b/source/behaviour/loot_tables/functions/set_book_contents.json
index 48e3c52c..8e74cdb4 100644
--- a/source/behaviour/loot_tables/functions/set_book_contents.json
+++ b/source/behaviour/loot_tables/functions/set_book_contents.json
@@ -3,33 +3,17 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_book_contents",
   "additionalProperties": false,
   "description": "The function set_book_contents",
-  "title": "Set book contents",
+  "title": "Set Book Contents",
   "required": ["function", "author", "title", "pages"],
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_book_contents",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "author": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "title": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "set_book_contents", "description": "TODO description", "title": "TODO Title" },
+    "author": { "type": "string", "description": "TODO description", "title": "TODO Title" },
+    "title": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "pages": {
       "type": "array",
-      "items": {
-        "type": "string",
-        "examples": ["Some text", "{\"rawtext\":[ {\"translate\":\"some.text\"}]}"]
-      },
+      "items": { "type": "string", "examples": ["Some text", "{\"rawtext\":[ {\"translate\":\"some.text\"}]}"] },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/set_count.json b/source/behaviour/loot_tables/functions/set_count.json
index 104c7ad9..9cd86d0b 100644
--- a/source/behaviour/loot_tables/functions/set_count.json
+++ b/source/behaviour/loot_tables/functions/set_count.json
@@ -3,34 +3,12 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_count",
   "additionalProperties": false,
   "description": "The function set_count",
-  "title": "Set count",
+  "title": "Set Count",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_count",
-      "title": "Function",
-      "description": "TODO description"
-    },
+    "function": { "type": "string", "const": "set_count", "title": "Function", "description": "TODO description" },
     "count": {
       "title": "Count",
-      "oneOf": [
-        {
-          "type": "integer"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "min": {
-              "type": "integer",
-              "title": "Minimum"
-            },
-            "max": {
-              "type": "integer",
-              "title": "Maximum"
-            }
-          }
-        }
-      ],
+      "oneOf": [{ "type": "integer" }, { "type": "object", "properties": { "min": { "type": "integer", "title": "Minimum" }, "max": { "type": "integer", "title": "Maximum" } } }],
       "description": "TODO description"
     }
   }
diff --git a/source/behaviour/loot_tables/functions/set_damage.json b/source/behaviour/loot_tables/functions/set_damage.json
index ac450d9c..c42e3830 100644
--- a/source/behaviour/loot_tables/functions/set_damage.json
+++ b/source/behaviour/loot_tables/functions/set_damage.json
@@ -3,34 +3,17 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_damage",
   "additionalProperties": false,
   "description": "The function set_damage",
-  "title": "Set damage",
+  "title": "Set Damage",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_damage",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "set_damage", "description": "TODO description", "title": "TODO Title" },
     "damage": {
       "oneOf": [
         { "type": "integer" },
-        {
-          "type": "object",
-          "properties": {
-            "min": { "type": "integer" },
-            "max": { "type": "integer" }
-          }
-        },
-        {
-          "type": "object",
-          "properties": {
-            "min": { "type": "number" },
-            "max": { "type": "number" }
-          }
-        }
+        { "type": "object", "properties": { "min": { "type": "integer" }, "max": { "type": "integer" } } },
+        { "type": "object", "properties": { "min": { "type": "number" }, "max": { "type": "number" } } }
       ],
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/set_data.json b/source/behaviour/loot_tables/functions/set_data.json
index c79dca2b..0317fc22 100644
--- a/source/behaviour/loot_tables/functions/set_data.json
+++ b/source/behaviour/loot_tables/functions/set_data.json
@@ -3,34 +3,12 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_data",
   "additionalProperties": false,
   "description": "The function set_data",
-  "title": "Set data",
+  "title": "Set Data",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_data",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "function": { "type": "string", "const": "set_data", "description": "TODO description", "title": "TODO Title" },
     "data": {
       "title": "Data",
-      "oneOf": [
-        {
-          "type": "integer"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "min": {
-              "type": "integer",
-              "title": "Minimum"
-            },
-            "max": {
-              "type": "integer",
-              "title": "Maximum"
-            }
-          }
-        }
-      ],
+      "oneOf": [{ "type": "integer" }, { "type": "object", "properties": { "min": { "type": "integer", "title": "Minimum" }, "max": { "type": "integer", "title": "Maximum" } } }],
       "description": "TODO description"
     }
   }
diff --git a/source/behaviour/loot_tables/functions/set_data_from_color_index.json b/source/behaviour/loot_tables/functions/set_data_from_color_index.json
index 9dfb1925..9fa382c5 100644
--- a/source/behaviour/loot_tables/functions/set_data_from_color_index.json
+++ b/source/behaviour/loot_tables/functions/set_data_from_color_index.json
@@ -3,13 +3,6 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_data_from_color_index",
   "additionalProperties": false,
   "description": "The function set_data_from_color_index",
-  "title": "Set data from color index",
-  "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_data_from_color_index",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
-  }
+  "title": "Set Data From Color Index",
+  "properties": { "function": { "type": "string", "const": "set_data_from_color_index", "description": "TODO description", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/loot_tables/functions/set_lore.json b/source/behaviour/loot_tables/functions/set_lore.json
index 5742854e..168533b7 100644
--- a/source/behaviour/loot_tables/functions/set_lore.json
+++ b/source/behaviour/loot_tables/functions/set_lore.json
@@ -3,21 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_lore",
   "additionalProperties": false,
   "description": "The function set_lore",
-  "title": "Set lore",
+  "title": "Set Lore",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_lore",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "lore": {
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "function": { "type": "string", "const": "set_lore", "description": "TODO description", "title": "TODO Title" },
+    "lore": { "type": "array", "items": { "type": "string" }, "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/set_name.json b/source/behaviour/loot_tables/functions/set_name.json
index 7964c405..75a7dddb 100644
--- a/source/behaviour/loot_tables/functions/set_name.json
+++ b/source/behaviour/loot_tables/functions/set_name.json
@@ -3,18 +3,9 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.set_name",
   "additionalProperties": false,
   "description": "The function set_name",
-  "title": "Set name",
+  "title": "Set Name",
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "set_name",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "name": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "function": { "type": "string", "const": "set_name", "description": "TODO description", "title": "TODO Title" },
+    "name": { "type": "string", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/behaviour/loot_tables/functions/specific_enchants.json b/source/behaviour/loot_tables/functions/specific_enchants.json
index c4c9bbfa..3437cd8c 100644
--- a/source/behaviour/loot_tables/functions/specific_enchants.json
+++ b/source/behaviour/loot_tables/functions/specific_enchants.json
@@ -3,11 +3,11 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.specific_enchants",
   "additionalProperties": false,
   "description": "The function specific_enchants",
-  "title": "Specific enchants",
+  "title": "Specific Enchants",
   "definitions": {
     "IDEnchant": {
       "type": "string",
-      "title": "ID enchantment",
+      "title": "ID Enchantment",
       "enum": [
         "aqua_affinity",
         "bane_of_arthropods",
@@ -52,9 +52,7 @@
       "title": "Enchantment",
       "additionalProperties": false,
       "properties": {
-        "id": {
-          "$ref": "#/definitions/IDEnchant"
-        },
+        "id": { "$ref": "#/definitions/IDEnchant" },
         "level": {
           "title": "Level",
           "oneOf": [
@@ -72,30 +70,14 @@
     }
   },
   "properties": {
-    "function": {
-      "type": "string",
-      "const": "specific_enchants",
-      "description": "Specific enchants",
-      "title": "Specific enchants"
-    },
+    "function": { "type": "string", "const": "specific_enchants", "description": "Specific enchants", "title": "Specific Enchants" },
     "enchants": {
       "title": "Enchants",
       "description": "A enchanting specification",
       "oneOf": [
-        {
-          "type": "string",
-          "$ref": "#/definitions/IDEnchant"
-        },
-        {
-          "type": "object",
-          "$ref": "#/definitions/Enchant"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Enchant"
-          }
-        }
+        { "type": "string", "$ref": "#/definitions/IDEnchant" },
+        { "type": "object", "$ref": "#/definitions/Enchant" },
+        { "type": "array", "items": { "$ref": "#/definitions/Enchant" } }
       ]
     }
   }
diff --git a/source/behaviour/loot_tables/functions/trader_material_type.json b/source/behaviour/loot_tables/functions/trader_material_type.json
index 3f71d6f6..266d5fe0 100644
--- a/source/behaviour/loot_tables/functions/trader_material_type.json
+++ b/source/behaviour/loot_tables/functions/trader_material_type.json
@@ -3,13 +3,6 @@
   "$id": "blockception.minecraft.behaviour.loot_tables.trader_material_type",
   "additionalProperties": false,
   "description": "The function trader_material_type",
-  "title": "Trader material type",
-  "properties": {
-    "function": {
-      "type": "string",
-      "const": "trader_material_type",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
-  }
+  "title": "Trader Material Type",
+  "properties": { "function": { "type": "string", "const": "trader_material_type", "description": "TODO description", "title": "TODO Title" } }
 }
diff --git a/source/behaviour/loot_tables/loot_tables.json b/source/behaviour/loot_tables/loot_tables.json
index 624e3919..6851c511 100644
--- a/source/behaviour/loot_tables/loot_tables.json
+++ b/source/behaviour/loot_tables/loot_tables.json
@@ -29,48 +29,22 @@
       "additionalProperties": false,
       "items": {
         "additionalProperties": false,
-        "title": "A single pool",
+        "title": "A Single Pool",
         "type": "object",
         "properties": {
           "rolls": {
             "title": "Rolls",
             "oneOf": [
-              {
-                "type": "integer",
-                "minimum": 0
-              },
+              { "type": "integer", "minimum": 0 },
               {
                 "type": "object",
                 "required": ["min", "max"],
-                "properties": {
-                  "min": {
-                    "title": "Minimum",
-                    "type": "number",
-                    "minimum": 0
-                  },
-                  "max": {
-                    "title": "Minimum",
-                    "type": "number",
-                    "minimum": 1
-                  }
-                }
+                "properties": { "min": { "title": "Minimum", "type": "number", "minimum": 0 }, "max": { "title": "Minimum", "type": "number", "minimum": 1 } }
               }
             ]
           },
-          "type": {
-            "title": "Type",
-            "type": "string",
-            "description": "",
-            "enum": ["loot_table", "item", "empty"]
-          },
-          "conditions": {
-            "title": "Conditions",
-            "description": "TODO",
-            "type": "array",
-            "items": {
-              "$ref": "./conditions.json"
-            }
-          },
+          "type": { "title": "Type", "type": "string", "description": "", "enum": ["loot_table", "item", "empty"] },
+          "conditions": { "title": "Conditions", "description": "TODO", "type": "array", "items": { "$ref": "./conditions.json" } },
           "entries": {
             "title": "Entries",
             "type": "array",
@@ -80,45 +54,13 @@
               "required": ["type"],
               "title": "Entry",
               "properties": {
-                "type": {
-                  "title": "Type",
-                  "type": "string",
-                  "enum": ["item", "empty", "loot_table"]
-                },
-                "count": {
-                  "type": "integer",
-                  "title": "Count",
-                  "description": "The amount of the item"
-                },
-                "name": {
-                  "title": "Name",
-                  "type": "string",
-                  "description": "An item or loottable",
-                  "pattern": "^([\\w]+:|loot_tables/)"
-                },
-                "weight": {
-                  "title": "Weight",
-                  "type": "integer",
-                  "minimum": 1
-                },
-                "functions": {
-                  "title": "Functions",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "required": ["function"],
-                    "title": "Function",
-                    "$ref": "./functions.json"
-                  }
-                },
-                "pools": {
-                  "$ref": "#/definitions/pools_spec"
-                },
-                "quality": {
-                  "title": "Quality",
-                  "description": "UNDOCUMANTED",
-                  "type": "integer"
-                }
+                "type": { "title": "Type", "type": "string", "enum": ["item", "empty", "loot_table"] },
+                "count": { "type": "integer", "title": "Count", "description": "The amount of the item" },
+                "name": { "title": "Name", "type": "string", "description": "An item or loottable", "pattern": "^([\\w]+:|loot_tables/)" },
+                "weight": { "title": "Weight", "type": "integer", "minimum": 1 },
+                "functions": { "title": "Functions", "type": "array", "items": { "type": "object", "required": ["function"], "title": "Function", "$ref": "./functions.json" } },
+                "pools": { "$ref": "#/definitions/pools_spec" },
+                "quality": { "title": "Quality", "description": "UNDOCUMANTED", "type": "integer" }
               }
             }
           },
@@ -128,21 +70,9 @@
             "type": "object",
             "additionalProperties": false,
             "properties": {
-              "bonus_chance": {
-                "title": "Bonus chance",
-                "description": "TODO description",
-                "type": "number"
-              },
-              "bonus_rolls": {
-                "title": "Bonus rolls",
-                "description": "TODO description",
-                "type": "integer"
-              },
-              "initial_range": {
-                "title": "Initial range",
-                "description": "TODO description",
-                "type": "integer"
-              }
+              "bonus_chance": { "title": "Bonus Chance", "description": "TODO description", "type": "number" },
+              "bonus_rolls": { "title": "Bonus Rolls", "description": "TODO description", "type": "integer" },
+              "initial_range": { "title": "Initial Range", "description": "TODO description", "type": "integer" }
             }
           }
         }
@@ -150,12 +80,7 @@
     }
   },
   "properties": {
-    "pools": { "$ref": "#/definitions/pools_spec", "description": "TODO description", "title": "TODO title" },
-    "type": {
-      "title": "Type",
-      "type": "string",
-      "description": "TODO description",
-      "enum": ["minecraft:chest"]
-    }
+    "pools": { "$ref": "#/definitions/pools_spec", "description": "TODO description", "title": "TODO Title" },
+    "type": { "title": "Type", "type": "string", "description": "TODO description", "enum": ["minecraft:chest"] }
   }
 }
diff --git a/source/behaviour/recipes/1.12.0/recipes.json b/source/behaviour/recipes/1.12.0/recipes.json
index 42a832a8..4258b686 100644
--- a/source/behaviour/recipes/1.12.0/recipes.json
+++ b/source/behaviour/recipes/1.12.0/recipes.json
@@ -10,7 +10,7 @@
     "format_version": {
       "type": "string",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file.",
-      "title": "Format version"
+      "title": "Format Version"
     },
     "minecraft:recipe_furnace": { "$ref": "./types/furnace.json" },
     "minecraft:recipe_brewing_container": { "$ref": "./types/recipe_brewing_container.json" },
diff --git a/source/behaviour/recipes/1.12.0/types/base types/definition.json b/source/behaviour/recipes/1.12.0/types/base types/definition.json
index 182d4c1e..b78a5126 100644
--- a/source/behaviour/recipes/1.12.0/types/base types/definition.json	
+++ b/source/behaviour/recipes/1.12.0/types/base types/definition.json	
@@ -4,13 +4,6 @@
   "description": "Recipe definition 1.12.0",
   "title": "Definition",
   "type": "object",
-  "properties": {
-    "identifier": {
-      "type": "string",
-      "pattern": "[a-z0-9_:\\-]+",
-      "title": "Recipe identifier",
-      "description": "TODO description"
-    }
-  },
+  "properties": { "identifier": { "type": "string", "pattern": "[a-z0-9_:\\-]+", "title": "Recipe Identifier", "description": "TODO description" } },
   "additionalProperties": false
 }
diff --git a/source/behaviour/recipes/1.12.0/types/base types/item.json b/source/behaviour/recipes/1.12.0/types/base types/item.json
index 647c1d0c..e37f9a59 100644
--- a/source/behaviour/recipes/1.12.0/types/base types/item.json	
+++ b/source/behaviour/recipes/1.12.0/types/base types/item.json	
@@ -4,27 +4,15 @@
   "description": "Recipe item 1.12.0",
   "title": "Item",
   "oneOf": [
-    { "type": "string", "title": "Item identifier" },
+    { "type": "string", "title": "Item Identifier" },
     {
       "additionalProperties": false,
       "type": "object",
       "required": ["item"],
       "properties": {
-        "item": {
-          "type": "string",
-          "title": "Item identifier"
-        },
-        "data": {
-          "type": "integer",
-          "minimum": 0,
-          "title": "Item data value"
-        },
-        "count": {
-          "type": "integer",
-          "minimum": 1,
-          "default": 1,
-          "title": "Count"
-        }
+        "item": { "type": "string", "title": "Item Identifier" },
+        "data": { "type": "integer", "minimum": 0, "title": "Item Data Value" },
+        "count": { "type": "integer", "minimum": 1, "default": 1, "title": "Count" }
       }
     }
   ]
diff --git a/source/behaviour/recipes/1.12.0/types/base types/tags.json b/source/behaviour/recipes/1.12.0/types/base types/tags.json
index 02b23a6d..2a7f6b15 100644
--- a/source/behaviour/recipes/1.12.0/types/base types/tags.json	
+++ b/source/behaviour/recipes/1.12.0/types/base types/tags.json	
@@ -4,8 +4,5 @@
   "description": "Recipe tags 1.12.0",
   "title": "Tags",
   "type": "array",
-  "items": {
-    "type": "string",
-    "title": "Tag"
-  }
+  "items": { "type": "string", "title": "Tag" }
 }
diff --git a/source/behaviour/recipes/1.12.0/types/furnace.json b/source/behaviour/recipes/1.12.0/types/furnace.json
index b408c802..bb5db56e 100644
--- a/source/behaviour/recipes/1.12.0/types/furnace.json
+++ b/source/behaviour/recipes/1.12.0/types/furnace.json
@@ -2,22 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.12.0.recipe.furnace",
   "description": "Represents a furnace recipe for a furnace.'Input' items will burn and transform into items specified in 'output'..",
-  "title": "Furnace recipe 1.12.0",
+  "title": "Furnace Recipe 1.12.0",
   "additionalProperties": false,
   "required": ["description"],
   "type": "object",
   "properties": {
     "description": { "$ref": "./base types/definition.json" },
     "tags": { "$ref": "./base types/tags.json" },
-    "input": {
-      "type": "string",
-      "description": "Items used as input for the furnace recipe.",
-      "title": "Input"
-    },
-    "output": {
-      "type": "string",
-      "description": "Items used as output for the furnace recipe.",
-      "title": "Output"
-    }
+    "input": { "type": "string", "description": "Items used as input for the furnace recipe.", "title": "Input" },
+    "output": { "type": "string", "description": "Items used as output for the furnace recipe.", "title": "Output" }
   }
 }
diff --git a/source/behaviour/recipes/1.12.0/types/recipe_brewing_container.json b/source/behaviour/recipes/1.12.0/types/recipe_brewing_container.json
index 532e964e..5c8c959a 100644
--- a/source/behaviour/recipes/1.12.0/types/recipe_brewing_container.json
+++ b/source/behaviour/recipes/1.12.0/types/recipe_brewing_container.json
@@ -2,27 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.12.0.recipe.brewing.container",
   "description": "Represents a Potion Brewing Container Recipe..",
-  "title": "Brewing recipe 1.12.0",
+  "title": "Brewing Recipe 1.12.0",
   "additionalProperties": false,
   "required": ["description"],
   "type": "object",
   "properties": {
     "description": { "$ref": "./base types/definition.json" },
     "tags": { "$ref": "./base types/tags.json" },
-    "input": {
-      "type": "string",
-      "description": "Input potion used on the brewing stand.",
-      "title": "Input"
-    },
-    "output": {
-      "type": "string",
-      "description": "Output potion from mixing the input potion with the reagent on the brewing stand.",
-      "title": "Output"
-    },
-    "reagent": {
-      "type": "string",
-      "description": "Item used to mix with the input potion.",
-      "title": "Reagent"
-    }
+    "input": { "type": "string", "description": "Input potion used on the brewing stand.", "title": "Input" },
+    "output": { "type": "string", "description": "Output potion from mixing the input potion with the reagent on the brewing stand.", "title": "Output" },
+    "reagent": { "type": "string", "description": "Item used to mix with the input potion.", "title": "Reagent" }
   }
 }
diff --git a/source/behaviour/recipes/1.12.0/types/recipe_brewing_mix.json b/source/behaviour/recipes/1.12.0/types/recipe_brewing_mix.json
index b6495408..26fc0146 100644
--- a/source/behaviour/recipes/1.12.0/types/recipe_brewing_mix.json
+++ b/source/behaviour/recipes/1.12.0/types/recipe_brewing_mix.json
@@ -2,27 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.12.0.recipe.brewing.mix",
   "description": "Represents a Potion Brewing Container Recipe..",
-  "title": "Brewing recipe 1.12.0",
+  "title": "Brewing Recipe 1.12.0",
   "additionalProperties": false,
   "required": ["description"],
   "type": "object",
   "properties": {
     "description": { "$ref": "./base types/definition.json" },
     "tags": { "$ref": "./base types/tags.json" },
-    "input": {
-      "type": "string",
-      "description": "Input potion used on the brewing stand.",
-      "title": "Input"
-    },
-    "output": {
-      "type": "string",
-      "description": "Output potion from mixing the input potion with the reagent on the brewing stand.",
-      "title": "Output"
-    },
-    "reagent": {
-      "type": "string",
-      "description": "Item used to mix with the input potion.",
-      "title": "Reagent"
-    }
+    "input": { "type": "string", "description": "Input potion used on the brewing stand.", "title": "Input" },
+    "output": { "type": "string", "description": "Output potion from mixing the input potion with the reagent on the brewing stand.", "title": "Output" },
+    "reagent": { "type": "string", "description": "Item used to mix with the input potion.", "title": "Reagent" }
   }
 }
diff --git a/source/behaviour/recipes/1.12.0/types/recipe_shaped.json b/source/behaviour/recipes/1.12.0/types/recipe_shaped.json
index de1f35c3..12d10342 100644
--- a/source/behaviour/recipes/1.12.0/types/recipe_shaped.json
+++ b/source/behaviour/recipes/1.12.0/types/recipe_shaped.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.12.0.recipe.shaped",
   "description": "Represents a shaped crafting recipe for a crafting table. The key used in the pattern may be any single character except the 'space' character, which is reserved for empty slots in a recipe..",
-  "title": "Shaped recipe 1.12.0",
+  "title": "Shaped Recipe 1.12.0",
   "additionalProperties": false,
   "required": ["description"],
   "type": "object",
@@ -14,45 +14,22 @@
       "description": "Patten key character mapped to item names.",
       "title": "Key",
       "minProperties": 1,
-      "additionalProperties": {
-        "$ref": "./base types/item.json"
-      }
-    },
-    "group": {
-      "type": "string",
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENTATED"
+      "additionalProperties": { "$ref": "./base types/item.json" }
     },
+    "group": { "type": "string", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
     "pattern": {
       "type": "array",
       "description": "Characters that represent a pattern to be defined by keys.",
       "title": "Pattern",
       "maxItems": 3,
       "minItems": 1,
-      "items": {
-        "type": "string",
-        "title": "Pattern"
-      }
-    },
-    "priority": {
-      "type": "integer",
-      "description": "Item used as output for the furnace recipe.",
-      "title": "Priority"
+      "items": { "type": "string", "title": "Pattern" }
     },
+    "priority": { "type": "integer", "description": "Item used as output for the furnace recipe.", "title": "Priority" },
     "result": {
       "description": "When input items match the pattern then these items are the result.",
       "title": "Result",
-      "oneOf": [
-        {
-          "$ref": "./base types/item.json"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "./base types/item.json"
-          }
-        }
-      ]
+      "oneOf": [{ "$ref": "./base types/item.json" }, { "type": "array", "items": { "$ref": "./base types/item.json" } }]
     }
   }
 }
diff --git a/source/behaviour/recipes/1.12.0/types/recipe_shapeless.json b/source/behaviour/recipes/1.12.0/types/recipe_shapeless.json
index 11d97d61..551fa908 100644
--- a/source/behaviour/recipes/1.12.0/types/recipe_shapeless.json
+++ b/source/behaviour/recipes/1.12.0/types/recipe_shapeless.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.1.12.0.recipe.shapeless",
   "description": "Represents a shapeless crafting recipe..",
-  "title": "Shapeless recipe 1.12.0",
+  "title": "Shapeless Recipe 1.12.0",
   "additionalProperties": false,
   "required": ["description"],
   "type": "object",
@@ -12,42 +12,14 @@
     "ingredients": {
       "description": "Items used as input (without a shape) for the recipe.",
       "title": "Ingredients",
-      "oneOf": [
-        {
-          "$ref": "./base types/item.json"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "./base types/item.json"
-          }
-        }
-      ]
-    },
-    "group": {
-      "type": "string",
-      "title": "UNDOCUMENTATED",
-      "description": "UNDOCUMENTATED"
-    },
-    "priority": {
-      "type": "integer",
-      "description": "Item used as output for the furnace recipe.",
-      "title": "Priority"
+      "oneOf": [{ "$ref": "./base types/item.json" }, { "type": "array", "items": { "$ref": "./base types/item.json" } }]
     },
+    "group": { "type": "string", "title": "UNDOCUMENTATED", "description": "UNDOCUMENTATED" },
+    "priority": { "type": "integer", "description": "Item used as output for the furnace recipe.", "title": "Priority" },
     "result": {
       "description": "When input items match the pattern then these items are the result.",
       "title": "Result",
-      "oneOf": [
-        {
-          "$ref": "./base types/item.json"
-        },
-        {
-          "type": "array",
-          "items": {
-            "$ref": "./base types/item.json"
-          }
-        }
-      ]
+      "oneOf": [{ "$ref": "./base types/item.json" }, { "type": "array", "items": { "$ref": "./base types/item.json" } }]
     }
   }
 }
diff --git a/source/behaviour/recipes/recipes.json b/source/behaviour/recipes/recipes.json
index 755474e0..306a60ff 100644
--- a/source/behaviour/recipes/recipes.json
+++ b/source/behaviour/recipes/recipes.json
@@ -5,28 +5,16 @@
     {
       "format_version": "1.12.0",
       "minecraft:recipe_shaped": {
-        "description": {
-          "identifier": "minecraft:item"
-        },
-
+        "description": { "identifier": "minecraft:item" },
         "tags": ["crafting_table"],
         "pattern": [],
         "key": {},
-        "result": {
-          "item": "minecraft:boat",
-          "data": 4
-        }
+        "result": { "item": "minecraft:boat", "data": 4 }
       }
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.12" } } },
-      "then": { "$ref": "./1.12.0/recipes.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } },
-      "then": { "$ref": "./1.12.0/recipes.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.12" } } }, "then": { "$ref": "./1.12.0/recipes.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } }, "then": { "$ref": "./1.12.0/recipes.json" } }
   ]
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.biome_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.biome_filter.json
index d8a319e2..79346390 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.biome_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.biome_filter.json
@@ -1,13 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.biome_filter",
-  "title": "Biome filter 1.11.0",
+  "title": "Biome Filter 1.11.0",
   "description": "TODO",
   "oneOf": [
-    {
-      "type": "array",
-      "items": { "$ref": "../../../entities/1.16.0/filters.json" }
-    },
+    { "type": "array", "items": { "$ref": "../../../entities/1.16.0/filters.json" } },
     { "type": "object", "$ref": "../../../entities/1.16.0/filters.json" }
   ]
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.brightness_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.brightness_filter.json
index b073ae8d..152a1748 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.brightness_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.brightness_filter.json
@@ -3,24 +3,11 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.brightness_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Brightness filter 1.11.0",
+  "title": "Brightness Filter 1.11.0",
   "description": "TODO",
   "properties": {
-    "min": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Min"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    },
-    "adjust_for_weather": {
-      "type": "boolean",
-      "description": "TODO",
-      "title": "Max",
-      "default": true
-    }
+    "min": { "type": "integer", "description": "TODO", "title": "Min" },
+    "max": { "type": "integer", "description": "TODO", "title": "Max" },
+    "adjust_for_weather": { "type": "boolean", "description": "TODO", "title": "Max", "default": true }
   }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.delay_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.delay_filter.json
index 3c895812..1b257ff6 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.delay_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.delay_filter.json
@@ -3,20 +3,12 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.Delay_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Delay filter 1.11.0",
+  "title": "Delay Filter 1.11.0",
   "description": "TODO",
   "properties": {
     "min": { "type": "integer", "description": "TODO", "title": "Min" },
     "max": { "type": "integer", "description": "TODO", "title": "Max" },
-    "identifier": {
-      "type": "string",
-      "description": "TODO",
-      "title": "Identifier"
-    },
-    "spawn_chance": {
-      "title": "Spawn chance",
-      "description": "UNDOCUMENTATED",
-      "type": "number"
-    }
+    "identifier": { "type": "string", "description": "TODO", "title": "Identifier" },
+    "spawn_chance": { "title": "Spawn Chance", "description": "UNDOCUMENTATED", "type": "number" }
   }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.density_limit.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.density_limit.json
index e09e5c3b..9922e676 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.density_limit.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.density_limit.json
@@ -3,18 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.density_limit",
   "additionalProperties": false,
   "type": "object",
-  "title": "Density limit 1.11.0",
+  "title": "Density Limit 1.11.0",
   "description": "TODO",
-  "properties": {
-    "surface": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Surface"
-    },
-    "underground": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Underground"
-    }
-  }
+  "properties": { "surface": { "type": "integer", "description": "TODO", "title": "Surface" }, "underground": { "type": "integer", "description": "TODO", "title": "Underground" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.difficulty_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.difficulty_filter.json
index ee393799..8f3456b8 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.difficulty_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.difficulty_filter.json
@@ -3,14 +3,9 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.difficulty_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Difficulty filter 1.11.0",
+  "title": "Difficulty Filter 1.11.0",
   "description": "TODO",
-  "definitions": {
-    "difficulty": {
-      "type": "string",
-      "enum": ["easy", "normal", "hard", "peaceful"]
-    }
-  },
+  "definitions": { "difficulty": { "type": "string", "enum": ["easy", "normal", "hard", "peaceful"] } },
   "properties": {
     "min": { "$ref": "#/definitions/difficulty", "description": "TODO", "title": "Min" },
     "max": { "$ref": "#/definitions/difficulty", "description": "TODO", "title": "Max" }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.distance_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.distance_filter.json
index c520f048..d8c541ac 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.distance_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.distance_filter.json
@@ -3,18 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.distance_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Distance filter 1.11.0",
+  "title": "Distance Filter 1.11.0",
   "description": "TODO",
-  "properties": {
-    "min": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Min"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    }
-  }
+  "properties": { "min": { "type": "integer", "description": "TODO", "title": "Min" }, "max": { "type": "integer", "description": "TODO", "title": "Max" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.height_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.height_filter.json
index cfa9da72..620ef589 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.height_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.height_filter.json
@@ -3,18 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.height_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Height filter 1.11.0",
+  "title": "Height Filter 1.11.0",
   "description": "TODO",
-  "properties": {
-    "min": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Min"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    }
-  }
+  "properties": { "min": { "type": "integer", "description": "TODO", "title": "Min" }, "max": { "type": "integer", "description": "TODO", "title": "Max" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.herd.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.herd.json
index 74ab1e11..c97d9549 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.herd.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.herd.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.height_filter",
-  "title": "Height filter 1.11.0",
+  "title": "Height Filter 1.11.0",
   "description": "TODO",
   "definitions": {
     "herd": {
@@ -10,32 +10,12 @@
       "description": "Herd",
       "additionalProperties": false,
       "properties": {
-        "initial_event": {
-          "title": "Initial event",
-          "description": "UNDOCUMENATED",
-          "type": "string"
-        },
-        "initial_event_count": {
-          "title": "Initial event count",
-          "description": "UNDOCUMENATED",
-          "type": "integer"
-        },
-        "min_size": {
-          "type": "integer",
-          "description": "TODO",
-          "title": "Min size"
-        },
-        "max_size": {
-          "type": "integer",
-          "description": "TODO",
-          "title": "Max size"
-        },
+        "initial_event": { "title": "Initial Event", "description": "UNDOCUMENATED", "type": "string" },
+        "initial_event_count": { "title": "Initial Event Count", "description": "UNDOCUMENATED", "type": "integer" },
+        "min_size": { "type": "integer", "description": "TODO", "title": "Min Size" },
+        "max_size": { "type": "integer", "description": "TODO", "title": "Max Size" },
         "event": { "type": "string", "description": "TODO", "title": "Event" },
-        "event_skip_count": {
-          "type": "integer",
-          "description": "TODO",
-          "title": "Event skip count"
-        }
+        "event_skip_count": { "type": "integer", "description": "TODO", "title": "Event Skip Count" }
       }
     }
   },
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.mob_event_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.mob_event_filter.json
index 72e03c83..a2e6fd57 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.mob_event_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.mob_event_filter.json
@@ -1,10 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.mob_event_filter",
-  "title": "Mob event filter 1.11.0",
+  "title": "Mob Event Filter 1.11.0",
   "description": "TODO",
   "additionalProperties": false,
-  "properties": {
-    "event": { "type": "string", "description": "TODO", "title": "Event" }
-  }
+  "properties": { "event": { "type": "string", "description": "TODO", "title": "Event" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.permute_type.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.permute_type.json
index 778e6594..fded1da7 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.permute_type.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.permute_type.json
@@ -3,20 +3,13 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.permute_type",
   "additionalProperties": false,
   "type": "array",
-  "title": "Permute type 1.11.0",
+  "title": "Permute Type 1.11.0",
   "description": "TODO",
   "items": {
     "type": "object",
     "additionalProperties": false,
     "title": "TODO",
     "description": "TODO",
-    "properties": {
-      "weight": { "type": "integer", "title": "Weight", "description": "TODO" },
-      "entity_type": {
-        "type": "string",
-        "title": "Entity type",
-        "description": "TODO"
-      }
-    }
+    "properties": { "weight": { "type": "integer", "title": "Weight", "description": "TODO" }, "entity_type": { "type": "string", "title": "Entity Type", "description": "TODO" } }
   }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.player_in_village_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.player_in_village_filter.json
index 586fcadd..5c919e4c 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.player_in_village_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.player_in_village_filter.json
@@ -3,14 +3,10 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.player_in_village_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Player in village filter 1.11.0",
+  "title": "Player In Village Filter 1.11.0",
   "description": "TODO",
   "properties": {
     "distance": { "type": "integer", "title": "Distance", "description": "TODO" },
-    "village_border_tolerance": {
-      "type": "integer",
-      "title": "Village border tolerance",
-      "description": "TODO"
-    }
+    "village_border_tolerance": { "type": "integer", "title": "Village Border Tolerance", "description": "TODO" }
   }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawn_event.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawn_event.json
index e742a2cb..e020ec94 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawn_event.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawn_event.json
@@ -1,15 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawn_event",
-  "title": "Spawn event 1.11.0",
+  "title": "Spawn Event 1.11.0",
   "description": "TODO",
   "type": "object",
   "additionalProperties": false,
-  "properties": {
-    "event": {
-      "type": "string",
-      "title": "Event",
-      "description": "TODO"
-    }
-  }
+  "properties": { "event": { "type": "string", "title": "Event", "description": "TODO" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_lava.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_lava.json
index 09d91cac..042ec4a8 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_lava.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_lava.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawns_lava",
   "additionalProperties": false,
   "type": "object",
-  "title": "Spawns on lava 1.11.0",
+  "title": "Spawns On Lava 1.11.0",
   "description": "TODO",
   "properties": {}
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_filter.json
index 120bd9d5..25d58a6f 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawns_on_block_filter",
-  "title": "Spawns on block filter 1.11.0",
+  "title": "Spawns On Block Filter 1.11.0",
   "description": "TODO",
   "oneOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }]
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_prevented_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_prevented_filter.json
index 069bbce3..f84f8304 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_prevented_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_block_prevented_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawns_on_block_prevented_filter",
-  "title": "Spawns on block prevented filter 1.11.0",
+  "title": "Spawns On Block Prevented Filter 1.11.0",
   "description": "TODO",
   "oneOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }]
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_surface.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_surface.json
index ed2eaeee..912238d0 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_surface.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_on_surface.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawns_on_surface",
   "additionalProperties": false,
   "type": "object",
-  "title": "Spawns on surface 1.11.0",
+  "title": "Spawns On Surface 1.11.0",
   "description": "TODO",
   "properties": {}
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underground.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underground.json
index 4aa8aebf..19b4384f 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underground.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underground.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawns_underground",
   "additionalProperties": false,
   "type": "object",
-  "title": "Spawns underground 1.11.0",
+  "title": "Spawns Underground 1.11.0",
   "description": "TODO",
   "properties": {}
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underwater.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underwater.json
index 26ab8acb..d05ce144 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underwater.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.spawns_underwater.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.spawns_underwater",
-  "title": "Spawns underwater 1.11.0",
+  "title": "Spawns Underwater 1.11.0",
   "description": "TODO",
   "type": "object",
   "additionalProperties": false
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.weight.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.weight.json
index 11d8777a..7d4218d9 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.weight.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.weight.json
@@ -5,11 +5,5 @@
   "type": "object",
   "title": "Weight 1.11.0",
   "description": "TODO",
-  "properties": {
-    "default": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Default"
-    }
-  }
+  "properties": { "default": { "type": "integer", "description": "TODO", "title": "Default" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/components/minecraft.world_age_filter.json b/source/behaviour/spawn_rules/1.11.0/components/minecraft.world_age_filter.json
index a55caab8..306920ec 100644
--- a/source/behaviour/spawn_rules/1.11.0/components/minecraft.world_age_filter.json
+++ b/source/behaviour/spawn_rules/1.11.0/components/minecraft.world_age_filter.json
@@ -1,10 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0.minecraft.world_age_filter",
-  "title": "World age filter 1.11.0",
+  "title": "World Age Filter 1.11.0",
   "description": "TODO",
   "additionalProperties": false,
-  "properties": {
-    "min": { "type": "integer", "description": "TODO", "title": "Min" }
-  }
+  "properties": { "min": { "type": "integer", "description": "TODO", "title": "Min" } }
 }
diff --git a/source/behaviour/spawn_rules/1.11.0/spawn_rules.json b/source/behaviour/spawn_rules/1.11.0/spawn_rules.json
index 05805dcd..c25d9254 100644
--- a/source/behaviour/spawn_rules/1.11.0/spawn_rules.json
+++ b/source/behaviour/spawn_rules/1.11.0/spawn_rules.json
@@ -2,19 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.11.0",
   "type": "object",
-  "title": "Spawn rules 1.11.0",
+  "title": "Spawn Rules 1.11.0",
   "description": "TODO",
   "additionalProperties": false,
   "required": ["format_version", "minecraft:spawn_rules"],
   "properties": {
-    "format_version": {
-      "const": "1.11.0",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "const": "1.11.0", "description": "TODO description", "title": "TODO Title" },
     "minecraft:spawn_rules": {
       "type": "object",
-      "title": "Spawn rules",
+      "title": "Spawn Rules",
       "description": "TODO",
       "additionalProperties": false,
       "properties": {
@@ -24,14 +20,10 @@
           "description": "TODO",
           "additionalProperties": false,
           "properties": {
-            "identifier": {
-              "title": "Identifier",
-              "description": "TODO",
-              "$ref": "../../../general/entity/identifier.json"
-            },
+            "identifier": { "title": "Identifier", "description": "TODO", "$ref": "../../../general/entity/identifier.json" },
             "population_control": {
               "type": "string",
-              "title": "Population control",
+              "title": "Population Control",
               "description": "TODO",
               "enum": ["ambient", "animal", "water_animal", "monster", "cat", "pillager"]
             }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.biome_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.biome_filter.json
index d6ecc4e1..0c4fefef 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.biome_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.biome_filter.json
@@ -1,13 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.biome_filter",
-  "title": "Biome filter 1.8.0",
+  "title": "Biome Filter 1.8.0",
   "description": "TODO",
   "oneOf": [
-    {
-      "type": "array",
-      "items": { "$ref": "../../../entities/1.16.0/filters.json" }
-    },
+    { "type": "array", "items": { "$ref": "../../../entities/1.16.0/filters.json" } },
     { "type": "object", "$ref": "../../../entities/1.16.0/filters.json" }
   ]
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.brightness_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.brightness_filter.json
index 7c186d86..dc91b562 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.brightness_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.brightness_filter.json
@@ -3,24 +3,11 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.brightness_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Brightness filter 1.8.0",
+  "title": "Brightness Filter 1.8.0",
   "description": "TODO",
   "properties": {
-    "min": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Min"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    },
-    "adjust_for_weather": {
-      "type": "boolean",
-      "description": "TODO",
-      "title": "Max",
-      "default": true
-    }
+    "min": { "type": "integer", "description": "TODO", "title": "Min" },
+    "max": { "type": "integer", "description": "TODO", "title": "Max" },
+    "adjust_for_weather": { "type": "boolean", "description": "TODO", "title": "Max", "default": true }
   }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.density_limit.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.density_limit.json
index 48615fee..b1e7a7fe 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.density_limit.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.density_limit.json
@@ -3,18 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.density_limit",
   "additionalProperties": false,
   "type": "object",
-  "title": "Density limit 1.8.0",
+  "title": "Density Limit 1.8.0",
   "description": "TODO",
-  "properties": {
-    "surface": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Surface"
-    },
-    "underground": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Underground"
-    }
-  }
+  "properties": { "surface": { "type": "integer", "description": "TODO", "title": "Surface" }, "underground": { "type": "integer", "description": "TODO", "title": "Underground" } }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.difficulty_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.difficulty_filter.json
index 3fc05de7..282af101 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.difficulty_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.difficulty_filter.json
@@ -3,14 +3,9 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.difficulty_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Difficulty filter 1.8.0",
+  "title": "Difficulty Filter 1.8.0",
   "description": "TODO",
-  "definitions": {
-    "difficulty": {
-      "type": "string",
-      "enum": ["easy", "normal", "hard", "peaceful"]
-    }
-  },
+  "definitions": { "difficulty": { "type": "string", "enum": ["easy", "normal", "hard", "peaceful"] } },
   "properties": {
     "min": { "$ref": "#/definitions/difficulty", "description": "TODO", "title": "Min" },
     "max": { "$ref": "#/definitions/difficulty", "description": "TODO", "title": "Max" }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.distance_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.distance_filter.json
index dc1c44df..bf47c201 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.distance_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.distance_filter.json
@@ -3,18 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.distance_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Distance filter 1.8.0",
+  "title": "Distance Filter 1.8.0",
   "description": "TODO",
-  "properties": {
-    "min": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Min"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    }
-  }
+  "properties": { "min": { "type": "integer", "description": "TODO", "title": "Min" }, "max": { "type": "integer", "description": "TODO", "title": "Max" } }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.height_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.height_filter.json
index 2f809134..02b4bfeb 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.height_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.height_filter.json
@@ -3,18 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.height_filter",
   "additionalProperties": false,
   "type": "object",
-  "title": "Height filter 1.8.0",
+  "title": "Height Filter 1.8.0",
   "description": "TODO",
-  "properties": {
-    "min": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Min"
-    },
-    "max": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Max"
-    }
-  }
+  "properties": { "min": { "type": "integer", "description": "TODO", "title": "Min" }, "max": { "type": "integer", "description": "TODO", "title": "Max" } }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.herd.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.herd.json
index 28902117..4ea6d8f7 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.herd.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.herd.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.height_filter",
-  "title": "Height filter 1.8.0",
+  "title": "Height Filter 1.8.0",
   "description": "TODO",
   "definitions": {
     "herd": {
@@ -10,22 +10,10 @@
       "description": "Herd",
       "additionalProperties": false,
       "properties": {
-        "min_size": {
-          "type": "integer",
-          "description": "TODO",
-          "title": "Min size"
-        },
-        "max_size": {
-          "type": "integer",
-          "description": "TODO",
-          "title": "Max size"
-        },
+        "min_size": { "type": "integer", "description": "TODO", "title": "Min Size" },
+        "max_size": { "type": "integer", "description": "TODO", "title": "Max Size" },
         "event": { "type": "string", "description": "TODO", "title": "Event" },
-        "event_skip_count": {
-          "type": "integer",
-          "description": "TODO",
-          "title": "Event skip count"
-        }
+        "event_skip_count": { "type": "integer", "description": "TODO", "title": "Event Skip Count" }
       }
     }
   },
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.permute_type.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.permute_type.json
index 2b3eb02e..39d4b1fd 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.permute_type.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.permute_type.json
@@ -3,20 +3,13 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.permute_type",
   "additionalProperties": false,
   "type": "array",
-  "title": "Permute type 1.8.0",
+  "title": "Permute Type 1.8.0",
   "description": "TODO",
   "items": {
     "type": "object",
     "additionalProperties": false,
     "title": "TODO",
     "description": "TODO",
-    "properties": {
-      "weight": { "type": "integer", "title": "Weight", "description": "TODO" },
-      "entity_type": {
-        "type": "string",
-        "title": "Entity type",
-        "description": "TODO"
-      }
-    }
+    "properties": { "weight": { "type": "integer", "title": "Weight", "description": "TODO" }, "entity_type": { "type": "string", "title": "Entity Type", "description": "TODO" } }
   }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawn_event.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawn_event.json
index 8f101261..abfb6a66 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawn_event.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawn_event.json
@@ -1,15 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawn_event",
-  "title": "Spawn event 1.8.0",
+  "title": "Spawn Event 1.8.0",
   "description": "TODO",
   "type": "object",
   "additionalProperties": false,
-  "properties": {
-    "event": {
-      "type": "string",
-      "title": "Event",
-      "description": "TODO"
-    }
-  }
+  "properties": { "event": { "type": "string", "title": "Event", "description": "TODO" } }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_lava.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_lava.json
index f030ee09..07aa3603 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_lava.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_lava.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawns_lava",
   "additionalProperties": false,
   "type": "object",
-  "title": "Spawns on lava 1.8.0",
+  "title": "Spawns On Lava 1.8.0",
   "description": "TODO",
   "properties": {}
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_filter.json
index f522f5c6..a7ed8496 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawns_on_block_filter",
-  "title": "Spawns on block filter 1.8.0",
+  "title": "Spawns On Block Filter 1.8.0",
   "description": "TODO",
   "oneOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }]
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_prevented_filter.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_prevented_filter.json
index 1b4716a8..5947e982 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_prevented_filter.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_block_prevented_filter.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawns_on_block_prevented_filter",
-  "title": "Spawns on block prevented filter 1.8.0",
+  "title": "Spawns On Block Prevented Filter 1.8.0",
   "description": "TODO",
   "oneOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }]
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_surface.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_surface.json
index 21967b69..40854b87 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_surface.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_on_surface.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawns_on_surface",
   "additionalProperties": false,
   "type": "object",
-  "title": "Spawns on surface 1.8.0",
+  "title": "Spawns On Surface 1.8.0",
   "description": "TODO",
   "properties": {}
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underground.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underground.json
index 04504f1c..53100bd1 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underground.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underground.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawns_underground",
   "additionalProperties": false,
   "type": "object",
-  "title": "Spawns underground 1.8.0",
+  "title": "Spawns Underground 1.8.0",
   "description": "TODO",
   "properties": {}
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underwater.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underwater.json
index 622b4646..01347338 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underwater.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.spawns_underwater.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0.minecraft.spawns_underwater",
-  "title": "Spawns underwater 1.8.0",
+  "title": "Spawns Underwater 1.8.0",
   "description": "TODO",
   "type": "object",
   "additionalProperties": false
diff --git a/source/behaviour/spawn_rules/1.8.0/components/minecraft.weight.json b/source/behaviour/spawn_rules/1.8.0/components/minecraft.weight.json
index 589bd966..2c5a5926 100644
--- a/source/behaviour/spawn_rules/1.8.0/components/minecraft.weight.json
+++ b/source/behaviour/spawn_rules/1.8.0/components/minecraft.weight.json
@@ -5,11 +5,5 @@
   "type": "object",
   "title": "Weight 1.8.0",
   "description": "TODO",
-  "properties": {
-    "default": {
-      "type": "integer",
-      "description": "TODO",
-      "title": "Default"
-    }
-  }
+  "properties": { "default": { "type": "integer", "description": "TODO", "title": "Default" } }
 }
diff --git a/source/behaviour/spawn_rules/1.8.0/spawn_rules.json b/source/behaviour/spawn_rules/1.8.0/spawn_rules.json
index 74738b4a..d12f80da 100644
--- a/source/behaviour/spawn_rules/1.8.0/spawn_rules.json
+++ b/source/behaviour/spawn_rules/1.8.0/spawn_rules.json
@@ -2,19 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules.1.8.0",
   "type": "object",
-  "title": "Spawn rules 1.8.0",
+  "title": "Spawn Rules 1.8.0",
   "description": "TODO",
   "additionalProperties": false,
   "required": ["format_version", "minecraft:spawn_rules"],
   "properties": {
-    "format_version": {
-      "const": "1.8.0",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "const": "1.8.0", "description": "TODO description", "title": "TODO Title" },
     "minecraft:spawn_rules": {
       "type": "object",
-      "title": "Spawn rules",
+      "title": "Spawn Rules",
       "description": "TODO",
       "additionalProperties": false,
       "properties": {
@@ -24,14 +20,10 @@
           "description": "TODO",
           "additionalProperties": false,
           "properties": {
-            "identifier": {
-              "title": "Identifier",
-              "description": "TODO",
-              "$ref": "../../../general/entity/identifier.json"
-            },
+            "identifier": { "title": "Identifier", "description": "TODO", "$ref": "../../../general/entity/identifier.json" },
             "population_control": {
               "type": "string",
-              "title": "Population control",
+              "title": "Population Control",
               "description": "TODO",
               "enum": ["ambient", "animal", "water_animal", "monster", "cat", "pillager"]
             }
diff --git a/source/behaviour/spawn_rules/spawn_rules.json b/source/behaviour/spawn_rules/spawn_rules.json
index 2572f5e7..465e455c 100644
--- a/source/behaviour/spawn_rules/spawn_rules.json
+++ b/source/behaviour/spawn_rules/spawn_rules.json
@@ -2,25 +2,10 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.behaviour.spawn_rules",
   "examples": [
-    {
-      "format_version": "1.10.0",
-      "minecraft:spawn_rules": {
-        "description": {
-          "identifier": "minecraft:entity",
-          "population_control": "ambient"
-        },
-        "conditions": [{}]
-      }
-    }
+    { "format_version": "1.10.0", "minecraft:spawn_rules": { "description": { "identifier": "minecraft:entity", "population_control": "ambient" }, "conditions": [{}] } }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/spawn_rules.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.11.0" } } },
-      "then": { "$ref": "./1.11.0/spawn_rules.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/spawn_rules.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.11.0" } } }, "then": { "$ref": "./1.11.0/spawn_rules.json" } }
   ]
 }
diff --git a/source/behaviour/trading/trading.json b/source/behaviour/trading/trading.json
index bba43b84..9bdde238 100644
--- a/source/behaviour/trading/trading.json
+++ b/source/behaviour/trading/trading.json
@@ -3,87 +3,36 @@
   "$id": "blockception.minecraft.behaviour.trading",
   "type": "object",
   "additionalProperties": false,
-  "examples": [
-    {
-      "tiers": [
-        {
-          "trades": [
-            {
-              "wants": [
-                {
-                  "item": "minecraft:coal:0",
-                  "quantity": { "min": 16, "max": 24 }
-                }
-              ],
-              "gives": [{ "item": "minecraft:emerald" }]
-            }
-          ]
-        }
-      ]
-    }
-  ],
+  "examples": [{ "tiers": [{ "trades": [{ "wants": [{ "item": "minecraft:coal:0", "quantity": { "min": 16, "max": 24 } }], "gives": [{ "item": "minecraft:emerald" }] }] }] }],
   "definitions": {
     "Item": {
       "title": "Item",
       "oneOf": [
-        {
-          "type": "string"
-        },
+        { "type": "string" },
         {
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "item": {
-              "type": "string",
-              "title": "Item identifier"
-            },
-            "price_multiplier": {
-              "type": "number",
-              "title": "Price multiplier"
-            },
+            "item": { "type": "string", "title": "Item Identifier" },
+            "price_multiplier": { "type": "number", "title": "Price Multiplier" },
             "quantity": {
               "title": "Quantity",
               "oneOf": [
-                {
-                  "type": "integer",
-                  "minimum": 1,
-                  "title": "Amount"
-                },
+                { "type": "integer", "minimum": 1, "title": "Amount" },
                 {
                   "type": "object",
                   "additionalProperties": false,
                   "required": ["min", "max"],
-                  "properties": {
-                    "min": {
-                      "type": "integer",
-                      "minimum": 1,
-                      "title": "Minimum"
-                    },
-                    "max": {
-                      "type": "integer",
-                      "minimum": 1,
-                      "title": "Maximum"
-                    }
-                  }
+                  "properties": { "min": { "type": "integer", "minimum": 1, "title": "Minimum" }, "max": { "type": "integer", "minimum": 1, "title": "Maximum" } }
                 }
               ]
             },
-            "functions": {
-              "$ref": "#/definitions/Functions"
-            }
+            "functions": { "$ref": "#/definitions/Functions" }
           }
         }
       ]
     },
-    "Functions": {
-      "title": "Functions",
-      "type": "array",
-      "items": {
-        "type": "object",
-        "required": ["function"],
-        "$ref": "../loot_tables/functions.json"
-      }
-    },
+    "Functions": { "title": "Functions", "type": "array", "items": { "type": "object", "required": ["function"], "$ref": "../loot_tables/functions.json" } },
     "TradeArray": {
       "type": "array",
       "title": "Trades",
@@ -104,7 +53,7 @@
                   "type": "object",
                   "additionalProperties": false,
                   "properties": {
-                    "item": { "type": "string", "title": "Item identifier" },
+                    "item": { "type": "string", "title": "Item Identifier" },
                     "quantity": {
                       "title": "Quantity",
                       "oneOf": [
@@ -113,32 +62,12 @@
                           "type": "object",
                           "additionalProperties": false,
                           "required": ["min", "max"],
-                          "properties": {
-                            "min": {
-                              "type": "integer",
-                              "minimum": 1,
-                              "title": "Minimum"
-                            },
-                            "max": {
-                              "type": "integer",
-                              "minimum": 1,
-                              "title": "Maximum"
-                            }
-                          }
+                          "properties": { "min": { "type": "integer", "minimum": 1, "title": "Minimum" }, "max": { "type": "integer", "minimum": 1, "title": "Maximum" } }
                         }
                       ]
                     },
-                    "functions": {
-                      "$ref": "#/definitions/Functions"
-                    },
-                    "choice": {
-                      "title": "Choice",
-                      "description": "TODO",
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/definitions/Item"
-                      }
-                    }
+                    "functions": { "$ref": "#/definitions/Functions" },
+                    "choice": { "title": "Choice", "description": "TODO", "type": "array", "items": { "$ref": "#/definitions/Item" } }
                   }
                 }
               ]
@@ -155,7 +84,7 @@
                   "type": "object",
                   "additionalProperties": false,
                   "properties": {
-                    "item": { "type": "string", "title": "Item identifier" },
+                    "item": { "type": "string", "title": "Item Identifier" },
                     "quantity": {
                       "title": "Quantity",
                       "oneOf": [
@@ -164,54 +93,21 @@
                           "type": "object",
                           "additionalProperties": false,
                           "required": ["min", "max"],
-                          "properties": {
-                            "min": {
-                              "type": "integer",
-                              "minimum": 1,
-                              "title": "Minimum"
-                            },
-                            "max": {
-                              "type": "integer",
-                              "minimum": 1,
-                              "title": "Maximum"
-                            }
-                          }
+                          "properties": { "min": { "type": "integer", "minimum": 1, "title": "Minimum" }, "max": { "type": "integer", "minimum": 1, "title": "Maximum" } }
                         }
                       ]
                     },
-                    "price_multiplier": {
-                      "title": "Price multiplier",
-                      "description": "TODO",
-                      "type": "number"
-                    },
-                    "functions": {
-                      "$ref": "#/definitions/Functions"
-                    },
-                    "choice": {
-                      "title": "Choice",
-                      "description": "TODO",
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/definitions/Item"
-                      }
-                    }
+                    "price_multiplier": { "title": "Price Multiplier", "description": "TODO", "type": "number" },
+                    "functions": { "$ref": "#/definitions/Functions" },
+                    "choice": { "title": "Choice", "description": "TODO", "type": "array", "items": { "$ref": "#/definitions/Item" } }
                   }
                 }
               ]
             }
           },
-          "trader_exp": {
-            "type": "integer",
-            "title": "Trader experience"
-          },
-          "max_uses": {
-            "type": "integer",
-            "title": "Maximum uses"
-          },
-          "reward_exp": {
-            "type": "boolean",
-            "title": "Reward experience"
-          }
+          "trader_exp": { "type": "integer", "title": "Trader Experience" },
+          "max_uses": { "type": "integer", "title": "Maximum Uses" },
+          "reward_exp": { "type": "boolean", "title": "Reward Experience" }
         }
       }
     }
@@ -226,13 +122,8 @@
         "type": "object",
         "title": "Tier",
         "properties": {
-          "trades": {
-            "$ref": "#/definitions/TradeArray"
-          },
-          "total_exp_required": {
-            "title": "Total experience required",
-            "type": "integer"
-          },
+          "trades": { "$ref": "#/definitions/TradeArray" },
+          "total_exp_required": { "title": "Total Experience Required", "type": "integer" },
           "groups": {
             "type": "array",
             "title": "Groups",
@@ -241,15 +132,7 @@
               "type": "object",
               "title": "Group",
               "additionalProperties": false,
-              "properties": {
-                "num_to_select": {
-                  "title": "Number to select",
-                  "type": "integer"
-                },
-                "trades": {
-                  "$ref": "#/definitions/TradeArray"
-                }
-              }
+              "properties": { "num_to_select": { "title": "Number To Select", "type": "integer" }, "trades": { "$ref": "#/definitions/TradeArray" } }
             }
           }
         }
@@ -257,5 +140,5 @@
     }
   },
   "description": "TODO description",
-  "title": "TODO title"
+  "title": "TODO Title"
 }
diff --git a/source/general/1.10.0/block_reference.json b/source/general/1.10.0/block_reference.json
index 7b6cfc39..0d0a1aee 100644
--- a/source/general/1.10.0/block_reference.json
+++ b/source/general/1.10.0/block_reference.json
@@ -6,31 +6,13 @@
   "title": "TODO",
   "description": "TODO",
   "properties": {
-    "name": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "name": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "states": {
       "type": "object",
-      "propertyNames": {
-        "pattern": "\\w*:?\\w+"
-      },
-      "additionalProperties": {
-        "oneOf": [
-          {
-            "type": "boolean"
-          },
-          {
-            "type": "integer"
-          },
-          {
-            "type": "string"
-          }
-        ]
-      },
+      "propertyNames": { "pattern": "\\w*:?\\w+" },
+      "additionalProperties": { "oneOf": [{ "type": "boolean" }, { "type": "integer" }, { "type": "string" }] },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   }
 }
diff --git a/source/general/1.14.0/chance_information.json b/source/general/1.14.0/chance_information.json
index 60464891..c2639ede 100644
--- a/source/general/1.14.0/chance_information.json
+++ b/source/general/1.14.0/chance_information.json
@@ -6,17 +6,7 @@
   "title": "TODO",
   "description": "TODO",
   "properties": {
-    "numerator": {
-      "type": "number",
-      "minimum": 1,
-      "description": "TODO description",
-      "title": "TODO title"
-    },
-    "denominator": {
-      "type": "number",
-      "minimum": 1,
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "numerator": { "type": "number", "minimum": 1, "description": "TODO description", "title": "TODO Title" },
+    "denominator": { "type": "number", "minimum": 1, "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/general/Version.json b/source/general/Version.json
index cfd3e373..4bf6a969 100644
--- a/source/general/Version.json
+++ b/source/general/Version.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "Version",
   "type": "array",
-  "title": "Version numbering",
+  "title": "Version Numbering",
   "description": "A version made of 3 numbers",
   "minItems": 3,
   "maxItems": 3,
diff --git a/source/general/array_2_integer.json b/source/general/array_2_integer.json
index 51315452..635b5ec4 100644
--- a/source/general/array_2_integer.json
+++ b/source/general/array_2_integer.json
@@ -2,13 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "general.array.integer.2",
   "type": "array",
-  "title": "Array of 2 items",
+  "title": "Array Of 2 Items",
   "description": "An array of 2 integers",
   "minimum": 2,
   "maximum": 2,
-  "items": {
-    "type": "integer",
-    "description": "An integer",
-    "title": "TODO title"
-  }
+  "items": { "type": "integer", "description": "An integer", "title": "TODO Title" }
 }
diff --git a/source/general/array_2_number.json b/source/general/array_2_number.json
index d16aab13..35880fde 100644
--- a/source/general/array_2_number.json
+++ b/source/general/array_2_number.json
@@ -2,13 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "general.array.number.2",
   "type": "array",
-  "title": "Array of 2 items",
+  "title": "Array Of 2 Items",
   "description": "An array of 2 numbers",
   "minimum": 2,
   "maximum": 2,
-  "items": {
-    "type": "number",
-    "description": "An number",
-    "title": "TODO title"
-  }
+  "items": { "type": "number", "description": "An number", "title": "TODO Title" }
 }
diff --git a/source/general/array_3_integer.json b/source/general/array_3_integer.json
index ef40b16e..b5a4e236 100644
--- a/source/general/array_3_integer.json
+++ b/source/general/array_3_integer.json
@@ -2,13 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "general.array.integer.3",
   "type": "array",
-  "title": "Array of 3 items",
+  "title": "Array Of 3 Items",
   "description": "An array of 3 integers",
   "minimum": 3,
   "maximum": 3,
-  "items": {
-    "type": "integer",
-    "description": "An integer",
-    "title": "TODO title"
-  }
+  "items": { "type": "integer", "description": "An integer", "title": "TODO Title" }
 }
diff --git a/source/general/array_3_number.json b/source/general/array_3_number.json
index 14182e09..3d8fc95d 100644
--- a/source/general/array_3_number.json
+++ b/source/general/array_3_number.json
@@ -2,13 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "general.array.number.3",
   "type": "array",
-  "title": "Array of 3 items",
+  "title": "Array Of 3 Items",
   "description": "An array of 3 numbers",
   "minimum": 3,
   "maximum": 3,
-  "items": {
-    "type": "number",
-    "description": "An number",
-    "title": "TODO title"
-  }
+  "items": { "type": "number", "description": "An number", "title": "TODO Title" }
 }
diff --git a/source/general/biome_item.json b/source/general/biome_item.json
index 8af0c8f3..2443b8e0 100644
--- a/source/general/biome_item.json
+++ b/source/general/biome_item.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.general.1.8.0.biome.item",
   "type": "string",
-  "title": "Biome name",
+  "title": "Biome Name",
   "enum": [
     "animal",
     "beach",
diff --git a/source/general/block/identifier.json b/source/general/block/identifier.json
index 6c6964d0..d4754e35 100644
--- a/source/general/block/identifier.json
+++ b/source/general/block/identifier.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.block.identifier.1.8.0",
   "type": "string",
-  "title": "The minecraft block identifier 1.8.0",
+  "title": "Block Identifier 1.8.0",
   "description": "The minecraft block identifier",
   "pattern": "^[0-9a-zA-Z:_\\.\\-]+$"
 }
diff --git a/source/general/block_definition.json b/source/general/block_definition.json
index 75b0cd47..6fa0e428 100644
--- a/source/general/block_definition.json
+++ b/source/general/block_definition.json
@@ -1,23 +1,15 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "title": "Block definition",
+  "title": "Block ",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "name": {
-      "title": "Name",
-      "description": "The block id, for example: 'minecraft:air'",
-      "type": "string"
-    },
+    "name": { "title": "Name", "description": "The block id, for example: 'minecraft:air'", "type": "string" },
     "states": {
       "title": "States",
       "description": "The block states",
       "type": "object",
-      "additionalProperties": {
-        "title": "State",
-        "description": "A single state of a block",
-        "oneOf": [{ "type": "string" }, { "type": "boolean" }, { "type": "number" }]
-      }
+      "additionalProperties": { "title": "State", "description": "A single state of a block", "oneOf": [{ "type": "string" }, { "type": "boolean" }, { "type": "number" }] }
     }
   }
 }
diff --git a/source/general/blocks_identifiers.json b/source/general/blocks_identifiers.json
index eeb94158..516fba21 100644
--- a/source/general/blocks_identifiers.json
+++ b/source/general/blocks_identifiers.json
@@ -2,6 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.general.1.8.0.blocks.item",
   "type": "string",
-  "title": "Block name",
+  "title": "Block Name",
   "description": "TODO description"
 }
diff --git a/source/general/blocks_item.json b/source/general/blocks_item.json
index eeb94158..516fba21 100644
--- a/source/general/blocks_item.json
+++ b/source/general/blocks_item.json
@@ -2,6 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.general.1.8.0.blocks.item",
   "type": "string",
-  "title": "Block name",
+  "title": "Block Name",
   "description": "TODO description"
 }
diff --git a/source/general/entity/identifier.json b/source/general/entity/identifier.json
index 3346844e..ddd4d446 100644
--- a/source/general/entity/identifier.json
+++ b/source/general/entity/identifier.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.entity.identifier.1.8.0",
   "type": "string",
-  "title": "The minecraft entity identifier 1.8.0",
+  "title": "Entity Identifier 1.8.0",
   "description": "The minecraft entity identifier",
   "examples": ["namespace:entity_name"],
   "pattern": "^[0-9a-zA-Z:_\\.\\-]+$"
diff --git a/source/general/entity_damage.json b/source/general/entity_damage.json
index b8843b38..a3aac431 100644
--- a/source/general/entity_damage.json
+++ b/source/general/entity_damage.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.general.1.8.0.entity.damage",
   "type": "string",
-  "title": "Entity damage name",
+  "title": "Entity Damage Name",
   "enum": [
     "all",
     "anvil",
diff --git a/source/general/fog/identifier.json b/source/general/fog/identifier.json
index ccb109ae..a8945cb1 100644
--- a/source/general/fog/identifier.json
+++ b/source/general/fog/identifier.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.fog.identifier",
   "type": "string",
-  "title": "The minecraft fog identifier",
+  "title": "Fog Identifier",
   "description": "The minecraft fog identifier",
   "pattern": "^[0-9a-zA-Z:_\\.\\-]+$"
 }
diff --git a/source/general/item/identifier.json b/source/general/item/identifier.json
index 8ad03a63..fcd48642 100644
--- a/source/general/item/identifier.json
+++ b/source/general/item/identifier.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.item.identifier.1.8.0",
   "type": "string",
-  "title": "The minecraft item identifier 1.8.0",
+  "title": "Item Identifier 1.8.0",
   "description": "The minecraft item identifier",
   "pattern": "^[0-9a-zA-Z:_\\-\\.]+$"
 }
diff --git a/source/general/manifest.json b/source/general/manifest.json
index 8f74a797..f6a3d173 100644
--- a/source/general/manifest.json
+++ b/source/general/manifest.json
@@ -2,56 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.manifest",
   "type": "object",
-  "title": "The minecraft manifest schema",
+  "title": "Manifest Schema",
   "description": "The minecraft manifest schema",
   "required": ["format_version", "header"],
   "examples": [
     {
       "format_version": 2,
-      "header": {
-        "description": "pack.description",
-        "name": "pack.name",
-        "uuid": "UUID2",
-        "min_engine_version": [1, 16, 0],
-        "version": [1, 0, 0]
-      },
-      "modules": [
-        {
-          "type": "data",
-          "uuid": "UUID2",
-          "version": [1, 0, 0]
-        }
-      ]
+      "header": { "description": "pack.description", "name": "pack.name", "uuid": "UUID2", "min_engine_version": [1, 16, 0], "version": [1, 0, 0] },
+      "modules": [{ "type": "data", "uuid": "UUID2", "version": [1, 0, 0] }]
     }
   ],
   "allOf": [
-    {
-      "if": {
-        "properties": {
-          "format_version": {
-            "const": 1,
-            "type": "number",
-            "title": "Format Version"
-          }
-        }
-      },
-      "then": {
-        "$ref": "./manifest/manifest.1.json"
-      }
-    },
-    {
-      "if": {
-        "properties": {
-          "format_version": {
-            "const": 2,
-            "type": "number",
-            "title": "Format Version"
-          }
-        }
-      },
-      "then": {
-        "$ref": "./manifest/manifest.2.json"
-      }
-    }
+    { "if": { "properties": { "format_version": { "const": 1, "type": "number", "title": "Format Version" } } }, "then": { "$ref": "./manifest/manifest.1.json" } },
+    { "if": { "properties": { "format_version": { "const": 2, "type": "number", "title": "Format Version" } } }, "then": { "$ref": "./manifest/manifest.2.json" } }
   ]
 }
diff --git a/source/general/manifest/manifest.1.json b/source/general/manifest/manifest.1.json
index 2101d8eb..9b3b8dc6 100644
--- a/source/general/manifest/manifest.1.json
+++ b/source/general/manifest/manifest.1.json
@@ -2,14 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.manifest.1",
   "type": "object",
-  "title": "The minecraft manifest v1 schema",
+  "title": "Manifest V1 Schema",
   "description": "The manifest file contains all the basic information about the pack that Minecraft needs to identify it. The tables below contain all the components of the manifest, their individual properties, and what they mean.",
   "additionalProperties": false,
   "required": ["format_version", "header"],
-  "definitions": {
-    "uuidv4": { "$ref": "../UUIDV4.json" },
-    "version": { "$ref": "../Version.json" }
-  },
+  "definitions": { "uuidv4": { "$ref": "../UUIDV4.json" }, "version": { "$ref": "../Version.json" } },
   "properties": {
     "format_version": {
       "type": "number",
@@ -19,12 +16,7 @@
     "header": {
       "required": ["description", "name", "uuid", "version"],
       "properties": {
-        "name": {
-          "type": "string",
-          "default": 0,
-          "description": "This is the name of the pack as it appears within Minecraft",
-          "title": "Name"
-        },
+        "name": { "type": "string", "default": 0, "description": "This is the name of the pack as it appears within Minecraft", "title": "Name" },
         "description": {
           "type": "string",
           "default": 0,
@@ -37,27 +29,15 @@
           "description": "This is a special type of identifier that uniquely identifies this pack from any other pack. UUIDs are written in the format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx where each x is a hexadecimal value (0-9 or a-f). We recommend using an online service to generate this and guarantee their uniqueness (just bing UUID Generator to find some)",
           "title": "Uuid"
         },
-        "version": {
-          "$ref": "#/definitions/version",
-          "description": "This is the version of your pack in the format [majorVersion, minorVersion, revision].",
-          "title": "Version"
-        },
+        "version": { "$ref": "#/definitions/version", "description": "This is the version of your pack in the format [majorVersion, minorVersion, revision].", "title": "Version" },
         "min_engine_version": {
           "type": "string",
           "$ref": "#/definitions/version",
           "description": "This is the minimum version of the game that this pack was written for. This helps the game identify whether any backwards compatibility is needed for your pack. You should always use the highest version currently available when creating packs",
           "title": "Min Engine Version"
         },
-        "lock_template_options": {
-          "type": "boolean",
-          "description": "TODO description: lock template options",
-          "title": "Lock Template Options"
-        },
-        "base_game_version": {
-          "$ref": "#/definitions/version",
-          "description": "TODO description: base game version",
-          "title": "Base Game Version"
-        }
+        "lock_template_options": { "type": "boolean", "description": "TODO description: lock template options", "title": "Lock Template Options" },
+        "base_game_version": { "$ref": "#/definitions/version", "description": "TODO description: base game version", "title": "Base Game Version" }
       },
       "description": "TODO description: header",
       "title": "Header"
@@ -130,30 +110,14 @@
           "description": "Allows HTML files in the pack to be used for custom UI, and scripts in the pack to call and manipulate custom UI",
           "title": "Experimental Custom Ui"
         },
-        "chemistry": {
-          "type": "boolean",
-          "description": "Allows the pack to add, change or replace Chemistry functionality",
-          "title": "Chemistry"
-        }
+        "chemistry": { "type": "boolean", "description": "Allows the pack to add, change or replace Chemistry functionality", "title": "Chemistry" }
       },
       "title": "Capabilities"
     },
     "metadata": {
-      "authors": {
-        "type": "string",
-        "description": "Name of the author(s) of the pack",
-        "title": "Authors"
-      },
-      "license": {
-        "type": "string",
-        "description": "The license of the pack",
-        "title": "License"
-      },
-      "url": {
-        "type": "string",
-        "description": "The home website of your pack",
-        "title": "Url"
-      },
+      "authors": { "type": "string", "description": "Name of the author(s) of the pack", "title": "Authors" },
+      "license": { "type": "string", "description": "The license of the pack", "title": "License" },
+      "url": { "type": "string", "description": "The home website of your pack", "title": "Url" },
       "description": "TODO description: metadata",
       "title": "Metadata"
     }
diff --git a/source/general/manifest/manifest.2.json b/source/general/manifest/manifest.2.json
index ede0f121..d2614b18 100644
--- a/source/general/manifest/manifest.2.json
+++ b/source/general/manifest/manifest.2.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.manifest.2",
   "type": "object",
-  "title": "The minecraft manifest v2 schema",
+  "title": "Manifest V2 Schema",
   "description": "The manifest file contains all the basic information about the pack that Minecraft needs to identify it. The tables below contain all the components of the manifest, their individual properties, and what they mean.",
   "required": ["format_version", "header"],
   "definitions": {
@@ -30,16 +30,8 @@
           "description": "Allows HTML files in the pack to be used for custom UI, and scripts in the pack to call and manipulate custom UI",
           "title": "Experimental Custom Ui"
         },
-        "chemistry": {
-          "type": "boolean",
-          "description": "Allows the pack to add, change or replace Chemistry functionality",
-          "title": "Chemistry"
-        },
-        "raytraced": {
-          "type": "boolean",
-          "description": "TODO",
-          "title": "Raytraced"
-        }
+        "chemistry": { "type": "boolean", "description": "Allows the pack to add, change or replace Chemistry functionality", "title": "Chemistry" },
+        "raytraced": { "type": "boolean", "description": "TODO", "title": "Raytraced" }
       },
       "title": "Capabilities"
     },
@@ -74,7 +66,7 @@
       "properties": {
         "base_game_version": {
           "$ref": "#/definitions/version",
-          "title": "Base game version",
+          "title": "Base Game Version",
           "description": "This is the version of the base game your world template requires, specified as [majorVersion, minorVersion, revision]. We use this to determine what version of the base game resource and behavior packs to apply when your content is used."
         },
         "description": {
@@ -84,30 +76,22 @@
           "description": "This is a short description of the pack. It will appear in the game below the name of the pack. We recommend keeping it to 1-2 lines."
         },
         "lock_template_options": {
-          "title": "Lock template options",
+          "title": "Lock Template Options",
           "type": "boolean",
           "description": "This option is required for any world templates. This will lock the player from modifying the options of the world."
         },
         "min_engine_version": {
-          "title": "Min engine version",
+          "title": "Min Engine Version",
           "$ref": "#/definitions/version",
           "description": "This is the minimum version of the game that this pack was written for. This is a required field for resource and behavior packs. This helps the game identify whether any backwards compatibility is needed for your pack. You should always use the highest version currently available when creating packs"
         },
-        "name": {
-          "title": "Name",
-          "type": "string",
-          "description": "This is the name of the pack as it appears within Minecraft. This is a required field."
-        },
+        "name": { "title": "Name", "type": "string", "description": "This is the name of the pack as it appears within Minecraft. This is a required field." },
         "uuid": {
           "title": "UUID",
           "$ref": "#/definitions/uuidv4",
           "description": "This is a special type of identifier that uniquely identifies this pack from any other pack. UUIDs are written in the format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx where each x is a hexadecimal value (0-9 or a-f). We recommend using an online service to generate this and guarantee their uniqueness (just bing UUID Generator to find some)"
         },
-        "version": {
-          "title": "Version",
-          "$ref": "#/definitions/version",
-          "description": "This is the version of your pack in the format [majorVersion, minorVersion, revision]."
-        }
+        "version": { "title": "Version", "$ref": "#/definitions/version", "description": "This is the version of your pack in the format [majorVersion, minorVersion, revision]." }
       }
     },
     "modules": {
@@ -154,23 +138,10 @@
         "authors": {
           "type": "array",
           "description": "Name of the author(s) of the pack",
-          "items": {
-            "type": "string",
-            "title": "Name",
-            "description": "Name of the author of the pack"
-          }
+          "items": { "type": "string", "title": "Name", "description": "Name of the author of the pack" }
         },
-        "license": {
-          "type": "string",
-          "title": "License",
-          "description": "The license of the pack"
-        },
-        "url": {
-          "type": "string",
-          "format": "uri",
-          "title": "Url",
-          "description": "The home website of your pack"
-        }
+        "license": { "type": "string", "title": "License", "description": "The license of the pack" },
+        "url": { "type": "string", "format": "uri", "title": "Url", "description": "The home website of your pack" }
       }
     }
   },
diff --git a/source/general/particle/identifier.json b/source/general/particle/identifier.json
index 25cdcdc9..85e96ba4 100644
--- a/source/general/particle/identifier.json
+++ b/source/general/particle/identifier.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.particle.identifier.1.8.0",
   "type": "string",
-  "title": "The minecraft particle identifier 1.8.0",
+  "title": "Particle Identifier 1.8.0",
   "description": "The minecraft particle identifier",
   "pattern": "^[0-9a-zA-Z:_\\.\\-]+$"
 }
diff --git a/source/general/world_x_packs.json b/source/general/world_x_packs.json
index 20b8c76e..1ba6ce20 100644
--- a/source/general/world_x_packs.json
+++ b/source/general/world_x_packs.json
@@ -2,26 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.world_x_packs",
   "type": "array",
-  "title": "The minecraft world x pack schema",
+  "title": "World X Pack Schema",
   "description": "TODO description",
   "examples": [[{ "pack_id": "UUID", "version": [1, 0, 0] }]],
-  "definitions": {
-    "uuidv4": { "$ref": "./UUIDV4.json" },
-    "version": { "$ref": "./Version.json" }
-  },
+  "definitions": { "uuidv4": { "$ref": "./UUIDV4.json" }, "version": { "$ref": "./Version.json" } },
   "items": {
     "type": "object",
     "properties": {
-      "pack_id": {
-        "description": "The uuid of the pack to include",
-        "$ref": "#/definitions/uuidv4",
-        "title": "Pack Id"
-      },
-      "version": {
-        "description": "The version of the pack",
-        "$ref": "#/definitions/version",
-        "title": "Version"
-      }
+      "pack_id": { "description": "The uuid of the pack to include", "$ref": "#/definitions/uuidv4", "title": "Pack Id" },
+      "version": { "description": "The version of the pack", "$ref": "#/definitions/version", "title": "Version" }
     },
     "description": "TODO description: items",
     "title": "Items"
diff --git a/source/language/language_names.json b/source/language/language_names.json
index 4e4ce315..ae4f0fa4 100644
--- a/source/language/language_names.json
+++ b/source/language/language_names.json
@@ -42,11 +42,7 @@
     "type": "array",
     "description": "A language name identifier",
     "items": [
-      {
-        "type": "string",
-        "description": "A language identifier",
-        "pattern": "^[a-z]{2}_[A-Z]{2}$"
-      },
+      { "type": "string", "description": "A language identifier", "pattern": "^[a-z]{2}_[A-Z]{2}$" },
       { "type": "string", "description": "The name of the language" }
     ]
   }
diff --git a/source/language/languages.json b/source/language/languages.json
index 23355db9..eac46d0f 100644
--- a/source/language/languages.json
+++ b/source/language/languages.json
@@ -38,9 +38,5 @@
   "type": "array",
   "title": "Languages",
   "description": "A language definitions file",
-  "items": {
-    "type": "string",
-    "description": "A language identifier",
-    "pattern": "^[a-z]{2}_[A-Z]{2}$"
-  }
+  "items": { "type": "string", "description": "A language identifier", "pattern": "^[a-z]{2}_[A-Z]{2}$" }
 }
diff --git a/source/molang/1.8.0/arraynumber3.json b/source/molang/1.8.0/arraynumber3.json
index 3420936a..781c9f39 100644
--- a/source/molang/1.8.0/arraynumber3.json
+++ b/source/molang/1.8.0/arraynumber3.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "title": "Molang array of 3 numbers",
+  "title": "Molang Array Of 3 Numbers",
   "description": "The minecraft molang definition that results in a 3 floats",
   "anyOf": [{ "type": "string", "minLength": 0, "format": "molang" }]
 }
diff --git a/source/molang/1.8.0/number.json b/source/molang/1.8.0/number.json
index c790bede..6c20895e 100644
--- a/source/molang/1.8.0/number.json
+++ b/source/molang/1.8.0/number.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "molang_number1.8.0",
-  "title": "Molang number",
+  "title": "Molang Number",
   "description": "The minecraft molang definition that results in a float",
   "anyOf": [{ "type": "string", "minLength": 0, "format": "molang" }, { "type": "number" }]
 }
diff --git a/source/molang/1.8.0/string.json b/source/molang/1.8.0/string.json
index cd597d41..1806497e 100644
--- a/source/molang/1.8.0/string.json
+++ b/source/molang/1.8.0/string.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "molang.string.1.8.0",
   "type": "string",
-  "title": "Molang / string definition",
+  "title": "Molang / String ",
   "description": "Molang definition",
   "format": "molang"
 }
diff --git a/source/resource/animation_controllers/1.10.0/animation_controller.json b/source/resource/animation_controllers/1.10.0/animation_controller.json
index ed41a5d2..18a032aa 100644
--- a/source/resource/animation_controllers/1.10.0/animation_controller.json
+++ b/source/resource/animation_controllers/1.10.0/animation_controller.json
@@ -2,25 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.animation_controller1.10.0",
   "type": "object",
-  "title": "The minecraft resourcepack animation controller 1.10.0",
+  "title": "Resourcepack Animation Controller 1.10.0",
   "description": "TODO description",
   "definitions": {
     "animationspec": {
       "anyOf": [
-        {
-          "title": "Animation Specification",
-          "description": "A single string that specifies which animation there are",
-          "type": "string"
-        },
+        { "title": "Animation Specification", "description": "A single string that specifies which animation there are", "type": "string" },
         {
           "type": "object",
           "title": "Animation Specification",
           "description": "A object specification on how to transition",
           "maxProperties": 1,
           "minProperties": 1,
-          "additionalProperties": {
-            "$ref": "../../../molang/1.8.0/string.json"
-          }
+          "additionalProperties": { "$ref": "../../../molang/1.8.0/string.json" }
         }
       ]
     },
@@ -31,53 +25,39 @@
       "properties": {
         "bind_to_actor": {
           "type": "boolean",
-          "title": "Bind to actor",
+          "title": "Bind To Actor",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         },
-        "effect": {
-          "type": "string",
-          "title": "Effect",
-          "description": "The name of a particle effect that should be played"
-        },
-        "locator": {
-          "type": "string",
-          "title": "Locator",
-          "description": "The name of a locator on the actor where the effect should be located"
-        },
+        "effect": { "type": "string", "title": "Effect", "description": "The name of a particle effect that should be played" },
+        "locator": { "type": "string", "title": "Locator", "description": "The name of a locator on the actor where the effect should be located" },
         "pre_effect_script": {
           "type": "string",
-          "title": "Pre effect script",
+          "title": "Pre Effect Script",
           "description": "A molang script that will be run when the particle emitter is initialized",
           "pattern": "^.+;$"
         }
       }
     },
-    "commands": {
-      "type": "string",
-      "description": "The event or commands to execute",
-      "pattern": "^(@s .+|/.+)$"
-    }
+    "commands": { "type": "string", "description": "The event or commands to execute", "pattern": "^(@s .+|/.+)$" }
   },
   "required": ["format_version", "animation_controllers"],
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "pattern": "^1.10.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animation_controllers": {
       "type": "object",
-      "title": "The animation controllers schema",
+      "title": "Animation Controllers Schema",
       "description": "The animation controllers schema for 1.10.0",
-      "propertyNames": {
-        "pattern": "^controller\\.animation\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^controller\\.animation\\.[a-z\\.]+" },
       "additionalProperties": {
         "additionalProperties": false,
         "type": "object",
-        "title": "A animation controller",
+        "title": "A Animation Controller",
         "description": "A single animation controller 1.10.0",
         "required": ["states"],
         "minProperties": 1,
@@ -86,47 +66,35 @@
             "controller.animation.some_name": {
               "initial_state": "default",
               "states": {
-                "default": {
-                  "transitions": [{ "state_1": "query.is_baby" }]
-                },
-                "state_1": {
-                  "animations": ["state_1"],
-                  "transitions": [{ "default": "query.all_animations_finished" }]
-                }
+                "default": { "transitions": [{ "state_1": "query.is_baby" }] },
+                "state_1": { "animations": ["state_1"], "transitions": [{ "default": "query.all_animations_finished" }] }
               }
             }
           }
         ],
         "properties": {
           "states": {
-            "title": "The states definition",
+            "title": "States ",
             "description": "The states of this animation controller",
             "propertyNames": { "pattern": "[a-z\\.]+", "examples": ["default"] },
             "minProperties": 1,
             "additionalProperties": {
               "additionalProperties": false,
-              "title": "Animation state",
+              "title": "Animation State",
               "description": "Animation state",
               "type": "object",
               "properties": {
                 "animations": {
-                  "title": "Animations definition",
+                  "title": "Animations ",
                   "description": "The animations definition for 1.10.0",
                   "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/animationspec",
-                    "description": "TODO description: animations",
-                    "title": "Animations"
-                  }
+                  "items": { "$ref": "#/definitions/animationspec", "description": "TODO description: animations", "title": "Animations" }
                 },
                 "blend_transition": {
                   "title": "Blend Transition",
                   "description": "when transitioning away from this state, cross-fade over",
                   "oneOf": [
-                    {
-                      "type": "number",
-                      "description": "A short-hand version of blend_out that simply sets the amount of time to fade out if the animation is interrupted"
-                    },
+                    { "type": "number", "description": "A short-hand version of blend_out that simply sets the amount of time to fade out if the animation is interrupted" },
                     {
                       "type": "object",
                       "description": "Specifies the cross-fade time in seconds when transitioning to another state",
@@ -145,11 +113,7 @@
                 "particle_effects": {
                   "description": "The effects to be emitted",
                   "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/particle_effect_spec",
-                    "description": "TODO description: particle effects",
-                    "title": "Particle Effects"
-                  },
+                  "items": { "$ref": "#/definitions/particle_effect_spec", "description": "TODO description: particle effects", "title": "Particle Effects" },
                   "title": "Particle Effects"
                 },
                 "sound_effects": {
@@ -159,16 +123,11 @@
                     "type": "object",
                     "additionalProperties": false,
                     "required": ["effect"],
-                    "properties": {
-                      "effect": {
-                        "description": "Valid sound effect names should be listed in the entity's resource_definition json file.",
-                        "type": "string"
-                      }
-                    }
+                    "properties": { "effect": { "description": "Valid sound effect names should be listed in the entity's resource_definition json file.", "type": "string" } }
                   }
                 },
                 "transitions": {
-                  "title": "Transition definition",
+                  "title": "Transition ",
                   "description": "The transition definition for 1.10.0",
                   "minProperties": 1,
                   "type": "array",
@@ -187,17 +146,10 @@
                     "type": "object",
                     "required": ["input"],
                     "properties": {
-                      "input": {
-                        "title": "Input",
-                        "description": "",
-                        "$ref": "../../../molang/1.8.0/number.json"
-                      },
+                      "input": { "title": "Input", "description": "", "$ref": "../../../molang/1.8.0/number.json" },
                       "remap_curve": {
-                        "title": "Remap curve",
-                        "additionalProperties": {
-                          "propertyNames": { "pattern": "^([\\-\\+0-9]+|[\\-\\+0-9]+.[0-9]+)$" },
-                          "type": "number"
-                        }
+                        "title": "Remap Curve",
+                        "additionalProperties": { "propertyNames": { "pattern": "^([\\-\\+0-9]+|[\\-\\+0-9]+.[0-9]+)$" }, "type": "number" }
                       }
                     }
                   }
@@ -217,11 +169,7 @@
               }
             }
           },
-          "initial_state": {
-            "type": "string",
-            "description": "TODO description: initial state",
-            "title": "Initial State"
-          }
+          "initial_state": { "type": "string", "description": "TODO description: initial state", "title": "Initial State" }
         }
       }
     }
diff --git a/source/resource/animation_controllers/1.8.0/animation_controller.json b/source/resource/animation_controllers/1.8.0/animation_controller.json
index 446eba51..e4506c4a 100644
--- a/source/resource/animation_controllers/1.8.0/animation_controller.json
+++ b/source/resource/animation_controllers/1.8.0/animation_controller.json
@@ -2,25 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.animation_controller1.8.0",
   "type": "object",
-  "title": "The minecraft resourcepack animation controller 1.8.0",
+  "title": "Resourcepack Animation Controller 1.8.0",
   "description": "TODO description",
   "definitions": {
     "animationspec": {
       "anyOf": [
-        {
-          "title": "Animation Specification",
-          "description": "A single string that specifies which animation there are",
-          "type": "string"
-        },
+        { "title": "Animation Specification", "description": "A single string that specifies which animation there are", "type": "string" },
         {
           "type": "object",
           "title": "Animation Specification",
           "description": "A object specification on how to transition",
           "maxProperties": 1,
           "minProperties": 1,
-          "additionalProperties": {
-            "$ref": "../../../molang/1.8.0/string.json"
-          }
+          "additionalProperties": { "$ref": "../../../molang/1.8.0/string.json" }
         }
       ]
     },
@@ -31,87 +25,64 @@
       "properties": {
         "bind_to_actor": {
           "type": "boolean",
-          "title": "Bind to actor",
+          "title": "Bind To Actor",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         },
-        "effect": {
-          "type": "string",
-          "title": "Effect",
-          "description": "The name of a particle effect that should be played"
-        },
-        "locator": {
-          "type": "string",
-          "title": "Locator",
-          "description": "The name of a locator on the actor where the effect should be located"
-        },
+        "effect": { "type": "string", "title": "Effect", "description": "The name of a particle effect that should be played" },
+        "locator": { "type": "string", "title": "Locator", "description": "The name of a locator on the actor where the effect should be located" },
         "pre_effect_script": {
           "type": "string",
-          "title": "Pre effect script",
+          "title": "Pre Effect Script",
           "description": "A molang script that will be run when the particle emitter is initialized",
           "pattern": "^.+;$"
         }
       }
     },
-    "commands": {
-      "type": "string",
-      "description": "The event or commands to execute",
-      "pattern": "^(@s .+|/.+)$"
-    }
+    "commands": { "type": "string", "description": "The event or commands to execute", "pattern": "^(@s .+|/.+)$" }
   },
   "required": ["format_version", "animation_controllers"],
   "additionalProperties": false,
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animation_controllers": {
       "type": "object",
-      "title": "The animation controllers schema",
+      "title": "Animation Controllers Schema",
       "description": "The animation controllers schema for 1.8.0",
-      "propertyNames": {
-        "pattern": "^controller\\.animation\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^controller\\.animation\\.[a-z\\.]+" },
       "additionalProperties": {
         "additionalProperties": false,
         "type": "object",
-        "title": "A animation controller",
+        "title": "A Animation Controller",
         "description": "A single animation controller 1.8.0",
         "required": ["states"],
         "minProperties": 1,
         "properties": {
           "states": {
-            "title": "The states definition",
+            "title": "States ",
             "description": "The states of this animation controller",
-            "propertyNames": {
-              "pattern": "[a-z\\.]+"
-            },
+            "propertyNames": { "pattern": "[a-z\\.]+" },
             "minProperties": 1,
             "additionalProperties": {
               "additionalProperties": false,
-              "title": "Animation state",
+              "title": "Animation State",
               "description": "Animation state",
               "type": "object",
               "properties": {
                 "animations": {
-                  "title": "Animations definition",
+                  "title": "Animations ",
                   "description": "The animations definition for 1.10.0",
                   "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/animationspec",
-                    "description": "TODO description: animations",
-                    "title": "Animations"
-                  }
+                  "items": { "$ref": "#/definitions/animationspec", "description": "TODO description: animations", "title": "Animations" }
                 },
                 "blend_transition": {
                   "title": "Blend Transition",
                   "oneOf": [
-                    {
-                      "type": "number",
-                      "description": "A short-hand version of blend_out that simply sets the amount of time to fade out if the animation is interrupted"
-                    },
+                    { "type": "number", "description": "A short-hand version of blend_out that simply sets the amount of time to fade out if the animation is interrupted" },
                     {
                       "type": "object",
                       "description": "Specifies the cross-fade time in seconds when transitioning to another state",
@@ -130,11 +101,7 @@
                 "particle_effects": {
                   "description": "The effects to be emitted",
                   "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/particle_effect_spec",
-                    "description": "TODO description: particle effects",
-                    "title": "Particle Effects"
-                  },
+                  "items": { "$ref": "#/definitions/particle_effect_spec", "description": "TODO description: particle effects", "title": "Particle Effects" },
                   "title": "Particle Effects"
                 },
                 "sound_effects": {
@@ -144,24 +111,15 @@
                     "type": "object",
                     "additionalProperties": false,
                     "required": ["effect"],
-                    "properties": {
-                      "effect": {
-                        "description": "Valid sound effect names should be listed in the entity's resource_definition json file.",
-                        "type": "string"
-                      }
-                    }
+                    "properties": { "effect": { "description": "Valid sound effect names should be listed in the entity's resource_definition json file.", "type": "string" } }
                   }
                 },
                 "transitions": {
-                  "title": "Transition definition",
+                  "title": "Transition ",
                   "description": "The transition definition for 1.8.0",
                   "minProperties": 1,
                   "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/animationspec",
-                    "description": "TODO description: transitions",
-                    "title": "Transitions"
-                  }
+                  "items": { "$ref": "#/definitions/animationspec", "description": "TODO description: transitions", "title": "Transitions" }
                 },
                 "variables": {
                   "type": "object",
@@ -169,16 +127,7 @@
                     "additionalProperties": false,
                     "type": "object",
                     "required": ["input"],
-                    "properties": {
-                      "input": {
-                        "$ref": "../../../molang/1.8.0/number.json"
-                      },
-                      "remap_curve": {
-                        "additionalProperties": {
-                          "type": "number"
-                        }
-                      }
-                    }
+                    "properties": { "input": { "$ref": "../../../molang/1.8.0/number.json" }, "remap_curve": { "additionalProperties": { "type": "number" } } }
                   }
                 },
                 "on_entry": {
@@ -196,11 +145,7 @@
               }
             }
           },
-          "initial_state": {
-            "type": "string",
-            "description": "TODO description: initial state",
-            "title": "Initial State"
-          }
+          "initial_state": { "type": "string", "description": "TODO description: initial state", "title": "Initial State" }
         }
       }
     }
diff --git a/source/resource/animation_controllers/animation_controller.json b/source/resource/animation_controllers/animation_controller.json
index 53a5da1e..2d92f021 100644
--- a/source/resource/animation_controllers/animation_controller.json
+++ b/source/resource/animation_controllers/animation_controller.json
@@ -7,26 +7,15 @@
       "animation_controllers": {
         "controller.animation.example": {
           "states": {
-            "default": {
-              "transitions": [{ "state_1": "query.is_baby" }]
-            },
-            "state_1": {
-              "animations": ["state_1"],
-              "transitions": [{ "default": "query.all_animations_finished" }]
-            }
+            "default": { "transitions": [{ "state_1": "query.is_baby" }] },
+            "state_1": { "animations": ["state_1"], "transitions": [{ "default": "query.all_animations_finished" }] }
           }
         }
       }
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/animation_controller.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/animation_controller.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/animation_controller.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/animation_controller.json" } }
   ]
 }
diff --git a/source/resource/animations/1.10.0/actor_animation.json b/source/resource/animations/1.10.0/actor_animation.json
index caf3db2f..f38c11f1 100644
--- a/source/resource/animations/1.10.0/actor_animation.json
+++ b/source/resource/animations/1.10.0/actor_animation.json
@@ -3,130 +3,78 @@
   "$id": "blockception.minecraft.resource.1.10.0.actor_animation",
   "additionalProperties": false,
   "type": "object",
-  "title": "The minecraft resourcepack actor animation 1.10.0",
+  "title": "Resourcepack Actor Animation 1.10.0",
   "description": "TODO description",
   "definitions": {
     "ParticleEffect": {
       "type": "object",
-      "title": "Particle effect",
+      "title": "Particle Effect",
       "additionalProperties": false,
       "required": ["effect"],
       "properties": {
-        "effect": {
-          "type": "string",
-          "title": "Particle id",
-          "description": "The name of a particle effect that should be played"
-        },
-        "locator": {
-          "type": "string",
-          "title": "Locator",
-          "description": "The name of a locator on the actor where the effect should be located"
-        },
+        "effect": { "type": "string", "title": "Particle Id", "description": "The name of a particle effect that should be played" },
+        "locator": { "type": "string", "title": "Locator", "description": "The name of a locator on the actor where the effect should be located" },
         "pre_effect_script": {
-          "title": "Pre effect script",
+          "title": "Pre Effect Script",
           "description": "A molang script that will be run when the particle emitter is initialized",
           "$ref": "../../../molang/1.8.0/string.json"
         },
         "bind_to_actor": {
           "type": "boolean",
-          "title": "Bind to actor",
+          "title": "Bind To Actor",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         }
       }
     },
     "PositionV3": {
-      "title": "Position array",
+      "title": "Position Array",
       "description": "An array of 3 items that describe the bones position",
       "type": "array",
       "items": [
-        {
-          "title": "Position X",
-          "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Y",
-          "description": "The position over the Y-axis, or up/down.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Z",
-          "description": "The position over the Z-axis, or left/right.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        }
+        { "title": "Position X", "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Y", "description": "The position over the Y-axis, or up/down.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Z", "description": "The position over the Z-axis, or left/right.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" }
       ]
     },
     "RotationV3": {
-      "title": "Rotation array",
+      "title": "Rotation Array",
       "description": "An array of 3 items that describe the bones rotation",
       "type": "array",
       "items": [
-        {
-          "title": "Rotation X",
-          "description": "The rotation over the X-axis, or up or down.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Rotation Y",
-          "description": "The rotation over the Y-axis, or yaw.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Rotation Z",
-          "description": "The rotation over the Z-axis, or roll.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        }
+        { "title": "Rotation X", "description": "The rotation over the X-axis, or up or down.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Rotation Y", "description": "The rotation over the Y-axis, or yaw.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Rotation Z", "description": "The rotation over the Z-axis, or roll.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" }
       ]
     },
     "ScaleV3": {
-      "title": "Scale array",
+      "title": "Scale Array",
       "description": "An array of 3 items that describe the bones position",
       "type": "array",
       "items": [
-        {
-          "title": "Position X",
-          "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Y",
-          "description": "The position over the Y-axis, or up/down.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Z",
-          "description": "The position over the Z-axis, or left/right.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        }
+        { "title": "Position X", "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Y", "description": "The position over the Y-axis, or up/down.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Z", "description": "The position over the Z-axis, or left/right.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" }
       ]
     },
     "SoundEffect": {
-      "title": "Sound effect",
+      "title": "Sound Effect",
       "type": "object",
       "additionalProperties": false,
-      "properties": {
-        "effect": {
-          "title": "Effect",
-          "type": "string",
-          "description": "Valid sound effect names should be listed in the entity's resource_definition json file."
-        }
-      }
+      "properties": { "effect": { "title": "Effect", "type": "string", "description": "Valid sound effect names should be listed in the entity's resource_definition json file." } }
     }
   },
   "required": ["format_version", "animations"],
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "const": "1.10.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animations": {
-      "title": "Animations schema",
+      "title": "Animations Schema",
       "description": "The animation 1.10.0 specification",
-      "propertyNames": {
-        "pattern": "^animation\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^animation\\.[a-z\\.]+" },
       "type": "object",
       "additionalProperties": {
         "additionalProperties": false,
@@ -135,26 +83,22 @@
         "description": "The animation specification for 1.8.0",
         "properties": {
           "anim_time_update": {
-            "title": "Start delay",
+            "title": "Start Delay",
             "description": "How does time pass when playing the animation. Defaults to \"query.anim_time + query.delta_time\" which means advance in seconds.",
             "$ref": "../../../molang/1.8.0/number.json"
           },
           "animation_length": {
-            "title": "Animation length",
+            "title": "Animation Length",
             "description": "Override calculated value (set as the last keyframe time) and set animation length in seconds.",
             "type": "number"
           },
-          "blend_weight": {
-            "title": "Blend weight",
-            "description": "TODO",
-            "$ref": "../../../molang/1.8.0/number.json"
-          },
+          "blend_weight": { "title": "Blend Weight", "description": "TODO", "$ref": "../../../molang/1.8.0/number.json" },
           "bones": {
             "title": "Bones",
             "description": "Defines how the bones in an animation move or transform",
             "type": "object",
             "additionalProperties": {
-              "title": "Bone transformation",
+              "title": "Bone Transformation",
               "description": "The bone definition that declare how it transforms during animation",
               "type": "object",
               "additionalProperties": false,
@@ -163,38 +107,19 @@
                   "title": "Position",
                   "description": "The Position transformation during this animation",
                   "oneOf": [
-                    {
-                      "$ref": "#/definitions/PositionV3"
-                    },
-                    {
-                      "$ref": "../../../molang/1.8.0/arraynumber3.json"
-                    },
+                    { "$ref": "#/definitions/PositionV3" },
+                    { "$ref": "../../../molang/1.8.0/arraynumber3.json" },
                     {
                       "type": "object",
-                      "propertyNames": {
-                        "pattern": "^[\\d.]+$"
-                      },
+                      "propertyNames": { "pattern": "^[\\d.]+$" },
                       "additionalProperties": {
-                        "title": "Timeline object",
+                        "title": "Timeline Object",
                         "description": "A single point in time",
                         "additionalProperties": false,
                         "properties": {
-                          "lerp_mode": {
-                            "type": "string",
-                            "title": "Lerp mode",
-                            "description": "TODO",
-                            "enum": ["linear", "catmullrom"]
-                          },
-                          "pre": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/PositionV3"
-                          },
-                          "post": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/PositionV3"
-                          }
+                          "lerp_mode": { "type": "string", "title": "Lerp Mode", "description": "TODO", "enum": ["linear", "catmullrom"] },
+                          "pre": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/PositionV3" },
+                          "post": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/PositionV3" }
                         }
                       }
                     }
@@ -204,90 +129,48 @@
                   "title": "Rotation",
                   "description": "The rotation transformation during this animation",
                   "oneOf": [
-                    {
-                      "$ref": "#/definitions/RotationV3"
-                    },
-                    {
-                      "$ref": "../../../molang/1.8.0/arraynumber3.json"
-                    },
+                    { "$ref": "#/definitions/RotationV3" },
+                    { "$ref": "../../../molang/1.8.0/arraynumber3.json" },
                     {
                       "type": "object",
-                      "propertyNames": {
-                        "pattern": "^[\\d.]+$"
-                      },
+                      "propertyNames": { "pattern": "^[\\d.]+$" },
                       "additionalProperties": {
-                        "title": "Timeline object",
+                        "title": "Timeline Object",
                         "description": "A single point in time",
                         "additionalProperties": false,
                         "properties": {
-                          "lerp_mode": {
-                            "type": "string",
-                            "title": "Lerp mode",
-                            "description": "TODO",
-                            "enum": ["linear", "catmullrom"]
-                          },
-                          "pre": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/RotationV3"
-                          },
-                          "post": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/RotationV3"
-                          }
+                          "lerp_mode": { "type": "string", "title": "Lerp Mode", "description": "TODO", "enum": ["linear", "catmullrom"] },
+                          "pre": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/RotationV3" },
+                          "post": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/RotationV3" }
                         }
                       }
                     }
                   ]
                 },
                 "relative_to": {
-                  "title": "Relative to",
+                  "title": "Relative To",
                   "description": "If set, makes the bone rotation relative to the entity instead of the bone's parent",
                   "properties": {
-                    "rotation": {
-                      "title": "Rotation",
-                      "description": "If set, makes the bone rotation relative to the entity instead of the bone's parent",
-                      "type": "string"
-                    }
+                    "rotation": { "title": "Rotation", "description": "If set, makes the bone rotation relative to the entity instead of the bone's parent", "type": "string" }
                   }
                 },
                 "scale": {
                   "title": "Scale",
                   "description": "TODO",
                   "oneOf": [
-                    {
-                      "$ref": "../../../molang/1.8.0/number.json"
-                    },
-                    {
-                      "$ref": "#/definitions/ScaleV3"
-                    },
+                    { "$ref": "../../../molang/1.8.0/number.json" },
+                    { "$ref": "#/definitions/ScaleV3" },
                     {
                       "type": "object",
-                      "propertyNames": {
-                        "pattern": "^[\\d.]+$"
-                      },
+                      "propertyNames": { "pattern": "^[\\d.]+$" },
                       "additionalProperties": {
-                        "title": "Timeline object",
+                        "title": "Timeline Object",
                         "description": "A single point in time",
                         "additionalProperties": false,
                         "properties": {
-                          "lerp_mode": {
-                            "type": "string",
-                            "title": "Lerp mode",
-                            "description": "TODO",
-                            "enum": ["linear", "catmullrom"]
-                          },
-                          "pre": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/ScaleV3"
-                          },
-                          "post": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/ScaleV3"
-                          }
+                          "lerp_mode": { "type": "string", "title": "Lerp Mode", "description": "TODO", "enum": ["linear", "catmullrom"] },
+                          "pre": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/ScaleV3" },
+                          "post": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/ScaleV3" }
                         }
                       }
                     }
@@ -299,28 +182,20 @@
           "loop": {
             "title": "Loop",
             "description": "Should this animation stop, loop, or stay on the last frame when finished (true, false, hold_on_last_frame)",
-            "oneOf": [
-              {
-                "type": "boolean"
-              },
-              {
-                "type": "string",
-                "enum": ["hold_on_last_frame"]
-              }
-            ]
+            "oneOf": [{ "type": "boolean" }, { "type": "string", "enum": ["hold_on_last_frame"] }]
           },
           "loop_delay": {
-            "title": "Loop delay",
+            "title": "Loop Delay",
             "description": "How long to wait in seconds before looping this animation. Note that this expression is evaluated after each loop and on looping animation only.",
             "$ref": "../../../molang/1.8.0/number.json"
           },
           "override_previous_animation": {
-            "title": "Override previous animation",
+            "title": "Override Previous Animation",
             "description": "Reset bones in this animation to the default pose before applying this animation.",
             "type": "boolean"
           },
           "particle_effects": {
-            "title": "Particle effects",
+            "title": "Particle Effects",
             "description": "TODO",
             "oneOf": [
               { "$ref": "#/definitions/ParticleEffect" },
@@ -328,7 +203,7 @@
                 "type": "object",
                 "propertyNames": { "pattern": "^[\\d.]+$", "examples": ["0.0"] },
                 "additionalProperties": {
-                  "title": "Timeline object",
+                  "title": "Timeline Object",
                   "description": "A single point in time",
                   "oneOf": [
                     { "type": "object", "$ref": "#/definitions/ParticleEffect" },
@@ -339,12 +214,12 @@
             ]
           },
           "start_delay": {
-            "title": "Start delay",
+            "title": "Start Delay",
             "description": "How long to wait in seconds before playing this animation. Note that this expression is evaluated once before playing, and only re-evaluated if asked to play from the beginning again. A looping animation should use 'loop_delay' if it wants a delay between loops.",
             "$ref": "../../../molang/1.8.0/number.json"
           },
           "sound_effects": {
-            "title": "Sound effect",
+            "title": "Sound Effect",
             "description": "TODO",
             "type": "object",
             "propertyNames": { "pattern": "^[\\d.]+$" },
@@ -354,26 +229,14 @@
             "title": "Timeline",
             "description": "The time line",
             "type": "object",
-            "propertyNames": {
-              "pattern": "^(\\d+.\\d+|\\d+)$"
-            },
+            "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$" },
             "additionalProperties": {
               "oneOf": [
-                {
-                  "type": "string",
-                  "title": "Molang",
-                  "description": "Variable definition",
-                  "pattern": "^(v|variable)\\..*=.*;$"
-                },
+                { "type": "string", "title": "Molang", "description": "Variable definition", "pattern": "^(v|variable)\\..*=.*;$" },
                 {
                   "type": "array",
-                  "title": "Collection timelime items",
-                  "items": {
-                    "type": "string",
-                    "title": "Molang",
-                    "description": "Variable definition",
-                    "pattern": "^(v|variable)\\..*=.*;$"
-                  }
+                  "title": "Collection Timelime Items",
+                  "items": { "type": "string", "title": "Molang", "description": "Variable definition", "pattern": "^(v|variable)\\..*=.*;$" }
                 }
               ]
             }
diff --git a/source/resource/animations/1.8.0/actor_animation.json b/source/resource/animations/1.8.0/actor_animation.json
index 35550fdd..a290b381 100644
--- a/source/resource/animations/1.8.0/actor_animation.json
+++ b/source/resource/animations/1.8.0/actor_animation.json
@@ -3,130 +3,78 @@
   "$id": "blockception.minecraft.resource.1.8.0.actor_animation",
   "additionalProperties": false,
   "type": "object",
-  "title": "The minecraft resourcepack actor animation 1.8.0",
+  "title": "Resourcepack Actor Animation 1.8.0",
   "description": "TODO description",
   "definitions": {
     "ParticleEffect": {
       "type": "object",
-      "title": "Particle effect",
+      "title": "Particle Effect",
       "additionalProperties": false,
       "required": ["effect"],
       "properties": {
-        "effect": {
-          "type": "string",
-          "title": "Particle id",
-          "description": "The name of a particle effect that should be played"
-        },
-        "locator": {
-          "type": "string",
-          "title": "Locator",
-          "description": "The name of a locator on the actor where the effect should be located"
-        },
+        "effect": { "type": "string", "title": "Particle Id", "description": "The name of a particle effect that should be played" },
+        "locator": { "type": "string", "title": "Locator", "description": "The name of a locator on the actor where the effect should be located" },
         "pre_effect_script": {
-          "title": "Pre effect script",
+          "title": "Pre Effect Script",
           "description": "A molang script that will be run when the particle emitter is initialized",
           "$ref": "../../../molang/1.8.0/string.json"
         },
         "bind_to_actor": {
           "type": "boolean",
-          "title": "Bind to actor",
+          "title": "Bind To Actor",
           "description": "Set to false to have the effect spawned in the world without being bound to an actor (by default an effect is bound to the actor)."
         }
       }
     },
     "PositionV3": {
-      "title": "Position array",
+      "title": "Position Array",
       "description": "An array of 3 items that describe the bones position",
       "type": "array",
       "items": [
-        {
-          "title": "Position X",
-          "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Y",
-          "description": "The position over the Y-axis, or up/down.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Z",
-          "description": "The position over the Z-axis, or left/right.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        }
+        { "title": "Position X", "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Y", "description": "The position over the Y-axis, or up/down.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Z", "description": "The position over the Z-axis, or left/right.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" }
       ]
     },
     "RotationV3": {
-      "title": "Rotation array",
+      "title": "Rotation Array",
       "description": "An array of 3 items that describe the bones rotation",
       "type": "array",
       "items": [
-        {
-          "title": "Rotation X",
-          "description": "The rotation over the X-axis, or up or down.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Rotation Y",
-          "description": "The rotation over the Y-axis, or yaw.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Rotation Z",
-          "description": "The rotation over the Z-axis, or roll.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        }
+        { "title": "Rotation X", "description": "The rotation over the X-axis, or up or down.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Rotation Y", "description": "The rotation over the Y-axis, or yaw.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Rotation Z", "description": "The rotation over the Z-axis, or roll.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" }
       ]
     },
     "ScaleV3": {
-      "title": "Scale array",
+      "title": "Scale Array",
       "description": "An array of 3 items that describe the bones position",
       "type": "array",
       "items": [
-        {
-          "title": "Position X",
-          "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Y",
-          "description": "The position over the Y-axis, or up/down.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        },
-        {
-          "title": "Position Z",
-          "description": "The position over the Z-axis, or left/right.\nCan be molang or a float",
-          "$ref": "../../../molang/1.8.0/number.json"
-        }
+        { "title": "Position X", "description": "The position over the X-axis or forwards/backwards.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Y", "description": "The position over the Y-axis, or up/down.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" },
+        { "title": "Position Z", "description": "The position over the Z-axis, or left/right.\nCan be molang or a float", "$ref": "../../../molang/1.8.0/number.json" }
       ]
     },
     "SoundEffect": {
-      "title": "Sound effect",
+      "title": "Sound Effect",
       "type": "object",
       "additionalProperties": false,
-      "properties": {
-        "effect": {
-          "title": "Effect",
-          "type": "string",
-          "description": "Valid sound effect names should be listed in the entity's resource_definition json file."
-        }
-      }
+      "properties": { "effect": { "title": "Effect", "type": "string", "description": "Valid sound effect names should be listed in the entity's resource_definition json file." } }
     }
   },
   "required": ["format_version", "animations"],
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "const": "1.8.0",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "animations": {
-      "title": "Animations schema",
+      "title": "Animations Schema",
       "description": "The animation 1.8.0 specification",
-      "propertyNames": {
-        "pattern": "^animation\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^animation\\.[a-z\\.]+" },
       "type": "object",
       "additionalProperties": {
         "additionalProperties": false,
@@ -135,26 +83,22 @@
         "description": "The animation specification for 1.8.0",
         "properties": {
           "anim_time_update": {
-            "title": "Anim time update",
+            "title": "Anim Time Update",
             "description": "How does time pass when playing the animation. Defaults to \"query.anim_time + query.delta_time\" which means advance in seconds.",
             "$ref": "../../../molang/1.8.0/number.json"
           },
           "animation_length": {
-            "title": "Animation length",
+            "title": "Animation Length",
             "description": "Override calculated value (set as the last keyframe time) and set animation length in seconds.",
             "type": "number"
           },
-          "blend_weight": {
-            "title": "Blend weight",
-            "description": "TODO",
-            "$ref": "../../../molang/1.8.0/number.json"
-          },
+          "blend_weight": { "title": "Blend Weight", "description": "TODO", "$ref": "../../../molang/1.8.0/number.json" },
           "bones": {
             "title": "Bones",
             "description": "Defines how the bones in an animation move or transform",
             "type": "object",
             "additionalProperties": {
-              "title": "Bone transformation",
+              "title": "Bone Transformation",
               "description": "The bone definition that declare how it transforms during animation",
               "type": "object",
               "additionalProperties": false,
@@ -163,38 +107,19 @@
                   "title": "Position",
                   "description": "The Position transformation during this animation",
                   "oneOf": [
-                    {
-                      "$ref": "#/definitions/PositionV3"
-                    },
-                    {
-                      "$ref": "../../../molang/1.8.0/arraynumber3.json"
-                    },
+                    { "$ref": "#/definitions/PositionV3" },
+                    { "$ref": "../../../molang/1.8.0/arraynumber3.json" },
                     {
                       "type": "object",
-                      "propertyNames": {
-                        "pattern": "^[\\d.]+$"
-                      },
+                      "propertyNames": { "pattern": "^[\\d.]+$" },
                       "additionalProperties": {
-                        "title": "Timeline object",
+                        "title": "Timeline Object",
                         "description": "A single point in time",
                         "additionalProperties": false,
                         "properties": {
-                          "lerp_mode": {
-                            "type": "string",
-                            "title": "Lerp mode",
-                            "description": "TODO",
-                            "enum": ["linear", "catmullrom"]
-                          },
-                          "pre": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/PositionV3"
-                          },
-                          "post": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/PositionV3"
-                          }
+                          "lerp_mode": { "type": "string", "title": "Lerp Mode", "description": "TODO", "enum": ["linear", "catmullrom"] },
+                          "pre": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/PositionV3" },
+                          "post": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/PositionV3" }
                         }
                       }
                     }
@@ -204,90 +129,48 @@
                   "title": "Rotation",
                   "description": "The rotation transformation during this animation",
                   "oneOf": [
-                    {
-                      "$ref": "#/definitions/RotationV3"
-                    },
-                    {
-                      "$ref": "../../../molang/1.8.0/arraynumber3.json"
-                    },
+                    { "$ref": "#/definitions/RotationV3" },
+                    { "$ref": "../../../molang/1.8.0/arraynumber3.json" },
                     {
                       "type": "object",
-                      "propertyNames": {
-                        "pattern": "^[\\d.]+$"
-                      },
+                      "propertyNames": { "pattern": "^[\\d.]+$" },
                       "additionalProperties": {
-                        "title": "Timeline object",
+                        "title": "Timeline Object",
                         "description": "A single point in time",
                         "additionalProperties": false,
                         "properties": {
-                          "lerp_mode": {
-                            "type": "string",
-                            "title": "Lerp mode",
-                            "description": "TODO",
-                            "enum": ["linear", "catmullrom"]
-                          },
-                          "pre": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/RotationV3"
-                          },
-                          "post": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/RotationV3"
-                          }
+                          "lerp_mode": { "type": "string", "title": "Lerp Mode", "description": "TODO", "enum": ["linear", "catmullrom"] },
+                          "pre": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/RotationV3" },
+                          "post": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/RotationV3" }
                         }
                       }
                     }
                   ]
                 },
                 "relative_to": {
-                  "title": "Relative to",
+                  "title": "Relative To",
                   "description": "If set, makes the bone rotation relative to the entity instead of the bone's parent",
                   "properties": {
-                    "rotation": {
-                      "title": "Rotation",
-                      "description": "If set, makes the bone rotation relative to the entity instead of the bone's parent",
-                      "type": "string"
-                    }
+                    "rotation": { "title": "Rotation", "description": "If set, makes the bone rotation relative to the entity instead of the bone's parent", "type": "string" }
                   }
                 },
                 "scale": {
                   "title": "Scale",
                   "description": "TODO",
                   "oneOf": [
-                    {
-                      "$ref": "../../../molang/1.8.0/number.json"
-                    },
-                    {
-                      "$ref": "#/definitions/ScaleV3"
-                    },
+                    { "$ref": "../../../molang/1.8.0/number.json" },
+                    { "$ref": "#/definitions/ScaleV3" },
                     {
                       "type": "object",
-                      "propertyNames": {
-                        "pattern": "^[\\d.]+$"
-                      },
+                      "propertyNames": { "pattern": "^[\\d.]+$" },
                       "additionalProperties": {
-                        "title": "Timeline object",
+                        "title": "Timeline Object",
                         "description": "A single point in time",
                         "additionalProperties": false,
                         "properties": {
-                          "lerp_mode": {
-                            "type": "string",
-                            "title": "Lerp mode",
-                            "description": "TODO",
-                            "enum": ["linear", "catmullrom"]
-                          },
-                          "pre": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/ScaleV3"
-                          },
-                          "post": {
-                            "title": "Pre",
-                            "description": "TODO",
-                            "$ref": "#/definitions/ScaleV3"
-                          }
+                          "lerp_mode": { "type": "string", "title": "Lerp Mode", "description": "TODO", "enum": ["linear", "catmullrom"] },
+                          "pre": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/ScaleV3" },
+                          "post": { "title": "Pre", "description": "TODO", "$ref": "#/definitions/ScaleV3" }
                         }
                       }
                     }
@@ -299,26 +182,20 @@
           "loop": {
             "title": "Loop",
             "description": "Should this animation stop, loop, or stay on the last frame when finished (true, false, hold_on_last_frame)",
-            "oneOf": [
-              { "type": "boolean" },
-              {
-                "type": "string",
-                "enum": ["hold_on_last_frame"]
-              }
-            ]
+            "oneOf": [{ "type": "boolean" }, { "type": "string", "enum": ["hold_on_last_frame"] }]
           },
           "loop_delay": {
-            "title": "Loop delay",
+            "title": "Loop Delay",
             "description": "How long to wait in seconds before looping this animation. Note that this expression is evaluated after each loop and on looping animation only.",
             "$ref": "../../../molang/1.8.0/number.json"
           },
           "override_previous_animation": {
-            "title": "Override previous animation",
+            "title": "Override Previous Animation",
             "description": "Reset bones in this animation to the default pose before applying this animation.",
             "type": "boolean"
           },
           "particle_effects": {
-            "title": "Particle effects",
+            "title": "Particle Effects",
             "description": "TODO",
             "oneOf": [
               { "$ref": "#/definitions/ParticleEffect" },
@@ -326,7 +203,7 @@
                 "type": "object",
                 "propertyNames": { "pattern": "^[\\d.]+$", "examples": ["0.0"] },
                 "additionalProperties": {
-                  "title": "Timeline object",
+                  "title": "Timeline Object",
                   "description": "A single point in time",
                   "oneOf": [
                     { "type": "object", "$ref": "#/definitions/ParticleEffect" },
@@ -337,45 +214,29 @@
             ]
           },
           "start_delay": {
-            "title": "Start delay",
+            "title": "Start Delay",
             "description": "How long to wait in seconds before playing this animation. Note that this expression is evaluated once before playing, and only re-evaluated if asked to play from the beginning again. A looping animation should use 'loop_delay' if it wants a delay between loops.",
             "$ref": "../../../molang/1.8.0/number.json"
           },
           "sound_effects": {
-            "title": "Sound effect",
+            "title": "Sound Effect",
             "description": "TODO",
             "type": "object",
-            "propertyNames": {
-              "pattern": "^[\\d.]+$"
-            },
-            "additionalProperties": {
-              "$ref": "#/definitions/SoundEffect"
-            }
+            "propertyNames": { "pattern": "^[\\d.]+$" },
+            "additionalProperties": { "$ref": "#/definitions/SoundEffect" }
           },
           "timeline": {
             "title": "Timeline",
             "description": "The time line",
             "type": "object",
-            "propertyNames": {
-              "pattern": "^(\\d+.\\d+|\\d+)$"
-            },
+            "propertyNames": { "pattern": "^(\\d+.\\d+|\\d+)$" },
             "additionalProperties": {
               "oneOf": [
-                {
-                  "type": "string",
-                  "title": "Molang",
-                  "description": "Variable definition",
-                  "pattern": "^(v|variable)\\..*=.*;$"
-                },
+                { "type": "string", "title": "Molang", "description": "Variable definition", "pattern": "^(v|variable)\\..*=.*;$" },
                 {
                   "type": "array",
-                  "title": "Collection timelime items",
-                  "items": {
-                    "type": "string",
-                    "title": "Molang",
-                    "description": "Variable definition",
-                    "pattern": "^(v|variable)\\..*=.*;$"
-                  }
+                  "title": "Collection Timelime Items",
+                  "items": { "type": "string", "title": "Molang", "description": "Variable definition", "pattern": "^(v|variable)\\..*=.*;$" }
                 }
               ]
             }
diff --git a/source/resource/animations/actor_animation.json b/source/resource/animations/actor_animation.json
index a12efe91..19625834 100644
--- a/source/resource/animations/actor_animation.json
+++ b/source/resource/animations/actor_animation.json
@@ -1,26 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.actor_animation",
-  "examples": [
-    {
-      "format_version": "1.8.0",
-      "animations": {
-        "animation.annie.idle": {
-          "loop": true,
-          "animation_length": 2.12,
-          "bones": {}
-        }
-      }
-    }
-  ],
+  "examples": [{ "format_version": "1.8.0", "animations": { "animation.annie.idle": { "loop": true, "animation_length": 2.12, "bones": {} } } }],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/actor_animation.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/actor_animation.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/actor_animation.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/actor_animation.json" } }
   ]
 }
diff --git a/source/resource/attachables/1.10.0/attachables.json b/source/resource/attachables/1.10.0/attachables.json
index 7836e37d..42c23136 100644
--- a/source/resource/attachables/1.10.0/attachables.json
+++ b/source/resource/attachables/1.10.0/attachables.json
@@ -2,35 +2,31 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.1.10.0.attachables",
   "type": "object",
-  "title": "The minecraft resourcepack actor animation 1.10.0",
+  "title": "Resourcepack Actor Animation 1.10.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:attachable"],
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "pattern": "^(1.10.0|1.10)$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:attachable": {
       "type": "object",
-      "title": "The attachables",
+      "title": "Attachables",
       "description": "The attachables definition",
       "required": ["description"],
       "properties": {
         "description": {
-          "title": "Description definition",
+          "title": "Description ",
           "type": "object",
           "required": ["identifier"],
           "additionalProperties": false,
           "properties": {
             "animations": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "A single animation reference",
-                "title": "Animation"
-              },
+              "additionalProperties": { "type": "string", "description": "A single animation reference", "title": "Animation" },
               "description": "The collection of animations references",
               "title": "Animations"
             },
@@ -38,59 +34,27 @@
               "type": "array",
               "additionalProperties": {
                 "type": "object",
-                "additionalProperties": {
-                  "type": "string",
-                  "description": "A single Animation controller reference",
-                  "title": "Animation controller reference"
-                },
+                "additionalProperties": { "type": "string", "description": "A single Animation controller reference", "title": "Animation Controller Reference" },
                 "description": "A collection of animation controller references",
                 "title": "TODO"
               },
               "description": "The specification of animation controllers",
               "title": "Animation Controllers"
             },
-            "enable_attachables": {
-              "type": "boolean",
-              "description": "TODO description: enable attachables",
-              "title": "Enable Attachables"
-            },
+            "enable_attachables": { "type": "boolean", "description": "TODO description: enable attachables", "title": "Enable Attachables" },
             "geometry": {
-              "title": "Geometry definition",
+              "title": "Geometry ",
               "type": "object",
-              "propertyNames": {
-                "pattern": "[a-zA-Z0-9_\\.\\-]+"
-              },
+              "propertyNames": { "pattern": "[a-zA-Z0-9_\\.\\-]+" },
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "A single geometry reference",
-                "title": "Geometry"
-              },
+              "additionalProperties": { "type": "string", "description": "A single geometry reference", "title": "Geometry" },
               "description": "The geometry specification"
             },
-            "identifier": {
-              "type": "string",
-              "description": "TODO description: identifier",
-              "title": "Identifier",
-              "$ref": "../../../general/item/identifier.json"
-            },
-            "item": {
-              "type": "object",
-              "title": "Item",
-              "description": "TODO",
-              "additionalProperties": {
-                "type": "string",
-                "title": "TODO",
-                "description": "TODO"
-              }
-            },
+            "identifier": { "type": "string", "description": "TODO description: identifier", "title": "Identifier", "$ref": "../../../general/item/identifier.json" },
+            "item": { "type": "object", "title": "Item", "description": "TODO", "additionalProperties": { "type": "string", "title": "TODO", "description": "TODO" } },
             "materials": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "A single material reference",
-                "title": "Material"
-              },
+              "additionalProperties": { "type": "string", "description": "A single material reference", "title": "Material" },
               "description": "A collection of material references",
               "title": "Materials"
             },
@@ -103,22 +67,14 @@
             "particle_effects": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "A single particle effect reference",
-                "title": "Particle effect"
-              },
+              "additionalProperties": { "type": "string", "description": "A single particle effect reference", "title": "Particle Effect" },
               "description": "A collection of particle effect references",
               "title": "Particle Effects"
             },
             "particle_emitters": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle emitters",
               "title": "Particle Emitters"
             },
@@ -127,11 +83,7 @@
               "description": "TODO description: render controllers",
               "title": "Render Controllers",
               "minItems": 1,
-              "items": {
-                "type": "string",
-                "description": "TODO description: render controllers",
-                "title": "Render Controllers"
-              }
+              "items": { "type": "string", "description": "TODO description: render controllers", "title": "Render Controllers" }
             },
             "scripts": {
               "additionalProperties": false,
@@ -141,25 +93,17 @@
               "properties": {
                 "animate": {
                   "type": "array",
-                  "title": "Animate schema",
+                  "title": "Animate Schema",
                   "minItems": 1,
                   "items": {
                     "oneOf": [
-                      {
-                        "type": "string",
-                        "description": "TODO description: oneOf[0]",
-                        "title": "TODO title"
-                      },
+                      { "type": "string", "description": "TODO description: oneOf[0]", "title": "TODO Title" },
                       {
                         "type": "object",
                         "minProperties": 1,
-                        "additionalProperties": {
-                          "type": "string",
-                          "description": "TODO description: additionalProperties",
-                          "title": "TODO"
-                        },
+                        "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
                         "description": "TODO description: oneOf[1]",
-                        "title": "TODO title"
+                        "title": "TODO Title"
                       }
                     ],
                     "description": "TODO description: animate",
@@ -171,36 +115,16 @@
                   "type": "array",
                   "description": "TODO description: initialize",
                   "title": "Initialize",
-                  "items": {
-                    "pattern": ";$",
-                    "$ref": "../../../molang/1.8.0/number.json",
-                    "description": "TODO description: initialize",
-                    "title": "Initialize"
-                  }
+                  "items": { "pattern": ";$", "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: initialize", "title": "Initialize" }
                 },
                 "pre_animation": {
                   "type": "array",
                   "description": "TODO description: pre aninamtion",
                   "title": "Pre Animation",
-                  "items": {
-                    "pattern": ";$",
-                    "$ref": "../../../molang/1.8.0/number.json",
-                    "description": "TODO description: pre aninamtion",
-                    "title": "Pre Animation"
-                  }
+                  "items": { "pattern": ";$", "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: pre aninamtion", "title": "Pre Animation" }
                 },
-                "parent_setup": {
-                  "type": "string",
-                  "description": "TODO description: parent setup",
-                  "title": "Parent Setup",
-                  "$ref": "../../../molang/1.8.0/number.json"
-                },
-                "scale": {
-                  "type": "string",
-                  "description": "TODO description: scale",
-                  "title": "Scale",
-                  "$ref": "../../../molang/1.8.0/number.json"
-                }
+                "parent_setup": { "type": "string", "description": "TODO description: parent setup", "title": "Parent Setup", "$ref": "../../../molang/1.8.0/number.json" },
+                "scale": { "type": "string", "description": "TODO description: scale", "title": "Scale", "$ref": "../../../molang/1.8.0/number.json" }
               }
             },
             "sound_effects": {
@@ -208,52 +132,23 @@
               "description": "TODO description: sound effects",
               "title": "Sound Effects",
               "minItems": 1,
-              "items": {
-                "type": "string",
-                "description": "TODO description: sound effects",
-                "title": "Sound Effects"
-              }
+              "items": { "type": "string", "description": "TODO description: sound effects", "title": "Sound Effects" }
             },
             "spawn_egg": {
               "type": "object",
               "description": "TODO description: spawn egg",
               "title": "Spawn Egg",
-              "dependencies": {
-                "texture": ["texture_index"],
-                "texture_index": ["texture"],
-                "base_colour": ["overlay_color"],
-                "overlay_color": ["base_colour"]
-              },
+              "dependencies": { "texture": ["texture_index"], "texture_index": ["texture"], "base_colour": ["overlay_color"], "overlay_color": ["base_colour"] },
               "properties": {
-                "base_colour": {
-                  "type": "string",
-                  "description": "TODO description: base colour",
-                  "title": "Base Colour"
-                },
-                "overlay_color": {
-                  "type": "string",
-                  "description": "TODO description: overlay color",
-                  "title": "Overlay Color"
-                },
-                "texture": {
-                  "type": "string",
-                  "description": "TODO description: texture",
-                  "title": "Texture"
-                },
-                "texture_index": {
-                  "type": "integer",
-                  "description": "TODO description: texture index",
-                  "title": "Texture Index"
-                }
+                "base_colour": { "type": "string", "description": "TODO description: base colour", "title": "Base Colour" },
+                "overlay_color": { "type": "string", "description": "TODO description: overlay color", "title": "Overlay Color" },
+                "texture": { "type": "string", "description": "TODO description: texture", "title": "Texture" },
+                "texture_index": { "type": "integer", "description": "TODO description: texture index", "title": "Texture Index" }
               }
             },
             "textures": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: textures",
               "title": "Textures"
             }
diff --git a/source/resource/attachables/1.8.0/attachables.json b/source/resource/attachables/1.8.0/attachables.json
index 83d971cd..07f535a3 100644
--- a/source/resource/attachables/1.8.0/attachables.json
+++ b/source/resource/attachables/1.8.0/attachables.json
@@ -2,39 +2,35 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.1.8.0.attachables",
   "type": "object",
-  "title": "The minecraft resourcepack actor animation 1.8.0",
+  "title": "Resourcepack Actor Animation 1.8.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:attachable"],
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:attachable": {
       "type": "object",
-      "title": "The attachables",
+      "title": "Attachables",
       "description": "The attachables definition for 1.8.0",
       "required": ["description"],
       "properties": {
         "description": {
           "additionalProperties": false,
-          "title": "Description definition",
+          "title": "Description ",
           "description": "TODO description: description",
           "type": "object",
           "required": ["identifier", "geometry"],
           "properties": {
             "animations": {
               "description": "The connecting of animations in animations controllers with the actuall animations, names should corosponds",
-              "title": "The animations schema",
+              "title": "Animations Schema",
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              }
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" }
             },
             "animation_controllers": {
               "type": "array",
@@ -43,82 +39,39 @@
               "title": "Animation Controllers",
               "items": {
                 "type": "object",
-                "additionalProperties": {
-                  "type": "string",
-                  "description": "TODO description: additionalProperties",
-                  "title": "TODO"
-                },
+                "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
                 "description": "TODO description: animation controllers",
                 "title": "Animation Controllers"
               }
             },
-            "enable_attachables": {
-              "type": "boolean",
-              "description": "TODO description: enable attachables",
-              "title": "Enable Attachables"
-            },
+            "enable_attachables": { "type": "boolean", "description": "TODO description: enable attachables", "title": "Enable Attachables" },
             "geometry": {
-              "title": "Geometry definition",
+              "title": "Geometry ",
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: geometry"
             },
-            "identifier": {
-              "type": "string",
-              "description": "TODO description: identifier",
-              "title": "Identifier",
-              "$ref": "../../../general/item/identifier.json"
-            },
-            "item": {
-              "type": "object",
-              "title": "Item",
-              "description": "TODO",
-              "additionalProperties": {
-                "type": "string",
-                "title": "TODO",
-                "description": "TODO"
-              }
-            },
+            "identifier": { "type": "string", "description": "TODO description: identifier", "title": "Identifier", "$ref": "../../../general/item/identifier.json" },
+            "item": { "type": "object", "title": "Item", "description": "TODO", "additionalProperties": { "type": "string", "title": "TODO", "description": "TODO" } },
             "materials": {
               "type": "object",
               "description": "TODO description: materials",
               "title": "Materials",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              }
-            },
-            "min_engine_version": {
-              "type": "string",
-              "pattern": "[0-9]+\\.[0-9]+\\.[0-9]+",
-              "description": "TODO description: min engine version",
-              "title": "Min Engine Version"
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" }
             },
+            "min_engine_version": { "type": "string", "pattern": "[0-9]+\\.[0-9]+\\.[0-9]+", "description": "TODO description: min engine version", "title": "Min Engine Version" },
             "particle_effects": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle effects",
               "title": "Particle Effects"
             },
             "particle_emitters": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle emitters",
               "title": "Particle Emitters"
             },
@@ -127,54 +80,25 @@
               "description": "TODO description: render controllers",
               "title": "Render Controllers",
               "minItems": 1,
-              "items": {
-                "type": "string",
-                "description": "TODO description: render controllers",
-                "title": "Render Controllers"
-              }
+              "items": { "type": "string", "description": "TODO description: render controllers", "title": "Render Controllers" }
             },
             "sound_effects": {
               "type": "array",
               "description": "TODO description: sound effects",
               "title": "Sound Effects",
               "minItems": 1,
-              "items": {
-                "type": "string",
-                "description": "TODO description: sound effects",
-                "title": "Sound Effects"
-              }
+              "items": { "type": "string", "description": "TODO description: sound effects", "title": "Sound Effects" }
             },
             "spawn_egg": {
               "type": "object",
               "description": "TODO description: spawn egg",
               "title": "Spawn Egg",
-              "dependencies": {
-                "texture": ["texture_index"],
-                "texture_index": ["texture"],
-                "base_colour": ["overlay_color"],
-                "overlay_color": ["base_colour"]
-              },
+              "dependencies": { "texture": ["texture_index"], "texture_index": ["texture"], "base_colour": ["overlay_color"], "overlay_color": ["base_colour"] },
               "properties": {
-                "base_colour": {
-                  "type": "string",
-                  "description": "TODO description: base colour",
-                  "title": "Base Colour"
-                },
-                "overlay_color": {
-                  "type": "string",
-                  "description": "TODO description: overlay color",
-                  "title": "Overlay Color"
-                },
-                "texture": {
-                  "type": "string",
-                  "description": "TODO description: texture",
-                  "title": "Texture"
-                },
-                "texture_index": {
-                  "type": "integer",
-                  "description": "TODO description: texture index",
-                  "title": "Texture Index"
-                }
+                "base_colour": { "type": "string", "description": "TODO description: base colour", "title": "Base Colour" },
+                "overlay_color": { "type": "string", "description": "TODO description: overlay color", "title": "Overlay Color" },
+                "texture": { "type": "string", "description": "TODO description: texture", "title": "Texture" },
+                "texture_index": { "type": "integer", "description": "TODO description: texture index", "title": "Texture Index" }
               }
             },
             "scripts": {
@@ -182,40 +106,23 @@
               "properties": {
                 "pre_animation": {
                   "type": "array",
-                  "items": {
-                    "pattern": ";$",
-                    "$ref": "../../../molang/1.8.0/number.json",
-                    "description": "TODO description: pre aninamtion",
-                    "title": "Pre Animation"
-                  },
+                  "items": { "pattern": ";$", "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: pre aninamtion", "title": "Pre Animation" },
                   "description": "TODO description: pre aninamtion",
                   "title": "Pre Animation"
                 },
-                "scale": {
-                  "type": "string",
-                  "description": "TODO description: scale",
-                  "title": "Scale"
-                },
+                "scale": { "type": "string", "description": "TODO description: scale", "title": "Scale" },
                 "animate": {
                   "type": "array",
-                  "title": "Animate schema",
+                  "title": "Animate Schema",
                   "items": {
                     "oneOf": [
-                      {
-                        "type": "string",
-                        "description": "TODO description: oneOf[0]",
-                        "title": "TODO title"
-                      },
+                      { "type": "string", "description": "TODO description: oneOf[0]", "title": "TODO Title" },
                       {
                         "type": "object",
                         "minProperties": 1,
-                        "additionalProperties": {
-                          "type": "string",
-                          "description": "TODO description: additionalProperties",
-                          "title": "TODO"
-                        },
+                        "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
                         "description": "TODO description: oneOf[1]",
-                        "title": "TODO title"
+                        "title": "TODO Title"
                       }
                     ],
                     "description": "TODO description: animate",
@@ -223,20 +130,14 @@
                   },
                   "description": "TODO description: animate"
                 },
-                "parent_setup": {
-                  "$ref": "../../../molang/1.8.0/number.json"
-                }
+                "parent_setup": { "$ref": "../../../molang/1.8.0/number.json" }
               },
               "description": "TODO description: scripts",
               "title": "Scripts"
             },
             "textures": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: textures",
               "title": "Textures"
             }
diff --git a/source/resource/attachables/attachables.json b/source/resource/attachables/attachables.json
index e642683d..4526ab62 100644
--- a/source/resource/attachables/attachables.json
+++ b/source/resource/attachables/attachables.json
@@ -7,16 +7,9 @@
       "minecraft:attachable": {
         "description": {
           "identifier": "minecraft:item",
-          "materials": {
-            "default": "entity_alphatest",
-            "enchanted": "entity_alphatest_glint"
-          },
-          "textures": {
-            "default": "textures/items/item"
-          },
-          "geometry": {
-            "default": "geometry.item"
-          },
+          "materials": { "default": "entity_alphatest", "enchanted": "entity_alphatest_glint" },
+          "textures": { "default": "textures/items/item" },
+          "geometry": { "default": "geometry.item" },
           "scripts": {},
           "render_controllers": ["controller.render.item"]
         }
@@ -24,17 +17,8 @@
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/attachables.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } },
-      "then": { "$ref": "./1.10.0/attachables.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/attachables.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/attachables.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } }, "then": { "$ref": "./1.10.0/attachables.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/attachables.json" } }
   ]
 }
diff --git a/source/resource/biomes_client.json b/source/resource/biomes_client.json
index f2998bbe..373246a2 100644
--- a/source/resource/biomes_client.json
+++ b/source/resource/biomes_client.json
@@ -2,52 +2,24 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.biomes_client.json",
   "type": "object",
-  "title": "Biomes client",
+  "title": "Biomes Client",
   "description": "The minecraft biomes definition file",
   "definitions": {
     "biomespec": {
       "additionalProperties": false,
       "description": "The specification of colors in a given biome",
-      "title": "Biome specification",
+      "title": "Biome ",
       "type": "object",
       "properties": {
-        "fog_color": {
-          "$ref": "#/definitions/colorhex",
-          "title": "Fog color",
-          "description": "The color of the fog"
-        },
-        "fog_identifier": {
-          "title": "Fog identifier",
-          "description": "The fog to be associated to this biome",
-          "$ref": "../general/fog/identifier.json"
-        },
-        "water_fog_color": {
-          "$ref": "#/definitions/colorhex",
-          "title": "Water fog color",
-          "description": "The color of the water fog"
-        },
-        "water_fog_distance": {
-          "type": "integer",
-          "title": "Water fog distance",
-          "description": "The distance the water fog start at"
-        },
-        "water_surface_color": {
-          "$ref": "#/definitions/colorhex",
-          "title": "Water surface color",
-          "description": "The color of the water surface"
-        },
-        "water_surface_transparency": {
-          "type": "number",
-          "title": "Water surface transparency",
-          "description": "TODO"
-        }
+        "fog_color": { "$ref": "#/definitions/colorhex", "title": "Fog Color", "description": "The color of the fog" },
+        "fog_identifier": { "title": "Fog Identifier", "description": "The fog to be associated to this biome", "$ref": "../general/fog/identifier.json" },
+        "water_fog_color": { "$ref": "#/definitions/colorhex", "title": "Water Fog Color", "description": "The color of the water fog" },
+        "water_fog_distance": { "type": "integer", "title": "Water Fog Distance", "description": "The distance the water fog start at" },
+        "water_surface_color": { "$ref": "#/definitions/colorhex", "title": "Water Surface Color", "description": "The color of the water surface" },
+        "water_surface_transparency": { "type": "number", "title": "Water Surface Transparency", "description": "TODO" }
       }
     },
-    "colorhex": {
-      "description": "TODO description: colorhex",
-      "title": "Colorhex",
-      "format": "color-hex"
-    }
+    "colorhex": { "description": "TODO description: colorhex", "title": "Colorhex", "format": "color-hex" }
   },
   "properties": {
     "biomes": {
@@ -56,213 +28,75 @@
       "title": "Biomes",
       "type": "object",
       "properties": {
-        "bamboo_jungle": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "bamboo_jungle_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "basalt_deltas": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "beach": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "birch_forest": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "birch_forest_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "cold_beach": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "cold_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "cold_taiga": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "cold_taiga_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "cold_taiga_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "crimson_forest": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "deep_cold_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "deep_frozen_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "deep_lukewarm_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "deep_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "deep_warm_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "default": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "desert": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "desert_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "extreme_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "extreme_hills_edge": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "extreme_hills_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "extreme_hills_plus_trees": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "extreme_hills_plus_trees_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "flower_forest": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "forest": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "forest_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "frozen_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "frozen_river": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "hell": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "ice_mountains": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "ice_plains": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "ice_plains_spikes": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "jungle": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "jungle_edge": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "jungle_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "jungle_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "lukewarm_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mega_spruce_taiga": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mega_spruce_taiga_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mega_taiga": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mega_taiga_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mega_taiga_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mesa": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mesa_bryce": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mesa_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mesa_plateau": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mesa_plateau_stone": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mushroom_island": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "mushroom_island_shore": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "plains": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "river": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "roofed_forest": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "savanna": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "savanna_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "savanna_plateau": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "soulsand_valley": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "stone_beach": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "sunflower_plains": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "swampland": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "swampland_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "taiga": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "taiga_hills": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "taiga_mutated": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "the_end": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "warm_ocean": {
-          "$ref": "#/definitions/biomespec"
-        },
-        "warped_forest": {
-          "$ref": "#/definitions/biomespec"
-        }
+        "bamboo_jungle": { "$ref": "#/definitions/biomespec" },
+        "bamboo_jungle_hills": { "$ref": "#/definitions/biomespec" },
+        "basalt_deltas": { "$ref": "#/definitions/biomespec" },
+        "beach": { "$ref": "#/definitions/biomespec" },
+        "birch_forest": { "$ref": "#/definitions/biomespec" },
+        "birch_forest_hills": { "$ref": "#/definitions/biomespec" },
+        "cold_beach": { "$ref": "#/definitions/biomespec" },
+        "cold_ocean": { "$ref": "#/definitions/biomespec" },
+        "cold_taiga": { "$ref": "#/definitions/biomespec" },
+        "cold_taiga_hills": { "$ref": "#/definitions/biomespec" },
+        "cold_taiga_mutated": { "$ref": "#/definitions/biomespec" },
+        "crimson_forest": { "$ref": "#/definitions/biomespec" },
+        "deep_cold_ocean": { "$ref": "#/definitions/biomespec" },
+        "deep_frozen_ocean": { "$ref": "#/definitions/biomespec" },
+        "deep_lukewarm_ocean": { "$ref": "#/definitions/biomespec" },
+        "deep_ocean": { "$ref": "#/definitions/biomespec" },
+        "deep_warm_ocean": { "$ref": "#/definitions/biomespec" },
+        "default": { "$ref": "#/definitions/biomespec" },
+        "desert": { "$ref": "#/definitions/biomespec" },
+        "desert_hills": { "$ref": "#/definitions/biomespec" },
+        "extreme_hills": { "$ref": "#/definitions/biomespec" },
+        "extreme_hills_edge": { "$ref": "#/definitions/biomespec" },
+        "extreme_hills_mutated": { "$ref": "#/definitions/biomespec" },
+        "extreme_hills_plus_trees": { "$ref": "#/definitions/biomespec" },
+        "extreme_hills_plus_trees_mutated": { "$ref": "#/definitions/biomespec" },
+        "flower_forest": { "$ref": "#/definitions/biomespec" },
+        "forest": { "$ref": "#/definitions/biomespec" },
+        "forest_hills": { "$ref": "#/definitions/biomespec" },
+        "frozen_ocean": { "$ref": "#/definitions/biomespec" },
+        "frozen_river": { "$ref": "#/definitions/biomespec" },
+        "hell": { "$ref": "#/definitions/biomespec" },
+        "ice_mountains": { "$ref": "#/definitions/biomespec" },
+        "ice_plains": { "$ref": "#/definitions/biomespec" },
+        "ice_plains_spikes": { "$ref": "#/definitions/biomespec" },
+        "jungle": { "$ref": "#/definitions/biomespec" },
+        "jungle_edge": { "$ref": "#/definitions/biomespec" },
+        "jungle_hills": { "$ref": "#/definitions/biomespec" },
+        "jungle_mutated": { "$ref": "#/definitions/biomespec" },
+        "lukewarm_ocean": { "$ref": "#/definitions/biomespec" },
+        "mega_spruce_taiga": { "$ref": "#/definitions/biomespec" },
+        "mega_spruce_taiga_mutated": { "$ref": "#/definitions/biomespec" },
+        "mega_taiga": { "$ref": "#/definitions/biomespec" },
+        "mega_taiga_hills": { "$ref": "#/definitions/biomespec" },
+        "mega_taiga_mutated": { "$ref": "#/definitions/biomespec" },
+        "mesa": { "$ref": "#/definitions/biomespec" },
+        "mesa_bryce": { "$ref": "#/definitions/biomespec" },
+        "mesa_mutated": { "$ref": "#/definitions/biomespec" },
+        "mesa_plateau": { "$ref": "#/definitions/biomespec" },
+        "mesa_plateau_stone": { "$ref": "#/definitions/biomespec" },
+        "mushroom_island": { "$ref": "#/definitions/biomespec" },
+        "mushroom_island_shore": { "$ref": "#/definitions/biomespec" },
+        "ocean": { "$ref": "#/definitions/biomespec" },
+        "plains": { "$ref": "#/definitions/biomespec" },
+        "river": { "$ref": "#/definitions/biomespec" },
+        "roofed_forest": { "$ref": "#/definitions/biomespec" },
+        "savanna": { "$ref": "#/definitions/biomespec" },
+        "savanna_mutated": { "$ref": "#/definitions/biomespec" },
+        "savanna_plateau": { "$ref": "#/definitions/biomespec" },
+        "soulsand_valley": { "$ref": "#/definitions/biomespec" },
+        "stone_beach": { "$ref": "#/definitions/biomespec" },
+        "sunflower_plains": { "$ref": "#/definitions/biomespec" },
+        "swampland": { "$ref": "#/definitions/biomespec" },
+        "swampland_mutated": { "$ref": "#/definitions/biomespec" },
+        "taiga": { "$ref": "#/definitions/biomespec" },
+        "taiga_hills": { "$ref": "#/definitions/biomespec" },
+        "taiga_mutated": { "$ref": "#/definitions/biomespec" },
+        "the_end": { "$ref": "#/definitions/biomespec" },
+        "warm_ocean": { "$ref": "#/definitions/biomespec" },
+        "warped_forest": { "$ref": "#/definitions/biomespec" }
       }
     }
   },
diff --git a/source/resource/blocks.json b/source/resource/blocks.json
index c27c772a..bd8e5b67 100644
--- a/source/resource/blocks.json
+++ b/source/resource/blocks.json
@@ -7,129 +7,57 @@
   "definitions": {
     "texture": {
       "oneOf": [
-        {
-          "type": "string"
-        },
+        { "type": "string" },
         {
           "additionalProperties": false,
           "type": "object",
           "properties": {
-            "down": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            },
-            "up": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            },
-            "side": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            },
-            "south": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            },
-            "north": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            },
-            "west": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            },
-            "east": {
-              "type": "string",
-              "pattern": "^[\\w_\\-]+$"
-            }
+            "down": { "type": "string", "pattern": "^[\\w_\\-]+$" },
+            "up": { "type": "string", "pattern": "^[\\w_\\-]+$" },
+            "side": { "type": "string", "pattern": "^[\\w_\\-]+$" },
+            "south": { "type": "string", "pattern": "^[\\w_\\-]+$" },
+            "north": { "type": "string", "pattern": "^[\\w_\\-]+$" },
+            "west": { "type": "string", "pattern": "^[\\w_\\-]+$" },
+            "east": { "type": "string", "pattern": "^[\\w_\\-]+$" }
           }
         }
       ]
     }
   },
-  "propertyNames": {
-    "pattern": "^[\\w_\\-:]+$"
-  },
+  "propertyNames": { "pattern": "^[\\w_\\-:]+$" },
   "properties": {
-    "format_version": {
-      "type": "array",
-      "items": [
-        {
-          "type": "integer"
-        },
-        {
-          "type": "integer"
-        },
-        {
-          "type": "integer"
-        }
-      ],
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "format_version": { "type": "array", "items": [{ "type": "integer" }, { "type": "integer" }, { "type": "integer" }], "description": "TODO description", "title": "TODO Title" }
   },
   "additionalProperties": {
     "additionalProperties": false,
-    "title": "Block definition",
+    "title": "Block ",
     "description": "TODO",
     "type": "object",
     "properties": {
-      "brightness_gamma": {
-        "type": "number",
-        "title": "Brightness gamma",
-        "description": "TODO"
-      },
-      "carried_textures": {
-        "$ref": "#/definitions/texture",
-        "title": "Carried textures",
-        "description": "TODO"
-      },
+      "brightness_gamma": { "type": "number", "title": "Brightness Gamma", "description": "TODO" },
+      "carried_textures": { "$ref": "#/definitions/texture", "title": "Carried Textures", "description": "TODO" },
       "isotropic": {
         "title": "Isotropic",
         "description": "TODO",
         "oneOf": [
-          {
-            "type": "boolean"
-          },
+          { "type": "boolean" },
           {
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "down": {
-                "type": "boolean"
-              },
-              "up": {
-                "type": "boolean"
-              },
-              "side": {
-                "type": "boolean"
-              },
-              "south": {
-                "type": "boolean"
-              },
-              "north": {
-                "type": "boolean"
-              },
-              "west": {
-                "type": "boolean"
-              },
-              "east": {
-                "type": "boolean"
-              }
+              "down": { "type": "boolean" },
+              "up": { "type": "boolean" },
+              "side": { "type": "boolean" },
+              "south": { "type": "boolean" },
+              "north": { "type": "boolean" },
+              "west": { "type": "boolean" },
+              "east": { "type": "boolean" }
             }
           }
         ]
       },
-      "sound": {
-        "type": "string",
-        "title": "Sound",
-        "description": "TODO"
-      },
-      "textures": {
-        "$ref": "#/definitions/texture",
-        "title": "Sound",
-        "description": "Textures"
-      }
+      "sound": { "type": "string", "title": "Sound", "description": "TODO" },
+      "textures": { "$ref": "#/definitions/texture", "title": "Sound", "description": "Textures" }
     }
   }
 }
diff --git a/source/resource/entity/1.10.0/entity.json b/source/resource/entity/1.10.0/entity.json
index 07b84b2b..2cf08f52 100644
--- a/source/resource/entity/1.10.0/entity.json
+++ b/source/resource/entity/1.10.0/entity.json
@@ -2,24 +2,24 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.1.10.0.entity",
   "type": "object",
-  "title": "The minecraft resourcepack actor animation 1.10.0",
+  "title": "Resourcepack Actor Animation 1.10.0",
   "description": "TODO description",
   "required": ["format_version", "minecraft:client_entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "pattern": "^1.10.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "minecraft:client_entity": {
       "type": "object",
-      "title": "The client entity",
+      "title": "Client Entity",
       "description": "The client entity definition",
       "required": ["description"],
       "properties": {
         "description": {
-          "title": "Description definition",
+          "title": "Description ",
           "type": "object",
           "required": ["identifier"],
           "additionalProperties": false,
@@ -31,74 +31,38 @@
               "additionalProperties": {
                 "type": "string",
                 "description": "A reference to an animation or animation controller",
-                "title": "Animation reference",
-                "examples": [
-                  {
-                    "basic": "controller.generic.basic"
-                  }
-                ]
+                "title": "Animation Reference",
+                "examples": [{ "basic": "controller.generic.basic" }]
               }
             },
-            "enable_attachables": {
-              "type": "boolean",
-              "description": "TODO description: enable attachables",
-              "title": "Enable Attachables"
-            },
+            "enable_attachables": { "type": "boolean", "description": "TODO description: enable attachables", "title": "Enable Attachables" },
             "geometry": {
-              "title": "Geometry definition",
+              "title": "Geometry ",
               "description": "The reference to defined geometries in '<resource pack>/models/'",
               "type": "object",
-              "propertyNames": {
-                "pattern": "[a-zA-Z0-9_\\.\\-]+"
-              },
+              "propertyNames": { "pattern": "[a-zA-Z0-9_\\.\\-]+" },
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "The reference to the geometry",
-                "title": "Geometry reference"
-              }
-            },
-            "identifier": {
-              "type": "string",
-              "description": "TODO description: identifier",
-              "title": "Identifier",
-              "$ref": "../../../general/item/identifier.json"
+              "additionalProperties": { "type": "string", "description": "The reference to the geometry", "title": "Geometry Reference" }
             },
+            "identifier": { "type": "string", "description": "TODO description: identifier", "title": "Identifier", "$ref": "../../../general/item/identifier.json" },
             "materials": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: materials",
               "title": "Materials"
             },
-            "min_engine_version": {
-              "type": "string",
-              "pattern": "[0-9]+\\.[0-9]+\\.[0-9]+",
-              "description": "TODO description: min engine version",
-              "title": "Min Engine Version"
-            },
+            "min_engine_version": { "type": "string", "pattern": "[0-9]+\\.[0-9]+\\.[0-9]+", "description": "TODO description: min engine version", "title": "Min Engine Version" },
             "particle_effects": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle effects",
               "title": "Particle Effects"
             },
             "particle_emitters": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle emitters",
               "title": "Particle Emitters"
             },
@@ -109,17 +73,8 @@
               "minItems": 1,
               "items": {
                 "oneOf": [
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "type": "object",
-                    "additionalProperties": {
-                      "type": "string",
-                      "description": "A render controller",
-                      "title": "Render controller"
-                    }
-                  }
+                  { "type": "string" },
+                  { "type": "object", "additionalProperties": { "type": "string", "description": "A render controller", "title": "Render Controller" } }
                 ]
               }
             },
@@ -131,25 +86,17 @@
               "properties": {
                 "animate": {
                   "type": "array",
-                  "title": "Animate schema",
+                  "title": "Animate Schema",
                   "minItems": 1,
                   "items": {
                     "oneOf": [
-                      {
-                        "type": "string",
-                        "description": "TODO description: oneOf[0]",
-                        "title": "TODO title"
-                      },
+                      { "type": "string", "description": "TODO description: oneOf[0]", "title": "TODO Title" },
                       {
                         "type": "object",
                         "minProperties": 1,
-                        "additionalProperties": {
-                          "type": "string",
-                          "description": "TODO description: additionalProperties",
-                          "title": "TODO"
-                        },
+                        "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
                         "description": "TODO description: oneOf[1]",
-                        "title": "TODO title"
+                        "title": "TODO Title"
                       }
                     ],
                     "description": "TODO description: animate",
@@ -161,55 +108,26 @@
                   "type": "array",
                   "description": "TODO description: initialize",
                   "title": "Initialize",
-                  "items": {
-                    "pattern": ";$",
-                    "$ref": "../../../molang/1.8.0/string.json",
-                    "description": "TODO description: initialize",
-                    "title": "Initialize"
-                  }
+                  "items": { "pattern": ";$", "$ref": "../../../molang/1.8.0/string.json", "description": "TODO description: initialize", "title": "Initialize" }
                 },
                 "pre_animation": {
                   "type": "array",
                   "description": "TODO description: pre aninamtion",
                   "title": "Pre Animation",
-                  "items": {
-                    "pattern": ";$",
-                    "$ref": "../../../molang/1.8.0/string.json",
-                    "description": "TODO description: pre aninamtion",
-                    "title": "Pre Animation"
-                  }
-                },
-                "parent_setup": {
-                  "type": "string",
-                  "description": "TODO description: parent setup",
-                  "title": "Parent Setup",
-                  "$ref": "../../../molang/1.8.0/number.json"
-                },
-                "scale": {
-                  "type": "string",
-                  "description": "TODO description: scale",
-                  "title": "Scale",
-                  "$ref": "../../../molang/1.8.0/number.json"
-                },
-                "scalex": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "title": "Scale X"
-                },
-                "scaley": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "title": "Scale Y"
-                },
-                "scalez": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "title": "Scale Z"
+                  "items": { "pattern": ";$", "$ref": "../../../molang/1.8.0/string.json", "description": "TODO description: pre aninamtion", "title": "Pre Animation" }
                 },
+                "parent_setup": { "type": "string", "description": "TODO description: parent setup", "title": "Parent Setup", "$ref": "../../../molang/1.8.0/number.json" },
+                "scale": { "type": "string", "description": "TODO description: scale", "title": "Scale", "$ref": "../../../molang/1.8.0/number.json" },
+                "scalex": { "$ref": "../../../molang/1.8.0/number.json", "title": "Scale X" },
+                "scaley": { "$ref": "../../../molang/1.8.0/number.json", "title": "Scale Y" },
+                "scalez": { "$ref": "../../../molang/1.8.0/number.json", "title": "Scale Z" },
                 "should_update_bones_and_effects_offscreen": {
-                  "title": "Should update bones and effects offscreen",
+                  "title": "Should Update Bones And Effects Offscreen",
                   "description": "Bones and effects will still be updated if the entity is off screen if this expression returns anything other than 0.0.",
                   "$ref": "../../../molang/1.8.0/string.json"
                 },
                 "should_update_effects_offscreen": {
-                  "title": "Should update effects offscreen",
+                  "title": "Should Update Effects Offscreen",
                   "description": "Effects will still be updated if the entity is off screen if this expression or `should_update_bones_and_effects_offscreen` returns anything other than 0.0.",
                   "$ref": "../../../molang/1.8.0/string.json"
                 },
@@ -218,11 +136,9 @@
                   "description": " A list of variables that need certain settings applied to them. Currently, for the client, only \"public\" is supported.",
                   "type": "object",
                   "minProperties": 1,
-                  "propertyNames": {
-                    "pattern": "variable.[a-zA-Z_][a-zA-Z0-9_]*"
-                  },
+                  "propertyNames": { "pattern": "variable.[a-zA-Z_][a-zA-Z0-9_]*" },
                   "additionalProperties": {
-                    "title": "Variable definition",
+                    "title": "Variable ",
                     "description": " If a variable is public, it can be read by other mobs. See the molang `->` operator for details.",
                     "type": "string",
                     "enum": ["public"]
@@ -235,54 +151,24 @@
               "description": "TODO description: sound effects",
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "Sound effect"
-              }
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "Sound Effect" }
             },
             "spawn_egg": {
               "additionalProperties": false,
               "type": "object",
               "description": "TODO description: spawn egg",
               "title": "Spawn Egg",
-              "dependencies": {
-                "texture_index": ["texture"],
-                "base_colour": ["overlay_color"],
-                "overlay_color": ["base_color"]
-              },
+              "dependencies": { "texture_index": ["texture"], "base_colour": ["overlay_color"], "overlay_color": ["base_color"] },
               "properties": {
-                "base_color": {
-                  "type": "string",
-                  "description": "TODO description: base color",
-                  "title": "Base Color",
-                  "format": "color-hex"
-                },
-                "overlay_color": {
-                  "type": "string",
-                  "description": "TODO description: overlay color",
-                  "title": "Overlay Color",
-                  "format": "color-hex"
-                },
-                "texture": {
-                  "type": "string",
-                  "description": "TODO description: texture",
-                  "title": "Texture"
-                },
-                "texture_index": {
-                  "type": "integer",
-                  "description": "TODO description: texture index",
-                  "title": "Texture Index"
-                }
+                "base_color": { "type": "string", "description": "TODO description: base color", "title": "Base Color", "format": "color-hex" },
+                "overlay_color": { "type": "string", "description": "TODO description: overlay color", "title": "Overlay Color", "format": "color-hex" },
+                "texture": { "type": "string", "description": "TODO description: texture", "title": "Texture" },
+                "texture_index": { "type": "integer", "description": "TODO description: texture index", "title": "Texture Index" }
               }
             },
             "textures": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: textures",
               "title": "Textures"
             }
diff --git a/source/resource/entity/1.8.0/entity.json b/source/resource/entity/1.8.0/entity.json
index a217030f..5fa41d8b 100644
--- a/source/resource/entity/1.8.0/entity.json
+++ b/source/resource/entity/1.8.0/entity.json
@@ -2,13 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.entity1.8.0",
   "type": "object",
-  "title": "The minecraft resourcepack actor animation 1.8.0",
+  "title": "Resourcepack Actor Animation 1.8.0",
   "description": "TODO description",
   "additionalProperties": false,
   "required": ["format_version", "minecraft:client_entity"],
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
@@ -16,26 +16,22 @@
     "minecraft:client_entity": {
       "type": "object",
       "additionalProperties": false,
-      "title": "Client entity",
+      "title": "Client Entity",
       "description": "The definition of an entity's models, materials, textures, and animations",
       "properties": {
         "description": {
           "additionalProperties": false,
-          "title": "Description definition",
+          "title": "Description ",
           "description": "TODO description: description",
           "type": "object",
           "required": ["identifier"],
           "properties": {
             "animations": {
               "description": "The connecting of animations in animations controllers with the actuall animations, names should corosponds",
-              "title": "The animations schema",
+              "title": "Animations Schema",
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              }
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" }
             },
             "animation_controllers": {
               "type": "array",
@@ -44,72 +40,38 @@
               "title": "Animation Controllers",
               "items": {
                 "type": "object",
-                "additionalProperties": {
-                  "type": "string",
-                  "description": "TODO description: additionalProperties",
-                  "title": "TODO"
-                },
+                "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
                 "description": "TODO description: animation controllers",
                 "title": "Animation Controllers"
               }
             },
-            "enable_attachables": {
-              "type": "boolean",
-              "description": "TODO description: enable attachables",
-              "title": "Enable Attachables"
-            },
+            "enable_attachables": { "type": "boolean", "description": "TODO description: enable attachables", "title": "Enable Attachables" },
             "geometry": {
-              "title": "Geometry definition",
+              "title": "Geometry ",
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: geometry"
             },
-            "identifier": {
-              "type": "string",
-              "description": "TODO description: identifier",
-              "title": "Identifier",
-              "$ref": "../../../general/entity/identifier.json"
-            },
+            "identifier": { "type": "string", "description": "TODO description: identifier", "title": "Identifier", "$ref": "../../../general/entity/identifier.json" },
             "materials": {
               "type": "object",
               "description": "TODO description: materials",
               "title": "Materials",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              }
-            },
-            "min_engine_version": {
-              "type": "string",
-              "pattern": "[0-9]+\\.[0-9]+\\.[0-9]+",
-              "description": "TODO description: min engine version",
-              "title": "Min Engine Version"
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" }
             },
+            "min_engine_version": { "type": "string", "pattern": "[0-9]+\\.[0-9]+\\.[0-9]+", "description": "TODO description: min engine version", "title": "Min Engine Version" },
             "particle_effects": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle effects",
               "title": "Particle Effects"
             },
             "particle_emitters": {
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: particle emitters",
               "title": "Particle Emitters"
             },
@@ -118,56 +80,26 @@
               "description": "TODO description: render controllers",
               "title": "Render Controllers",
               "minItems": 1,
-              "items": {
-                "type": "string",
-                "description": "TODO description: render controllers",
-                "title": "Render Controllers"
-              }
+              "items": { "type": "string", "description": "TODO description: render controllers", "title": "Render Controllers" }
             },
             "sound_effects": {
               "title": "Sound Effects",
               "description": "TODO description: sound effects",
               "type": "object",
               "minProperties": 1,
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              }
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" }
             },
             "spawn_egg": {
               "additionalProperties": false,
               "type": "object",
               "description": "TODO description: spawn egg",
               "title": "Spawn Egg",
-              "dependencies": {
-                "texture_index": ["texture"],
-                "base_colour": ["overlay_color"],
-                "overlay_color": ["base_color"]
-              },
+              "dependencies": { "texture_index": ["texture"], "base_colour": ["overlay_color"], "overlay_color": ["base_color"] },
               "properties": {
-                "base_color": {
-                  "type": "string",
-                  "description": "TODO description: base color",
-                  "title": "Base Color",
-                  "format": "color-hex"
-                },
-                "overlay_color": {
-                  "type": "string",
-                  "description": "TODO description: overlay color",
-                  "title": "Overlay Color",
-                  "format": "color-hex"
-                },
-                "texture": {
-                  "type": "string",
-                  "description": "TODO description: texture",
-                  "title": "Texture"
-                },
-                "texture_index": {
-                  "type": "integer",
-                  "description": "TODO description: texture index",
-                  "title": "Texture Index"
-                }
+                "base_color": { "type": "string", "description": "TODO description: base color", "title": "Base Color", "format": "color-hex" },
+                "overlay_color": { "type": "string", "description": "TODO description: overlay color", "title": "Overlay Color", "format": "color-hex" },
+                "texture": { "type": "string", "description": "TODO description: texture", "title": "Texture" },
+                "texture_index": { "type": "integer", "description": "TODO description: texture index", "title": "Texture Index" }
               }
             },
             "scripts": {
@@ -180,42 +112,18 @@
                   "type": "array",
                   "description": "TODO description: pre aninamtion",
                   "title": "Pre Animation",
-                  "items": {
-                    "pattern": ";$",
-                    "$ref": "../../../molang/1.8.0/number.json",
-                    "description": "TODO description: pre aninamtion",
-                    "title": "Pre Animation"
-                  }
+                  "items": { "pattern": ";$", "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: pre aninamtion", "title": "Pre Animation" }
                 },
-                "parent_setup": {
-                  "$ref": "../../../molang/1.8.0/number.json"
-                },
-                "scale": {
-                  "type": "string",
-                  "description": "TODO description: scale",
-                  "title": "Scale"
-                },
-                "scalex": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "title": "Scale X"
-                },
-                "scaley": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "title": "Scale Y"
-                },
-                "scalez": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "title": "Scale Z"
-                }
+                "parent_setup": { "$ref": "../../../molang/1.8.0/number.json" },
+                "scale": { "type": "string", "description": "TODO description: scale", "title": "Scale" },
+                "scalex": { "$ref": "../../../molang/1.8.0/number.json", "title": "Scale X" },
+                "scaley": { "$ref": "../../../molang/1.8.0/number.json", "title": "Scale Y" },
+                "scalez": { "$ref": "../../../molang/1.8.0/number.json", "title": "Scale Z" }
               }
             },
             "textures": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: textures",
               "title": "Textures"
             }
diff --git a/source/resource/entity/entity.json b/source/resource/entity/entity.json
index 600f26b0..6e5ae7d3 100644
--- a/source/resource/entity/entity.json
+++ b/source/resource/entity/entity.json
@@ -8,33 +8,19 @@
         "description": {
           "identifier": "minecraft:entity",
           "materials": { "default": "entity_custom" },
-          "textures": {
-            "default": "textures/entity/custom/entity"
-          },
-          "geometry": {
-            "default": "geometry.entity"
-          },
+          "textures": { "default": "textures/entity/custom/entity" },
+          "geometry": { "default": "geometry.entity" },
           "animations": {},
           "particle_effects": {},
           "scripts": {},
           "render_controllers": ["controller.render.entity"],
-
-          "spawn_egg": {
-            "base_color": "#288483",
-            "overlay_color": "#2B7135"
-          }
+          "spawn_egg": { "base_color": "#288483", "overlay_color": "#2B7135" }
         }
       }
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/entity.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/entity.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/entity.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/entity.json" } }
   ]
 }
diff --git a/source/resource/fog/1.16.100/fog.json b/source/resource/fog/1.16.100/fog.json
index 2e1f2fd6..d2a5415d 100644
--- a/source/resource/fog/1.16.100/fog.json
+++ b/source/resource/fog/1.16.100/fog.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.resource.1.16.100.resource",
   "type": "object",
   "additionalProperties": false,
-  "title": "Fog specification",
+  "title": "Fog ",
   "description": "TODO",
   "definitions": {
     "colorHexOrArray": {
@@ -17,11 +17,7 @@
             { "type": "number", "minimum": 0, "maximum": 1, "title": "Blue" }
           ]
         },
-        {
-          "type": "string",
-          "format": "color-hex",
-          "pattern": "^\\#[0-9a-fA-F]{6}$"
-        }
+        { "type": "string", "format": "color-hex", "pattern": "^\\#[0-9a-fA-F]{6}$" }
       ]
     },
     "defaultFogSettings": {
@@ -31,25 +27,20 @@
       "examples": [{ "fog_start": 100, "fog_end": 200, "fog_color": "#056bd1", "render_distance_type": "render" }],
       "properties": {
         "fog_start": {
-          "title": "Fog start",
+          "title": "Fog Start",
           "description": "The distance from the player that the fog will begin to appear. 'fog_start' must be less than or equal to 'fog_end'.",
           "type": "number",
           "minimum": 0
         },
         "fog_end": {
-          "title": "Fog end",
+          "title": "Fog End",
           "description": "The distance from the player that the fog will become fully opaque. 'fog_end' must be greater than or equal to 'fog_start'.",
           "type": "number",
           "minimum": 0
         },
-        "fog_color": {
-          "title": "Fog color",
-          "description": "The color that the fog will take on.",
-          "type": "string",
-          "format": "color-hex"
-        },
+        "fog_color": { "title": "Fog Color", "description": "The color that the fog will take on.", "type": "string", "format": "color-hex" },
         "render_distance_type": {
-          "title": "Render distance type",
+          "title": "Render Distance Type",
           "description": "Determines how distance value is used. Fixed distance is measured in blocks. Dynamic distance is multiplied by the current render distance.",
           "type": "string",
           "enum": ["fixed", "render"]
@@ -63,58 +54,42 @@
       "examples": [{ "max_density": 0.25 }, { "max_density": 0.25, "max_density_height": 128, "zero_density_height": 20, "uniform": true }],
       "properties": {
         "max_density": {
-          "title": "Max density",
+          "title": "Max Density",
           "description": "The maximum amount of opaqueness that the ground fog will take on. A value from [0.0, 1.0].",
           "minimum": 0,
           "maximum": 1,
           "type": "number"
         },
         "max_density_height": {
-          "title": "Max density height",
+          "title": "Max Density Height",
           "description": "The height in blocks that the ground fog will become it's maximum density.",
           "minimum": 0,
           "maximum": 128,
           "type": "number"
         },
         "zero_density_height": {
-          "title": "Zero density height",
+          "title": "Zero Density Height",
           "description": "The height in blocks that the ground fog will be completely transparent and begin to appear. This value needs to be at least 1 higher than 'max_density_height'.",
           "minimum": 0,
           "maximum": 128,
           "type": "number"
         },
-        "uniform": {
-          "title": "Uniform",
-          "description": "When set to true, the density will be uniform across all heights.",
-          "type": "boolean"
-        }
+        "uniform": { "title": "Uniform", "description": "When set to true, the density will be uniform across all heights.", "type": "boolean" }
       }
     },
     "volumeMediaObject": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "absorption": {
-          "title": "Absorption",
-          "description": "Proportion of light that is absorbed (lost) per block.",
-          "$ref": "#/definitions/colorHexOrArray"
-        },
-        "scattering": {
-          "title": "Scattering",
-          "description": "Proportion of light that is scattered per block.",
-          "$ref": "#/definitions/colorHexOrArray"
-        }
+        "absorption": { "title": "Absorption", "description": "Proportion of light that is absorbed (lost) per block.", "$ref": "#/definitions/colorHexOrArray" },
+        "scattering": { "title": "Scattering", "description": "Proportion of light that is scattered per block.", "$ref": "#/definitions/colorHexOrArray" }
       }
     }
   },
   "properties": {
-    "format_version": {
-      "title": "Format version",
-      "description": "TODO: format_version",
-      "type": "string"
-    },
+    "format_version": { "title": "Format Version", "description": "TODO: format_version", "type": "string" },
     "minecraft:fog_settings": {
-      "title": "Fog settings",
+      "title": "Fog Settings",
       "description": "The definition of a single fog",
       "type": "object",
       "additionalProperties": false,
@@ -139,36 +114,20 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "air": {
-              "title": "Air",
-              "description": "The fog settings when the camera is in the air.",
-              "$ref": "#/definitions/defaultFogSettings"
-            },
+            "air": { "title": "Air", "description": "The fog settings when the camera is in the air.", "$ref": "#/definitions/defaultFogSettings" },
             "weather": {
               "title": "Weather",
               "description": " The fog settings for when the camera is in the air with active weather (rain, snow, etc..).",
               "$ref": "#/definitions/defaultFogSettings"
             },
-            "water": {
-              "title": "Water",
-              "description": "The fog settings when the camera is in water.",
-              "$ref": "#/definitions/defaultFogSettings"
-            },
-            "lava": {
-              "title": "Lava",
-              "description": "The fog settings when the camera is in lava.",
-              "$ref": "#/definitions/defaultFogSettings"
-            },
+            "water": { "title": "Water", "description": "The fog settings when the camera is in water.", "$ref": "#/definitions/defaultFogSettings" },
+            "lava": { "title": "Lava", "description": "The fog settings when the camera is in lava.", "$ref": "#/definitions/defaultFogSettings" },
             "lava_resistance": {
-              "title": "Lava resistance",
+              "title": "Lava Resistance",
               "description": "The fog settings when the camera is in lava and the player has the lava resistance effect active.",
               "$ref": "#/definitions/defaultFogSettings"
             },
-            "powder_snow": {
-              "title": "Powder snow",
-              "description": "The fog settings when the camera is inside a Powder Snow block.",
-              "$ref": "#/definitions/defaultFogSettings"
-            }
+            "powder_snow": { "title": "Powder Snow", "description": "The fog settings when the camera is inside a Powder Snow block.", "$ref": "#/definitions/defaultFogSettings" }
           }
         },
         "volumetric": {
@@ -183,48 +142,24 @@
               "type": "object",
               "additionalProperties": false,
               "properties": {
-                "air": {
-                  "title": "Air",
-                  "description": "Fog density values as light passes through air blocks.",
-                  "$ref": "#/definitions/volumeDensityObject"
-                },
-                "water": {
-                  "title": "Water",
-                  "description": "Fog density values as light passes through water blocks.",
-                  "$ref": "#/definitions/volumeDensityObject"
-                },
-                "lava": {
-                  "title": "Lava",
-                  "description": "Fog density values as light passes through lava blocks.",
-                  "$ref": "#/definitions/volumeDensityObject"
-                },
+                "air": { "title": "Air", "description": "Fog density values as light passes through air blocks.", "$ref": "#/definitions/volumeDensityObject" },
+                "water": { "title": "Water", "description": "Fog density values as light passes through water blocks.", "$ref": "#/definitions/volumeDensityObject" },
+                "lava": { "title": "Lava", "description": "Fog density values as light passes through lava blocks.", "$ref": "#/definitions/volumeDensityObject" },
                 "lava_resistance": {
-                  "title": "Lava resistance",
+                  "title": "Lava Resistance",
                   "description": "Fog density values as light passes through lava blocks while the player has lava resistance.",
                   "$ref": "#/definitions/volumeDensityObject"
                 }
               }
             },
             "media_coefficients": {
-              "title": "Media coefficients",
+              "title": "Media Coefficients",
               "description": "The coefficient settings for the volumetric fog in different blocks.",
               "additionalProperties": false,
               "properties": {
-                "air": {
-                  "title": "Air",
-                  "description": "Fog coefficient values while light passes through air.",
-                  "$ref": "#/definitions/volumeMediaObject"
-                },
-                "water": {
-                  "title": "Water",
-                  "description": "Fog coefficient values while light passes through water.",
-                  "$ref": "#/definitions/volumeMediaObject"
-                },
-                "cloud": {
-                  "title": "Cloud",
-                  "description": "Fog coefficient values while light passes through clouds.",
-                  "$ref": "#/definitions/volumeMediaObject"
-                }
+                "air": { "title": "Air", "description": "Fog coefficient values while light passes through air.", "$ref": "#/definitions/volumeMediaObject" },
+                "water": { "title": "Water", "description": "Fog coefficient values while light passes through water.", "$ref": "#/definitions/volumeMediaObject" },
+                "cloud": { "title": "Cloud", "description": "Fog coefficient values while light passes through clouds.", "$ref": "#/definitions/volumeMediaObject" }
               }
             }
           }
diff --git a/source/resource/fog/fog.json b/source/resource/fog/fog.json
index 4a018582..74d90f95 100644
--- a/source/resource/fog/fog.json
+++ b/source/resource/fog/fog.json
@@ -2,10 +2,5 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.fog",
   "examples": [],
-  "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.16.100" } } },
-      "then": { "$ref": "./1.16.100/fog.json" }
-    }
-  ]
+  "allOf": [{ "if": { "properties": { "format_version": { "type": "string", "const": "1.16.100" } } }, "then": { "$ref": "./1.16.100/fog.json" } }]
 }
diff --git a/source/resource/items/1.10.0/items.json b/source/resource/items/1.10.0/items.json
index 660d07f9..a589e204 100644
--- a/source/resource/items/1.10.0/items.json
+++ b/source/resource/items/1.10.0/items.json
@@ -5,11 +5,7 @@
   "required": ["format_version", "minecraft:item"],
   "title": "Item",
   "properties": {
-    "format_version": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "format_version": { "type": "string", "description": "TODO description", "title": "TODO Title" },
     "minecraft:item": {
       "title": "Item",
       "description": "TODO",
@@ -24,16 +20,8 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "identifier": {
-              "title": "Identifier",
-              "description": "TODO",
-              "$ref": "../../../general/item/identifier.json"
-            },
-            "category": {
-              "title": "Category",
-              "description": "TODO",
-              "type": "string"
-            }
+            "identifier": { "title": "Identifier", "description": "TODO", "$ref": "../../../general/item/identifier.json" },
+            "category": { "title": "Category", "description": "TODO", "type": "string" }
           }
         },
         "components": {
@@ -41,17 +29,8 @@
           "description": "TODO",
           "additionalProperties": false,
           "properties": {
-            "minecraft:icon": {
-              "title": "Icon",
-              "description": "The texture defined in `textures/item_texture.json`",
-              "type": "string"
-            },
-            "minecraft:render_offsets": {
-              "type": "string",
-              "description": "TODO",
-              "title": "Render offsets",
-              "enum": ["apple"]
-            }
+            "minecraft:icon": { "title": "Icon", "description": "The texture defined in `textures/item_texture.json`", "type": "string" },
+            "minecraft:render_offsets": { "type": "string", "description": "TODO", "title": "Render Offsets", "enum": ["apple"] }
           }
         }
       }
diff --git a/source/resource/items/items.json b/source/resource/items/items.json
index 8e74084c..794f1cbf 100644
--- a/source/resource/items/items.json
+++ b/source/resource/items/items.json
@@ -5,25 +5,13 @@
     {
       "format_version": "1.10.0",
       "minecraft:item": {
-        "description": {
-          "identifier": "blockception:item",
-          "category": "Equipment"
-        },
-        "components": {
-          "minecraft:icon": "item",
-          "minecraft:render_offsets": "apple"
-        }
+        "description": { "identifier": "blockception:item", "category": "Equipment" },
+        "components": { "minecraft:icon": "item", "minecraft:render_offsets": "apple" }
       }
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } },
-      "then": { "$ref": "./1.10.0/items.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/items.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } }, "then": { "$ref": "./1.10.0/items.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/items.json" } }
   ]
 }
diff --git a/source/resource/materials/materials.json b/source/resource/materials/materials.json
index 30204df2..fb568e9c 100644
--- a/source/resource/materials/materials.json
+++ b/source/resource/materials/materials.json
@@ -95,48 +95,18 @@
         ]
       }
     },
-    "FailOperation": {
-      "type": "string",
-      "title": "Fail operation",
-      "description": "TODO",
-      "enum": ["Keep", "Replace"]
-    },
+    "FailOperation": { "type": "string", "title": "Fail Operation", "description": "TODO", "enum": ["Keep", "Replace"] },
     "FaceSpecification": {
       "type": "object",
       "title": "Face",
       "description": "TODO",
       "additionalProperties": false,
       "properties": {
-        "stencilDepthFailOp": {
-          "type": "string",
-          "title": "Stencil depth fail operation",
-          "description": "",
-          "$ref": "#/definitions/FailOperation"
-        },
-        "stencilFailOp": {
-          "type": "string",
-          "title": "Stencil fail operation",
-          "description": "",
-          "$ref": "#/definitions/FailOperation"
-        },
-        "stencilFunc": {
-          "type": "string",
-          "title": "Stencil function",
-          "description": "",
-          "enum": ["Always", "Equal", "NotEqual"]
-        },
-        "stencilPass": {
-          "type": "string",
-          "title": "Stencil pass",
-          "description": "",
-          "enum": ["Replace"]
-        },
-        "stencilPassOp": {
-          "type": "string",
-          "title": "Stencil depth fail operation",
-          "description": "",
-          "$ref": "#/definitions/FailOperation"
-        }
+        "stencilDepthFailOp": { "type": "string", "title": "Stencil Depth Fail Operation", "description": "", "$ref": "#/definitions/FailOperation" },
+        "stencilFailOp": { "type": "string", "title": "Stencil Fail Operation", "description": "", "$ref": "#/definitions/FailOperation" },
+        "stencilFunc": { "type": "string", "title": "Stencil Function", "description": "", "enum": ["Always", "Equal", "NotEqual"] },
+        "stencilPass": { "type": "string", "title": "Stencil Pass", "description": "", "enum": ["Replace"] },
+        "stencilPassOp": { "type": "string", "title": "Stencil Depth Fail Operation", "description": "", "$ref": "#/definitions/FailOperation" }
       }
     },
     "StatesSpecification": {
@@ -167,46 +137,26 @@
       "description": "TODO",
       "items": {
         "type": "object",
-        "title": "Sample state",
+        "title": "Sample State",
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "samplerIndex": {
-            "type": "integer",
-            "title": "Sample state",
-            "description": "TODO"
-          },
-          "textureFilter": {
-            "type": "string",
-            "title": "Texture filter",
-            "description": "TODO",
-            "enum": ["Point", "Bilinear", "TexelAA"]
-          },
-          "textureWrap": {
-            "type": "string",
-            "title": "Texture wrap",
-            "description": "TODO",
-            "enum": ["Repeat", "Clamp"]
-          }
+          "samplerIndex": { "type": "integer", "title": "Sample State", "description": "TODO" },
+          "textureFilter": { "type": "string", "title": "Texture Filter", "description": "TODO", "enum": ["Point", "Bilinear", "TexelAA"] },
+          "textureWrap": { "type": "string", "title": "Texture Wrap", "description": "TODO", "enum": ["Repeat", "Clamp"] }
         }
       }
     },
     "VertexFieldsSpecification": {
       "type": "array",
-      "title": "Vertex fields",
+      "title": "Vertex Fields",
       "description": "TODO",
       "items": {
         "type": "object",
-        "title": "Vertex field",
+        "title": "Vertex Field",
         "description": "TODO",
         "additionalProperties": false,
-        "properties": {
-          "field": {
-            "type": "string",
-            "title": "Vertex field",
-            "description": "TODO"
-          }
-        }
+        "properties": { "field": { "type": "string", "title": "Vertex Field", "description": "TODO" } }
       }
     },
     "VariantSpecification": {
@@ -217,14 +167,8 @@
         "type": "object",
         "title": "Variant",
         "description": "TODO",
-        "propertyNames": {
-          "enum": ["fading", "fog", "fog.underwater", "lit", "skinning", "skinning_color", "underlava", "underwater"]
-        },
-        "additionalProperties": {
-          "title": "Variant Item",
-          "description": "TODO",
-          "$ref": "#/definitions/VariantsItemSpecificaiton"
-        }
+        "propertyNames": { "enum": ["fading", "fog", "fog.underwater", "lit", "skinning", "skinning_color", "underlava", "underwater"] },
+        "additionalProperties": { "title": "Variant Item", "description": "TODO", "$ref": "#/definitions/VariantsItemSpecificaiton" }
       }
     },
     "VariantsItemSpecificaiton": {
@@ -233,31 +177,11 @@
       "description": "TODO",
       "additionalProperties": false,
       "properties": {
-        "+defines": {
-          "title": "Defines",
-          "description": "TODO, Add definitions???",
-          "$ref": "#/definitions/DefinesSpecification"
-        },
-        "vertexFields": {
-          "title": "Vertex fields",
-          "description": "TODO",
-          "$ref": "#/definitions/VertexFieldsSpecification"
-        },
-        "states": {
-          "title": "States",
-          "description": "TODO, start states???",
-          "$ref": "#/definitions/StatesSpecification"
-        },
-        "+states": {
-          "title": "States",
-          "description": "TODO, Add additional states???",
-          "$ref": "#/definitions/StatesSpecification"
-        },
-        "-states": {
-          "title": "States",
-          "description": "TODO, remove additional states???",
-          "$ref": "#/definitions/StatesSpecification"
-        }
+        "+defines": { "title": "Defines", "description": "TODO, Add definitions???", "$ref": "#/definitions/DefinesSpecification" },
+        "vertexFields": { "title": "Vertex Fields", "description": "TODO", "$ref": "#/definitions/VertexFieldsSpecification" },
+        "states": { "title": "States", "description": "TODO, start states???", "$ref": "#/definitions/StatesSpecification" },
+        "+states": { "title": "States", "description": "TODO, Add additional states???", "$ref": "#/definitions/StatesSpecification" },
+        "-states": { "title": "States", "description": "TODO, remove additional states???", "$ref": "#/definitions/StatesSpecification" }
       }
     }
   },
@@ -267,183 +191,48 @@
       "title": "Materials",
       "description": "TODO",
       "required": ["version"],
-      "properties": {
-        "version": {
-          "type": "string",
-          "const": "1.0.0",
-          "title": "Version",
-          "description": "TODO"
-        }
-      },
+      "properties": { "version": { "type": "string", "const": "1.0.0", "title": "Version", "description": "TODO" } },
       "additionalProperties": {
-        "title": "Material definitions",
+        "title": "Material Definitions",
         "description": "TODO",
         "additionalProperties": false,
         "properties": {
-          "alphaDst": {
-            "type": "string",
-            "title": "Alpha distance",
-            "description": "TODO",
-            "enum": ["DestColor", "OneMinusSrcAlpha"]
-          },
-          "backFace": {
-            "title": "Back face",
-            "description": "TODO",
-            "$ref": "#/definitions/FaceSpecification"
-          },
+          "alphaDst": { "type": "string", "title": "Alpha Distance", "description": "TODO", "enum": ["DestColor", "OneMinusSrcAlpha"] },
+          "backFace": { "title": "Back Face", "description": "TODO", "$ref": "#/definitions/FaceSpecification" },
           "blendDst": {
             "type": "string",
             "title": "Blend Distance",
             "description": "TODO",
             "enum": ["SourceAlpha", "OneMinusSrcAlpha", "OneMinusSrcColor", "SourceColor", "Zero", "One"]
           },
-          "blendSrc": {
-            "type": "string",
-            "title": "Blend source",
-            "description": "TODO",
-            "enum": ["DestColor", "One", "OneMinusDestColor", "SourceAlpha", "SourceColor"]
-          },
-          "defines": {
-            "title": "Defines",
-            "description": "TODO, sets or starts definitions???",
-            "$ref": "#/definitions/DefinesSpecification"
-          },
-          "+defines": {
-            "title": "Defines",
-            "description": "TODO, Add definitions???",
-            "$ref": "#/definitions/DefinesSpecification"
-          },
-          "-defines": {
-            "title": "Defines",
-            "description": "TODO, removes definitions???",
-            "$ref": "#/definitions/DefinesSpecification"
-          },
-          "depthBias": {
-            "type": "number",
-            "title": "Depth bias",
-            "description": "TODO"
-          },
-          "depthBiasOGL": {
-            "type": "number",
-            "title": "Depth bias OGL",
-            "description": "TODO"
-          },
-          "depthFunc": {
-            "type": "string",
-            "title": "Depth function",
-            "description": "TODO",
-            "enum": ["LessEqual", "Always", "Equal"]
-          },
-          "fragmentShader": {
-            "type": "string",
-            "title": "Fragment shader",
-            "description": "TODO",
-            "pattern": "^shaders/.*\\.fragment$"
-          },
-          "frontFace": {
-            "title": "Front face",
-            "description": "TODO",
-            "$ref": "#/definitions/FaceSpecification"
-          },
-          "isAnimatedTexture": {
-            "type": "integer",
-            "title": "Is animated texture",
-            "description": "TODO, think its a boolean value as a number, so 1 and 0????"
-          },
-          "msaaSupport": {
-            "type": "string",
-            "title": "MSAA support",
-            "description": "TODO",
-            "enum": ["Both", "MSAA"]
-          },
-          "primitiveMode": {
-            "type": "string",
-            "title": "Primitive mode",
-            "description": "TODO",
-            "enum": ["Line"]
-          },
-          "samplerStates": {
-            "title": "Sampler States",
-            "description": "TODO, set or start samplerStates???",
-            "$ref": "#/definitions/SamplerStatesSpecification"
-          },
-          "+samplerStates": {
-            "title": "Sampler States",
-            "description": "TODO, Add samplerStates???",
-            "$ref": "#/definitions/SamplerStatesSpecification"
-          },
-          "slopeScaledDepthBias": {
-            "type": "number",
-            "title": "Slope scaled depth bias",
-            "description": "TODO"
-          },
-          "slopeScaledDepthBiasOGL": {
-            "type": "number",
-            "title": "Slope scaled depth bias OGL",
-            "description": "TODO"
-          },
-          "states": {
-            "title": "States",
-            "description": "TODO, start states???",
-            "$ref": "#/definitions/StatesSpecification"
-          },
-          "+states": {
-            "title": "States",
-            "description": "TODO, Add additional states???",
-            "$ref": "#/definitions/StatesSpecification"
-          },
-          "-states": {
-            "title": "States",
-            "description": "TODO, remove additional states???",
-            "$ref": "#/definitions/StatesSpecification"
-          },
-          "stencilRef": {
-            "type": "integer",
-            "title": "Stencil Ref",
-            "description": "TODO"
-          },
-          "stencilRefOverride": {
-            "type": "integer",
-            "title": "Stencil ref override",
-            "description": "TODO"
-          },
-          "stencilReadMask": {
-            "type": "integer",
-            "title": "Stencil read mask",
-            "description": "TODO"
-          },
-          "stencilWriteMask": {
-            "type": "integer",
-            "title": "Stencil write mask",
-            "description": "TODO"
-          },
-          "variants": {
-            "title": "Variants",
-            "description": "TODO, sets the variants?",
-            "$ref": "#/definitions/VariantSpecification"
-          },
-          "+variants": {
-            "title": "Variants",
-            "description": "TODO, adds variants?",
-            "$ref": "#/definitions/VariantSpecification"
-          },
-          "vertexFields": {
-            "title": "Vertex fields",
-            "description": "TODO",
-            "$ref": "#/definitions/VertexFieldsSpecification"
-          },
-          "vertexShader": {
-            "type": "string",
-            "title": "Vertex shader",
-            "description": "TODO",
-            "pattern": "^shaders/.*\\.vertex$"
-          },
-          "vrGeometryShader": {
-            "type": "string",
-            "title": "VR geometry shader",
-            "description": "TODO",
-            "pattern": "^shaders/.*\\.geometry$"
-          }
+          "blendSrc": { "type": "string", "title": "Blend Source", "description": "TODO", "enum": ["DestColor", "One", "OneMinusDestColor", "SourceAlpha", "SourceColor"] },
+          "defines": { "title": "Defines", "description": "TODO, sets or starts definitions???", "$ref": "#/definitions/DefinesSpecification" },
+          "+defines": { "title": "Defines", "description": "TODO, Add definitions???", "$ref": "#/definitions/DefinesSpecification" },
+          "-defines": { "title": "Defines", "description": "TODO, removes definitions???", "$ref": "#/definitions/DefinesSpecification" },
+          "depthBias": { "type": "number", "title": "Depth Bias", "description": "TODO" },
+          "depthBiasOGL": { "type": "number", "title": "Depth Bias OGL", "description": "TODO" },
+          "depthFunc": { "type": "string", "title": "Depth Function", "description": "TODO", "enum": ["LessEqual", "Always", "Equal"] },
+          "fragmentShader": { "type": "string", "title": "Fragment Shader", "description": "TODO", "pattern": "^shaders/.*\\.fragment$" },
+          "frontFace": { "title": "Front Face", "description": "TODO", "$ref": "#/definitions/FaceSpecification" },
+          "isAnimatedTexture": { "type": "integer", "title": "Is Animated Texture", "description": "TODO, think its a boolean value as a number, so 1 and 0????" },
+          "msaaSupport": { "type": "string", "title": "MSAA Support", "description": "TODO", "enum": ["Both", "MSAA"] },
+          "primitiveMode": { "type": "string", "title": "Primitive Mode", "description": "TODO", "enum": ["Line"] },
+          "samplerStates": { "title": "Sampler States", "description": "TODO, set or start samplerStates???", "$ref": "#/definitions/SamplerStatesSpecification" },
+          "+samplerStates": { "title": "Sampler States", "description": "TODO, Add samplerStates???", "$ref": "#/definitions/SamplerStatesSpecification" },
+          "slopeScaledDepthBias": { "type": "number", "title": "Slope Scaled Depth Bias", "description": "TODO" },
+          "slopeScaledDepthBiasOGL": { "type": "number", "title": "Slope Scaled Depth Bias OGL", "description": "TODO" },
+          "states": { "title": "States", "description": "TODO, start states???", "$ref": "#/definitions/StatesSpecification" },
+          "+states": { "title": "States", "description": "TODO, Add additional states???", "$ref": "#/definitions/StatesSpecification" },
+          "-states": { "title": "States", "description": "TODO, remove additional states???", "$ref": "#/definitions/StatesSpecification" },
+          "stencilRef": { "type": "integer", "title": "Stencil Ref", "description": "TODO" },
+          "stencilRefOverride": { "type": "integer", "title": "Stencil Ref Override", "description": "TODO" },
+          "stencilReadMask": { "type": "integer", "title": "Stencil Read Mask", "description": "TODO" },
+          "stencilWriteMask": { "type": "integer", "title": "Stencil Write Mask", "description": "TODO" },
+          "variants": { "title": "Variants", "description": "TODO, sets the variants?", "$ref": "#/definitions/VariantSpecification" },
+          "+variants": { "title": "Variants", "description": "TODO, adds variants?", "$ref": "#/definitions/VariantSpecification" },
+          "vertexFields": { "title": "Vertex Fields", "description": "TODO", "$ref": "#/definitions/VertexFieldsSpecification" },
+          "vertexShader": { "type": "string", "title": "Vertex Shader", "description": "TODO", "pattern": "^shaders/.*\\.vertex$" },
+          "vrGeometryShader": { "type": "string", "title": "VR Geometry Shader", "description": "TODO", "pattern": "^shaders/.*\\.geometry$" }
         }
       }
     }
diff --git a/source/resource/models/entity/1.10.0/model_entity.json b/source/resource/models/entity/1.10.0/model_entity.json
index 7dccbaba..b5a2067e 100644
--- a/source/resource/models/entity/1.10.0/model_entity.json
+++ b/source/resource/models/entity/1.10.0/model_entity.json
@@ -2,25 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.model.1.10.0",
   "type": "object",
-  "title": "The minecraft resourcepack model schema for 1.10.0",
+  "title": "Resourcepack Model Schema For 1.10.0",
   "description": "TODO description",
   "required": ["format_version"],
   "properties": {
-    "debug": {
-      "type": "boolean",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "debug": { "type": "boolean", "description": "TODO description", "title": "TODO Title" },
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "pattern": "^1.10.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     }
   },
-  "propertyNames": {
-    "pattern": "(^geometry\\.[a-zA-Z0-9_.'\\-:]+|format_version)"
-  },
+  "propertyNames": { "pattern": "(^geometry\\.[a-zA-Z0-9_.'\\-:]+|format_version)" },
   "additionalProperties": {
     "additionalProperties": false,
     "type": "object",
@@ -38,303 +32,72 @@
           "title": "Bone",
           "required": ["name"],
           "properties": {
-            "bind_pose_rotation": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
+            "bind_pose_rotation": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
             "cubes": {
               "type": "array",
               "items": {
                 "additionalProperties": false,
                 "type": "object",
                 "properties": {
-                  "inflate": {
-                    "type": "number"
-                  },
-                  "mirror": {
-                    "type": "boolean"
-                  },
-                  "origin": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "size": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "uv": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  }
+                  "inflate": { "type": "number" },
+                  "mirror": { "type": "boolean" },
+                  "origin": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "size": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "uv": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }] }
                 }
               }
             },
-            "debug": {
-              "type": "boolean"
-            },
-            "inflate": {
-              "type": "number"
-            },
-            "locators": {
-              "type": "object",
-              "additionalProperties": {
-                "type": "array",
-                "items": {
-                  "type": "number"
-                }
-              }
-            },
-            "mirror": {
-              "type": "boolean"
-            },
-            "name": {
-              "type": "string"
-            },
-            "neverRender": {
-              "type": "boolean"
-            },
-            "parent": {
-              "type": "string"
-            },
-            "pivot": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
+            "debug": { "type": "boolean" },
+            "inflate": { "type": "number" },
+            "locators": { "type": "object", "additionalProperties": { "type": "array", "items": { "type": "number" } } },
+            "mirror": { "type": "boolean" },
+            "name": { "type": "string" },
+            "neverRender": { "type": "boolean" },
+            "parent": { "type": "string" },
+            "pivot": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
             "poly_mesh": {
               "type": "object",
               "required": ["polys"],
               "properties": {
-                "normalized_uvs": {
-                  "type": "boolean"
-                },
-                "positions": {
-                  "type": "array",
-                  "items": [
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    }
-                  ]
-                },
-                "normals": {
-                  "type": "array",
-                  "items": [
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    }
-                  ]
-                },
+                "normalized_uvs": { "type": "boolean" },
+                "positions": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                "normals": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
                 "polys": {
                   "type": "array",
-                  "items": {
-                    "type": "array",
-                    "minItems": 3,
-                    "maxItems": 4,
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  }
+                  "items": { "type": "array", "minItems": 3, "maxItems": 4, "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] }
                 }
               }
             },
-            "render_group_id": {
-              "type": "integer",
-              "minimum": 0
-            },
-            "reset": {
-              "type": "boolean"
-            },
-            "rotation": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
+            "render_group_id": { "type": "integer", "minimum": 0 },
+            "reset": { "type": "boolean" },
+            "rotation": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
             "texture_meshes": {
               "type": "array",
               "items": {
                 "type": "object",
                 "properties": {
-                  "texture": {
-                    "type": "string"
-                  },
-                  "local_pivot": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "position": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "rotation": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "scale": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  }
+                  "texture": { "type": "string" },
+                  "local_pivot": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "position": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "rotation": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "scale": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] }
                 }
               }
             }
           }
         }
       },
-      "cape": {
-        "type": "string"
-      },
-      "debug": {
-        "type": "boolean"
-      },
-      "texturewidth": {
-        "type": "integer",
-        "description": "TODO description: texturewidth",
-        "title": "Texturewidth"
-      },
-      "textureheight": {
-        "type": "integer",
-        "description": "TODO description: textureheight",
-        "title": "Textureheight"
-      },
-      "visible_bounds_width": {
-        "type": "number",
-        "description": "TODO description: visible bounds width",
-        "title": "Visible Bounds Width"
-      },
-      "visible_bounds_height": {
-        "type": "number",
-        "description": "TODO description: visible bounds height",
-        "title": "Visible Bounds Height"
-      },
+      "cape": { "type": "string" },
+      "debug": { "type": "boolean" },
+      "texturewidth": { "type": "integer", "description": "TODO description: texturewidth", "title": "Texturewidth" },
+      "textureheight": { "type": "integer", "description": "TODO description: textureheight", "title": "Textureheight" },
+      "visible_bounds_width": { "type": "number", "description": "TODO description: visible bounds width", "title": "Visible Bounds Width" },
+      "visible_bounds_height": { "type": "number", "description": "TODO description: visible bounds height", "title": "Visible Bounds Height" },
       "visible_bounds_offset": {
         "type": "array",
         "description": "TODO description: visible bounds offset",
         "title": "Visible Bounds Offset",
-        "items": [
-          {
-            "type": "number"
-          },
-          {
-            "type": "number"
-          },
-          {
-            "type": "number"
-          }
-        ]
+        "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }]
       }
     }
   }
diff --git a/source/resource/models/entity/1.12.0/model_entity.json b/source/resource/models/entity/1.12.0/model_entity.json
index 3001dde1..38361146 100644
--- a/source/resource/models/entity/1.12.0/model_entity.json
+++ b/source/resource/models/entity/1.12.0/model_entity.json
@@ -7,14 +7,7 @@
   "description": "The minecraft resourcepack model schema for 1.12.0",
   "required": ["format_version", "minecraft:geometry"],
   "definitions": {
-    "uv": {
-      "type": "array",
-      "minItems": 2,
-      "maxItems": 2,
-      "items": {
-        "type": "number"
-      }
-    },
+    "uv": { "type": "array", "minItems": 2, "maxItems": 2, "items": { "type": "number" } },
     "direction_uv": {
       "additionalProperties": false,
       "type": "object",
@@ -23,26 +16,15 @@
           "description": "Specifies the uv origin for the face. For this face, it is the upper-left corner, when looking at the face with y being up.",
           "$ref": "#/definitions/uv"
         },
-        "uv_size": {
-          "description": "The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.",
-          "$ref": "#/definitions/uv"
-        },
-        "material_instance": {
-          "type": "string",
-          "description": "TODO"
-        }
+        "uv_size": { "description": "The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.", "$ref": "#/definitions/uv" },
+        "material_instance": { "type": "string", "description": "TODO" }
       }
     }
   },
   "properties": {
-    "debug": {
-      "type": "boolean",
-      "default": false,
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "debug": { "type": "boolean", "default": false, "description": "TODO description", "title": "TODO Title" },
     "format_version": {
-      "title": "The 1.12.0 format version",
+      "title": "1.12.0 Format Version",
       "type": "string",
       "pattern": "^1.12.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
@@ -72,36 +54,18 @@
                 "pattern": "^geometry\\.[a-zA-Z0-9_\\-\\.]+$",
                 "title": "Identifier"
               },
-              "texture_width": {
-                "type": "number",
-                "description": "Assumed width in texels of the texture that will be bound to this geometry.",
-                "title": "Texture Width"
-              },
-              "texture_height": {
-                "type": "number",
-                "description": "Assumed height in texels of the texture that will be bound to this geometry.",
-                "title": "Texture Height"
-              },
+              "texture_width": { "type": "number", "description": "Assumed width in texels of the texture that will be bound to this geometry.", "title": "Texture Width" },
+              "texture_height": { "type": "number", "description": "Assumed height in texels of the texture that will be bound to this geometry.", "title": "Texture Height" },
               "visible_bounds_offset": {
                 "description": "Offset of the visibility bounding box from the entity location point (in model space units).",
                 "title": "Visible Bounds Offset",
                 "type": "array",
                 "minItems": 3,
                 "maxItems": 3,
-                "items": {
-                  "type": "number"
-                }
+                "items": { "type": "number" }
               },
-              "visible_bounds_width": {
-                "type": "number",
-                "description": "Width of the visibility bounding box (in model space units).",
-                "title": "Visible Bounds Width"
-              },
-              "visible_bounds_height": {
-                "type": "number",
-                "description": "Height of the visible bounding box (in model space units).",
-                "title": "Visible Bounds Height"
-              }
+              "visible_bounds_width": { "type": "number", "description": "Width of the visibility bounding box (in model space units).", "title": "Visible Bounds Width" },
+              "visible_bounds_height": { "type": "number", "description": "Height of the visible bounding box (in model space units).", "title": "Visible Bounds Height" }
             }
           },
           "bones": {
@@ -113,10 +77,7 @@
               "description": "A bones specification",
               "required": ["name"],
               "properties": {
-                "average_normals": {
-                  "type": "object",
-                  "examples": [null]
-                },
+                "average_normals": { "type": "object", "examples": [null] },
                 "cubes": {
                   "type": "array",
                   "description": "This is the list of cubes associated with this bone.",
@@ -137,10 +98,7 @@
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units)."
-                        }
+                        "items": { "type": "number", "description": "This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units)." }
                       },
                       "pivot": {
                         "type": "array",
@@ -155,19 +113,13 @@
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot."
-                        }
+                        "items": { "type": "number", "description": "The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot." }
                       },
                       "size": {
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The cube extends this amount relative to its origin (in model space units)."
-                        }
+                        "items": { "type": "number", "description": "The cube extends this amount relative to its origin (in model space units)." }
                       },
                       "uv": {
                         "description": "This is an alternate per-face uv mapping which specifies each face of the cube. Omitting a face will cause that face to not get drawn.",
@@ -202,26 +154,14 @@
                               }
                             }
                           },
-                          {
-                            "type": "array",
-                            "minItems": 2,
-                            "maxItems": 2,
-                            "items": {
-                              "type": "number"
-                            }
-                          }
+                          { "type": "array", "minItems": 2, "maxItems": 2, "items": { "type": "number" } }
                         ]
                       }
                     }
                   }
                 },
-                "debug": {
-                  "type": "boolean"
-                },
-                "inflate": {
-                  "type": "number",
-                  "description": "Grow this box by this additive amount in all directions (in model space units)."
-                },
+                "debug": { "type": "boolean" },
+                "inflate": { "type": "number", "description": "Grow this box by this additive amount in all directions (in model space units)." },
                 "locators": {
                   "description": "This is a list of locators associated with this bone. A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).",
                   "type": "object",
@@ -236,25 +176,16 @@
                             "minItems": 3,
                             "maxItems": 3,
                             "description": "Position of the locator in model space.",
-                            "items": {
-                              "type": "number",
-                              "description": "Position of the locator in model space."
-                            }
+                            "items": { "type": "number", "description": "Position of the locator in model space." }
                           },
                           "rotation": {
                             "type": "array",
                             "minItems": 3,
                             "maxItems": 3,
                             "description": "Rotation of the locator in model space.",
-                            "items": {
-                              "type": "number",
-                              "description": "Rotation of the locator in model space."
-                            }
+                            "items": { "type": "number", "description": "Rotation of the locator in model space." }
                           },
-                          "ignore_inherited_scale": {
-                            "type": "boolean",
-                            "description": "Discard scale inherited from parent bone."
-                          }
+                          "ignore_inherited_scale": { "type": "boolean", "description": "Discard scale inherited from parent bone." }
                         }
                       },
                       {
@@ -262,35 +193,20 @@
                         "minItems": 3,
                         "maxItems": 3,
                         "description": "This is a list of locators associated with this bone. A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).",
-                        "items": {
-                          "type": "number",
-                          "description": "Position of the locator in model space."
-                        }
+                        "items": { "type": "number", "description": "Position of the locator in model space." }
                       }
                     ]
                   }
                 },
-                "mirror": {
-                  "type": "boolean",
-                  "description": "Mirrors the UV's of the unrotated cubes along the x axis, also causes the east/west faces to get flipped."
-                },
-                "name": {
-                  "type": "string",
-                  "description": "Animation files refer to this bone via this identifier."
-                },
-                "parent": {
-                  "type": "string",
-                  "description": "Bone that this bone is relative to. If the parent bone moves, this bone will move along with it."
-                },
+                "mirror": { "type": "boolean", "description": "Mirrors the UV's of the unrotated cubes along the x axis, also causes the east/west faces to get flipped." },
+                "name": { "type": "string", "description": "Animation files refer to this bone via this identifier." },
+                "parent": { "type": "string", "description": "Bone that this bone is relative to. If the parent bone moves, this bone will move along with it." },
                 "pivot": {
                   "type": "array",
                   "minItems": 3,
                   "maxItems": 3,
                   "description": "The bone pivots around this point (in model space units).",
-                  "items": {
-                    "type": "number",
-                    "description": "The bone pivots around this point (in model space units)."
-                  }
+                  "items": { "type": "number", "description": "The bone pivots around this point (in model space units)." }
                 },
                 "poly_mesh": {
                   "additionalProperties": false,
@@ -336,18 +252,9 @@
                               "minItems": 3,
                               "maxItems": 3,
                               "items": [
-                                {
-                                  "type": "number",
-                                  "description": "The index of the position"
-                                },
-                                {
-                                  "type": "number",
-                                  "description": "The index of the normal vertex"
-                                },
-                                {
-                                  "type": "number",
-                                  "description": "The index of the uv vertex"
-                                }
+                                { "type": "number", "description": "The index of the position" },
+                                { "type": "number", "description": "The index of the normal vertex" },
+                                { "type": "number", "description": "The index of the uv vertex" }
                               ]
                             }
                           }
@@ -382,19 +289,13 @@
                     }
                   }
                 },
-                "render_group_id": {
-                  "type": "integer",
-                  "minimum": 0
-                },
+                "render_group_id": { "type": "integer", "minimum": 0 },
                 "rotation": {
                   "type": "array",
                   "minItems": 3,
                   "maxItems": 3,
                   "description": "The bone pivots around this point (in model space units).",
-                  "items": {
-                    "type": "number",
-                    "description": "This is the initial rotation of the bone around the pivot, pre-animation (in degrees, x-then-y-then-z order)."
-                  }
+                  "items": { "type": "number", "description": "This is the initial rotation of the bone around the pivot, pre-animation (in degrees, x-then-y-then-z order)." }
                 },
                 "texture_meshes": {
                   "type": "array",
@@ -408,10 +309,7 @@
                         "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry"
-                        }
+                        "items": { "type": "number", "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry" }
                       },
                       "position": {
                         "type": "array",
@@ -428,34 +326,23 @@
                         "description": "The rotation (in degrees) of the texture geometry relative to the offset",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The rotation (in degrees) of the texture geometry relative to the offset"
-                        }
+                        "items": { "type": "number", "description": "The rotation (in degrees) of the texture geometry relative to the offset" }
                       },
                       "scale": {
                         "type": "array",
                         "description": "The scale (in degrees) of the texture geometry relative to the offset",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The scale (in degrees) of the texture geometry relative to the offset"
-                        }
+                        "items": { "type": "number", "description": "The scale (in degrees) of the texture geometry relative to the offset" }
                       },
-                      "texture": {
-                        "type": "string",
-                        "description": "The friendly-named texture to use."
-                      }
+                      "texture": { "type": "string", "description": "The friendly-named texture to use." }
                     }
                   }
                 }
               }
             }
           },
-          "cape": {
-            "type": "string"
-          }
+          "cape": { "type": "string" }
         }
       }
     }
diff --git a/source/resource/models/entity/1.14.0/model_entity.json b/source/resource/models/entity/1.14.0/model_entity.json
index 396e0b77..14847881 100644
--- a/source/resource/models/entity/1.14.0/model_entity.json
+++ b/source/resource/models/entity/1.14.0/model_entity.json
@@ -24,27 +24,18 @@
           "$ref": "#/definitions/uv"
         },
         "uv_size": {
-          "title": "Uv size",
+          "title": "Uv Size",
           "description": "The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.",
           "$ref": "#/definitions/uv"
         },
-        "material_instance": {
-          "type": "string",
-          "title": "Material instance",
-          "description": "Specifies the UV's for the face that stretches"
-        }
+        "material_instance": { "type": "string", "title": "Material Instance", "description": "Specifies the UV's for the face that stretches" }
       }
     }
   },
   "properties": {
-    "debug": {
-      "type": "boolean",
-      "default": false,
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "debug": { "type": "boolean", "default": false, "description": "TODO description", "title": "TODO Title" },
     "format_version": {
-      "title": "The 1.14.0 format version",
+      "title": "1.14.0 Format Version",
       "type": "string",
       "pattern": "^1.14.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
@@ -74,36 +65,18 @@
                 "pattern": "^geometry\\.[a-zA-Z0-9_\\-\\.]+$",
                 "title": "Identifier"
               },
-              "texture_width": {
-                "type": "number",
-                "description": "Assumed width in texels of the texture that will be bound to this geometry.",
-                "title": "Texture Width"
-              },
-              "texture_height": {
-                "type": "number",
-                "description": "Assumed height in texels of the texture that will be bound to this geometry.",
-                "title": "Texture Height"
-              },
+              "texture_width": { "type": "number", "description": "Assumed width in texels of the texture that will be bound to this geometry.", "title": "Texture Width" },
+              "texture_height": { "type": "number", "description": "Assumed height in texels of the texture that will be bound to this geometry.", "title": "Texture Height" },
               "visible_bounds_offset": {
                 "description": "Offset of the visibility bounding box from the entity location point (in model space units).",
                 "title": "Visible Bounds Offset",
                 "type": "array",
                 "minItems": 3,
                 "maxItems": 3,
-                "items": {
-                  "type": "number"
-                }
+                "items": { "type": "number" }
               },
-              "visible_bounds_width": {
-                "type": "number",
-                "description": "Width of the visibility bounding box (in model space units).",
-                "title": "Visible Bounds Width"
-              },
-              "visible_bounds_height": {
-                "type": "number",
-                "description": "Height of the visible bounding box (in model space units).",
-                "title": "Visible Bounds Height"
-              }
+              "visible_bounds_width": { "type": "number", "description": "Width of the visibility bounding box (in model space units).", "title": "Visible Bounds Width" },
+              "visible_bounds_height": { "type": "number", "description": "Height of the visible bounding box (in model space units).", "title": "Visible Bounds Height" }
             }
           },
           "bones": {
@@ -115,10 +88,7 @@
               "description": "A bones specification",
               "required": ["name"],
               "properties": {
-                "average_normals": {
-                  "type": "object",
-                  "examples": [null]
-                },
+                "average_normals": { "type": "object", "examples": [null] },
                 "cubes": {
                   "type": "array",
                   "description": "This is the list of cubes associated with this bone.",
@@ -139,10 +109,7 @@
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units)."
-                        }
+                        "items": { "type": "number", "description": "This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units)." }
                       },
                       "pivot": {
                         "type": "array",
@@ -171,31 +138,16 @@
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot."
-                        }
+                        "items": { "type": "number", "description": "The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot." }
                       },
                       "size": {
                         "title": "Size",
                         "type": "array",
                         "description": "The cube extends this amount relative to its origin (in model space units).",
                         "items": [
-                          {
-                            "type": "number",
-                            "title": "X",
-                            "description": "The cube extends this amount relative to its origin (in model space units)."
-                          },
-                          {
-                            "type": "number",
-                            "title": "Y",
-                            "description": "The cube extends this amount relative to its origin (in model space units)."
-                          },
-                          {
-                            "type": "number",
-                            "title": "Z",
-                            "description": "The cube extends this amount relative to its origin (in model space units)."
-                          }
+                          { "type": "number", "title": "X", "description": "The cube extends this amount relative to its origin (in model space units)." },
+                          { "type": "number", "title": "Y", "description": "The cube extends this amount relative to its origin (in model space units)." },
+                          { "type": "number", "title": "Z", "description": "The cube extends this amount relative to its origin (in model space units)." }
                         ]
                       },
                       "uv": {
@@ -250,13 +202,8 @@
                     }
                   }
                 },
-                "debug": {
-                  "type": "boolean"
-                },
-                "inflate": {
-                  "type": "number",
-                  "description": "Grow this box by this additive amount in all directions (in model space units)."
-                },
+                "debug": { "type": "boolean" },
+                "inflate": { "type": "number", "description": "Grow this box by this additive amount in all directions (in model space units)." },
                 "locators": {
                   "description": "This is a list of locators associated with this bone. A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).",
                   "type": "object",
@@ -271,25 +218,16 @@
                             "minItems": 3,
                             "maxItems": 3,
                             "description": "Position of the locator in model space.",
-                            "items": {
-                              "type": "number",
-                              "description": "Position of the locator in model space."
-                            }
+                            "items": { "type": "number", "description": "Position of the locator in model space." }
                           },
                           "rotation": {
                             "type": "array",
                             "minItems": 3,
                             "maxItems": 3,
                             "description": "Rotation of the locator in model space.",
-                            "items": {
-                              "type": "number",
-                              "description": "Rotation of the locator in model space."
-                            }
+                            "items": { "type": "number", "description": "Rotation of the locator in model space." }
                           },
-                          "ignore_inherited_scale": {
-                            "type": "boolean",
-                            "description": "Discard scale inherited from parent bone."
-                          }
+                          "ignore_inherited_scale": { "type": "boolean", "description": "Discard scale inherited from parent bone." }
                         }
                       },
                       {
@@ -297,10 +235,7 @@
                         "minItems": 3,
                         "maxItems": 3,
                         "description": "This is a list of locators associated with this bone. A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).",
-                        "items": {
-                          "type": "number",
-                          "description": "Position of the locator in model space."
-                        }
+                        "items": { "type": "number", "description": "Position of the locator in model space." }
                       }
                     ]
                   }
@@ -310,11 +245,7 @@
                   "title": "Mirror",
                   "description": "Mirrors the UV's of the unrotated cubes along the x axis, also causes the east/west faces to get flipped."
                 },
-                "name": {
-                  "type": "string",
-                  "title": "Name",
-                  "description": "Animation files refer to this bone via this identifier."
-                },
+                "name": { "type": "string", "title": "Name", "description": "Animation files refer to this bone via this identifier." },
                 "parent": {
                   "type": "string",
                   "title": "Parent",
@@ -325,10 +256,7 @@
                   "minItems": 3,
                   "maxItems": 3,
                   "description": "The bone pivots around this point (in model space units).",
-                  "items": {
-                    "type": "number",
-                    "description": "The bone pivots around this point (in model space units)."
-                  }
+                  "items": { "type": "number", "description": "The bone pivots around this point (in model space units)." }
                 },
                 "poly_mesh": {
                   "additionalProperties": false,
@@ -374,18 +302,9 @@
                               "minItems": 3,
                               "maxItems": 3,
                               "items": [
-                                {
-                                  "type": "number",
-                                  "description": "The index of the position"
-                                },
-                                {
-                                  "type": "number",
-                                  "description": "The index of the normal vertex"
-                                },
-                                {
-                                  "type": "number",
-                                  "description": "The index of the uv vertex"
-                                }
+                                { "type": "number", "description": "The index of the position" },
+                                { "type": "number", "description": "The index of the normal vertex" },
+                                { "type": "number", "description": "The index of the uv vertex" }
                               ]
                             }
                           }
@@ -420,19 +339,13 @@
                     }
                   }
                 },
-                "render_group_id": {
-                  "type": "integer",
-                  "minimum": 0
-                },
+                "render_group_id": { "type": "integer", "minimum": 0 },
                 "rotation": {
                   "type": "array",
                   "minItems": 3,
                   "maxItems": 3,
                   "description": "The bone pivots around this point (in model space units).",
-                  "items": {
-                    "type": "number",
-                    "description": "This is the initial rotation of the bone around the pivot, pre-animation (in degrees, x-then-y-then-z order)."
-                  }
+                  "items": { "type": "number", "description": "This is the initial rotation of the bone around the pivot, pre-animation (in degrees, x-then-y-then-z order)." }
                 },
                 "texture_meshes": {
                   "type": "array",
@@ -447,10 +360,7 @@
                         "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry"
-                        }
+                        "items": { "type": "number", "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry" }
                       },
                       "position": {
                         "type": "array",
@@ -467,34 +377,23 @@
                         "description": "The rotation (in degrees) of the texture geometry relative to the offset",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The rotation (in degrees) of the texture geometry relative to the offset"
-                        }
+                        "items": { "type": "number", "description": "The rotation (in degrees) of the texture geometry relative to the offset" }
                       },
                       "scale": {
                         "type": "array",
                         "description": "The scale (in degrees) of the texture geometry relative to the offset",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The scale (in degrees) of the texture geometry relative to the offset"
-                        }
+                        "items": { "type": "number", "description": "The scale (in degrees) of the texture geometry relative to the offset" }
                       },
-                      "texture": {
-                        "type": "string",
-                        "description": "The friendly-named texture to use."
-                      }
+                      "texture": { "type": "string", "description": "The friendly-named texture to use." }
                     }
                   }
                 }
               }
             }
           },
-          "cape": {
-            "type": "string"
-          }
+          "cape": { "type": "string" }
         }
       }
     }
diff --git a/source/resource/models/entity/1.16.0/model_entity.json b/source/resource/models/entity/1.16.0/model_entity.json
index ca2fdbfb..d63b5f7b 100644
--- a/source/resource/models/entity/1.16.0/model_entity.json
+++ b/source/resource/models/entity/1.16.0/model_entity.json
@@ -24,27 +24,18 @@
           "$ref": "#/definitions/uv"
         },
         "uv_size": {
-          "title": "Uv size",
+          "title": "Uv Size",
           "description": "The face maps this many texels from the uv origin. If not specified, the box dimensions are used instead.",
           "$ref": "#/definitions/uv"
         },
-        "material_instance": {
-          "type": "string",
-          "title": "Material instance",
-          "description": "Specifies the UV's for the face that stretches"
-        }
+        "material_instance": { "type": "string", "title": "Material Instance", "description": "Specifies the UV's for the face that stretches" }
       }
     }
   },
   "properties": {
-    "debug": {
-      "title": "Debug",
-      "description": "TODO description",
-      "type": "boolean",
-      "default": false
-    },
+    "debug": { "title": "Debug", "description": "TODO description", "type": "boolean", "default": false },
     "format_version": {
-      "title": "The 1.16.0 format version",
+      "title": "1.16.0 Format Version",
       "type": "string",
       "pattern": "^1.16.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
@@ -74,36 +65,18 @@
                 "pattern": "^geometry\\.[a-zA-Z0-9_\\-\\.]+$",
                 "title": "Identifier"
               },
-              "texture_width": {
-                "type": "number",
-                "description": "Assumed width in texels of the texture that will be bound to this geometry.",
-                "title": "Texture Width"
-              },
-              "texture_height": {
-                "type": "number",
-                "description": "Assumed height in texels of the texture that will be bound to this geometry.",
-                "title": "Texture Height"
-              },
+              "texture_width": { "type": "number", "description": "Assumed width in texels of the texture that will be bound to this geometry.", "title": "Texture Width" },
+              "texture_height": { "type": "number", "description": "Assumed height in texels of the texture that will be bound to this geometry.", "title": "Texture Height" },
               "visible_bounds_offset": {
                 "title": "Visible Bounds Offset",
                 "description": "Offset of the visibility bounding box from the entity location point (in model space units).",
                 "type": "array",
                 "minItems": 3,
                 "maxItems": 3,
-                "items": {
-                  "type": "number"
-                }
+                "items": { "type": "number" }
               },
-              "visible_bounds_width": {
-                "type": "number",
-                "title": "Visible Bounds Width",
-                "description": "Width of the visibility bounding box (in model space units)."
-              },
-              "visible_bounds_height": {
-                "type": "number",
-                "title": "Visible Bounds Height",
-                "description": "Height of the visible bounding box (in model space units)."
-              }
+              "visible_bounds_width": { "type": "number", "title": "Visible Bounds Width", "description": "Width of the visibility bounding box (in model space units)." },
+              "visible_bounds_height": { "type": "number", "title": "Visible Bounds Height", "description": "Height of the visible bounding box (in model space units)." }
             }
           },
           "bones": {
@@ -142,10 +115,7 @@
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units)."
-                        }
+                        "items": { "type": "number", "description": "This point declares the unrotated lower corner of cube (smallest x/y/z value in model space units)." }
                       },
                       "pivot": {
                         "type": "array",
@@ -174,31 +144,16 @@
                         "type": "array",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot."
-                        }
+                        "items": { "type": "number", "description": "The cube is rotated by this amount (in degrees, x-then-y-then-z order) around the pivot." }
                       },
                       "size": {
                         "title": "Size",
                         "type": "array",
                         "description": "The cube extends this amount relative to its origin (in model space units).",
                         "items": [
-                          {
-                            "type": "number",
-                            "title": "X",
-                            "description": "The cube extends this amount relative to its origin (in model space units)."
-                          },
-                          {
-                            "type": "number",
-                            "title": "Y",
-                            "description": "The cube extends this amount relative to its origin (in model space units)."
-                          },
-                          {
-                            "type": "number",
-                            "title": "Z",
-                            "description": "The cube extends this amount relative to its origin (in model space units)."
-                          }
+                          { "type": "number", "title": "X", "description": "The cube extends this amount relative to its origin (in model space units)." },
+                          { "type": "number", "title": "Y", "description": "The cube extends this amount relative to its origin (in model space units)." },
+                          { "type": "number", "title": "Z", "description": "The cube extends this amount relative to its origin (in model space units)." }
                         ]
                       },
                       "uv": {
@@ -253,13 +208,8 @@
                     }
                   }
                 },
-                "debug": {
-                  "type": "boolean"
-                },
-                "inflate": {
-                  "type": "number",
-                  "description": "Grow this box by this additive amount in all directions (in model space units)."
-                },
+                "debug": { "type": "boolean" },
+                "inflate": { "type": "number", "description": "Grow this box by this additive amount in all directions (in model space units)." },
                 "locators": {
                   "description": "This is a list of locators associated with this bone. A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).",
                   "type": "object",
@@ -274,25 +224,16 @@
                             "minItems": 3,
                             "maxItems": 3,
                             "description": "Position of the locator in model space.",
-                            "items": {
-                              "type": "number",
-                              "description": "Position of the locator in model space."
-                            }
+                            "items": { "type": "number", "description": "Position of the locator in model space." }
                           },
                           "rotation": {
                             "type": "array",
                             "minItems": 3,
                             "maxItems": 3,
                             "description": "Rotation of the locator in model space.",
-                            "items": {
-                              "type": "number",
-                              "description": "Rotation of the locator in model space."
-                            }
+                            "items": { "type": "number", "description": "Rotation of the locator in model space." }
                           },
-                          "ignore_inherited_scale": {
-                            "type": "boolean",
-                            "description": "Discard scale inherited from parent bone."
-                          }
+                          "ignore_inherited_scale": { "type": "boolean", "description": "Discard scale inherited from parent bone." }
                         }
                       },
                       {
@@ -300,10 +241,7 @@
                         "minItems": 3,
                         "maxItems": 3,
                         "description": "This is a list of locators associated with this bone. A locator is a point in model space that tracks a particular bone as the bone animates (by maintaining it's relationship to the bone through the animation).",
-                        "items": {
-                          "type": "number",
-                          "description": "Position of the locator in model space."
-                        }
+                        "items": { "type": "number", "description": "Position of the locator in model space." }
                       }
                     ]
                   }
@@ -313,11 +251,7 @@
                   "title": "Mirror",
                   "description": "Mirrors the UV's of the unrotated cubes along the x axis, also causes the east/west faces to get flipped."
                 },
-                "name": {
-                  "type": "string",
-                  "title": "Name",
-                  "description": "Animation files refer to this bone via this identifier."
-                },
+                "name": { "type": "string", "title": "Name", "description": "Animation files refer to this bone via this identifier." },
                 "parent": {
                   "type": "string",
                   "title": "Parent",
@@ -377,18 +311,9 @@
                               "minItems": 3,
                               "maxItems": 3,
                               "items": [
-                                {
-                                  "type": "number",
-                                  "description": "The index of the position"
-                                },
-                                {
-                                  "type": "number",
-                                  "description": "The index of the normal vertex"
-                                },
-                                {
-                                  "type": "number",
-                                  "description": "The index of the uv vertex"
-                                }
+                                { "type": "number", "description": "The index of the position" },
+                                { "type": "number", "description": "The index of the normal vertex" },
+                                { "type": "number", "description": "The index of the uv vertex" }
                               ]
                             }
                           }
@@ -423,10 +348,7 @@
                     }
                   }
                 },
-                "render_group_id": {
-                  "type": "integer",
-                  "minimum": 0
-                },
+                "render_group_id": { "type": "integer", "minimum": 0 },
                 "rotation": {
                   "type": "array",
                   "title": "Rotation",
@@ -439,7 +361,7 @@
                 },
                 "texture_meshes": {
                   "type": "array",
-                  "title": "Texture meshes",
+                  "title": "Texture Meshes",
                   "description": "***EXPERIMENTAL*** Adds a mesh to the bone's geometry by converting texels in a texture into boxes",
                   "items": {
                     "type": "object",
@@ -451,10 +373,7 @@
                         "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry"
-                        }
+                        "items": { "type": "number", "description": "The pivot point on the texture (in *texture space* not entity or bone space) of the texture geometry" }
                       },
                       "position": {
                         "type": "array",
@@ -471,36 +390,23 @@
                         "description": "The rotation (in degrees) of the texture geometry relative to the offset",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The rotation (in degrees) of the texture geometry relative to the offset"
-                        }
+                        "items": { "type": "number", "description": "The rotation (in degrees) of the texture geometry relative to the offset" }
                       },
                       "scale": {
                         "type": "array",
                         "description": "The scale (in degrees) of the texture geometry relative to the offset",
                         "minItems": 3,
                         "maxItems": 3,
-                        "items": {
-                          "type": "number",
-                          "description": "The scale (in degrees) of the texture geometry relative to the offset"
-                        }
+                        "items": { "type": "number", "description": "The scale (in degrees) of the texture geometry relative to the offset" }
                       },
-                      "texture": {
-                        "type": "string",
-                        "description": "The friendly-named texture to use."
-                      }
+                      "texture": { "type": "string", "description": "The friendly-named texture to use." }
                     }
                   }
                 }
               }
             }
           },
-          "cape": {
-            "title": "Cape",
-            "description": "UNDOCUMENTATED",
-            "type": "string"
-          }
+          "cape": { "title": "Cape", "description": "UNDOCUMENTATED", "type": "string" }
         }
       }
     }
diff --git a/source/resource/models/entity/1.8.0/model_entity.json b/source/resource/models/entity/1.8.0/model_entity.json
index 5688375d..3a4e7088 100644
--- a/source/resource/models/entity/1.8.0/model_entity.json
+++ b/source/resource/models/entity/1.8.0/model_entity.json
@@ -2,25 +2,19 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.model.1.8.0",
   "type": "object",
-  "title": "The minecraft resourcepack model schema for 1.8.0",
+  "title": "Resourcepack Model Schema For 1.8.0",
   "description": "TODO description",
   "required": ["format_version"],
   "properties": {
-    "debug": {
-      "type": "boolean",
-      "description": "TODO description",
-      "title": "TODO title"
-    },
+    "debug": { "type": "boolean", "description": "TODO description", "title": "TODO Title" },
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     }
   },
-  "propertyNames": {
-    "pattern": "(^geometry\\.[a-zA-Z0-9_.'\\-:]+|format_version)"
-  },
+  "propertyNames": { "pattern": "(^geometry\\.[a-zA-Z0-9_.'\\-:]+|format_version)" },
   "additionalProperties": {
     "additionalProperties": false,
     "type": "object",
@@ -38,327 +32,80 @@
           "title": "Bone",
           "required": ["name"],
           "properties": {
-            "bind_pose_rotation": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
+            "bind_pose_rotation": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
             "cubes": {
               "type": "array",
               "items": {
                 "additionalProperties": false,
                 "type": "object",
                 "properties": {
-                  "inflate": {
-                    "type": "number"
-                  },
-                  "mirror": {
-                    "type": "boolean"
-                  },
-                  "origin": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "size": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "uv": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  }
+                  "inflate": { "type": "number" },
+                  "mirror": { "type": "boolean" },
+                  "origin": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "size": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "uv": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }] }
                 }
               }
             },
-            "debug": {
-              "type": "boolean"
-            },
-            "inflate": {
-              "type": "number"
-            },
-            "locators": {
-              "type": "object",
-              "additionalProperties": {
-                "type": "array",
-                "items": {
-                  "type": "number"
-                }
-              }
-            },
-            "mirror": {
-              "type": "boolean"
-            },
-            "name": {
-              "type": "string"
-            },
-            "neverRender": {
-              "type": "boolean"
-            },
-            "parent": {
-              "type": "string"
-            },
-            "pivot": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
+            "debug": { "type": "boolean" },
+            "inflate": { "type": "number" },
+            "locators": { "type": "object", "additionalProperties": { "type": "array", "items": { "type": "number" } } },
+            "mirror": { "type": "boolean" },
+            "name": { "type": "string" },
+            "neverRender": { "type": "boolean" },
+            "parent": { "type": "string" },
+            "pivot": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
             "poly_mesh": {
               "type": "object",
               "required": ["polys"],
-              "title": "Poly mesh",
+              "title": "Poly Mesh",
               "description": "TODO",
               "additionalProperties": false,
               "properties": {
-                "normalized_uvs": {
-                  "title": "Normalized uvs",
-                  "description": "TODO",
-                  "type": "boolean"
-                },
-                "positions": {
-                  "title": "Positions",
-                  "description": "TODO",
-                  "type": "array",
-                  "items": [
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    }
-                  ]
-                },
-                "normals": {
-                  "title": "Normals",
-                  "description": "TODO",
-                  "type": "array",
-                  "items": [
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    },
-                    {
-                      "type": "number"
-                    }
-                  ]
-                },
+                "normalized_uvs": { "title": "Normalized Uvs", "description": "TODO", "type": "boolean" },
+                "positions": { "title": "Positions", "description": "TODO", "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                "normals": { "title": "Normals", "description": "TODO", "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
                 "polys": {
                   "title": "Polys",
                   "description": "TODO",
                   "type": "array",
-                  "items": {
-                    "type": "array",
-                    "minItems": 3,
-                    "maxItems": 4,
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  }
+                  "items": { "type": "array", "minItems": 3, "maxItems": 4, "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] }
                 }
               }
             },
-            "render_group_id": {
-              "title": "Render group id",
-              "description": "TODO",
-              "type": "integer",
-              "minimum": 0
-            },
-            "reset": {
-              "title": "Reset",
-              "description": "TODO",
-              "type": "boolean"
-            },
-            "rotation": {
-              "title": "Rotation",
-              "description": "TODO",
-              "type": "array",
-              "items": [
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                },
-                {
-                  "type": "number"
-                }
-              ]
-            },
+            "render_group_id": { "title": "Render Group Id", "description": "TODO", "type": "integer", "minimum": 0 },
+            "reset": { "title": "Reset", "description": "TODO", "type": "boolean" },
+            "rotation": { "title": "Rotation", "description": "TODO", "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
             "texture_meshes": {
               "type": "array",
-              "title": "Texture meshes",
+              "title": "Texture Meshes",
               "description": "TODO",
               "items": {
                 "type": "object",
                 "additionalProperties": false,
                 "properties": {
-                  "texture": {
-                    "type": "string"
-                  },
-                  "local_pivot": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "position": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "rotation": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  },
-                  "scale": {
-                    "type": "array",
-                    "items": [
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      },
-                      {
-                        "type": "number"
-                      }
-                    ]
-                  }
+                  "texture": { "type": "string" },
+                  "local_pivot": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "position": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "rotation": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] },
+                  "scale": { "type": "array", "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }] }
                 }
               }
             }
           }
         }
       },
-      "cape": {
-        "title": "Cape",
-        "description": "TODO",
-        "type": "string"
-      },
-      "debug": {
-        "title": "Debug",
-        "description": "TODO",
-        "type": "boolean"
-      },
-      "texturewidth": {
-        "type": "integer",
-        "description": "TODO description: texturewidth",
-        "title": "Texturewidth"
-      },
-      "textureheight": {
-        "type": "integer",
-        "description": "TODO description: textureheight",
-        "title": "Textureheight"
-      },
-      "visible_bounds_width": {
-        "type": "number",
-        "description": "TODO description: visible bounds width",
-        "title": "Visible Bounds Width"
-      },
-      "visible_bounds_height": {
-        "type": "number",
-        "description": "TODO description: visible bounds height",
-        "title": "Visible Bounds Height"
-      },
+      "cape": { "title": "Cape", "description": "TODO", "type": "string" },
+      "debug": { "title": "Debug", "description": "TODO", "type": "boolean" },
+      "texturewidth": { "type": "integer", "description": "TODO description: texturewidth", "title": "Texturewidth" },
+      "textureheight": { "type": "integer", "description": "TODO description: textureheight", "title": "Textureheight" },
+      "visible_bounds_width": { "type": "number", "description": "TODO description: visible bounds width", "title": "Visible Bounds Width" },
+      "visible_bounds_height": { "type": "number", "description": "TODO description: visible bounds height", "title": "Visible Bounds Height" },
       "visible_bounds_offset": {
         "type": "array",
         "description": "TODO description: visible bounds offset",
         "title": "Visible Bounds Offset",
-        "items": [
-          {
-            "type": "number"
-          },
-          {
-            "type": "number"
-          },
-          {
-            "type": "number"
-          }
-        ]
+        "items": [{ "type": "number" }, { "type": "number" }, { "type": "number" }]
       }
     }
   }
diff --git a/source/resource/models/entity/model_entity.json b/source/resource/models/entity/model_entity.json
index 3497e36e..0308dc6d 100644
--- a/source/resource/models/entity/model_entity.json
+++ b/source/resource/models/entity/model_entity.json
@@ -6,38 +6,17 @@
       "format_version": "1.16.0",
       "minecraft:geometry": [
         {
-          "description": {
-            "identifier": "geometry.entity",
-            "texture_width": 64.0,
-            "texture_height": 64.0,
-            "visible_bounds_offset": [0.0, 0.5, 0.0],
-            "visible_bounds_width": 1.5
-          },
+          "description": { "identifier": "geometry.entity", "texture_width": 64.0, "texture_height": 64.0, "visible_bounds_offset": [0.0, 0.5, 0.0], "visible_bounds_width": 1.5 },
           "bones": {}
         }
       ]
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/model_entity.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/model_entity.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } },
-      "then": { "$ref": "./1.12.0/model_entity.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } },
-      "then": { "$ref": "./1.14.0/model_entity.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.16.0" } } },
-      "then": { "$ref": "./1.16.0/model_entity.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/model_entity.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/model_entity.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } }, "then": { "$ref": "./1.12.0/model_entity.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } }, "then": { "$ref": "./1.14.0/model_entity.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.16.0" } } }, "then": { "$ref": "./1.16.0/model_entity.json" } }
   ]
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_initialization.json b/source/resource/particles/1.10.0/components/minecraft.emitter_initialization.json
index b00e4ae1..f8798001 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_initialization.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_initialization.json
@@ -3,18 +3,10 @@
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_initialization",
   "description": "This component allows the emitter to run some Molang at creation, primarily to populate any MoLang variables that get used later.",
   "type": "object",
-  "title": "The emitter initialization component for 1.10.0",
+  "title": "Emitter Initialization Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
-    "creation_expression": {
-      "$ref": "../../../../molang/1.8.0/string.json",
-      "description": "This is run once at emitter startup.",
-      "title": "Creation Expression"
-    },
-    "per_update_expression": {
-      "$ref": "../../../../molang/1.8.0/string.json",
-      "description": "This is run once per emitter update.",
-      "title": "Per Update Expression"
-    }
+    "creation_expression": { "$ref": "../../../../molang/1.8.0/string.json", "description": "This is run once at emitter startup.", "title": "Creation Expression" },
+    "per_update_expression": { "$ref": "../../../../molang/1.8.0/string.json", "description": "This is run once per emitter update.", "title": "Per Update Expression" }
   }
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_events.json b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_events.json
index 9f3e27dc..964dcf39 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_events.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_events.json
@@ -2,99 +2,47 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_lifetime_events",
   "type": "object",
-  "title": "The emitter lifetime events component for 1.10.0",
+  "title": "Emitter Lifetime Events Component For 1.10.0",
   "description": "TODO",
   "additionalProperties": false,
   "properties": {
     "creation_event": {
-      "title": "Creation event",
+      "title": "Creation Event",
       "description": "Fires when the emitter is created",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ]
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }]
     },
     "expiration_event": {
-      "title": "Expiration event",
+      "title": "Expiration Event",
       "description": "Fires when the emitter expires (does not wait for particles to expire too)",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ]
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }]
     },
     "timeline": {
       "type": "object",
       "description": "A series of times, e.g. 0.0 or 1.0, that trigger the event, these get fired on every loop the emitter goes through, \"time\" is the time, e.g. one line might be: \"0.4\": \"event\"",
-      "propertyNames": {
-        "pattern": "^[\\d\\.]+$"
-      },
+      "propertyNames": { "pattern": "^[\\d\\.]+$" },
       "additionalProperties": {
-        "title": "Timeline object",
+        "title": "Timeline Object",
         "description": "A single point in time that executes commands/molang/events",
-        "oneOf": [
-          {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          {
-            "type": "string"
-          }
-        ]
+        "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }]
       },
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "travel_distance_events": {
-      "title": "Travel distance events",
+      "title": "Travel Distance Events",
       "description": "A series of distances, e.g. 0.0 or 1.0, that trigger the event these get fired when the emitter has moved by the specified input distance, e.g. one line might be: \"0.4\": \"event\"",
-      "propertyNames": {
-        "pattern": "^[\\d\\.]+$"
-      }
+      "propertyNames": { "pattern": "^[\\d\\.]+$" }
     },
     "looping_travel_distance_events": {
-      "title": "Looping travel distance events",
+      "title": "Looping Travel Distance Events",
       "description": "A series of events that occur at set intervals these get fired every time the emitter has moved the specified input distance from the last time it was fired.",
       "type": "array",
       "items": {
         "type": "object",
-        "title": "Distance event",
+        "title": "Distance Event",
         "additionalProperties": false,
         "properties": {
-          "distance": {
-            "title": "Distance",
-            "description": "TODO",
-            "type": "number"
-          },
-          "effects": {
-            "title": "Effects",
-            "description": "TODO",
-            "oneOf": [
-              {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              {
-                "type": "string"
-              }
-            ]
-          }
+          "distance": { "title": "Distance", "description": "TODO", "type": "number" },
+          "effects": { "title": "Effects", "description": "TODO", "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }] }
         }
       }
     }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_expression.json b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_expression.json
index d659af77..8f212a81 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_expression.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_expression.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_rate_manual",
   "type": "object",
-  "title": "The emitter rate manual component for 1.10.0",
+  "title": "Emitter Rate Manual Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "activation_expression": {
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_looping.json b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_looping.json
index ade014ef..75023fa7 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_looping.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_looping.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_lifetime_looping",
   "type": "object",
-  "title": "The emitter lifetime looping component for 1.10.0",
+  "title": "Emitter Lifetime Looping Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "active_time": {
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_once.json b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_once.json
index 54a5a7d2..f66e44ff 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_once.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_lifetime_once.json
@@ -2,14 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_lifetime_once",
   "type": "object",
-  "title": "The emitter lifetime once component for 1.10.0",
+  "title": "Emitter Lifetime Once Component For 1.10.0",
   "additionalProperties": false,
-  "properties": {
-    "active_time": {
-      "$ref": "../../../../molang/1.8.0/number.json",
-      "description": "How long the particles emit for evaluated once",
-      "title": "Active Time"
-    }
-  },
+  "properties": { "active_time": { "$ref": "../../../../molang/1.8.0/number.json", "description": "How long the particles emit for evaluated once", "title": "Active Time" } },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_local_space.json b/source/resource/particles/1.10.0/components/minecraft.emitter_local_space.json
index c4e686a7..08bd0dd0 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_local_space.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_local_space.json
@@ -2,24 +2,12 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_local_space",
   "type": "object",
-  "title": "The emitter local space component for 1.10.0",
+  "title": "Emitter Local Space Component For 1.10.0",
   "description": "TODO description: ",
   "additionalProperties": false,
   "properties": {
-    "position": {
-      "type": "boolean",
-      "description": "TODO description: position",
-      "title": "Position"
-    },
-    "rotation": {
-      "type": "boolean",
-      "description": "TODO description: rotation",
-      "title": "Rotation"
-    },
-    "velocity": {
-      "type": "boolean",
-      "description": "TODO description: rotation",
-      "title": "Rotation"
-    }
+    "position": { "type": "boolean", "description": "TODO description: position", "title": "Position" },
+    "rotation": { "type": "boolean", "description": "TODO description: rotation", "title": "Rotation" },
+    "velocity": { "type": "boolean", "description": "TODO description: rotation", "title": "Rotation" }
   }
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_rate_instant.json b/source/resource/particles/1.10.0/components/minecraft.emitter_rate_instant.json
index a6ac2faf..0dd20757 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_rate_instant.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_rate_instant.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_rate_instant",
   "type": "object",
-  "title": "The emitter rate instant component for 1.10.0",
+  "title": "Emitter Rate Instant Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "num_particles": {
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_rate_manual.json b/source/resource/particles/1.10.0/components/minecraft.emitter_rate_manual.json
index 75c1271b..67fa7551 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_rate_manual.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_rate_manual.json
@@ -2,14 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_rate_manual",
   "type": "object",
-  "title": "The emitter rate manual component for 1.10.0",
+  "title": "Emitter Rate Manual Component For 1.10.0",
   "additionalProperties": false,
-  "properties": {
-    "max_particles": {
-      "$ref": "../../../../molang/1.8.0/number.json",
-      "description": "Evaluated once per particle emitted",
-      "title": "Max Particles"
-    }
-  },
+  "properties": { "max_particles": { "$ref": "../../../../molang/1.8.0/number.json", "description": "Evaluated once per particle emitted", "title": "Max Particles" } },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_rate_steady.json b/source/resource/particles/1.10.0/components/minecraft.emitter_rate_steady.json
index bf5634cc..8316e15c 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_rate_steady.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_rate_steady.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_rate_steady",
   "type": "object",
-  "title": "The emitter rate steady component for 1.10.0",
+  "title": "Emitter Rate Steady Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "max_particles": {
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_box.json b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_box.json
index d836c41f..1972a022 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_box.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_box.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_shape_box",
   "type": "object",
-  "title": "The emitter shape box component for 1.10.0",
+  "title": "Emitter Shape Box Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "direction": {
@@ -10,50 +10,24 @@
       "title": "Direction",
       "default": "outwards",
       "anyOf": [
-        {
-          "type": "string",
-          "enum": ["inwards", "outwards"]
-        },
-        {
-          "type": "array",
-          "minItems": 3,
-          "maxItems": 3,
-          "items": {
-            "$ref": "../../../../molang/1.8.0/number.json"
-          }
-        }
+        { "type": "string", "enum": ["inwards", "outwards"] },
+        { "type": "array", "minItems": 3, "maxItems": 3, "items": { "$ref": "../../../../molang/1.8.0/number.json" } }
       ]
     },
     "radius": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: radius", "title": "Radius" },
     "offset": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: offset",
-        "title": "Offset"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "half_dimensions": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: half dimensions",
-        "title": "Half Dimensions"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: half dimensions", "title": "Half Dimensions" },
       "description": "TODO description: half dimensions",
       "title": "Half Dimensions"
     },
-    "surface_only": {
-      "type": "boolean",
-      "description": "TODO description: surface only",
-      "title": "Surface Only"
-    }
+    "surface_only": { "type": "boolean", "description": "TODO description: surface only", "title": "Surface Only" }
   },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_custom.json b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_custom.json
index 77c36a70..5423660d 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_custom.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_custom.json
@@ -2,30 +2,18 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_shape_custom",
   "type": "object",
-  "title": "The emitter shape custom component for 1.10.0",
+  "title": "Emitter Shape Custom Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "direction": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: direction",
-        "title": "Direction"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: direction", "title": "Direction" },
       "description": "TODO description: direction",
       "title": "Direction"
     },
     "offset": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: offset",
-        "title": "Offset"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
       "description": "TODO description: offset",
       "title": "Offset"
     }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_disc.json b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_disc.json
index 7d0080a9..8769562a 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_disc.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_disc.json
@@ -2,23 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_shape_disc",
   "type": "object",
-  "title": "The emitter shape disc component for 1.10.0",
+  "title": "Emitter Shape Disc Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "direction": {
       "anyOf": [
-        {
-          "type": "string",
-          "enum": ["inwards", "outwards"]
-        },
-        {
-          "type": "array",
-          "minItems": 3,
-          "maxItems": 3,
-          "items": {
-            "$ref": "../../../../molang/1.8.0/number.json"
-          }
-        }
+        { "type": "string", "enum": ["inwards", "outwards"] },
+        { "type": "array", "minItems": 3, "maxItems": 3, "items": { "$ref": "../../../../molang/1.8.0/number.json" } }
       ],
       "description": "TODO description: direction",
       "title": "Direction"
@@ -26,46 +16,23 @@
     "radius": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: radius", "title": "Radius" },
     "offset": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: offset",
-        "title": "Offset"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "plane_normal": {
-      "title": "Plane normal",
+      "title": "Plane Normal",
       "description": "Specifies the normal of the disc plane, the disc will be perpendicular to this direction",
       "default": [0, 1, 0],
       "oneOf": [
-        {
-          "type": "string",
-          "enum": ["x", "y", "z"]
-        },
+        { "type": "string", "enum": ["x", "y", "z"] },
         {
           "type": "array",
-          "items": [
-            {
-              "$ref": "../../../../molang/1.8.0/number.json"
-            },
-            {
-              "$ref": "../../../../molang/1.8.0/number.json"
-            },
-            {
-              "$ref": "../../../../molang/1.8.0/number.json"
-            }
-          ]
+          "items": [{ "$ref": "../../../../molang/1.8.0/number.json" }, { "$ref": "../../../../molang/1.8.0/number.json" }, { "$ref": "../../../../molang/1.8.0/number.json" }]
         }
       ]
     },
-    "surface_only": {
-      "type": "boolean",
-      "description": "TODO description: surface only",
-      "title": "Surface Only"
-    }
+    "surface_only": { "type": "boolean", "description": "TODO description: surface only", "title": "Surface Only" }
   },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_entity_aabb.json b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_entity_aabb.json
index 3fbbb988..4e4a87ec 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_entity_aabb.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_entity_aabb.json
@@ -2,26 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_shape_entity_aabb",
   "type": "object",
-  "title": "The emitter shape entity aabb component for 1.10.0",
+  "title": "Emitter Shape Entity Aabb Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "direction": {
       "anyOf": [
-        {
-          "type": "string",
-          "enum": ["inwards", "outwards"],
-          "description": "TODO description: Todo",
-          "title": "Todo"
-        },
+        { "type": "string", "enum": ["inwards", "outwards"], "description": "TODO description: Todo", "title": "Todo" },
         {
           "type": "array",
-          "items": {
-            "minItems": 3,
-            "maxItems": 3,
-            "$ref": "../../../../molang/1.8.0/number.json",
-            "description": "TODO description: Todo",
-            "title": "Todo"
-          },
+          "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: Todo", "title": "Todo" },
           "description": "TODO description: Todo",
           "title": "Todo"
         }
@@ -31,15 +20,9 @@
     },
     "offset": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: offset",
-        "title": "Offset"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   },
   "description": "TODO description: "
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_point.json b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_point.json
index 24a6ddbb..96d8ec9d 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_point.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_point.json
@@ -2,32 +2,20 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_shape_point",
   "type": "object",
-  "title": "The emitter shape point component for 1.10.0",
+  "title": "Emitter Shape Point Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "direction": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: direction",
-        "title": "Direction"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: direction", "title": "Direction" },
       "description": "TODO description: direction",
       "title": "Direction"
     },
     "offset": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: offset",
-        "title": "Offset"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   },
   "description": "TODO description: "
diff --git a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_sphere.json b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_sphere.json
index f6749640..fd29f4de 100644
--- a/source/resource/particles/1.10.0/components/minecraft.emitter_shape_sphere.json
+++ b/source/resource/particles/1.10.0/components/minecraft.emitter_shape_sphere.json
@@ -2,26 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.emitter_shape_sphere",
   "type": "object",
-  "title": "The emitter shape sphere component for 1.10.0",
+  "title": "Emitter Shape Sphere Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "direction": {
       "anyOf": [
-        {
-          "type": "string",
-          "enum": ["inwards", "outwards"],
-          "description": "TODO description: Todo",
-          "title": "Todo"
-        },
+        { "type": "string", "enum": ["inwards", "outwards"], "description": "TODO description: Todo", "title": "Todo" },
         {
           "type": "array",
-          "items": {
-            "minItems": 3,
-            "maxItems": 3,
-            "$ref": "../../../../molang/1.8.0/number.json",
-            "description": "TODO description: Todo",
-            "title": "Todo"
-          },
+          "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: Todo", "title": "Todo" },
           "description": "TODO description: Todo",
           "title": "Todo"
         }
@@ -31,22 +20,12 @@
     },
     "offset": {
       "type": "array",
-      "items": {
-        "minItems": 3,
-        "maxItems": 3,
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: offset",
-        "title": "Offset"
-      },
+      "items": { "minItems": 3, "maxItems": 3, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
     "radius": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: radius", "title": "Radius" },
-    "surface_only": {
-      "type": "boolean",
-      "description": "TODO description: surface only",
-      "title": "Surface Only"
-    }
+    "surface_only": { "type": "boolean", "description": "TODO description: surface only", "title": "Surface Only" }
   },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_appearance_billboard.json b/source/resource/particles/1.10.0/components/minecraft.particle_appearance_billboard.json
index 2e708a26..ff5d8c8f 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_appearance_billboard.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_appearance_billboard.json
@@ -2,18 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_appearance_billboard",
   "type": "object",
-  "title": "The particle appearance billboard component for 1.10.0",
+  "title": "Particle Appearance Billboard Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "size": {
       "type": "array",
       "minItems": 2,
       "maxItems": 2,
-      "items": {
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: size",
-        "title": "Size"
-      },
+      "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: size", "title": "Size" },
       "description": "TODO description: size",
       "title": "Size"
     },
@@ -27,16 +23,8 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "texture_width": {
-          "type": "integer",
-          "description": "TODO description: texture width",
-          "title": "Texture Width"
-        },
-        "texture_height": {
-          "type": "integer",
-          "description": "TODO description: texture height",
-          "title": "Texture Height"
-        },
+        "texture_width": { "type": "integer", "description": "TODO description: texture width", "title": "Texture Width" },
+        "texture_height": { "type": "integer", "description": "TODO description: texture height", "title": "Texture Height" },
         "flipbook": {
           "additionalProperties": false,
           "type": "object",
@@ -46,11 +34,7 @@
               "type": "array",
               "minItems": 2,
               "maxItems": 2,
-              "items": {
-                "$ref": "../../../../molang/1.8.0/number.json",
-                "description": "TODO description: base UV",
-                "title": "Base U V"
-              },
+              "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: base UV", "title": "Base U V" },
               "description": "TODO description: base UV",
               "title": "Base U V"
             },
@@ -58,11 +42,7 @@
               "type": "array",
               "minItems": 2,
               "maxItems": 2,
-              "items": {
-                "$ref": "../../../../molang/1.8.0/number.json",
-                "description": "TODO description: size UV",
-                "title": "Size U V"
-              },
+              "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: size UV", "title": "Size U V" },
               "description": "TODO description: size UV",
               "title": "Size U V"
             },
@@ -70,34 +50,14 @@
               "type": "array",
               "minItems": 2,
               "maxItems": 2,
-              "items": {
-                "$ref": "../../../../molang/1.8.0/number.json",
-                "description": "TODO description: step UV",
-                "title": "Step U V"
-              },
+              "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: step UV", "title": "Step U V" },
               "description": "TODO description: step UV",
               "title": "Step U V"
             },
-            "frames_per_second": {
-              "$ref": "../../../../molang/1.8.0/number.json",
-              "description": "TODO description: frames per second",
-              "title": "Frames Per Second"
-            },
-            "max_frame": {
-              "$ref": "../../../../molang/1.8.0/number.json",
-              "description": "TODO description: max frame",
-              "title": "Max Frame"
-            },
-            "stretch_to_lifetime": {
-              "type": "boolean",
-              "description": "TODO description: stretch to lifetime",
-              "title": "Stretch To Lifetime"
-            },
-            "loop": {
-              "type": "boolean",
-              "description": "TODO description: loop",
-              "title": "Loop"
-            }
+            "frames_per_second": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: frames per second", "title": "Frames Per Second" },
+            "max_frame": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: max frame", "title": "Max Frame" },
+            "stretch_to_lifetime": { "type": "boolean", "description": "TODO description: stretch to lifetime", "title": "Stretch To Lifetime" },
+            "loop": { "type": "boolean", "description": "TODO description: loop", "title": "Loop" }
           },
           "description": "TODO description: flipbook",
           "title": "Flipbook"
@@ -106,11 +66,7 @@
           "type": "array",
           "minItems": 2,
           "maxItems": 2,
-          "items": {
-            "$ref": "../../../../molang/1.8.0/number.json",
-            "description": "TODO description: uv",
-            "title": "Uv"
-          },
+          "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: uv", "title": "Uv" },
           "description": "TODO description: uv",
           "title": "Uv"
         },
@@ -118,11 +74,7 @@
           "type": "array",
           "minItems": 2,
           "maxItems": 2,
-          "items": {
-            "$ref": "../../../../molang/1.8.0/number.json",
-            "description": "TODO description: uv size",
-            "title": "Uv Size"
-          },
+          "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: uv size", "title": "Uv Size" },
           "description": "TODO description: uv size",
           "title": "Uv Size"
         }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_appearance_lighting.json b/source/resource/particles/1.10.0/components/minecraft.particle_appearance_lighting.json
index 6dc3ab27..23390763 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_appearance_lighting.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_appearance_lighting.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_appearance_lighting",
   "type": "object",
-  "title": "The particle appearance lighting component for 1.10.0",
+  "title": "Particle Appearance Lighting Component For 1.10.0",
   "additionalProperties": false,
   "description": "TODO description"
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_appearance_tinting.json b/source/resource/particles/1.10.0/components/minecraft.particle_appearance_tinting.json
index 020400e7..3118ad58 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_appearance_tinting.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_appearance_tinting.json
@@ -3,22 +3,14 @@
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_appearance_tinting",
   "description": "Color fields are special, they can be either an RGB, or a \"#RRGGBB\" field (or RGBA or \"AARRGGBB\").  If RGB(A), the channels are from 0 to 1.  If the string \"#AARRGGBB\", then the values are hex from 00 to ff.",
   "type": "object",
-  "title": "The particle appearance tinting component for 1.10.0",
+  "title": "Particle Appearance Tinting Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "color": {
       "title": "Color",
       "anyOf": [
-        {
-          "type": "array",
-          "description": "Direct color field",
-          "items": { "$ref": "../../../../molang/1.8.0/number.json" }
-        },
-        {
-          "type": "string",
-          "format": "color-hex",
-          "description": "Direct color field"
-        },
+        { "type": "array", "description": "Direct color field", "items": { "$ref": "../../../../molang/1.8.0/number.json" } },
+        { "type": "string", "format": "color-hex", "description": "Direct color field" },
         {
           "description": "Interpolation based color",
           "type": "object",
@@ -27,27 +19,12 @@
             "gradient": {
               "title": "Gradient",
               "oneOf": [
-                {
-                  "description": "An array of colors",
-                  "type": "array",
-                  "items": {
-                    "type": "string",
-                    "description": "Color",
-                    "title": "Color",
-                    "format": "color-hex"
-                  }
-                },
+                { "description": "An array of colors", "type": "array", "items": { "type": "string", "description": "Color", "title": "Color", "format": "color-hex" } },
                 {
                   "description": "An object of colors",
                   "type": "object",
-                  "propertyNames": {
-                    "pattern": "(^[\\-0-9]+$|^[\\-0-9]+\\.[\\-0-9]+$)"
-                  },
-                  "additionalProperties": {
-                    "type": "string",
-                    "description": "Color",
-                    "format": "color-hex"
-                  }
+                  "propertyNames": { "pattern": "(^[\\-0-9]+$|^[\\-0-9]+\\.[\\-0-9]+$)" },
+                  "additionalProperties": { "type": "string", "description": "Color", "format": "color-hex" }
                 },
                 {
                   "description": "An array of colors",
@@ -57,28 +34,15 @@
                     "minItems": 3,
                     "items": {
                       "oneOf": [
-                        {
-                          "type": "number",
-                          "description": "Color",
-                          "title": "Color",
-                          "minimum": 0,
-                          "maximum": 1
-                        },
-                        {
-                          "type": "string",
-                          "title": "Molang"
-                        }
+                        { "type": "number", "description": "Color", "title": "Color", "minimum": 0, "maximum": 1 },
+                        { "type": "string", "title": "Molang" }
                       ]
                     }
                   }
                 }
               ]
             },
-            "interpolant": {
-              "$ref": "../../../../molang/1.8.0/number.json",
-              "description": "TODO description: interpolant",
-              "title": "Interpolant"
-            }
+            "interpolant": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: interpolant", "title": "Interpolant" }
           }
         }
       ],
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_expire_if_not_in_blocks.json b/source/resource/particles/1.10.0/components/minecraft.particle_expire_if_not_in_blocks.json
index 4af6fe1f..d51f1d2b 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_expire_if_not_in_blocks.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_expire_if_not_in_blocks.json
@@ -2,12 +2,8 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_expire_if_not_in_blocks",
   "type": "array",
-  "title": "The particle expire if not in blocks component for 1.10.0",
+  "title": "Particle Expire If Not In Blocks Component For 1.10.0",
   "additionalProperties": false,
-  "items": {
-    "$ref": "../../../../general/blocks_identifiers.json",
-    "description": "TODO description",
-    "title": "TODO title"
-  },
+  "items": { "$ref": "../../../../general/blocks_identifiers.json", "description": "TODO description", "title": "TODO Title" },
   "description": "TODO description"
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_initial_speed.json b/source/resource/particles/1.10.0/components/minecraft.particle_initial_speed.json
index 88d14195..9782971f 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_initial_speed.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_initial_speed.json
@@ -1,21 +1,17 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_initial_speed",
-  "title": "The particle initial speed component for 1.10.0",
+  "title": "Particle Initial Speed Component For 1.10.0",
   "additionalProperties": false,
   "anyOf": [
     { "$ref": "../../../../molang/1.8.0/number.json" },
     {
       "type": "array",
-      "items": {
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description",
-        "title": "TODO title"
-      },
+      "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description", "title": "TODO Title" },
       "minItems": 3,
       "maxItems": 3,
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     }
   ]
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_initial_spin.json b/source/resource/particles/1.10.0/components/minecraft.particle_initial_spin.json
index 98e5d30f..d50e25e1 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_initial_spin.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_initial_spin.json
@@ -1,16 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_initial_spin",
-  "title": "The particle initial spin component for 1.10.0",
+  "title": "Particle Initial Spin Component For 1.10.0",
   "description": "Starts the particle with a specified orientation and rotation rate.",
   "additionalProperties": false,
   "type": "object",
   "properties": {
     "rotation": { "$ref": "../../../../molang/1.8.0/number.json", "description": "Specifies the initial rotation in degrees", "title": "Rotation" },
-    "rotation_rate": {
-      "$ref": "../../../../molang/1.8.0/number.json",
-      "description": "Specifies the spin rate in degrees/second",
-      "title": "Rotation Rate"
-    }
+    "rotation_rate": { "$ref": "../../../../molang/1.8.0/number.json", "description": "Specifies the spin rate in degrees/second", "title": "Rotation Rate" }
   }
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_initialization.json b/source/resource/particles/1.10.0/components/minecraft.particle_initialization.json
index d01c6794..461418cd 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_initialization.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_initialization.json
@@ -2,19 +2,11 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_initialization",
   "type": "object",
-  "title": "The particle initialization component for 1.10.0",
+  "title": "Particle Initialization Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
-    "per_update_expression": {
-      "$ref": "../../../../molang/1.8.0/number.json",
-      "description": "TODO description: per update expression",
-      "title": "Per Update Expression"
-    },
-    "per_render_expression": {
-      "$ref": "../../../../molang/1.8.0/number.json",
-      "description": "TODO description: per render expression",
-      "title": "Per Render Expression"
-    }
+    "per_update_expression": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: per update expression", "title": "Per Update Expression" },
+    "per_render_expression": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: per render expression", "title": "Per Render Expression" }
   },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_kill_plane.json b/source/resource/particles/1.10.0/components/minecraft.particle_kill_plane.json
index fe7beccd..17ce67be 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_kill_plane.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_kill_plane.json
@@ -2,13 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_kill_plane",
   "type": "array",
-  "title": "The particle kill plane component for 1.10.0",
-  "items": {
-    "minItems": 4,
-    "maxItems": 4,
-    "$ref": "../../../../molang/1.8.0/number.json",
-    "description": "TODO description",
-    "title": "TODO title"
-  },
+  "title": "Particle Kill Plane Component For 1.10.0",
+  "items": { "minItems": 4, "maxItems": 4, "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description", "title": "TODO Title" },
   "description": "TODO description"
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_events.json b/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_events.json
index 0e3f1954..b1055ffc 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_events.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_events.json
@@ -2,50 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_lifetime_events",
   "type": "object",
-  "title": "The particle lifetime events component for 1.10.0",
+  "title": "Particle Lifetime Events Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "creation_event": {
-      "title": "Creation event",
+      "title": "Creation Event",
       "description": "Fires when the particle is created",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
-    "custom_events": {
-      "title": "Custom events",
-      "description": "TODO, unclear structure :("
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }]
     },
+    "custom_events": { "title": "Custom Events", "description": "TODO, unclear structure :(" },
     "expiration_event": {
-      "title": "Expiration event",
+      "title": "Expiration Event",
       "description": "Fires when the particle expires (does not wait for particles to expire too)",
-      "oneOf": [
-        {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "string"
-        }
-      ]
+      "oneOf": [{ "type": "array", "items": { "type": "string" } }, { "type": "string" }]
     },
-    "timeline": {
-      "propertyNames": {
-        "pattern": "[0-9]*.[0-9]*"
-      },
-      "description": "TODO description: timeline",
-      "title": "Timeline"
-    }
+    "timeline": { "propertyNames": { "pattern": "[0-9]*.[0-9]*" }, "description": "TODO description: timeline", "title": "Timeline" }
   },
   "description": "TODO description: "
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_expression.json b/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_expression.json
index a113fdbb..e15e000f 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_expression.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_lifetime_expression.json
@@ -3,11 +3,11 @@
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_lifetime_expression",
   "type": "object",
   "description": "TODO description: ",
-  "title": "The particle lifetime expression component for 1.10.0",
+  "title": "Particle Lifetime Expression Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "expiration_expression": {
-      "title": "Expiration expression",
+      "title": "Expiration Expression",
       "description": "This expression makes the particle expire when true (non-zero), The float/expr is evaluated once per particle, evaluated every frame",
       "$ref": "../../../../molang/1.8.0/number.json"
     },
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_motion_collision.json b/source/resource/particles/1.10.0/components/minecraft.particle_motion_collision.json
index 3af88a0b..c78c736f 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_motion_collision.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_motion_collision.json
@@ -2,45 +2,21 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_motion_collision",
   "type": "object",
-  "title": "The particle motion collision component for 1.10.0",
+  "title": "Particle Motion Collision Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
-    "collision_drag": {
-      "type": "number",
-      "description": "TODO description: collision drag",
-      "title": "Collision Drag"
-    },
-    "coefficient_of_restitution": {
-      "type": "number",
-      "description": "TODO description: coefficient of restitution",
-      "title": "Coefficient Of Restitution"
-    },
-    "collision_radius": {
-      "type": "number",
-      "description": "TODO description: collision radius",
-      "title": "Collision Radius"
-    },
+    "collision_drag": { "type": "number", "description": "TODO description: collision drag", "title": "Collision Drag" },
+    "coefficient_of_restitution": { "type": "number", "description": "TODO description: coefficient of restitution", "title": "Coefficient Of Restitution" },
+    "collision_radius": { "type": "number", "description": "TODO description: collision radius", "title": "Collision Radius" },
     "enabled": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: enabled", "title": "Enabled" },
-    "expire_on_contact": {
-      "type": "boolean",
-      "description": "TODO description: expire on contact",
-      "title": "Expire On Contact"
-    },
+    "expire_on_contact": { "type": "boolean", "description": "TODO description: expire on contact", "title": "Expire On Contact" },
     "events": {
       "type": "array",
       "items": {
         "properties": {
           "additionalProperties": false,
-          "event": {
-            "type": "string",
-            "description": "TODO description: event",
-            "title": "Event"
-          },
-          "min_speed": {
-            "type": "number",
-            "description": "TODO description: min speed",
-            "title": "Min Speed"
-          }
+          "event": { "type": "string", "description": "TODO description: event", "title": "Event" },
+          "min_speed": { "type": "number", "description": "TODO description: min speed", "title": "Min Speed" }
         },
         "description": "TODO description: events",
         "title": "Events"
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_motion_dynamic.json b/source/resource/particles/1.10.0/components/minecraft.particle_motion_dynamic.json
index f987f25b..2eadaaec 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_motion_dynamic.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_motion_dynamic.json
@@ -3,7 +3,7 @@
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_motion_dynamic",
   "description": "This component specifies the dynamic properties of the particle, from a simulation standpoint what forces act upon the particle? These dynamics alter the velocity of the particle, which is a combination of the direction of the particle and the speed. Particle direction will always be in the direction of the velocity of the particle.",
   "type": "object",
-  "title": "The particle motion dynamic component for 1.10.0",
+  "title": "Particle Motion Dynamic Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "linear_acceleration": {
@@ -11,9 +11,7 @@
       "default": [0, 0, 0],
       "minItems": 3,
       "maxItems": 3,
-      "items": {
-        "$ref": "../../../../molang/1.8.0/number.json"
-      },
+      "items": { "$ref": "../../../../molang/1.8.0/number.json" },
       "description": "The linear acceleration applied to the particle. Units are blocks/sec/sec",
       "title": "Linear Acceleration"
     },
@@ -29,11 +27,6 @@
       "title": "Rotation Acceleration",
       "default": 0
     },
-    "rotation_drag_coefficient": {
-      "$ref": "../../../../molang/1.8.0/number.json",
-      "description": "Drag applied to rotation",
-      "title": "Rotation Drag Coefficient",
-      "default": 0
-    }
+    "rotation_drag_coefficient": { "$ref": "../../../../molang/1.8.0/number.json", "description": "Drag applied to rotation", "title": "Rotation Drag Coefficient", "default": 0 }
   }
 }
diff --git a/source/resource/particles/1.10.0/components/minecraft.particle_motion_parametric.json b/source/resource/particles/1.10.0/components/minecraft.particle_motion_parametric.json
index a30194b8..62f26730 100644
--- a/source/resource/particles/1.10.0/components/minecraft.particle_motion_parametric.json
+++ b/source/resource/particles/1.10.0/components/minecraft.particle_motion_parametric.json
@@ -2,18 +2,14 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.resource.particle.1.10.0.particle_motion_parametric",
   "type": "object",
-  "title": "The particle motion parametric component for 1.10.0",
+  "title": "Particle Motion Parametric Component For 1.10.0",
   "additionalProperties": false,
   "properties": {
     "relative_position": {
       "type": "array",
       "minItems": 3,
       "maxItems": 3,
-      "items": {
-        "$ref": "../../../../molang/1.8.0/number.json",
-        "description": "TODO description: relative position",
-        "title": "Relative Position"
-      },
+      "items": { "$ref": "../../../../molang/1.8.0/number.json", "description": "TODO description: relative position", "title": "Relative Position" },
       "description": "TODO description: relative position",
       "title": "Relative Position"
     },
diff --git a/source/resource/particles/1.10.0/particle.json b/source/resource/particles/1.10.0/particle.json
index 314bf7a0..5301f015 100644
--- a/source/resource/particles/1.10.0/particle.json
+++ b/source/resource/particles/1.10.0/particle.json
@@ -19,28 +19,13 @@
           "type": "object",
           "required": ["identifier", "basic_render_parameters"],
           "properties": {
-            "identifier": {
-              "type": "string",
-              "description": "TODO description: identifier",
-              "title": "Identifier",
-              "$ref": "../../../general/particle/identifier.json"
-            },
+            "identifier": { "type": "string", "description": "TODO description: identifier", "title": "Identifier", "$ref": "../../../general/particle/identifier.json" },
             "basic_render_parameters": {
               "additionalProperties": false,
               "type": "object",
               "properties": {
-                "material": {
-                  "type": "string",
-                  "examples": ["particles_alpha", "particles_blend"],
-                  "description": " Minecraft material to use for emitter",
-                  "title": "Material"
-                },
-                "texture": {
-                  "type": "string",
-                  "pattern": "^.+$",
-                  "description": "Minecraft texture to use for emitter",
-                  "title": "Texture"
-                }
+                "material": { "type": "string", "examples": ["particles_alpha", "particles_blend"], "description": " Minecraft material to use for emitter", "title": "Material" },
+                "texture": { "type": "string", "pattern": "^.+$", "description": "Minecraft texture to use for emitter", "title": "Texture" }
               },
               "description": "TODO description: basic render parameters",
               "title": "Basic Render Parameters"
@@ -53,54 +38,24 @@
           "title": "Curves",
           "description": "Curves are interpolation values, with inputs from 0 to 1, and outputs based on the curve. The result of the curve is a MoLang variable of the same name that can be referenced in MoLang in components. For each rendering frame for each particle, the curves are evaluated and the result is placed in a MoLang variable of the name of the curve.",
           "type": "object",
-          "propertyNames": {
-            "pattern": "^(v|variable)\\.[a-zA-z0-9]+$"
-          },
+          "propertyNames": { "pattern": "^(v|variable)\\.[a-zA-z0-9]+$" },
           "additionalProperties": {
             "type": "object",
             "additionalProperties": false,
             "title": "Curve",
             "description": "TODO",
             "properties": {
-              "input": {
-                "$ref": "../../../molang/1.8.0/number.json",
-                "title": "Input",
-                "description": "What is the input value to use"
-              },
+              "input": { "$ref": "../../../molang/1.8.0/number.json", "title": "Input", "description": "What is the input value to use" },
               "nodes": {
                 "description": "Control nodes for curve.  These are assumed to be equally, used Object for bezier_chain",
                 "title": "Nodes",
                 "oneOf": [
-                  {
-                    "minItems": 1,
-                    "type": "array",
-                    "items": {
-                      "$ref": "../../../molang/1.8.0/number.json"
-                    }
-                  },
-                  {
-                    "type": "object",
-                    "propertyNames": {
-                      "pattern": "(^[\\-0-9]+$|^[\\-0-9]+\\.[\\-0-9]+$)"
-                    },
-                    "additionalProperties": {
-                      "type": "object",
-                      "properties": {}
-                    }
-                  }
+                  { "minItems": 1, "type": "array", "items": { "$ref": "../../../molang/1.8.0/number.json" } },
+                  { "type": "object", "propertyNames": { "pattern": "(^[\\-0-9]+$|^[\\-0-9]+\\.[\\-0-9]+$)" }, "additionalProperties": { "type": "object", "properties": {} } }
                 ]
               },
-              "type": {
-                "type": "string",
-                "title": "Type",
-                "description": "The type of curve",
-                "enum": ["linear", "bezier", "bezier_chain", "catmull_rom"]
-              },
-              "horizontal_range": {
-                "type": "string",
-                "title": "Horizontal Range",
-                "description": "What is the range the input is mapped onto"
-              }
+              "type": { "type": "string", "title": "Type", "description": "The type of curve", "enum": ["linear", "bezier", "bezier_chain", "catmull_rom"] },
+              "horizontal_range": { "type": "string", "title": "Horizontal Range", "description": "What is the range the input is mapped onto" }
             }
           }
         },
@@ -110,90 +65,34 @@
           "description": "The particle components.",
           "title": "Components",
           "properties": {
-            "minecraft:emitter_initialization": {
-              "$ref": "./components/minecraft.emitter_initialization.json"
-            },
-            "minecraft:emitter_lifetime_events": {
-              "$ref": "./components/minecraft.emitter_lifetime_events.json"
-            },
-            "minecraft:emitter_lifetime_expression": {
-              "$ref": "./components/minecraft.emitter_lifetime_expression.json"
-            },
-            "minecraft:emitter_lifetime_once": {
-              "$ref": "./components/minecraft.emitter_lifetime_once.json"
-            },
-            "minecraft:emitter_lifetime_looping": {
-              "$ref": "./components/minecraft.emitter_lifetime_looping.json"
-            },
-            "minecraft:emitter_local_space": {
-              "$ref": "./components/minecraft.emitter_local_space.json"
-            },
-            "minecraft:emitter_rate_instant": {
-              "$ref": "./components/minecraft.emitter_rate_instant.json"
-            },
-            "minecraft:emitter_rate_manual": {
-              "$ref": "./components/minecraft.emitter_rate_manual.json"
-            },
-            "minecraft:emitter_rate_steady": {
-              "$ref": "./components/minecraft.emitter_rate_steady.json"
-            },
-            "minecraft:emitter_shape_box": {
-              "$ref": "./components/minecraft.emitter_shape_box.json"
-            },
-            "minecraft:emitter_shape_custom": {
-              "$ref": "./components/minecraft.emitter_shape_custom.json"
-            },
-            "minecraft:emitter_shape_disc": {
-              "$ref": "./components/minecraft.emitter_shape_disc.json"
-            },
-            "minecraft:emitter_shape_entity_aabb": {
-              "$ref": "./components/minecraft.emitter_shape_entity_aabb.json"
-            },
-            "minecraft:emitter_shape_point": {
-              "$ref": "./components/minecraft.emitter_shape_point.json"
-            },
-            "minecraft:emitter_shape_sphere": {
-              "$ref": "./components/minecraft.emitter_shape_sphere.json"
-            },
-            "minecraft:particle_appearance_billboard": {
-              "$ref": "./components/minecraft.particle_appearance_billboard.json"
-            },
-            "minecraft:particle_appearance_tinting": {
-              "$ref": "./components/minecraft.particle_appearance_tinting.json"
-            },
-            "minecraft:particle_appearance_lighting": {
-              "$ref": "./components/minecraft.particle_appearance_lighting.json"
-            },
-            "minecraft:particle_expire_if_not_in_blocks": {
-              "$ref": "./components/minecraft.particle_expire_if_not_in_blocks.json"
-            },
-            "minecraft:particle_initialization": {
-              "$ref": "./components/minecraft.particle_initialization.json"
-            },
-            "minecraft:particle_initial_speed": {
-              "$ref": "./components/minecraft.particle_initial_speed.json"
-            },
-            "minecraft:particle_initial_spin": {
-              "$ref": "./components/minecraft.particle_initial_spin.json"
-            },
-            "minecraft:particle_lifetime_expression": {
-              "$ref": "./components/minecraft.particle_lifetime_expression.json"
-            },
-            "minecraft:particle_lifetime_events": {
-              "$ref": "./components/minecraft.particle_lifetime_events.json"
-            },
-            "minecraft:particle_kill_plane": {
-              "$ref": "./components/minecraft.particle_kill_plane.json"
-            },
-            "minecraft:particle_motion_collision": {
-              "$ref": "./components/minecraft.particle_motion_collision.json"
-            },
-            "minecraft:particle_motion_dynamic": {
-              "$ref": "./components/minecraft.particle_motion_dynamic.json"
-            },
-            "minecraft:particle_motion_parametric": {
-              "$ref": "./components/minecraft.particle_motion_parametric.json"
-            }
+            "minecraft:emitter_initialization": { "$ref": "./components/minecraft.emitter_initialization.json" },
+            "minecraft:emitter_lifetime_events": { "$ref": "./components/minecraft.emitter_lifetime_events.json" },
+            "minecraft:emitter_lifetime_expression": { "$ref": "./components/minecraft.emitter_lifetime_expression.json" },
+            "minecraft:emitter_lifetime_once": { "$ref": "./components/minecraft.emitter_lifetime_once.json" },
+            "minecraft:emitter_lifetime_looping": { "$ref": "./components/minecraft.emitter_lifetime_looping.json" },
+            "minecraft:emitter_local_space": { "$ref": "./components/minecraft.emitter_local_space.json" },
+            "minecraft:emitter_rate_instant": { "$ref": "./components/minecraft.emitter_rate_instant.json" },
+            "minecraft:emitter_rate_manual": { "$ref": "./components/minecraft.emitter_rate_manual.json" },
+            "minecraft:emitter_rate_steady": { "$ref": "./components/minecraft.emitter_rate_steady.json" },
+            "minecraft:emitter_shape_box": { "$ref": "./components/minecraft.emitter_shape_box.json" },
+            "minecraft:emitter_shape_custom": { "$ref": "./components/minecraft.emitter_shape_custom.json" },
+            "minecraft:emitter_shape_disc": { "$ref": "./components/minecraft.emitter_shape_disc.json" },
+            "minecraft:emitter_shape_entity_aabb": { "$ref": "./components/minecraft.emitter_shape_entity_aabb.json" },
+            "minecraft:emitter_shape_point": { "$ref": "./components/minecraft.emitter_shape_point.json" },
+            "minecraft:emitter_shape_sphere": { "$ref": "./components/minecraft.emitter_shape_sphere.json" },
+            "minecraft:particle_appearance_billboard": { "$ref": "./components/minecraft.particle_appearance_billboard.json" },
+            "minecraft:particle_appearance_tinting": { "$ref": "./components/minecraft.particle_appearance_tinting.json" },
+            "minecraft:particle_appearance_lighting": { "$ref": "./components/minecraft.particle_appearance_lighting.json" },
+            "minecraft:particle_expire_if_not_in_blocks": { "$ref": "./components/minecraft.particle_expire_if_not_in_blocks.json" },
+            "minecraft:particle_initialization": { "$ref": "./components/minecraft.particle_initialization.json" },
+            "minecraft:particle_initial_speed": { "$ref": "./components/minecraft.particle_initial_speed.json" },
+            "minecraft:particle_initial_spin": { "$ref": "./components/minecraft.particle_initial_spin.json" },
+            "minecraft:particle_lifetime_expression": { "$ref": "./components/minecraft.particle_lifetime_expression.json" },
+            "minecraft:particle_lifetime_events": { "$ref": "./components/minecraft.particle_lifetime_events.json" },
+            "minecraft:particle_kill_plane": { "$ref": "./components/minecraft.particle_kill_plane.json" },
+            "minecraft:particle_motion_collision": { "$ref": "./components/minecraft.particle_motion_collision.json" },
+            "minecraft:particle_motion_dynamic": { "$ref": "./components/minecraft.particle_motion_dynamic.json" },
+            "minecraft:particle_motion_parametric": { "$ref": "./components/minecraft.particle_motion_parametric.json" }
           }
         },
         "events": {
@@ -205,19 +104,11 @@
             "additionalProperties": false,
             "properties": {
               "particle_effect": {
-                "title": "Particle effect",
+                "title": "Particle Effect",
                 "description": "TODO",
                 "properties": {
-                  "effect": {
-                    "type": "string",
-                    "description": "TODO description: effect",
-                    "title": "Effect"
-                  },
-                  "type": {
-                    "type": "string",
-                    "description": "TODO description: type",
-                    "title": "Type"
-                  }
+                  "effect": { "type": "string", "description": "TODO description: effect", "title": "Effect" },
+                  "type": { "type": "string", "description": "TODO description: type", "title": "Type" }
                 }
               }
             }
@@ -231,5 +122,5 @@
     }
   },
   "description": "TODO description: ",
-  "title": "TODO title"
+  "title": "TODO Title"
 }
diff --git a/source/resource/particles/1.8.0/particle.json b/source/resource/particles/1.8.0/particle.json
index 3bf662d5..22efd4a8 100644
--- a/source/resource/particles/1.8.0/particle.json
+++ b/source/resource/particles/1.8.0/particle.json
@@ -18,27 +18,17 @@
           "additionalProperties": false,
           "type": "object",
           "properties": {
-            "identifier": {
-              "type": "string",
-              "description": "TODO description: identifier",
-              "title": "Identifier",
-              "$ref": "../../../general/particle/identifier.json"
-            }
+            "identifier": { "type": "string", "description": "TODO description: identifier", "title": "Identifier", "$ref": "../../../general/particle/identifier.json" }
           },
           "description": "TODO description: description",
           "title": "Description"
         },
-        "components": {
-          "additionalProperties": false,
-          "type": "object",
-          "description": "TODO description: components",
-          "title": "Components"
-        }
+        "components": { "additionalProperties": false, "type": "object", "description": "TODO description: components", "title": "Components" }
       },
       "description": "TODO description: particle effect",
       "title": "Particle Effect"
     }
   },
   "description": "TODO description: ",
-  "title": "TODO title"
+  "title": "TODO Title"
 }
diff --git a/source/resource/particles/particles.json b/source/resource/particles/particles.json
index 853b6e3b..71c7ebe2 100644
--- a/source/resource/particles/particles.json
+++ b/source/resource/particles/particles.json
@@ -5,26 +5,14 @@
     {
       "format_version": "1.10.0",
       "particle_effect": {
-        "description": {
-          "identifier": "blockception:particle",
-          "basic_render_parameters": {
-            "material": "particles_alpha",
-            "texture": "textures/particle/particle"
-          }
-        },
+        "description": { "identifier": "blockception:particle", "basic_render_parameters": { "material": "particles_alpha", "texture": "textures/particle/particle" } },
         "curves": {},
         "components": {}
       }
     }
   ],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/particle.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/particle.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/particle.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/particle.json" } }
   ]
 }
diff --git a/source/resource/render_controllers/1.10.0/render_controllers.json b/source/resource/render_controllers/1.10.0/render_controllers.json
index b42ea30c..073ff83e 100644
--- a/source/resource/render_controllers/1.10.0/render_controllers.json
+++ b/source/resource/render_controllers/1.10.0/render_controllers.json
@@ -3,37 +3,25 @@
   "$id": "blockception.minecraft.render_controllers.json",
   "additionalProperties": false,
   "type": "object",
-  "title": "Render controllers 1.10.0",
+  "title": "Render Controllers 1.10.0",
   "description": "Render_controllers 1.10.0",
   "definitions": {
     "color": {
       "anyOf": [
-        {
-          "type": "number",
-          "description": "A color definition as number, between 0 and 1",
-          "minimum": 0,
-          "maximum": 1,
-          "title": "Color number"
-        },
-        {
-          "type": "string",
-          "description": "A color definition in molang",
-          "title": "Molang color"
-        }
+        { "type": "number", "description": "A color definition as number, between 0 and 1", "minimum": 0, "maximum": 1, "title": "Color Number" },
+        { "type": "string", "description": "A color definition in molang", "title": "Molang Color" }
       ]
     }
   },
   "properties": {
     "format_version": {
-      "title": "The 1.10.0 format version",
+      "title": "1.10.0 Format Version",
       "type": "string",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "render_controllers": {
       "type": "object",
-      "propertyNames": {
-        "pattern": "^controller\\.render\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^controller\\.render\\.[a-z\\.]+" },
       "additionalProperties": {
         "additionalProperties": false,
         "type": "object",
@@ -49,12 +37,7 @@
                 "minProperties": 1,
                 "additionalProperties": {
                   "type": "array",
-                  "items": {
-                    "type": "string",
-                    "pattern": "^[Gg]eometry\\..+",
-                    "description": "TODO description: additionalProperties",
-                    "title": "TODO"
-                  },
+                  "items": { "type": "string", "pattern": "^[Gg]eometry\\..+", "description": "TODO description: additionalProperties", "title": "TODO" },
                   "description": "TODO description: additionalProperties",
                   "title": "TODO"
                 },
@@ -66,12 +49,7 @@
                 "minProperties": 1,
                 "additionalProperties": {
                   "type": "array",
-                  "items": {
-                    "type": "string",
-                    "pattern": "^[Mm]aterial\\..+",
-                    "description": "TODO description: additionalProperties",
-                    "title": "TODO"
-                  },
+                  "items": { "type": "string", "pattern": "^[Mm]aterial\\..+", "description": "TODO description: additionalProperties", "title": "TODO" },
                   "description": "TODO description: additionalProperties",
                   "title": "TODO"
                 },
@@ -85,13 +63,7 @@
                   "type": "array",
                   "description": "Textures",
                   "title": "Texture",
-                  "items": {
-                    "type": "string",
-                    "pattern": "^[Tt]exture\\..+",
-                    "default": "texture.",
-                    "description": "An texture item",
-                    "title": "Texture"
-                  }
+                  "items": { "type": "string", "pattern": "^[Tt]exture\\..+", "default": "texture.", "description": "An texture item", "title": "Texture" }
                 },
                 "description": "TODO description: textures",
                 "title": "Textures"
@@ -104,50 +76,22 @@
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "r": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: r",
-                "title": "R"
-              },
-              "g": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: g",
-                "title": "G"
-              },
-              "b": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: b",
-                "title": "B"
-              },
-              "a": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: a",
-                "title": "A"
-              }
+              "r": { "$ref": "#/definitions/color", "description": "TODO description: r", "title": "R" },
+              "g": { "$ref": "#/definitions/color", "description": "TODO description: g", "title": "G" },
+              "b": { "$ref": "#/definitions/color", "description": "TODO description: b", "title": "B" },
+              "a": { "$ref": "#/definitions/color", "description": "TODO description: a", "title": "A" }
             },
             "description": "TODO description: color",
             "title": "Color"
           },
-          "filter_lighting": {
-            "type": "boolean",
-            "description": "TODO description: filter lighting",
-            "title": "Filter Lighting"
-          },
-          "geometry": {
-            "type": "string",
-            "description": "TODO description: geometry",
-            "title": "Geometry"
-          },
+          "filter_lighting": { "type": "boolean", "description": "TODO description: filter lighting", "title": "Filter Lighting" },
+          "geometry": { "type": "string", "description": "TODO description: geometry", "title": "Geometry" },
           "materials": {
             "type": "array",
             "minItems": 1,
             "items": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: materials",
               "title": "Materials"
             },
@@ -158,26 +102,10 @@
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "r": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: r",
-                "title": "R"
-              },
-              "g": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: g",
-                "title": "G"
-              },
-              "b": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: b",
-                "title": "B"
-              },
-              "a": {
-                "$ref": "#/definitions/color",
-                "description": "TODO description: a",
-                "title": "A"
-              }
+              "r": { "$ref": "#/definitions/color", "description": "TODO description: r", "title": "R" },
+              "g": { "$ref": "#/definitions/color", "description": "TODO description: g", "title": "G" },
+              "b": { "$ref": "#/definitions/color", "description": "TODO description: b", "title": "B" },
+              "a": { "$ref": "#/definitions/color", "description": "TODO description: a", "title": "A" }
             },
             "description": "TODO description: overlay color",
             "title": "Overlay Color"
@@ -185,11 +113,7 @@
           "textures": {
             "type": "array",
             "minItems": 1,
-            "items": {
-              "type": "string",
-              "description": "TODO description: textures",
-              "title": "Textures"
-            },
+            "items": { "type": "string", "description": "TODO description: textures", "title": "Textures" },
             "description": "TODO description: textures",
             "title": "Textures"
           },
@@ -202,11 +126,7 @@
                 "type": "array",
                 "minItems": 2,
                 "maxItems": 2,
-                "items": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "description": "TODO description: offset",
-                  "title": "Offset"
-                },
+                "items": { "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
                 "description": "TODO description: offset",
                 "title": "Offset"
               },
@@ -216,11 +136,7 @@
                 "title": "Scale",
                 "minItems": 2,
                 "maxItems": 2,
-                "items": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "description": "TODO description: scale",
-                  "title": "Scale"
-                }
+                "items": { "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: scale", "title": "Scale" }
               }
             },
             "description": "TODO description: uv anim",
@@ -231,30 +147,14 @@
             "minItems": 1,
             "items": {
               "description": "The object that describe different bone visibility",
-              "title": "Part visibility",
+              "title": "Part Visibility",
               "type": "object",
-              "additionalProperties": {
-                "oneOf": [
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "type": "boolean"
-                  },
-                  {
-                    "type": "number"
-                  }
-                ]
-              }
+              "additionalProperties": { "oneOf": [{ "type": "string" }, { "type": "boolean" }, { "type": "number" }] }
             },
             "description": "TODO description: part visibility",
             "title": "Part Visibility"
           },
-          "rebuild_animation_matrices": {
-            "type": "boolean",
-            "description": "TODO description: rebuild animation matrices",
-            "title": "Rebuild Animation Matrices"
-          }
+          "rebuild_animation_matrices": { "type": "boolean", "description": "TODO description: rebuild animation matrices", "title": "Rebuild Animation Matrices" }
         },
         "title": "TODO"
       },
diff --git a/source/resource/render_controllers/1.8.0/render_controllers.json b/source/resource/render_controllers/1.8.0/render_controllers.json
index dfb1ca71..1e9b1a34 100644
--- a/source/resource/render_controllers/1.8.0/render_controllers.json
+++ b/source/resource/render_controllers/1.8.0/render_controllers.json
@@ -9,37 +9,25 @@
   "definitions": {
     "color": {
       "anyOf": [
-        {
-          "type": "number",
-          "description": "A color definition as number, between 0 and 1",
-          "title": "Color number",
-          "minimum": 0,
-          "maximum": 1
-        },
-        {
-          "type": "string",
-          "description": "A color definition in molang, must result in a float between 0 and 1",
-          "title": "Molang color"
-        }
+        { "type": "number", "description": "A color definition as number, between 0 and 1", "title": "Color Number", "minimum": 0, "maximum": 1 },
+        { "type": "string", "description": "A color definition in molang, must result in a float between 0 and 1", "title": "Molang Color" }
       ]
     }
   },
   "properties": {
     "format_version": {
-      "title": "The 1.8.0 format version",
+      "title": "1.8.0 Format Version",
       "type": "string",
       "pattern": "^1.8.0$",
       "description": "A version that tells minecraft what type of data format can be expected when reading this file."
     },
     "render_controllers": {
       "type": "object",
-      "propertyNames": {
-        "pattern": "^controller\\.render\\.[a-z\\.]+"
-      },
+      "propertyNames": { "pattern": "^controller\\.render\\.[a-z\\.]+" },
       "additionalProperties": {
         "additionalProperties": false,
         "type": "object",
-        "title": "Render controller",
+        "title": "Render Controller",
         "description": "A single render_controller definition",
         "required": ["geometry", "materials"],
         "properties": {
@@ -52,17 +40,10 @@
               "geometries": {
                 "type": "object",
                 "minProperties": 1,
-                "propertyNames": {
-                  "pattern": "^[Aa]rray\\..+"
-                },
+                "propertyNames": { "pattern": "^[Aa]rray\\..+" },
                 "additionalProperties": {
                   "type": "array",
-                  "items": {
-                    "type": "string",
-                    "pattern": "^[Gg]eometry\\..+",
-                    "description": "TODO description: additionalProperties",
-                    "title": "TODO"
-                  },
+                  "items": { "type": "string", "pattern": "^[Gg]eometry\\..+", "description": "TODO description: additionalProperties", "title": "TODO" },
                   "description": "TODO description: additionalProperties",
                   "title": "TODO"
                 },
@@ -72,17 +53,10 @@
               "materials": {
                 "type": "object",
                 "minProperties": 1,
-                "propertyNames": {
-                  "pattern": "^[Aa]rray\\..+"
-                },
+                "propertyNames": { "pattern": "^[Aa]rray\\..+" },
                 "additionalProperties": {
                   "type": "array",
-                  "items": {
-                    "type": "string",
-                    "pattern": "^[Mm]aterial\\..+",
-                    "description": "TODO description: additionalProperties",
-                    "title": "TODO"
-                  },
+                  "items": { "type": "string", "pattern": "^[Mm]aterial\\..+", "description": "TODO description: additionalProperties", "title": "TODO" },
                   "description": "TODO description: additionalProperties",
                   "title": "TODO"
                 },
@@ -92,17 +66,10 @@
               "textures": {
                 "type": "object",
                 "minProperties": 1,
-                "propertyNames": {
-                  "pattern": "^[Aa]rray\\..+"
-                },
+                "propertyNames": { "pattern": "^[Aa]rray\\..+" },
                 "additionalProperties": {
                   "type": "array",
-                  "items": {
-                    "type": "string",
-                    "pattern": "^[Tt]exture\\..+",
-                    "description": "TODO description: additionalProperties",
-                    "title": "TODO"
-                  },
+                  "items": { "type": "string", "pattern": "^[Tt]exture\\..+", "description": "TODO description: additionalProperties", "title": "TODO" },
                   "description": "TODO description: additionalProperties",
                   "title": "TODO"
                 },
@@ -115,72 +82,36 @@
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "r": {
-                "$ref": "#/definitions/color"
-              },
-              "g": {
-                "$ref": "#/definitions/color"
-              },
-              "b": {
-                "$ref": "#/definitions/color"
-              },
-              "a": {
-                "$ref": "#/definitions/color"
-              }
+              "r": { "$ref": "#/definitions/color" },
+              "g": { "$ref": "#/definitions/color" },
+              "b": { "$ref": "#/definitions/color" },
+              "a": { "$ref": "#/definitions/color" }
             },
             "description": "TODO description: color",
             "title": "Color"
           },
-          "filter_lighting": {
-            "type": "boolean",
-            "description": "TODO description: filter lighting",
-            "title": "Filter Lighting"
-          },
-          "geometry": {
-            "type": "string",
-            "description": "TODO description: geometry",
-            "title": "Geometry"
-          },
-          "ignore_lighting": {
-            "type": "boolean",
-            "description": "TODO description: ignore lighting",
-            "title": "Ignore Lighting"
-          },
+          "filter_lighting": { "type": "boolean", "description": "TODO description: filter lighting", "title": "Filter Lighting" },
+          "geometry": { "type": "string", "description": "TODO description: geometry", "title": "Geometry" },
+          "ignore_lighting": { "type": "boolean", "description": "TODO description: ignore lighting", "title": "Ignore Lighting" },
           "is_hurt_color": {
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "r": {
-                "$ref": "#/definitions/color"
-              },
-              "g": {
-                "$ref": "#/definitions/color"
-              },
-              "b": {
-                "$ref": "#/definitions/color"
-              },
-              "a": {
-                "$ref": "#/definitions/color"
-              }
+              "r": { "$ref": "#/definitions/color" },
+              "g": { "$ref": "#/definitions/color" },
+              "b": { "$ref": "#/definitions/color" },
+              "a": { "$ref": "#/definitions/color" }
             },
             "description": "TODO description: is hurt color",
             "title": "Is Hurt Color"
           },
-          "light_color_multiplier": {
-            "$ref": "../../../molang/1.8.0/number.json",
-            "description": "TODO description: light color multiplier",
-            "title": "Light Color Multiplier"
-          },
+          "light_color_multiplier": { "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: light color multiplier", "title": "Light Color Multiplier" },
           "materials": {
             "type": "array",
             "minItems": 1,
             "items": {
               "type": "object",
-              "additionalProperties": {
-                "type": "string",
-                "description": "TODO description: additionalProperties",
-                "title": "TODO"
-              },
+              "additionalProperties": { "type": "string", "description": "TODO description: additionalProperties", "title": "TODO" },
               "description": "TODO description: materials",
               "title": "Materials"
             },
@@ -191,18 +122,10 @@
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "r": {
-                "$ref": "#/definitions/color"
-              },
-              "g": {
-                "$ref": "#/definitions/color"
-              },
-              "b": {
-                "$ref": "#/definitions/color"
-              },
-              "a": {
-                "$ref": "#/definitions/color"
-              }
+              "r": { "$ref": "#/definitions/color" },
+              "g": { "$ref": "#/definitions/color" },
+              "b": { "$ref": "#/definitions/color" },
+              "a": { "$ref": "#/definitions/color" }
             },
             "description": "TODO description: on fire color",
             "title": "On Fire Color"
@@ -211,18 +134,10 @@
             "additionalProperties": false,
             "type": "object",
             "properties": {
-              "r": {
-                "$ref": "#/definitions/color"
-              },
-              "g": {
-                "$ref": "#/definitions/color"
-              },
-              "b": {
-                "$ref": "#/definitions/color"
-              },
-              "a": {
-                "$ref": "#/definitions/color"
-              }
+              "r": { "$ref": "#/definitions/color" },
+              "g": { "$ref": "#/definitions/color" },
+              "b": { "$ref": "#/definitions/color" },
+              "a": { "$ref": "#/definitions/color" }
             },
             "description": "TODO description: overlay color",
             "title": "Overlay Color"
@@ -232,41 +147,23 @@
             "minItems": 1,
             "items": {
               "description": "A collection of object that describe which bones are hidden or not",
-              "title": "Part visibilty",
+              "title": "Part Visibilty",
               "type": "object",
               "minProperties": 1,
               "additionalProperties": {
-                "oneOf": [
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "type": "boolean"
-                  },
-                  {
-                    "type": "number"
-                  }
-                ],
+                "oneOf": [{ "type": "string" }, { "type": "boolean" }, { "type": "number" }],
                 "description": "Describes which bones are visible or not, can be a string, boolean or number",
-                "title": "Part visibilty"
+                "title": "Part Visibilty"
               }
             },
             "description": "TODO description: part visibility",
             "title": "Part Visibility"
           },
-          "rebuild_animation_matrices": {
-            "type": "boolean",
-            "description": "TODO description: rebuild animation matrices",
-            "title": "Rebuild Animation Matrices"
-          },
+          "rebuild_animation_matrices": { "type": "boolean", "description": "TODO description: rebuild animation matrices", "title": "Rebuild Animation Matrices" },
           "textures": {
             "type": "array",
             "minItems": 1,
-            "items": {
-              "type": "string",
-              "description": "TODO description: textures",
-              "title": "Textures"
-            },
+            "items": { "type": "string", "description": "TODO description: textures", "title": "Textures" },
             "description": "TODO description: textures",
             "title": "Textures"
           },
@@ -279,11 +176,7 @@
                 "type": "array",
                 "minItems": 2,
                 "maxItems": 2,
-                "items": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "description": "TODO description: offset",
-                  "title": "Offset"
-                },
+                "items": { "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: offset", "title": "Offset" },
                 "description": "TODO description: offset",
                 "title": "Offset"
               },
@@ -293,11 +186,7 @@
                 "title": "Scale",
                 "minItems": 2,
                 "maxItems": 2,
-                "items": {
-                  "$ref": "../../../molang/1.8.0/number.json",
-                  "description": "TODO description: scale",
-                  "title": "Scale"
-                }
+                "items": { "$ref": "../../../molang/1.8.0/number.json", "description": "TODO description: scale", "title": "Scale" }
               }
             },
             "description": "TODO description: uv anim",
diff --git a/source/resource/render_controllers/render_controllers.json b/source/resource/render_controllers/render_controllers.json
index a684cec7..fd4a47f9 100644
--- a/source/resource/render_controllers/render_controllers.json
+++ b/source/resource/render_controllers/render_controllers.json
@@ -4,30 +4,15 @@
   "examples": [
     {
       "format_version": "1.8.0",
-      "render_controllers": {
-        "controller.render.example": {
-          "geometry": "Geometry.default",
-          "materials": [{ "*": "Material.default" }],
-          "textures": ["Texture.default"]
-        }
-      }
+      "render_controllers": { "controller.render.example": { "geometry": "Geometry.default", "materials": [{ "*": "Material.default" }], "textures": ["Texture.default"] } }
     }
   ],
   "type": "object",
   "title": "Render Controllers",
   "description": "TODO description",
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } },
-      "then": { "$ref": "./1.8.0/render_controllers.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } },
-      "then": { "$ref": "./1.10.0/render_controllers.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } },
-      "then": { "$ref": "./1.10.0/render_controllers.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/render_controllers.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10" } } }, "then": { "$ref": "./1.10.0/render_controllers.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/render_controllers.json" } }
   ]
 }
diff --git a/source/resource/sounds.json b/source/resource/sounds.json
index e875ae00..9d3f3af3 100644
--- a/source/resource/sounds.json
+++ b/source/resource/sounds.json
@@ -9,25 +9,13 @@
     "pitch": {
       "title": "Pitch",
       "oneOf": [
-        {
-          "default": 1,
-          "type": "number",
-          "description": "A defined pitch"
-        },
+        { "default": 1, "type": "number", "description": "A defined pitch" },
         {
           "description": "A random selection between a minimum and maximum",
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "minimum": 0,
-              "title": "Minimum"
-            },
-            {
-              "type": "number",
-              "minimum": 0,
-              "title": "Maximum"
-            }
+            { "type": "number", "minimum": 0, "title": "Minimum" },
+            { "type": "number", "minimum": 0, "title": "Maximum" }
           ]
         }
       ]
@@ -35,158 +23,97 @@
     "volume": {
       "title": "Volume",
       "oneOf": [
-        {
-          "default": 1,
-          "type": "number",
-          "description": "A defined volume"
-        },
+        { "default": 1, "type": "number", "description": "A defined volume" },
         {
           "description": "A random selection between a minimum and maximum",
           "type": "array",
           "items": [
-            {
-              "type": "number",
-              "minimum": 0,
-              "title": "Minimum"
-            },
-            {
-              "type": "number",
-              "minimum": 0,
-              "title": "Maximum"
-            }
+            { "type": "number", "minimum": 0, "title": "Minimum" },
+            { "type": "number", "minimum": 0, "title": "Maximum" }
           ]
         }
       ]
     },
     "sound_event": {
-      "title": "Sound event definition",
+      "title": "Sound Event ",
       "description": "A single sound event definition",
       "oneOf": [
-        {
-          "type": "string"
-        },
+        { "type": "string" },
         {
           "type": "object",
           "additionalProperties": false,
           "required": ["sound"],
           "properties": {
-            "volume": {
-              "$ref": "#/definitions/volume"
-            },
-            "sound": {
-              "type": "string",
-              "title": "Sound event",
-              "description": "The sound event described in sound_definitions.json"
-            },
-            "pitch": {
-              "$ref": "#/definitions/pitch"
-            }
+            "volume": { "$ref": "#/definitions/volume" },
+            "sound": { "type": "string", "title": "Sound Event", "description": "The sound event described in sound_definitions.json" },
+            "pitch": { "$ref": "#/definitions/pitch" }
           }
         }
       ]
     },
     "entity_event": {
       "type": "object",
-      "title": "Entity sound",
+      "title": "Entity Sound",
       "description": "Entity sound definitions",
       "properties": {
-        "volume": {
-          "$ref": "#/definitions/volume"
-        },
-        "pitch": {
-          "$ref": "#/definitions/pitch"
-        },
-        "events": {
-          "type": "object",
-          "title": "Events",
-          "propertyNames": {
-            "pattern": "[a-z\\._]+"
-          },
-          "additionalProperties": {
-            "$ref": "#/definitions/sound_event"
-          }
-        }
+        "volume": { "$ref": "#/definitions/volume" },
+        "pitch": { "$ref": "#/definitions/pitch" },
+        "events": { "type": "object", "title": "Events", "propertyNames": { "pattern": "[a-z\\._]+" }, "additionalProperties": { "$ref": "#/definitions/sound_event" } }
       }
     }
   },
   "properties": {
     "block_sounds": {
       "type": "object",
-      "title": "Block sounds",
+      "title": "Block Sounds",
       "description": "Block sound definitions",
       "additionalProperties": {
         "type": "object",
-        "title": "Block sound definition",
+        "title": "Block Sound ",
         "description": "A single block sound definition",
         "additionalProperties": false,
         "properties": {
-          "volume": {
-            "$ref": "#/definitions/volume"
-          },
-          "pitch": {
-            "$ref": "#/definitions/pitch"
-          },
+          "volume": { "$ref": "#/definitions/volume" },
+          "pitch": { "$ref": "#/definitions/pitch" },
           "events": {
             "type": "object",
             "title": "Events",
-            "propertyNames": {
-              "enum": ["default", "item.use.on", "break", "hit", "place", "power.on", "power.off"]
-            },
-            "additionalProperties": {
-              "$ref": "#/definitions/sound_event"
-            }
+            "propertyNames": { "enum": ["default", "item.use.on", "break", "hit", "place", "power.on", "power.off"] },
+            "additionalProperties": { "$ref": "#/definitions/sound_event" }
           }
         }
       }
     },
     "entity_sounds": {
       "type": "object",
-      "title": "Entity sounds",
+      "title": "Entity Sounds",
       "description": "Entity sounds definitions",
       "additionalProperties": false,
       "properties": {
-        "defaults": {
-          "$ref": "#/definitions/entity_event"
-        },
-        "entities": {
-          "type": "object",
-          "title": "Entities",
-          "description": "Entities definitions",
-          "additionalProperties": {
-            "$ref": "#/definitions/entity_event"
-          }
-        }
+        "defaults": { "$ref": "#/definitions/entity_event" },
+        "entities": { "type": "object", "title": "Entities", "description": "Entities definitions", "additionalProperties": { "$ref": "#/definitions/entity_event" } }
       }
     },
     "individual_event_sounds": {
       "type": "object",
-      "title": "Individual event sounds",
+      "title": "Individual Event Sounds",
       "description": "Individual event sounds definitions",
       "additionalProperties": false,
-      "properties": {
-        "events": {
-          "type": "object",
-          "title": "Events",
-          "description": "Events",
-          "additionalProperties": {
-            "$ref": "#/definitions/sound_event"
-          }
-        }
-      }
+      "properties": { "events": { "type": "object", "title": "Events", "description": "Events", "additionalProperties": { "$ref": "#/definitions/sound_event" } } }
     },
     "interactive_sounds": {
       "type": "object",
-      "title": "Interactive sounds",
+      "title": "Interactive Sounds",
       "description": "Interactive sounds definitions",
       "additionalProperties": false,
       "properties": {
         "block_sounds": {
           "type": "object",
-          "title": "Block sounds",
+          "title": "Block Sounds",
           "description": "Block sound definitions",
           "additionalProperties": {
             "type": "object",
-            "title": "Block sound definition",
+            "title": "Block Sound ",
             "description": "A single block sound definition",
             "additionalProperties": false,
             "properties": {
@@ -195,11 +122,9 @@
               "events": {
                 "type": "object",
                 "title": "Events",
-                "propertyNames": {
-                  "enum": ["default", "fall", "step", "hit", "jump", "land"]
-                },
+                "propertyNames": { "enum": ["default", "fall", "step", "hit", "jump", "land"] },
                 "additionalProperties": {
-                  "title": "Sound event definition",
+                  "title": "Sound Event ",
                   "description": "A single sound event definition",
                   "oneOf": [
                     { "type": "string" },
@@ -209,11 +134,7 @@
                       "minProperties": 1,
                       "properties": {
                         "volume": { "$ref": "#/definitions/volume" },
-                        "sound": {
-                          "type": "string",
-                          "title": "Sound event",
-                          "description": "The sound event described in sound_definitions.json"
-                        },
+                        "sound": { "type": "string", "title": "Sound Event", "description": "The sound event described in sound_definitions.json" },
                         "pitch": { "$ref": "#/definitions/pitch" }
                       }
                     }
@@ -225,7 +146,7 @@
         },
         "entity_sounds": {
           "type": "object",
-          "title": "Entity sounds",
+          "title": "Entity Sounds",
           "description": "Entity sound definitions",
           "additionalProperties": false,
           "properties": {
@@ -235,63 +156,42 @@
               "description": "Default sound definitions",
               "additionalProperties": {
                 "type": "object",
-                "title": "Entity sounds",
+                "title": "Entity Sounds",
                 "properties": {
                   "events": {
                     "type": "object",
-                    "title": "Entity events",
-                    "propertyNames": {
-                      "pattern": "[a-z0-9\\.]+"
-                    },
+                    "title": "Entity Events",
+                    "propertyNames": { "pattern": "[a-z0-9\\.]+" },
                     "additionalProperties": {
                       "type": "object",
                       "title": "Entity Event",
                       "description": "A single entity event",
-                      "additionalProperties": {
-                        "type": "string",
-                        "title": "A sound interaction"
-                      }
+                      "additionalProperties": { "type": "string", "title": "A Sound Interaction" }
                     }
                   }
                 }
               },
-              "properties": {
-                "volume": {
-                  "$ref": "#/definitions/volume"
-                },
-                "pitch": {
-                  "$ref": "#/definitions/pitch"
-                }
-              }
+              "properties": { "volume": { "$ref": "#/definitions/volume" }, "pitch": { "$ref": "#/definitions/pitch" } }
             },
             "entities": {
               "type": "object",
-              "title": "Entites sounds",
+              "title": "Entites Sounds",
               "description": "Entities sound definitions",
               "additionalProperties": {
                 "type": "object",
-                "title": "Entity sounds",
+                "title": "Entity Sounds",
                 "properties": {
-                  "volume": {
-                    "$ref": "#/definitions/volume"
-                  },
-                  "pitch": {
-                    "$ref": "#/definitions/pitch"
-                  },
+                  "volume": { "$ref": "#/definitions/volume" },
+                  "pitch": { "$ref": "#/definitions/pitch" },
                   "events": {
                     "type": "object",
-                    "title": "Entity events",
-                    "propertyNames": {
-                      "pattern": "[a-z0-9\\.]+"
-                    },
+                    "title": "Entity Events",
+                    "propertyNames": { "pattern": "[a-z0-9\\.]+" },
                     "additionalProperties": {
                       "type": "object",
                       "title": "Entity Event",
                       "description": "A single entity event",
-                      "additionalProperties": {
-                        "type": "string",
-                        "title": "A sound interaction"
-                      }
+                      "additionalProperties": { "type": "string", "title": "A Sound Interaction" }
                     }
                   }
                 }
diff --git a/source/resource/sounds/1.14.0/sound_definitions.json b/source/resource/sounds/1.14.0/sound_definitions.json
index fbfcd3ac..64211bc2 100644
--- a/source/resource/sounds/1.14.0/sound_definitions.json
+++ b/source/resource/sounds/1.14.0/sound_definitions.json
@@ -3,13 +3,13 @@
   "$id": "blockception.minecraft.sound_definition.1.14.0.json",
   "type": "object",
   "additionalItems": false,
-  "title": "The minecraft sound definition file for 1.14.0",
+  "title": "Sound  File For 1.14.0",
   "description": "TODO description",
   "definitions": {
     "SoundPath": {
       "$id": "SoundFilepath",
       "type": "string",
-      "title": "The sound filepath schema",
+      "title": "Sound Filepath Schema",
       "description": "The filepath to the sound, starts with 'sounds/'",
       "pattern": "(^sounds/.*$|^$)",
       "additionalItems": true
@@ -18,62 +18,31 @@
       "additionalItems": false,
       "type": "object",
       "$id": "#/Sound",
-      "title": "Sound specification",
+      "title": "Sound ",
       "required": ["sounds"],
       "properties": {
         "category": {
           "type": "string",
           "$id": "#/Sound/category",
-          "title": "Sound category",
+          "title": "Sound Category",
           "enum": ["ambient", "block", "music", "weather", "ui", "bucket", "neutral", "player", "hostile", "record", "bottle"],
           "description": "TODO description: category"
         },
         "sounds": {
           "items": {
             "anyOf": [
-              {
-                "$id": "#/Sound/sounds/stringItem",
-                "type": "string",
-                "$ref": "#/definitions/SoundPath",
-                "description": "TODO description: Todo",
-                "title": "Todo"
-              },
+              { "$id": "#/Sound/sounds/stringItem", "type": "string", "$ref": "#/definitions/SoundPath", "description": "TODO description: Todo", "title": "Todo" },
               {
                 "additionalItems": false,
                 "$id": "#/Sound/sounds/ObjectItem",
                 "type": "object",
                 "required": ["name"],
                 "properties": {
-                  "pitch": {
-                    "description": "The pitch of the audio, 1 is nomial",
-                    "type": "number",
-                    "minimum": 0,
-                    "maximum": 2,
-                    "title": "Pitch"
-                  },
-                  "volume": {
-                    "description": "The volume of the audio, 1 is nomial",
-                    "type": "number",
-                    "minimum": 0,
-                    "title": "Volume"
-                  },
-                  "load_on_low_memory": {
-                    "type": "boolean",
-                    "description": "Marks if this audio should be loaded or not on low memory",
-                    "title": "Load On Low Memory"
-                  },
-                  "stream": {
-                    "description": "If marked true then minecraft will stream the audio",
-                    "type": "boolean",
-                    "title": "Stream"
-                  },
-                  "name": {
-                    "$id": "#/Sound/sounds/stringItem",
-                    "type": "string",
-                    "$ref": "#/definitions/SoundPath",
-                    "description": "TODO description: name",
-                    "title": "Name"
-                  }
+                  "pitch": { "description": "The pitch of the audio, 1 is nomial", "type": "number", "minimum": 0, "maximum": 2, "title": "Pitch" },
+                  "volume": { "description": "The volume of the audio, 1 is nomial", "type": "number", "minimum": 0, "title": "Volume" },
+                  "load_on_low_memory": { "type": "boolean", "description": "Marks if this audio should be loaded or not on low memory", "title": "Load On Low Memory" },
+                  "stream": { "description": "If marked true then minecraft will stream the audio", "type": "boolean", "title": "Stream" },
+                  "name": { "$id": "#/Sound/sounds/stringItem", "type": "string", "$ref": "#/definitions/SoundPath", "description": "TODO description: name", "title": "Name" }
                 },
                 "description": "TODO description: Todo",
                 "title": "Todo"
@@ -97,18 +66,11 @@
     },
     "sound_definitions": {
       "type": "object",
-      "additionalProperties": {
-        "$ref": "#/definitions/SoundSpec"
-      },
+      "additionalProperties": { "$ref": "#/definitions/SoundSpec" },
       "description": "TODO description: sound definitions",
       "title": "Sound Definitions"
     },
-    "__use_legacy_max_distance": {
-      "description": "TODO description: use legacy max distance",
-      "title": "Use Legacy Max Distance",
-      "type": "string",
-      "enum": ["true", "false"]
-    }
+    "__use_legacy_max_distance": { "description": "TODO description: use legacy max distance", "title": "Use Legacy Max Distance", "type": "string", "enum": ["true", "false"] }
   },
   "additionalProperties": false
 }
diff --git a/source/resource/sounds/music_definitions.json b/source/resource/sounds/music_definitions.json
index c8026216..904f3273 100644
--- a/source/resource/sounds/music_definitions.json
+++ b/source/resource/sounds/music_definitions.json
@@ -1,24 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.music_definitions.json",
-  "examples": [
-    {
-      "example": {
-        "event_name": "music.example",
-        "min_delay": 600,
-        "max_delay": 1200
-      }
-    }
-  ],
+  "examples": [{ "example": { "event_name": "music.example", "min_delay": 600, "max_delay": 1200 } }],
   "type": "object",
-  "title": "The minecraft music definition file",
+  "title": "Music  File",
   "description": "The definition file of music of the resourcepack",
-  "definitions": {
-    "music": {}
-  },
-  "propertyNames": {
-    "examples": ["creative", "credits", "end", "endboss", "game", "hell", "menu", "nether", "soulsand_valley", "water"]
-  },
+  "definitions": { "music": {} },
+  "propertyNames": { "examples": ["creative", "credits", "end", "endboss", "game", "hell", "menu", "nether", "soulsand_valley", "water"] },
   "additionalProperties": {
     "additionalProperties": false,
     "type": "object",
@@ -40,16 +28,8 @@
         ],
         "title": "Event Name"
       },
-      "min_delay": {
-        "type": "integer",
-        "description": "TODO description: min delay",
-        "title": "Min Delay"
-      },
-      "max_delay": {
-        "type": "integer",
-        "description": "TODO description: max delay",
-        "title": "Max Delay"
-      }
+      "min_delay": { "type": "integer", "description": "TODO description: min delay", "title": "Min Delay" },
+      "max_delay": { "type": "integer", "description": "TODO description: max delay", "title": "Max Delay" }
     },
     "title": "Music"
   }
diff --git a/source/resource/sounds/sound_definitions.json b/source/resource/sounds/sound_definitions.json
index 2a4fbbef..8a6fd7bc 100644
--- a/source/resource/sounds/sound_definitions.json
+++ b/source/resource/sounds/sound_definitions.json
@@ -1,22 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.sound_definition.json",
-  "examples": [
-    {
-      "format_version": "1.14.0",
-      "sound_definitions": {
-        "music.game": { "category": "music", "sounds": [""] }
-      }
-    }
-  ],
+  "examples": [{ "format_version": "1.14.0", "sound_definitions": { "music.game": { "category": "music", "sounds": [""] } } }],
   "allOf": [
-    {
-      "if": { "properties": { "format_version": { "type": "string" } } },
-      "else": { "$ref": "./sound_definitions_unknown.json" }
-    },
-    {
-      "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } },
-      "then": { "$ref": "./1.14.0/sound_definitions.json" }
-    }
+    { "if": { "properties": { "format_version": { "type": "string" } } }, "else": { "$ref": "./sound_definitions_unknown.json" } },
+    { "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } }, "then": { "$ref": "./1.14.0/sound_definitions.json" } }
   ]
 }
diff --git a/source/resource/sounds/sound_definitions_unknown.json b/source/resource/sounds/sound_definitions_unknown.json
index eb1d173b..374dbbc1 100644
--- a/source/resource/sounds/sound_definitions_unknown.json
+++ b/source/resource/sounds/sound_definitions_unknown.json
@@ -2,13 +2,13 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "blockception.minecraft.sound_definition.json",
   "type": "object",
-  "title": "The minecraft sound definition file, unknown version",
+  "title": "Sound  File, Unknown Version",
   "description": "TODO description",
   "definitions": {
     "SoundPath": {
       "$id": "SoundFilepath",
       "type": "string",
-      "title": "The sound filepath schema",
+      "title": "Sound Filepath Schema",
       "description": "The filepath to the sound, starts with 'sounds/'",
       "pattern": "(^sounds/.*$|^$)",
       "additionalItems": true
@@ -17,63 +17,31 @@
       "additionalItems": false,
       "type": "object",
       "$id": "#/Sound",
-      "title": "Sound specification",
+      "title": "Sound ",
       "required": ["sounds"],
       "properties": {
         "category": {
           "type": "string",
           "$id": "#/Sound/category",
-          "title": "Sound category",
+          "title": "Sound Category",
           "enum": ["block", "music", "weather", "ui", "bucket", "neutral", "player", "hostile", "record"],
           "description": "TODO description: category"
         },
         "sounds": {
           "items": {
             "anyOf": [
-              {
-                "$id": "#/Sound/sounds/stringItem",
-                "type": "string",
-                "$ref": "#/definitions/SoundPath",
-                "description": "TODO description: Todo",
-                "title": "Todo"
-              },
+              { "$id": "#/Sound/sounds/stringItem", "type": "string", "$ref": "#/definitions/SoundPath", "description": "TODO description: Todo", "title": "Todo" },
               {
                 "additionalItems": false,
                 "$id": "#/Sound/sounds/ObjectItem",
                 "type": "object",
                 "required": ["name"],
                 "properties": {
-                  "pitch": {
-                    "description": "The pitch of the audio, 1 is nomial",
-                    "type": "number",
-                    "minimum": 0,
-                    "maximum": 2,
-                    "title": "Pitch"
-                  },
-                  "volume": {
-                    "description": "The volume of the audio, 1 is nomial",
-                    "type": "number",
-                    "minimum": 0,
-                    "maximum": 2,
-                    "title": "Volume"
-                  },
-                  "load_on_low_memory": {
-                    "type": "boolean",
-                    "description": "Marks if this audio should be loaded or not on low memory",
-                    "title": "Load On Low Memory"
-                  },
-                  "stream": {
-                    "description": "If marked true then minecraft will stream the audio",
-                    "type": "boolean",
-                    "title": "Stream"
-                  },
-                  "name": {
-                    "$id": "#/Sound/sounds/stringItem",
-                    "type": "string",
-                    "$ref": "#/definitions/SoundPath",
-                    "description": "TODO description: name",
-                    "title": "Name"
-                  }
+                  "pitch": { "description": "The pitch of the audio, 1 is nomial", "type": "number", "minimum": 0, "maximum": 2, "title": "Pitch" },
+                  "volume": { "description": "The volume of the audio, 1 is nomial", "type": "number", "minimum": 0, "maximum": 2, "title": "Volume" },
+                  "load_on_low_memory": { "type": "boolean", "description": "Marks if this audio should be loaded or not on low memory", "title": "Load On Low Memory" },
+                  "stream": { "description": "If marked true then minecraft will stream the audio", "type": "boolean", "title": "Stream" },
+                  "name": { "$id": "#/Sound/sounds/stringItem", "type": "string", "$ref": "#/definitions/SoundPath", "description": "TODO description: name", "title": "Name" }
                 },
                 "description": "TODO description: Todo",
                 "title": "Todo"
@@ -89,9 +57,7 @@
       "description": "TODO description: additionalProperties"
     }
   },
-  "additionalProperties": {
-    "$ref": "#/definitions/SoundSpec"
-  },
+  "additionalProperties": { "$ref": "#/definitions/SoundSpec" },
   "properties": {
     "format_version": {
       "type": "string",
@@ -100,9 +66,7 @@
     },
     "sound_definitions": {
       "type": "object",
-      "additionalProperties": {
-        "$ref": "#/definitions/SoundSpec"
-      },
+      "additionalProperties": { "$ref": "#/definitions/SoundSpec" },
       "description": "TODO description: sound definitions",
       "title": "Sound Definitions"
     }
diff --git a/source/resource/textures/flipbook_textures.json b/source/resource/textures/flipbook_textures.json
index 1b30c5a4..b8cace04 100644
--- a/source/resource/textures/flipbook_textures.json
+++ b/source/resource/textures/flipbook_textures.json
@@ -3,59 +3,26 @@
   "$id": "blockception.minecraft.resource.texture.flipbook",
   "additionalProperties": false,
   "type": "array",
-  "title": "The minecraft flipbook texture file",
+  "title": "Flipbook Texture File",
   "description": "",
   "items": {
     "additionalProperties": false,
     "type": "object",
     "description": "A single flipbook texture",
-    "title": "Flipbook texture",
+    "title": "Flipbook Texture",
     "properties": {
-      "atlas_index": {
-        "type": "integer",
-        "title": "Atlas index",
-        "description": "TODO: add description"
-      },
-      "atlas_tile": {
-        "type": "string",
-        "pattern": "^[a-z0-9_\\-]*$",
-        "title": "Atlas index",
-        "description": "TODO: add description"
-      },
-      "atlas_tile_variant": {
-        "type": "integer",
-        "title": "Atlas index",
-        "description": "TODO: add description"
-      },
-      "blend_frames": {
-        "type": "boolean",
-        "title": "Atlas index",
-        "description": "TODO: add description"
-      },
-      "flipbook_texture": {
-        "description": "A texture file",
-        "type": "string",
-        "pattern": "^textures/.+$"
-      },
+      "atlas_index": { "type": "integer", "title": "Atlas Index", "description": "TODO: add description" },
+      "atlas_tile": { "type": "string", "pattern": "^[a-z0-9_\\-]*$", "title": "Atlas Index", "description": "TODO: add description" },
+      "atlas_tile_variant": { "type": "integer", "title": "Atlas Index", "description": "TODO: add description" },
+      "blend_frames": { "type": "boolean", "title": "Atlas Index", "description": "TODO: add description" },
+      "flipbook_texture": { "description": "A texture file", "type": "string", "pattern": "^textures/.+$" },
       "frames": {
         "description": "The collection of frame index to display",
         "type": "array",
-        "items": {
-          "description": "The index of the frame",
-          "type": "integer",
-          "title": "Frame index",
-          "minimum": 0
-        }
+        "items": { "description": "The index of the frame", "type": "integer", "title": "Frame Index", "minimum": 0 }
       },
-      "replicate": {
-        "type": "integer",
-        "title": "Atlas index",
-        "description": "TODO: add description"
-      },
-      "ticks_per_frame": {
-        "description": "The amount of ticks to wait between frames",
-        "type": "integer"
-      }
+      "replicate": { "type": "integer", "title": "Atlas Index", "description": "TODO: add description" },
+      "ticks_per_frame": { "description": "The amount of ticks to wait between frames", "type": "integer" }
     }
   }
 }
diff --git a/source/resource/textures/item_texture.json b/source/resource/textures/item_texture.json
index 23d07b23..707cb690 100644
--- a/source/resource/textures/item_texture.json
+++ b/source/resource/textures/item_texture.json
@@ -3,74 +3,42 @@
   "$id": "blockception.minecraft.resource.texture.item_texture",
   "additionalProperties": false,
   "type": "object",
-  "title": "The minecraft item texture file",
+  "title": "Item Texture File",
   "description": "",
   "definitions": {
     "texture": {
       "oneOf": [
-        {
-          "description": "A texture file",
-          "type": "string",
-          "pattern": "^textures/.+$"
-        },
+        { "description": "A texture file", "type": "string", "pattern": "^textures/.+$" },
         {
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "overlay_color": {
-              "description": "The color to apply to the texture",
-              "format": "color-hex"
-            },
-            "path": {
-              "description": "A texture file",
-              "type": "string",
-              "pattern": "^textures/.+$"
-            }
+            "overlay_color": { "description": "The color to apply to the texture", "format": "color-hex" },
+            "path": { "description": "A texture file", "type": "string", "pattern": "^textures/.+$" }
           }
         }
       ]
     }
   },
   "properties": {
-    "resource_pack_name": {
-      "type": "string",
-      "title": "Resource pack name",
-      "description": "TODO: add description"
-    },
+    "resource_pack_name": { "type": "string", "title": "Resource Pack Name", "description": "TODO: add description" },
     "texture_data": {
-      "title": "Texture data",
+      "title": "Texture Data",
       "description": "TODO: add description",
       "type": "object",
-      "propertyNames": {
-        "pattern": "^[\\w_\\-\\.]+$"
-      },
+      "propertyNames": { "pattern": "^[\\w_\\-\\.]+$" },
       "additionalProperties": {
-        "title": "Texture data",
+        "title": "Texture Data",
         "description": "TODO: add description",
         "type": "object",
         "additionalProperties": false,
         "properties": {
           "textures": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/texture"
-              },
-              {
-                "description": "A collection of textures",
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/texture"
-                }
-              }
-            ]
+            "oneOf": [{ "$ref": "#/definitions/texture" }, { "description": "A collection of textures", "type": "array", "items": { "$ref": "#/definitions/texture" } }]
           }
         }
       }
     },
-    "texture_name": {
-      "title": "Texture name",
-      "description": "TODO: add description",
-      "type": "string"
-    }
+    "texture_name": { "title": "Texture Name", "description": "TODO: add description", "type": "string" }
   }
 }
diff --git a/source/resource/textures/terrain_texture.json b/source/resource/textures/terrain_texture.json
index adb799db..ba87ded5 100644
--- a/source/resource/textures/terrain_texture.json
+++ b/source/resource/textures/terrain_texture.json
@@ -3,36 +3,19 @@
   "$id": "blockception.minecraft.resource.texture.terrain_texture",
   "additionalProperties": false,
   "type": "object",
-  "title": "The minecraft terrain texture file",
+  "title": "Terrain Texture File",
   "description": "",
   "definitions": {
     "texture": {
       "oneOf": [
-        {
-          "description": "A texture file",
-          "type": "string",
-          "pattern": "^textures/.+$"
-        },
+        { "description": "A texture file", "type": "string", "pattern": "^textures/.+$" },
         {
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "overlay_color": {
-              "description": "The color to apply to the texture",
-              "format": "color-hex"
-            },
-            "path": {
-              "description": "A texture file",
-              "type": "string",
-              "pattern": "^textures/.+$",
-              "title": "Path"
-            },
-            "tint_color": {
-              "title": "Tint color",
-              "description": "TODO",
-              "format": "color-hex",
-              "type": "string"
-            },
+            "overlay_color": { "description": "The color to apply to the texture", "format": "color-hex" },
+            "path": { "description": "A texture file", "type": "string", "pattern": "^textures/.+$", "title": "Path" },
+            "tint_color": { "title": "Tint Color", "description": "TODO", "format": "color-hex", "type": "string" },
             "variations": {
               "type": "array",
               "title": "Variantions",
@@ -43,17 +26,8 @@
                 "description": "TODO",
                 "required": ["path"],
                 "properties": {
-                  "path": {
-                    "description": "A texture file",
-                    "type": "string",
-                    "pattern": "^textures/.+$",
-                    "title": "Path"
-                  },
-                  "weight": {
-                    "type": "integer",
-                    "title": "Weight",
-                    "description": "TODO"
-                  }
+                  "path": { "description": "A texture file", "type": "string", "pattern": "^textures/.+$", "title": "Path" },
+                  "weight": { "type": "integer", "title": "Weight", "description": "TODO" }
                 }
               }
             }
@@ -63,51 +37,21 @@
     }
   },
   "properties": {
-    "num_mip_levels": {
-      "type": "integer",
-      "title": "Num mip levels",
-      "description": "TODO: add description"
-    },
-    "padding": {
-      "type": "integer",
-      "title": "Padding",
-      "description": "TODO: add description"
-    },
-    "resource_pack_name": {
-      "type": "string",
-      "title": "Resource pack name",
-      "description": "TODO: add description"
-    },
+    "num_mip_levels": { "type": "integer", "title": "Num Mip Levels", "description": "TODO: add description" },
+    "padding": { "type": "integer", "title": "Padding", "description": "TODO: add description" },
+    "resource_pack_name": { "type": "string", "title": "Resource Pack Name", "description": "TODO: add description" },
     "texture_data": {
       "type": "object",
-      "propertyNames": {
-        "pattern": "^[\\w_\\-\\.]+$"
-      },
+      "propertyNames": { "pattern": "^[\\w_\\-\\.]+$" },
       "additionalProperties": {
         "type": "object",
-        "title": "Texture data",
+        "title": "Texture Data",
         "description": "TODO: add description",
-        "properties": {
-          "textures": {
-            "oneOf": [
-              { "$ref": "#/definitions/texture" },
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/texture"
-                }
-              }
-            ]
-          }
-        }
+        "properties": { "textures": { "oneOf": [{ "$ref": "#/definitions/texture" }, { "type": "array", "items": { "$ref": "#/definitions/texture" } }] } }
       },
       "description": "TODO description",
-      "title": "TODO title"
+      "title": "TODO Title"
     },
-    "texture_name": {
-      "type": "string",
-      "description": "TODO description",
-      "title": "TODO title"
-    }
+    "texture_name": { "type": "string", "description": "TODO description", "title": "TODO Title" }
   }
 }
diff --git a/source/resource/textures/texture_list.json b/source/resource/textures/texture_list.json
index 707dc0fe..5c08308d 100644
--- a/source/resource/textures/texture_list.json
+++ b/source/resource/textures/texture_list.json
@@ -1,12 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "title": "Texture list",
+  "title": "Texture List",
   "description": "A list of texture to load in",
   "type": "array",
-  "items": {
-    "title": "Filepath",
-    "type": "string",
-    "pattern": "^textures/",
-    "examples": ["textures/blocks/"]
-  }
+  "items": { "title": "Filepath", "type": "string", "pattern": "^textures/", "examples": ["textures/blocks/"] }
 }
diff --git a/source/skinpacks/skins.json b/source/skinpacks/skins.json
index fc3b0365..91b9e28a 100644
--- a/source/skinpacks/skins.json
+++ b/source/skinpacks/skins.json
@@ -1,51 +1,31 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "title": "Skip pack",
+  "title": "Skip Pack",
   "description": "Skin pack definition",
   "type": "object",
   "additionalProperties": false,
   "required": ["serialize_name", "localization_name", "skins"],
   "properties": {
     "serialize_name": {
-      "title": "Serialize name",
+      "title": "Serialize Name",
       "description": "The name of the pack as an identifier, they must be the same as the name of pack without spaces",
       "type": "string"
     },
-    "localization_name": {
-      "title": "Locatlization name",
-      "description": "The key in the language file to use to display text",
-      "type": "string"
-    },
+    "localization_name": { "title": "Locatlization Name", "description": "The key in the language file to use to display text", "type": "string" },
     "skins": {
       "type": "array",
       "title": "Skins",
       "description": "An array of item",
       "items": {
-        "title": "Skin definition",
+        "title": "Skin ",
         "description": "A single skin definition",
         "additionalProperties": false,
         "required": ["localization_name", "geometry", "texture", "type"],
         "properties": {
-          "localization_name": {
-            "title": "Locatlization name",
-            "description": "The key in the language file to use to display text",
-            "type": "string"
-          },
-          "geometry": {
-            "title": "Geometry",
-            "description": "The type of geometry to use",
-            "enum": ["geometry.humanoid.custom", "geometry.humanoid.customSlim"]
-          },
-          "texture": {
-            "title": "Texture",
-            "description": "The filename of the skin",
-            "pattern": "^.*\\.png$"
-          },
-          "type": {
-            "title": "Type",
-            "description": "The type of skin",
-            "enum": ["free", "paid"]
-          }
+          "localization_name": { "title": "Locatlization Name", "description": "The key in the language file to use to display text", "type": "string" },
+          "geometry": { "title": "Geometry", "description": "The type of geometry to use", "enum": ["geometry.humanoid.custom", "geometry.humanoid.customSlim"] },
+          "texture": { "title": "Texture", "description": "The filename of the skin", "pattern": "^.*\\.png$" },
+          "type": { "title": "Type", "description": "The type of skin", "enum": ["free", "paid"] }
         }
       }
     }