diff --git a/package.json b/package.json
index d2f066b2..e4aa4f70 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 	"title": "Animated Java",
 	"icon": "icon.svg",
 	"description": "Effortlessly craft complex animations for Minecraft: Java Edition",
-	"version": "1.8.0-beta.1",
+	"version": "1.8.0-beta.2",
 	"min_blockbench_version": "4.12.0",
 	"max_blockbench_version": "4.12.6",
 	"variant": "desktop",
diff --git a/src/components/boneConfigDialog.svelte b/src/components/boneConfigDialog.svelte
deleted file mode 100644
index 6ee73746..00000000
--- a/src/components/boneConfigDialog.svelte
+++ /dev/null
@@ -1,329 +0,0 @@
-<script lang="ts" , context="module">
-	import Checkbox from './dialogItems/checkbox.svelte'
-	import ColorPicker from './dialogItems/colorPicker.svelte'
-	import NumberSlider from './dialogItems/numberSlider.svelte'
-	import Select from './dialogItems/select.svelte'
-
-	import { NbtCompound, NbtTag } from 'deepslate/lib/nbt'
-	import { BoneConfig } from '../nodeConfigs'
-	import { JsonText } from '../systems/jsonText'
-	import { Valuable } from '../util/stores'
-	import { translate } from '../util/translation'
-	import { Variant } from '../variants'
-
-	const BILLBOARD_OPTIONS: Record<BoneConfig['billboard'], string> = {
-		fixed: translate('dialog.bone_config.billboard.options.fixed'),
-		vertical: translate('dialog.bone_config.billboard.options.vertical'),
-		horizontal: translate('dialog.bone_config.billboard.options.horizontal'),
-		center: translate('dialog.bone_config.billboard.options.center'),
-	}
-
-	const nbtChecker: DialogItemValueChecker<string> = value => {
-		let parsedNbt: NbtTag | undefined
-		try {
-			parsedNbt = NbtTag.fromString(value)
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.error', e.message),
-			}
-		}
-		if (!(parsedNbt instanceof NbtCompound)) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.not_compound'),
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-
-	const customNameChecker: DialogItemValueChecker<string> = value => {
-		if (value === '') return { type: 'success', message: '' }
-
-		try {
-			JsonText.fromString(value, {
-				minecraftVersion: Project!.animated_java.target_minecraft_version,
-			})
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: e.message,
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-</script>
-
-<script lang="ts">
-	import CodeInput from './dialogItems/codeInput.svelte'
-
-	const PLUGIN_MODE = !!Project?.animated_java?.enable_plugin_mode
-
-	export let variant: Variant
-
-	export let customName: Valuable<string>
-	export let customNameVisible: Valuable<boolean>
-	export let billboard: Valuable<string>
-	export let overrideBrightness: Valuable<NonNullable<BoneConfig['__overrideBrightness']>>
-	export let brightnessOverride: Valuable<NonNullable<BoneConfig['__brightnessOverride']>>
-	export let enchanted: Valuable<NonNullable<BoneConfig['__enchanted']>>
-	export let glowing: Valuable<NonNullable<BoneConfig['__glowing']>>
-	export let overrideGlowColor: Valuable<NonNullable<BoneConfig['__overrideGlowColor']>>
-	export let glowColor: Valuable<NonNullable<BoneConfig['__glowColor']>>
-	export let inheritSettings: Valuable<NonNullable<BoneConfig['__inheritSettings']>>
-	export let invisible: Valuable<NonNullable<BoneConfig['__invisible']>>
-	export let nbt: Valuable<NonNullable<BoneConfig['__nbt']>>
-	export let shadowRadius: Valuable<NonNullable<BoneConfig['__shadowRadius']>>
-	export let shadowStrength: Valuable<NonNullable<BoneConfig['__shadowStrength']>>
-	export let useNBT: Valuable<NonNullable<BoneConfig['__useNBT']>>
-</script>
-
-<div class="selected_variant_title">
-	{translate('dialog.bone_config.selected_variant', variant.displayName)}
-</div>
-{#if variant.isDefault}
-	<div class="selected_variant_subtitle">
-		{translate('dialog.bone_config.default_variant_subtitle')}
-	</div>
-{:else}
-	<div class="selected_variant_subtitle">
-		{translate('dialog.bone_config.selected_variant_subtitle')}
-	</div>
-{/if}
-
-{#if PLUGIN_MODE}
-	<Checkbox
-		label={translate('dialog.bone_config.inherit_settings.title')}
-		tooltip={translate('dialog.bone_config.inherit_settings.description')}
-		bind:checked={inheritSettings}
-		defaultValue={BoneConfig.prototype.inheritSettings}
-	/>
-
-	<CodeInput
-		label={translate('dialog.bone_config.custom_name.title')}
-		tooltip={translate('dialog.bone_config.custom_name.description')}
-		bind:value={customName}
-		defaultValue={BoneConfig.prototype.customName}
-		valueChecker={customNameChecker}
-		syntax="snbtTextComponent"
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.custom_name_visible.title')}
-		tooltip={translate('dialog.bone_config.custom_name_visible.description')}
-		bind:checked={customNameVisible}
-		defaultValue={BoneConfig.prototype.customNameVisible}
-	/>
-
-	<Select
-		label={translate('dialog.bone_config.billboard.title')}
-		tooltip={translate('dialog.bone_config.billboard.description')}
-		options={BILLBOARD_OPTIONS}
-		defaultOption={BoneConfig.prototype.billboard}
-		bind:value={billboard}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.glowing.title')}
-		tooltip={translate('dialog.bone_config.glowing.description')}
-		bind:checked={glowing}
-		defaultValue={BoneConfig.prototype.glowing}
-	/>
-
-	<ColorPicker
-		label={translate('dialog.bone_config.glow_color.title')}
-		tooltip={translate('dialog.bone_config.glow_color.description')}
-		bind:value={glowColor}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.shadow_radius.title')}
-		tooltip={translate('dialog.bone_config.shadow_radius.description')}
-		bind:value={shadowRadius}
-		defaultValue={BoneConfig.prototype.shadowRadius}
-		min={0}
-		max={64}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.shadow_strength.title')}
-		tooltip={translate('dialog.bone_config.shadow_strength.description')}
-		bind:value={shadowStrength}
-		defaultValue={BoneConfig.prototype.shadowStrength}
-		min={0}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.use_custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.use_custom_brightness.description')}
-		bind:checked={overrideBrightness}
-		defaultValue={BoneConfig.prototype.overrideBrightness}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.custom_brightness.description')}
-		bind:value={brightnessOverride}
-		defaultValue={BoneConfig.prototype.brightnessOverride}
-		min={0}
-		max={15}
-		valueStep={1}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.enchanted.title')}
-		tooltip={translate('dialog.bone_config.enchanted.description')}
-		bind:checked={enchanted}
-		defaultValue={BoneConfig.prototype.enchanted}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.invisible.title')}
-		tooltip={translate('dialog.bone_config.invisible.description')}
-		bind:checked={invisible}
-		defaultValue={BoneConfig.prototype.invisible}
-	/>
-{:else}
-	<Checkbox
-		label={translate('dialog.bone_config.inherit_settings.title')}
-		tooltip={translate('dialog.bone_config.inherit_settings.description')}
-		bind:checked={inheritSettings}
-		defaultValue={BoneConfig.prototype.inheritSettings}
-	/>
-
-	<CodeInput
-		label={translate('dialog.bone_config.custom_name.title')}
-		tooltip={translate('dialog.bone_config.custom_name.description')}
-		bind:value={customName}
-		defaultValue={BoneConfig.prototype.customName}
-		valueChecker={customNameChecker}
-		syntax="snbtTextComponent"
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.custom_name_visible.title')}
-		tooltip={translate('dialog.bone_config.custom_name_visible.description')}
-		bind:checked={customNameVisible}
-		defaultValue={BoneConfig.prototype.customNameVisible}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.use_nbt.title')}
-		tooltip={translate('dialog.bone_config.use_nbt.description')}
-		bind:checked={useNBT}
-		defaultValue={BoneConfig.prototype.useNBT}
-	/>
-
-	{#if $useNBT}
-		<p class="use_nbt_warning">
-			{translate('dialog.bone_config.use_nbt.use_nbt_warning')}
-		</p>
-		<CodeInput
-			label={translate('dialog.bone_config.nbt.title')}
-			tooltip={translate('dialog.bone_config.nbt.description')}
-			bind:value={nbt}
-			defaultValue={BoneConfig.prototype.nbt}
-			valueChecker={nbtChecker}
-			syntax="snbtTextComponent"
-		/>
-	{:else}
-		<Select
-			label={translate('dialog.bone_config.billboard.title')}
-			tooltip={translate('dialog.bone_config.billboard.description')}
-			options={BILLBOARD_OPTIONS}
-			defaultOption={BoneConfig.prototype.billboard}
-			bind:value={billboard}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.glowing.title')}
-			tooltip={translate('dialog.bone_config.glowing.description')}
-			bind:checked={glowing}
-			defaultValue={BoneConfig.prototype.glowing}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.override_glow_color.title')}
-			tooltip={translate('dialog.bone_config.override_glow_color.description')}
-			bind:checked={overrideGlowColor}
-			defaultValue={BoneConfig.prototype.overrideGlowColor}
-		/>
-
-		{#if $overrideGlowColor}
-			<ColorPicker
-				label={translate('dialog.bone_config.glow_color.title')}
-				tooltip={translate('dialog.bone_config.glow_color.description')}
-				bind:value={glowColor}
-			/>
-		{/if}
-
-		<NumberSlider
-			label={translate('dialog.bone_config.shadow_radius.title')}
-			tooltip={translate('dialog.bone_config.shadow_radius.description')}
-			bind:value={shadowRadius}
-			defaultValue={BoneConfig.prototype.shadowRadius}
-			min={0}
-			max={15}
-		/>
-
-		<NumberSlider
-			label={translate('dialog.bone_config.shadow_strength.title')}
-			tooltip={translate('dialog.bone_config.shadow_strength.description')}
-			bind:value={shadowStrength}
-			defaultValue={BoneConfig.prototype.shadowStrength}
-			min={0}
-			max={15}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.override_brightness.title')}
-			tooltip={translate('dialog.bone_config.override_brightness.description')}
-			bind:checked={overrideBrightness}
-			defaultValue={BoneConfig.prototype.overrideBrightness}
-		/>
-
-		{#if $overrideBrightness}
-			<NumberSlider
-				label={translate('dialog.bone_config.brightness_override.title')}
-				tooltip={translate('dialog.bone_config.brightness_override.description')}
-				bind:value={brightnessOverride}
-				defaultValue={BoneConfig.prototype.brightnessOverride}
-				min={0}
-				max={15}
-				valueStep={1}
-			/>
-		{/if}
-
-		<Checkbox
-			label={translate('dialog.bone_config.enchanted.title')}
-			tooltip={translate('dialog.bone_config.enchanted.description')}
-			bind:checked={enchanted}
-			defaultValue={BoneConfig.prototype.enchanted}
-		/>
-
-		<!-- <Checkbox
-			label={translate('dialog.bone_config.invisible.title')}
-			tooltip={translate('dialog.bone_config.invisible.description')}
-			bind:checked={invisible}
-		/> -->
-	{/if}
-{/if}
-
-<style>
-	.use_nbt_warning {
-		color: var(--color-warning);
-		margin: 0px 18px 16px;
-		font-size: small;
-	}
-	.selected_variant_title {
-		font-size: 1.2em;
-		margin-bottom: 8px;
-	}
-	.selected_variant_subtitle {
-		text-align: center;
-		font-size: 0.8em;
-		margin-bottom: 8px;
-	}
-</style>
diff --git a/src/components/customCodeJar.svelte b/src/components/customCodeJar.svelte
index 8ad75a94..0cbd9745 100644
--- a/src/components/customCodeJar.svelte
+++ b/src/components/customCodeJar.svelte
@@ -3,6 +3,7 @@
 
 	export let value: string
 	export let placeholder: string | undefined = undefined
+	export let style: string | undefined = undefined
 	export let syntax: string | undefined = undefined
 
 	let codeJarElement: HTMLPreElement | undefined
@@ -26,12 +27,13 @@
 		}
 	}
 
-	const forceNoWrap = () => {
+	const forceNoWrap = (_?: HTMLElement) => {
 		if (!codeJarElement) return
 		codeJarElement.style.overflowWrap = 'unset'
 		codeJarElement.style.whiteSpace = 'pre'
 	}
 
+	$: codeJarElement && forceNoWrap()
 	$: value !== undefined && forceNoWrap()
 </script>
 
@@ -45,7 +47,7 @@
 		preserveIdent
 		history
 		class={'language-' + (syntax ?? 'plaintext')}
-		style="
+		style={`
 			font-family: var(--font-code);
 			font-size: 14px;
 			padding: 3px 6px;
@@ -61,8 +63,9 @@
 			border: 1px solid var(--color-border);
 			border-radius: 0;
 			text-shadow: 0px 1px rgba(0, 0, 0, 0.3);
-		"
+		` + style}
 	/>
+	<div use:forceNoWrap />
 	{#if placeholder && (!value || value.length === 0)}
 		<div class="placeholder">{placeholder}</div>
 	{/if}
diff --git a/src/components/dialogItems/codeInput.svelte b/src/components/dialogItems/codeInput.svelte
index c636dd0c..66b6fe2b 100644
--- a/src/components/dialogItems/codeInput.svelte
+++ b/src/components/dialogItems/codeInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { CodeJar } from '@novacbn/svelte-codejar'
 	import { onDestroy } from 'svelte'
 	import { Valuable } from '../../util/stores'
+	import CustomCodeJar from '../customCodeJar.svelte'
 	import BaseDialogItem from './baseDialogItem.svelte'
 
 	export let label: string
@@ -18,25 +18,12 @@
 	let warningText = ''
 	let errorText = ''
 
-	function highlight(code: string, syntax?: string) {
-		if (!syntax) return code
-		return Prism.highlight(code, Prism.languages[syntax], syntax)
-	}
-
-	function forceNoWrap() {
-		if (!codeJarElement) return
-		codeJarElement.style.overflowWrap = 'unset'
-		codeJarElement.style.whiteSpace = 'pre'
-	}
-
 	function onValueChange() {
 		if (valueChecker) {
 			const result = valueChecker($value)
 			result.type === 'error' ? (errorText = result.message) : (errorText = '')
 			result.type === 'warning' ? (warningText = result.message) : (warningText = '')
 		}
-
-		forceNoWrap()
 	}
 
 	const unsub = value.subscribe(() => {
@@ -73,34 +60,12 @@
 		<label class="name_space_left" for={id}>{label}</label>
 
 		<div class="content codejar-container" on:keydown={onKeydown}>
-			<CodeJar
-				bind:element={codeJarElement}
+			<CustomCodeJar
 				{syntax}
-				{highlight}
 				bind:value={$value}
-				on:change={() => forceNoWrap()}
-				preserveIdent
-				history
-				class={'language-' + (syntax ?? 'plaintext')}
-				style="
-					font-family: var(--font-code);
-					font-size: 14px;
-					padding: 3px 6px;
-					max-height: 20em;
-					height: fit-content;
-					padding-bottom: 1rem;
-					width: 100%;
-					outline: none;
-					overflow-wrap: unset;
-					overflow-y: scroll;
-					white-space: pre;
-					margin: 8px;
-					margin-bottom: 0px;
-					{errorText
+				style={errorText
 					? 'border: 1px solid var(--color-error); border-bottom: none; border-radius: 0.3em 0.3em 0 0;'
 					: 'border: 1px solid var(--color-border);'}
-					text-shadow: 0px 1px rgba(0, 0, 0, 0.3);
-				"
 			/>
 			{#if errorText || warningText}
 				<textarea readonly rows={errorText.split('\n').length + 1}
diff --git a/src/components/dialogItems/colorPicker.svelte b/src/components/dialogItems/colorPicker.svelte
index 52441ceb..9df01944 100644
--- a/src/components/dialogItems/colorPicker.svelte
+++ b/src/components/dialogItems/colorPicker.svelte
@@ -6,26 +6,31 @@
 
 	export let label: string
 	export let tooltip = ''
+	export let defaultValue = '#ffffff'
 	export let value: Valuable<string>
 
 	let colorPicker = new ColorPicker(`${PACKAGE.name}:${label}-color_picker`, {
 		onChange() {
 			const color = colorPicker.get() as tinycolor.Instance
-			value.set(color.toHexString())
+			$value = color.toHexString()
 		},
 	})
-	let colorPickerMount: HTMLDivElement
 
-	function onLoad(el: HTMLDivElement) {
+	function mountColorPicker(el: HTMLDivElement) {
 		colorPicker.toElement(el)
-		colorPicker.set(value.get())
+		colorPicker.set($value)
 	}
 
 	function onReset() {
-		value.set('#ffffff')
+		$value = defaultValue
 	}
 
+	const unsub = value.subscribe(v => {
+		colorPicker.set(v)
+	})
+
 	onDestroy(() => {
+		unsub()
 		colorPicker.delete()
 	})
 </script>
@@ -33,6 +38,6 @@
 <BaseDialogItem {label} {tooltip} {onReset} let:id>
 	<div class="dialog_bar form_bar">
 		<label class="name_space_left" for={id}>{label}</label>
-		<div bind:this={colorPickerMount} use:onLoad />
+		<div use:mountColorPicker />
 	</div>
 </BaseDialogItem>
diff --git a/src/components/dialogItems/select.svelte b/src/components/dialogItems/select.svelte
index c94efb61..7e91bc73 100644
--- a/src/components/dialogItems/select.svelte
+++ b/src/components/dialogItems/select.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { onDestroy } from 'svelte'
 	import { Valuable } from '../../util/stores'
 	import BaseDialogItem from './baseDialogItem.svelte'
 
@@ -8,8 +9,6 @@
 	export let defaultOption: string
 	export let value: Valuable<string>
 
-	let container: HTMLDivElement
-
 	if (!(value.get() || options[value.get()])) value.set(defaultOption)
 
 	const SELECT_ELEMENT = new Interface.CustomElements.SelectInput('dialog-select', {
@@ -32,13 +31,22 @@
 		}
 	}
 
-	requestAnimationFrame(() => {
-		container.appendChild(SELECT_ELEMENT.node)
+	const unsub = value.subscribe(v => {
+		SELECT_ELEMENT.set(v)
+	})
+
+	onDestroy(() => {
+		unsub()
+		SELECT_ELEMENT.node.remove()
 	})
+
+	const mountSelect = (node: HTMLDivElement) => {
+		node.appendChild(SELECT_ELEMENT.node)
+	}
 </script>
 
 <BaseDialogItem {label} {tooltip} {onReset} let:id>
-	<div bind:this={container} class="dialog_bar form_bar">
+	<div class="dialog_bar form_bar" use:mountSelect>
 		<label class="name_space_left" for={id}>{label}</label>
 	</div>
 </BaseDialogItem>
diff --git a/src/components/displayEntityConfigDialog.svelte b/src/components/displayEntityConfigDialog.svelte
new file mode 100644
index 00000000..238ea047
--- /dev/null
+++ b/src/components/displayEntityConfigDialog.svelte
@@ -0,0 +1,238 @@
+<script lang="ts" , context="module">
+	import { type DisplayEntity } from 'src/interface/dialog/displayEntityConfig'
+	import { TextDisplay } from 'src/outliner/textDisplay'
+	import { type IDisplayEntityConfigs } from 'src/systems/rigRenderer'
+	import { onDestroy } from 'svelte'
+	import { type BillboardMode, DisplayEntityConfig } from '../nodeConfigs'
+	import { Valuable } from '../util/stores'
+	import { translate } from '../util/translation'
+	import { Variant } from '../variants'
+	import Checkbox from './dialogItems/checkbox.svelte'
+	import CodeInput from './dialogItems/codeInput.svelte'
+	import ColorPicker from './dialogItems/colorPicker.svelte'
+	import NumberSlider from './dialogItems/numberSlider.svelte'
+	import SectionHeader from './dialogItems/sectionHeader.svelte'
+	import Select from './dialogItems/select.svelte'
+
+	const BILLBOARD_OPTIONS: Record<DisplayEntityConfig['billboard'], string> = {
+		fixed: translate('dialog.display_entity.billboard.options.fixed'),
+		vertical: translate('dialog.display_entity.billboard.options.vertical'),
+		horizontal: translate('dialog.display_entity.billboard.options.horizontal'),
+		center: translate('dialog.display_entity.billboard.options.center'),
+	}
+
+	const DEFAULT_CONFIG = DisplayEntityConfig.getDefault()
+</script>
+
+<script lang="ts">
+	export let displayEntity: DisplayEntity
+	export let onSummonFunction: Valuable<string>
+	export let configs: IDisplayEntityConfigs
+
+	let onApplyFunction = new Valuable<string>(DEFAULT_CONFIG.onApplyFunction)
+
+	let billboard = new Valuable<string>(DEFAULT_CONFIG.billboard)
+	let overrideBrightness = new Valuable<boolean>(DEFAULT_CONFIG.overrideBrightness)
+	let brightnessOverride = new Valuable<number>(DEFAULT_CONFIG.brightnessOverride)
+	let enchanted = new Valuable<boolean>(DEFAULT_CONFIG.enchanted)
+	let glowing = new Valuable<boolean>(DEFAULT_CONFIG.glowing)
+	let overrideGlowColor = new Valuable<boolean>(DEFAULT_CONFIG.overrideGlowColor)
+	let glowColor = new Valuable<string>(DEFAULT_CONFIG.glowColor)
+	let invisible = new Valuable<boolean>(DEFAULT_CONFIG.invisible)
+	let shadowRadius = new Valuable<number>(DEFAULT_CONFIG.shadowRadius)
+	let shadowStrength = new Valuable<number>(DEFAULT_CONFIG.shadowStrength)
+
+	let config: DisplayEntityConfig
+
+	const loadConfig = (uuid: string) => {
+		const variant = Variant.getByUUID(uuid)
+		if (!variant) {
+			console.error(`Variant with UUID ${uuid} not found`)
+			return
+		}
+		if (variant.isDefault) {
+			config = DisplayEntityConfig.fromJSON(configs.default)
+		} else {
+			config = DisplayEntityConfig.fromJSON(configs.variants[variant.uuid] ?? {})
+		}
+		$onApplyFunction = config.onApplyFunction
+		$billboard = config.billboard
+		$overrideBrightness = config.overrideBrightness
+		$brightnessOverride = config.brightnessOverride
+		$enchanted = config.enchanted
+		$glowing = config.glowing
+		$overrideGlowColor = config.overrideGlowColor
+		$glowColor = config.glowColor
+		$invisible = config.invisible
+		$shadowRadius = config.shadowRadius
+		$shadowStrength = config.shadowStrength
+	}
+
+	const saveConfig = (uuid: string) => {
+		const variant = Variant.getByUUID(uuid)
+		if (!variant) {
+			console.error(`Variant with UUID ${uuid} not found`)
+			return
+		}
+		if (variant.isDefault) {
+			configs.default = config.toJSON()
+		} else {
+			configs.variants[variant.uuid] = config.toJSON()
+		}
+	}
+
+	const OPTIONS = Object.fromEntries(
+		Variant.all.map(variant => [variant.uuid, variant.displayName])
+	)
+
+	let variant = new Valuable(Variant.getDefault().uuid)
+
+	$: {
+		loadConfig($variant)
+	}
+
+	$: {
+		config.onApplyFunction = $onApplyFunction
+		config.billboard = $billboard as BillboardMode
+		config.overrideBrightness = $overrideBrightness
+		config.brightnessOverride = $brightnessOverride
+		config.enchanted = $enchanted
+		config.glowing = $glowing
+		config.overrideGlowColor = $overrideGlowColor
+		config.glowColor = $glowColor
+		config.invisible = $invisible
+		config.shadowRadius = $shadowRadius
+		config.shadowStrength = $shadowStrength
+		saveConfig($variant)
+	}
+
+	const SELECT_ELEMENT = new Interface.CustomElements.SelectInput(
+		'animated-java:display-entity-variant-select',
+		{
+			options: OPTIONS,
+			value: $variant,
+			onChange(value) {
+				$variant = value
+			},
+		}
+	)
+
+	const unsub = variant.subscribe(v => {
+		SELECT_ELEMENT.set(v)
+	})
+
+	const mountVariantSelect = (node: HTMLDivElement) => {
+		node.appendChild(SELECT_ELEMENT.node)
+	}
+
+	onDestroy(() => {
+		unsub()
+	})
+</script>
+
+<SectionHeader label={translate('dialog.display_entity.node_options.title')} />
+
+<CodeInput
+	label={translate('dialog.display_entity.on_summon_function.title')}
+	tooltip={translate('dialog.display_entity.on_summon_function.description')}
+	bind:value={onSummonFunction}
+	defaultValue=""
+/>
+
+<SectionHeader label={translate('dialog.display_entity.per_variant_options.title')} />
+
+<div class="variant-select" use:mountVariantSelect />
+
+<hr />
+
+<CodeInput
+	label={translate('dialog.display_entity.on_apply_function.title')}
+	tooltip={translate('dialog.display_entity.on_apply_function.description')}
+	bind:value={onApplyFunction}
+	defaultValue=""
+/>
+
+<Select
+	label={translate('dialog.display_entity.billboard.title')}
+	tooltip={translate('dialog.display_entity.billboard.description')}
+	options={BILLBOARD_OPTIONS}
+	defaultOption={DisplayEntityConfig.prototype.billboard}
+	bind:value={billboard}
+/>
+
+<Checkbox
+	label={translate('dialog.display_entity.override_brightness.title')}
+	tooltip={translate('dialog.display_entity.override_brightness.description')}
+	bind:checked={overrideBrightness}
+	defaultValue={DisplayEntityConfig.prototype.overrideBrightness}
+/>
+
+{#if $overrideBrightness}
+	<NumberSlider
+		label={translate('dialog.display_entity.brightness_override.title')}
+		tooltip={translate('dialog.display_entity.brightness_override.description')}
+		bind:value={brightnessOverride}
+		defaultValue={DisplayEntityConfig.prototype.brightnessOverride}
+		min={0}
+		max={15}
+		valueStep={1}
+	/>
+{/if}
+
+{#if !(displayEntity instanceof TextDisplay)}
+	<Checkbox
+		label={translate('dialog.display_entity.enchanted.title')}
+		tooltip={translate('dialog.display_entity.enchanted.description')}
+		bind:checked={enchanted}
+		defaultValue={DisplayEntityConfig.prototype.enchanted}
+	/>
+
+	<Checkbox
+		label={translate('dialog.display_entity.glowing.title')}
+		tooltip={translate('dialog.display_entity.glowing.description')}
+		bind:checked={glowing}
+		defaultValue={DisplayEntityConfig.prototype.glowing}
+	/>
+
+	<Checkbox
+		label={translate('dialog.display_entity.override_glow_color.title')}
+		tooltip={translate('dialog.display_entity.override_glow_color.description')}
+		bind:checked={overrideGlowColor}
+		defaultValue={DisplayEntityConfig.prototype.overrideGlowColor}
+	/>
+
+	{#if $overrideGlowColor}
+		<ColorPicker
+			label={translate('dialog.display_entity.glow_color.title')}
+			tooltip={translate('dialog.display_entity.glow_color.description')}
+			bind:value={glowColor}
+		/>
+	{/if}
+{/if}
+
+<NumberSlider
+	label={translate('dialog.display_entity.shadow_radius.title')}
+	tooltip={translate('dialog.display_entity.shadow_radius.description')}
+	bind:value={shadowRadius}
+	defaultValue={DisplayEntityConfig.prototype.shadowRadius}
+	min={0}
+	max={15}
+/>
+
+<NumberSlider
+	label={translate('dialog.display_entity.shadow_strength.title')}
+	tooltip={translate('dialog.display_entity.shadow_strength.description')}
+	bind:value={shadowStrength}
+	defaultValue={DisplayEntityConfig.prototype.shadowStrength}
+	min={0}
+	max={15}
+/>
+
+<style>
+	.variant-select {
+		margin: 0px 32px 8px 24px;
+	}
+	.variant-select :global(bb-select) {
+		width: 100%;
+	}
+</style>
diff --git a/src/components/keyframePanels/variantKeyframePanel.svelte b/src/components/keyframePanels/variantKeyframePanel.svelte
index 382c98cb..f4676774 100644
--- a/src/components/keyframePanels/variantKeyframePanel.svelte
+++ b/src/components/keyframePanels/variantKeyframePanel.svelte
@@ -11,7 +11,7 @@
 	let executeCondition = keyframe?.execute_condition ?? ''
 
 	$: {
-		keyframe.variant = Variant.all.find(v => v.uuid === variantUuid) ?? Variant.getDefault()
+		keyframe.variant = Variant.getByUUID(variantUuid) ?? Variant.getDefault()
 		keyframe.execute_condition = executeCondition
 		Animator.preview()
 	}
diff --git a/src/components/textDisplayConfigDialog.svelte b/src/components/textDisplayConfigDialog.svelte
deleted file mode 100644
index bf2cde0a..00000000
--- a/src/components/textDisplayConfigDialog.svelte
+++ /dev/null
@@ -1,221 +0,0 @@
-<script lang="ts" , context="module">
-	import Checkbox from './dialogItems/checkbox.svelte'
-	import CodeInput from './dialogItems/codeInput.svelte'
-	import ColorPicker from './dialogItems/colorPicker.svelte'
-	import NumberSlider from './dialogItems/numberSlider.svelte'
-	import Select from './dialogItems/select.svelte'
-
-	import { NbtCompound, NbtTag } from 'deepslate/lib/nbt'
-	import { TextDisplayConfig } from '../nodeConfigs'
-	import { Valuable } from '../util/stores'
-	import { translate } from '../util/translation'
-
-	const BILLBOARD_OPTIONS: Record<TextDisplayConfig['billboard'], string> = {
-		fixed: translate('dialog.bone_config.billboard.options.fixed'),
-		vertical: translate('dialog.bone_config.billboard.options.vertical'),
-		horizontal: translate('dialog.bone_config.billboard.options.horizontal'),
-		center: translate('dialog.bone_config.billboard.options.center'),
-	}
-
-	const nbtChecker: DialogItemValueChecker<string> = value => {
-		let parsedNbt: NbtTag | undefined
-		try {
-			parsedNbt = NbtTag.fromString(value)
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.error', e.message),
-			}
-		}
-		if (!(parsedNbt instanceof NbtCompound)) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.not_compound'),
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-</script>
-
-<script lang="ts">
-	const PLUGIN_MODE = !!Project?.animated_java?.enable_plugin_mode
-
-	export let billboard: Valuable<string>
-	export let overrideBrightness: Valuable<NonNullable<TextDisplayConfig['__overrideBrightness']>>
-	export let brightnessOverride: Valuable<NonNullable<TextDisplayConfig['__brightnessOverride']>>
-	export let glowing: Valuable<NonNullable<TextDisplayConfig['__glowing']>>
-	export let overrideGlowColor: Valuable<NonNullable<TextDisplayConfig['__overrideGlowColor']>>
-	export let glowColor: Valuable<NonNullable<TextDisplayConfig['__glowColor']>>
-	export let invisible: Valuable<NonNullable<TextDisplayConfig['__invisible']>>
-	export let nbt: Valuable<NonNullable<TextDisplayConfig['__nbt']>>
-	export let shadowRadius: Valuable<NonNullable<TextDisplayConfig['__shadowRadius']>>
-	export let shadowStrength: Valuable<NonNullable<TextDisplayConfig['__shadowStrength']>>
-	export let useNBT: Valuable<NonNullable<TextDisplayConfig['__useNBT']>>
-</script>
-
-{#if PLUGIN_MODE}
-	<Select
-		label={translate('dialog.text_display_config.billboard.title')}
-		tooltip={translate('dialog.text_display_config.billboard.description')}
-		options={BILLBOARD_OPTIONS}
-		defaultOption={TextDisplayConfig.prototype.billboard}
-		bind:value={billboard}
-	/>
-
-	<Checkbox
-		label={translate('dialog.text_display_config.glowing.title')}
-		tooltip={translate('dialog.text_display_config.glowing.description')}
-		bind:checked={glowing}
-		defaultValue={TextDisplayConfig.prototype.glowing}
-	/>
-
-	<ColorPicker
-		label={translate('dialog.text_display_config.glow_color.title')}
-		tooltip={translate('dialog.text_display_config.glow_color.description')}
-		bind:value={glowColor}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.text_display_config.shadow_radius.title')}
-		tooltip={translate('dialog.text_display_config.shadow_radius.description')}
-		bind:value={shadowRadius}
-		defaultValue={TextDisplayConfig.prototype.shadowRadius}
-		min={0}
-		max={64}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.text_display_config.shadow_strength.title')}
-		tooltip={translate('dialog.text_display_config.shadow_strength.description')}
-		bind:value={shadowStrength}
-		defaultValue={TextDisplayConfig.prototype.shadowStrength}
-		min={0}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.use_custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.use_custom_brightness.description')}
-		bind:checked={overrideBrightness}
-		defaultValue={TextDisplayConfig.prototype.overrideBrightness}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.custom_brightness.description')}
-		bind:value={brightnessOverride}
-		defaultValue={TextDisplayConfig.prototype.brightnessOverride}
-		min={0}
-		max={15}
-		valueStep={1}
-	/>
-
-	<Checkbox
-		label={translate('dialog.text_display_config.invisible.title')}
-		tooltip={translate('dialog.text_display_config.invisible.description')}
-		bind:checked={invisible}
-		defaultValue={TextDisplayConfig.prototype.invisible}
-	/>
-{:else}
-	<Checkbox
-		label={translate('dialog.text_display_config.use_nbt.title')}
-		tooltip={translate('dialog.text_display_config.use_nbt.description')}
-		bind:checked={useNBT}
-		defaultValue={TextDisplayConfig.prototype.useNBT}
-	/>
-
-	{#if $useNBT}
-		<p class="use_nbt_warning">
-			{translate('dialog.text_display_config.use_nbt.use_nbt_warning')}
-		</p>
-		<CodeInput
-			label={translate('dialog.text_display_config.nbt.title')}
-			tooltip={translate('dialog.text_display_config.nbt.description')}
-			bind:value={nbt}
-			defaultValue={TextDisplayConfig.prototype.nbt}
-			valueChecker={nbtChecker}
-			syntax="snbtTextComponent"
-		/>
-	{:else}
-		<Select
-			label={translate('dialog.bone_config.billboard.title')}
-			tooltip={translate('dialog.bone_config.billboard.description')}
-			options={BILLBOARD_OPTIONS}
-			defaultOption={TextDisplayConfig.prototype.billboard}
-			bind:value={billboard}
-		/>
-
-		<Checkbox
-			label={translate('dialog.text_display_config.glowing.title')}
-			tooltip={translate('dialog.text_display_config.glowing.description')}
-			bind:checked={glowing}
-			defaultValue={TextDisplayConfig.prototype.glowing}
-		/>
-
-		<Checkbox
-			label={translate('dialog.text_display_config.override_glow_color.title')}
-			tooltip={translate('dialog.text_display_config.override_glow_color.description')}
-			bind:checked={overrideGlowColor}
-			defaultValue={TextDisplayConfig.prototype.overrideGlowColor}
-		/>
-
-		{#if $overrideGlowColor}
-			<ColorPicker
-				label={translate('dialog.text_display_config.glow_color.title')}
-				tooltip={translate('dialog.text_display_config.glow_color.description')}
-				bind:value={glowColor}
-			/>
-		{/if}
-
-		<NumberSlider
-			label={translate('dialog.text_display_config.shadow_radius.title')}
-			tooltip={translate('dialog.text_display_config.shadow_radius.description')}
-			bind:value={shadowRadius}
-			defaultValue={TextDisplayConfig.prototype.shadowRadius}
-			min={0}
-			max={15}
-		/>
-
-		<NumberSlider
-			label={translate('dialog.text_display_config.shadow_strength.title')}
-			tooltip={translate('dialog.text_display_config.shadow_strength.description')}
-			bind:value={shadowStrength}
-			defaultValue={TextDisplayConfig.prototype.shadowStrength}
-			min={0}
-			max={15}
-		/>
-
-		<Checkbox
-			label={translate('dialog.text_display_config.override_brightness.title')}
-			tooltip={translate('dialog.text_display_config.override_brightness.description')}
-			bind:checked={overrideBrightness}
-			defaultValue={TextDisplayConfig.prototype.overrideBrightness}
-		/>
-
-		{#if $overrideBrightness}
-			<NumberSlider
-				label={translate('dialog.text_display_config.brightness_override.title')}
-				tooltip={translate('dialog.text_display_config.brightness_override.description')}
-				bind:value={brightnessOverride}
-				defaultValue={TextDisplayConfig.prototype.brightnessOverride}
-				min={0}
-				max={15}
-				valueStep={1}
-			/>
-		{/if}
-
-		<!-- <Checkbox
-				label={translate('dialog.text_display_config.invisible.title')}
-				tooltip={translate('dialog.text_display_config.invisible.description')}
-				bind:checked={invisible}
-			/> -->
-	{/if}
-{/if}
-
-<style>
-	.use_nbt_warning {
-		color: var(--color-warning);
-		margin: 0px 18px 16px;
-		font-size: small;
-	}
-</style>
diff --git a/src/components/textDisplayElementPanel.svelte b/src/components/textDisplayElementPanel.svelte
index 3209781e..5d2b67f6 100644
--- a/src/components/textDisplayElementPanel.svelte
+++ b/src/components/textDisplayElementPanel.svelte
@@ -1,7 +1,6 @@
 <script lang="ts" context="module">
 	import { CodeJar } from '@novacbn/svelte-codejar'
 	import { Stopwatch } from 'src/util/stopwatch'
-	import { onDestroy } from 'svelte'
 	import {
 		TEXT_DISPLAY_ALIGNMENT_SELECT,
 		TEXT_DISPLAY_BACKGROUND_COLOR_PICKER,
@@ -11,8 +10,6 @@
 		TEXT_DISPLAY_WIDTH_SLIDER,
 	} from '../interface/panel/textDisplayElement'
 	import { TextDisplay } from '../outliner/textDisplay'
-	import EVENTS from '../util/events'
-	import { Valuable } from '../util/stores'
 	import { translate } from '../util/translation'
 
 	const HIGHLIGHT_CACHE = new Map<string, string>()
@@ -27,65 +24,57 @@
 		}
 		const stopwatch = new Stopwatch('Highlighting').start()
 		const result = Prism.highlight(code, Prism.languages[syntax], syntax)
-		stopwatch.debug(result)
+		stopwatch.debug({ code, result })
 		HIGHLIGHT_CACHE.set(code, result)
 		return result
 	}
 </script>
 
 <script lang="ts">
-	let selected = TextDisplay.selected.at(0)
+	export let selected: TextDisplay
 
-	let text = new Valuable(selected?.text ?? '')
-
-	let error = selected?.textError ?? new Valuable('')
+	let text = selected.text
+	let error = selected.textError
 
 	let codeJarElement: HTMLPreElement | undefined
 
-	let lineWidthSlot: HTMLDivElement
-	let backgroundColorSlot: HTMLDivElement
-	let shadowSlot: HTMLDivElement
-	let alignmentSlot: HTMLDivElement
-	let seeThroughSlot: HTMLDivElement
-	let copyTextSlot: HTMLDivElement
-
-	let unsubFromText: (() => void) | undefined
-
-	const unsubFromEvent = EVENTS.UPDATE_SELECTION.subscribe(() => {
-		unsubFromText?.()
-
-		selected = TextDisplay.selected.at(0)
-		if (!selected || Group.first_selected) {
-			$text = ''
-			error = new Valuable('')
-			return
+	// Force the inputs to update
+	TEXT_DISPLAY_WIDTH_SLIDER.setValue(selected.lineWidth)
+	TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.set(tinycolor(selected.backgroundColor))
+	TEXT_DISPLAY_SHADOW_TOGGLE.set(selected.shadow)
+	TEXT_DISPLAY_ALIGNMENT_SELECT.set(selected.align)
+	TEXT_DISPLAY_SEE_THROUGH_TOGGLE.set(selected.seeThrough)
+
+	$: {
+		if (selected.text !== text) {
+			Undo.initEdit({ elements: [selected] })
+			selected.text = text
+			selected.updateTextMesh()
+			Project!.saved = false
+			Undo.finishEdit(`Change Text Display Text`, { elements: [selected] })
 		}
+	}
 
-		$text = selected.text
-		error = selected.textError
-
-		// Force the inputs to update
-		TEXT_DISPLAY_WIDTH_SLIDER.setValue(selected.lineWidth)
-		const color = tinycolor(selected.backgroundColor)
-		TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.set(color)
-		TEXT_DISPLAY_SHADOW_TOGGLE.set(selected.shadow)
-		TEXT_DISPLAY_ALIGNMENT_SELECT.set(selected.align)
-		TEXT_DISPLAY_SEE_THROUGH_TOGGLE.set(selected.seeThrough)
-
-		text.subscribe(v => {
-			console.log('Text changed:', v)
-			if (!selected) return
-			selected.text = v
-		})
-	})
+	const mountLineWidth = (node: HTMLDivElement) => {
+		node.appendChild(TEXT_DISPLAY_WIDTH_SLIDER.node)
+	}
+	const mountShadow = (node: HTMLDivElement) => {
+		node.appendChild(TEXT_DISPLAY_SHADOW_TOGGLE.node)
+	}
+	const mountAlignment = (node: HTMLDivElement) => {
+		node.appendChild(TEXT_DISPLAY_ALIGNMENT_SELECT.node)
+	}
+	const mountSeeThrough = (node: HTMLDivElement) => {
+		node.appendChild(TEXT_DISPLAY_SEE_THROUGH_TOGGLE.node)
+	}
+	const mountBackgroundColor = (node: HTMLDivElement) => {
+		node.appendChild(TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.node)
+	}
+	const mountCopyText = (node: HTMLDivElement) => {
+		node.appendChild(TEXT_DISPLAY_COPY_TEXT_ACTION.node)
+	}
 
 	requestAnimationFrame(() => {
-		lineWidthSlot.appendChild(TEXT_DISPLAY_WIDTH_SLIDER.node)
-		backgroundColorSlot.appendChild(TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.node)
-		shadowSlot.appendChild(TEXT_DISPLAY_SHADOW_TOGGLE.node)
-		alignmentSlot.appendChild(TEXT_DISPLAY_ALIGNMENT_SELECT.node)
-		seeThroughSlot.appendChild(TEXT_DISPLAY_SEE_THROUGH_TOGGLE.node)
-		copyTextSlot.appendChild(TEXT_DISPLAY_COPY_TEXT_ACTION.node)
 		forceNoWrap()
 	})
 
@@ -103,31 +92,24 @@
 			// CodeJar doesn't capture undo correctly. So we have to fudge it a little.
 			requestAnimationFrame(() => {
 				if (selected && codeJarElement?.textContent != undefined) {
-					$text = codeJarElement.textContent
+					text = codeJarElement.textContent
 				}
 			})
 		}
 	}
-
-	onDestroy(() => {
-		unsubFromEvent()
-	})
 </script>
 
-<p class="panel_toolbar_label label" style={!!selected ? '' : 'visibility:hidden; height: 0px;'}>
+<p class="panel_toolbar_label label">
 	{translate('panel.text_display.title')}
 </p>
 
-<div
-	class="toolbar text-display-toolbar"
-	style={!!selected ? '' : 'visibility:hidden; height: 0px;'}
->
-	<div class="content" bind:this={lineWidthSlot} />
-	<div class="content" bind:this={backgroundColorSlot} />
-	<div class="content" bind:this={shadowSlot} />
-	<div class="content" bind:this={alignmentSlot} />
-	<div class="content" bind:this={seeThroughSlot} />
-	<div class="content" bind:this={copyTextSlot} />
+<div class="toolbar text-display-toolbar">
+	<div class="content" use:mountLineWidth />
+	<div class="content" use:mountShadow />
+	<div class="content" use:mountAlignment />
+	<div class="content" use:mountSeeThrough />
+	<div class="content" use:mountBackgroundColor />
+	<div class="content" use:mountCopyText />
 </div>
 
 <div
@@ -139,7 +121,7 @@
 			bind:element={codeJarElement}
 			syntax="snbtTextComponent"
 			{highlight}
-			bind:value={$text}
+			bind:value={text}
 			on:change={() => forceNoWrap()}
 			preserveIdent
 			history
diff --git a/src/components/vanillaBlockDisplayConfigDialog.svelte b/src/components/vanillaBlockDisplayConfigDialog.svelte
deleted file mode 100644
index d9b64972..00000000
--- a/src/components/vanillaBlockDisplayConfigDialog.svelte
+++ /dev/null
@@ -1,274 +0,0 @@
-<script lang="ts" , context="module">
-	import Checkbox from './dialogItems/checkbox.svelte'
-	import ColorPicker from './dialogItems/colorPicker.svelte'
-	import NumberSlider from './dialogItems/numberSlider.svelte'
-	import Select from './dialogItems/select.svelte'
-
-	import { NbtCompound, NbtTag } from 'deepslate/lib/nbt'
-	import { BoneConfig } from '../nodeConfigs'
-	import { JsonText } from '../systems/jsonText'
-	import { Valuable } from '../util/stores'
-	import { translate } from '../util/translation'
-
-	const BILLBOARD_OPTIONS: Record<BoneConfig['billboard'], string> = {
-		fixed: translate('dialog.bone_config.billboard.options.fixed'),
-		vertical: translate('dialog.bone_config.billboard.options.vertical'),
-		horizontal: translate('dialog.bone_config.billboard.options.horizontal'),
-		center: translate('dialog.bone_config.billboard.options.center'),
-	}
-
-	const nbtChecker: DialogItemValueChecker<string> = value => {
-		let parsedNbt: NbtTag | undefined
-		try {
-			parsedNbt = NbtTag.fromString(value)
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.error', e.message),
-			}
-		}
-		if (!(parsedNbt instanceof NbtCompound)) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.not_compound'),
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-
-	const customNameChecker: DialogItemValueChecker<string> = value => {
-		if (value === '') return { type: 'success', message: '' }
-
-		try {
-			JsonText.fromString(value, {
-				minecraftVersion: Project!.animated_java.target_minecraft_version,
-			})
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: e.message,
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-</script>
-
-<script lang="ts">
-	import CodeInput from './dialogItems/codeInput.svelte'
-
-	const PLUGIN_MODE = !!Project?.animated_java?.enable_plugin_mode
-
-	export let customName: Valuable<string>
-	export let customNameVisible: Valuable<boolean>
-	export let billboard: Valuable<string>
-	export let overrideBrightness: Valuable<NonNullable<BoneConfig['__overrideBrightness']>>
-	export let brightnessOverride: Valuable<NonNullable<BoneConfig['__brightnessOverride']>>
-	export let glowing: Valuable<NonNullable<BoneConfig['__glowing']>>
-	export let overrideGlowColor: Valuable<NonNullable<BoneConfig['__overrideGlowColor']>>
-	export let glowColor: Valuable<NonNullable<BoneConfig['__glowColor']>>
-	export let invisible: Valuable<NonNullable<BoneConfig['__invisible']>>
-	export let nbt: Valuable<NonNullable<BoneConfig['__nbt']>>
-	export let shadowRadius: Valuable<NonNullable<BoneConfig['__shadowRadius']>>
-	export let shadowStrength: Valuable<NonNullable<BoneConfig['__shadowStrength']>>
-	export let useNBT: Valuable<NonNullable<BoneConfig['__useNBT']>>
-</script>
-
-{#if PLUGIN_MODE}
-	<Select
-		label={translate('dialog.bone_config.billboard.title')}
-		tooltip={translate('dialog.bone_config.billboard.description')}
-		options={BILLBOARD_OPTIONS}
-		defaultOption={BoneConfig.prototype.billboard}
-		bind:value={billboard}
-	/>
-
-	<CodeInput
-		label={translate('dialog.bone_config.custom_name.title')}
-		tooltip={translate('dialog.bone_config.custom_name.description')}
-		bind:value={customName}
-		defaultValue={BoneConfig.prototype.customName}
-		valueChecker={customNameChecker}
-		syntax="snbtTextComponent"
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.custom_name_visible.title')}
-		tooltip={translate('dialog.bone_config.custom_name_visible.description')}
-		bind:checked={customNameVisible}
-		defaultValue={BoneConfig.prototype.customNameVisible}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.glowing.title')}
-		tooltip={translate('dialog.bone_config.glowing.description')}
-		bind:checked={glowing}
-		defaultValue={BoneConfig.prototype.glowing}
-	/>
-
-	<ColorPicker
-		label={translate('dialog.bone_config.glow_color.title')}
-		tooltip={translate('dialog.bone_config.glow_color.description')}
-		bind:value={glowColor}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.shadow_radius.title')}
-		tooltip={translate('dialog.bone_config.shadow_radius.description')}
-		bind:value={shadowRadius}
-		defaultValue={BoneConfig.prototype.shadowRadius}
-		min={0}
-		max={64}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.shadow_strength.title')}
-		tooltip={translate('dialog.bone_config.shadow_strength.description')}
-		bind:value={shadowStrength}
-		defaultValue={BoneConfig.prototype.shadowStrength}
-		min={0}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.use_custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.use_custom_brightness.description')}
-		bind:checked={overrideBrightness}
-		defaultValue={BoneConfig.prototype.overrideBrightness}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.custom_brightness.description')}
-		bind:value={brightnessOverride}
-		defaultValue={BoneConfig.prototype.brightnessOverride}
-		min={0}
-		max={15}
-		valueStep={1}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.invisible.title')}
-		tooltip={translate('dialog.bone_config.invisible.description')}
-		bind:checked={invisible}
-		defaultValue={BoneConfig.prototype.invisible}
-	/>
-{:else}
-	<Checkbox
-		label={translate('dialog.bone_config.use_nbt.title')}
-		tooltip={translate('dialog.bone_config.use_nbt.description')}
-		bind:checked={useNBT}
-		defaultValue={BoneConfig.prototype.useNBT}
-	/>
-
-	{#if $useNBT}
-		<p class="use_nbt_warning">
-			{translate('dialog.bone_config.use_nbt.use_nbt_warning')}
-		</p>
-		<CodeInput
-			label={translate('dialog.bone_config.nbt.title')}
-			tooltip={translate('dialog.bone_config.nbt.description')}
-			bind:value={nbt}
-			defaultValue={BoneConfig.prototype.nbt}
-			valueChecker={nbtChecker}
-			syntax="snbtTextComponent"
-		/>
-	{:else}
-		<CodeInput
-			label={translate('dialog.bone_config.custom_name.title')}
-			tooltip={translate('dialog.bone_config.custom_name.description')}
-			bind:value={customName}
-			defaultValue={BoneConfig.prototype.customName}
-			valueChecker={customNameChecker}
-			syntax="snbtTextComponent"
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.custom_name_visible.title')}
-			tooltip={translate('dialog.bone_config.custom_name_visible.description')}
-			bind:checked={customNameVisible}
-			defaultValue={BoneConfig.prototype.customNameVisible}
-		/>
-
-		<Select
-			label={translate('dialog.bone_config.billboard.title')}
-			tooltip={translate('dialog.bone_config.billboard.description')}
-			options={BILLBOARD_OPTIONS}
-			defaultOption={BoneConfig.prototype.billboard}
-			bind:value={billboard}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.glowing.title')}
-			tooltip={translate('dialog.bone_config.glowing.description')}
-			bind:checked={glowing}
-			defaultValue={BoneConfig.prototype.glowing}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.override_glow_color.title')}
-			tooltip={translate('dialog.bone_config.override_glow_color.description')}
-			bind:checked={overrideGlowColor}
-			defaultValue={BoneConfig.prototype.overrideGlowColor}
-		/>
-
-		{#if $overrideGlowColor}
-			<ColorPicker
-				label={translate('dialog.bone_config.glow_color.title')}
-				tooltip={translate('dialog.bone_config.glow_color.description')}
-				bind:value={glowColor}
-			/>
-		{/if}
-
-		<NumberSlider
-			label={translate('dialog.bone_config.shadow_radius.title')}
-			tooltip={translate('dialog.bone_config.shadow_radius.description')}
-			bind:value={shadowRadius}
-			defaultValue={BoneConfig.prototype.shadowRadius}
-			min={0}
-			max={15}
-		/>
-
-		<NumberSlider
-			label={translate('dialog.bone_config.shadow_strength.title')}
-			tooltip={translate('dialog.bone_config.shadow_strength.description')}
-			bind:value={shadowStrength}
-			defaultValue={BoneConfig.prototype.shadowStrength}
-			min={0}
-			max={15}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.override_brightness.title')}
-			tooltip={translate('dialog.bone_config.override_brightness.description')}
-			bind:checked={overrideBrightness}
-			defaultValue={BoneConfig.prototype.overrideBrightness}
-		/>
-
-		{#if $overrideBrightness}
-			<NumberSlider
-				label={translate('dialog.bone_config.brightness_override.title')}
-				tooltip={translate('dialog.bone_config.brightness_override.description')}
-				bind:value={brightnessOverride}
-				defaultValue={BoneConfig.prototype.brightnessOverride}
-				min={0}
-				max={15}
-				valueStep={1}
-			/>
-		{/if}
-
-		<!-- <Checkbox
-				label={translate('dialog.bone_config.invisible.title')}
-				tooltip={translate('dialog.bone_config.invisible.description')}
-				bind:checked={invisible}
-			/> -->
-	{/if}
-{/if}
-
-<style>
-	.use_nbt_warning {
-		color: var(--color-warning);
-		margin: 0px 18px 16px;
-		font-size: small;
-	}
-</style>
diff --git a/src/components/vanillaBlockDisplayElementPanel.svelte b/src/components/vanillaBlockDisplayElementPanel.svelte
index 52cb972d..51ba46e9 100644
--- a/src/components/vanillaBlockDisplayElementPanel.svelte
+++ b/src/components/vanillaBlockDisplayElementPanel.svelte
@@ -1,80 +1,57 @@
 <script lang="ts" context="module">
+	import { validateBlock } from 'src/util/minecraftUtil'
 	import { VanillaBlockDisplay } from '../outliner/vanillaBlockDisplay'
-	import EVENTS from '../util/events'
-	import { Valuable } from '../util/stores'
 	import { translate } from '../util/translation'
 </script>
 
 <script lang="ts">
-	let selectedDisplay = VanillaBlockDisplay.selected.at(0)
-	let lastSelected = selectedDisplay
+	export let selected: VanillaBlockDisplay
 
-	let block = new Valuable<string>('')
-	let error = new Valuable<string>('')
-	let visible = false
+	let block = selected.block
+	let error = selected.error
 
-	let unsub: (() => void) | undefined
+	$: {
+		$error = ''
+		if (selected.block !== block) {
+			void validateBlock(block)
+				.then(err => {
+					if (err) {
+						$error = err
+						console.log('Block validation error:', err)
+						return
+					}
+					console.log('Changing block to', block)
+					Undo.initEdit({ elements: [selected] })
 
-	EVENTS.UPDATE_SELECTION.subscribe(() => {
-		unsub?.()
+					selected.block = block
+					Project!.saved = false
 
-		lastSelected = selectedDisplay
-		selectedDisplay = VanillaBlockDisplay.selected.at(0)
-
-		if (!selectedDisplay) {
-			visible = false
-			return
+					Undo.finishEdit(`Change Block Display Block to "${block}"`, {
+						elements: [selected],
+					})
+				})
+				.catch(err => {
+					$error = err.message
+				})
 		}
-
-		$block = selectedDisplay.block
-		error = selectedDisplay.error
-		visible = true
-
-		unsub = block.subscribe(value => {
-			if (selectedDisplay == undefined || selectedDisplay !== lastSelected) {
-				lastSelected = selectedDisplay
-				return
-			}
-			if (value === selectedDisplay.block) return
-
-			Undo.initEdit({ elements: VanillaBlockDisplay.selected })
-
-			if (VanillaBlockDisplay.selected.length > 1) {
-				for (const display of VanillaBlockDisplay.selected) {
-					display.block = value
-				}
-			} else {
-				selectedDisplay.block = value
-			}
-			Project!.saved = false
-
-			Undo.finishEdit(`Change Block Display Block to "${$block}"`, {
-				elements: VanillaBlockDisplay.selected,
-			})
-		})
-	})
+	}
 </script>
 
-<p class="panel_toolbar_label label" style={!!visible ? '' : 'visibility:hidden; height: 0px;'}>
+<p class="panel_toolbar_label label">
 	{translate('panel.vanilla_block_display.title')}
 </p>
 
-<div
-	class="toolbar custom-toolbar"
-	style={!!visible ? '' : 'visibility:hidden; height: 0px;'}
-	title={translate('panel.vanilla_block_display.description')}
->
+<div class="toolbar custom-toolbar" title={translate('panel.vanilla_block_display.description')}>
 	<div class="content" style="width: 95%;">
-		<input type="text" bind:value={$block} />
+		<input type="text" bind:value={block} />
 	</div>
 </div>
 
-<div
-	class="error"
-	style={!!$error ? '' : 'visibility:hidden; height: 0px; color: var(--color-error);'}
->
-	{$error}
-</div>
+{#if $error}
+	<div class="error">
+		{$error}
+	</div>
+{/if}
 
 <style>
 	input {
diff --git a/src/components/vanillaItemDisplayConfigDialog.svelte b/src/components/vanillaItemDisplayConfigDialog.svelte
deleted file mode 100644
index d9b64972..00000000
--- a/src/components/vanillaItemDisplayConfigDialog.svelte
+++ /dev/null
@@ -1,274 +0,0 @@
-<script lang="ts" , context="module">
-	import Checkbox from './dialogItems/checkbox.svelte'
-	import ColorPicker from './dialogItems/colorPicker.svelte'
-	import NumberSlider from './dialogItems/numberSlider.svelte'
-	import Select from './dialogItems/select.svelte'
-
-	import { NbtCompound, NbtTag } from 'deepslate/lib/nbt'
-	import { BoneConfig } from '../nodeConfigs'
-	import { JsonText } from '../systems/jsonText'
-	import { Valuable } from '../util/stores'
-	import { translate } from '../util/translation'
-
-	const BILLBOARD_OPTIONS: Record<BoneConfig['billboard'], string> = {
-		fixed: translate('dialog.bone_config.billboard.options.fixed'),
-		vertical: translate('dialog.bone_config.billboard.options.vertical'),
-		horizontal: translate('dialog.bone_config.billboard.options.horizontal'),
-		center: translate('dialog.bone_config.billboard.options.center'),
-	}
-
-	const nbtChecker: DialogItemValueChecker<string> = value => {
-		let parsedNbt: NbtTag | undefined
-		try {
-			parsedNbt = NbtTag.fromString(value)
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.error', e.message),
-			}
-		}
-		if (!(parsedNbt instanceof NbtCompound)) {
-			return {
-				type: 'error',
-				message: translate('dialog.bone_config.nbt.invalid_nbt.not_compound'),
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-
-	const customNameChecker: DialogItemValueChecker<string> = value => {
-		if (value === '') return { type: 'success', message: '' }
-
-		try {
-			JsonText.fromString(value, {
-				minecraftVersion: Project!.animated_java.target_minecraft_version,
-			})
-		} catch (e: any) {
-			return {
-				type: 'error',
-				message: e.message,
-			}
-		}
-
-		return { type: 'success', message: '' }
-	}
-</script>
-
-<script lang="ts">
-	import CodeInput from './dialogItems/codeInput.svelte'
-
-	const PLUGIN_MODE = !!Project?.animated_java?.enable_plugin_mode
-
-	export let customName: Valuable<string>
-	export let customNameVisible: Valuable<boolean>
-	export let billboard: Valuable<string>
-	export let overrideBrightness: Valuable<NonNullable<BoneConfig['__overrideBrightness']>>
-	export let brightnessOverride: Valuable<NonNullable<BoneConfig['__brightnessOverride']>>
-	export let glowing: Valuable<NonNullable<BoneConfig['__glowing']>>
-	export let overrideGlowColor: Valuable<NonNullable<BoneConfig['__overrideGlowColor']>>
-	export let glowColor: Valuable<NonNullable<BoneConfig['__glowColor']>>
-	export let invisible: Valuable<NonNullable<BoneConfig['__invisible']>>
-	export let nbt: Valuable<NonNullable<BoneConfig['__nbt']>>
-	export let shadowRadius: Valuable<NonNullable<BoneConfig['__shadowRadius']>>
-	export let shadowStrength: Valuable<NonNullable<BoneConfig['__shadowStrength']>>
-	export let useNBT: Valuable<NonNullable<BoneConfig['__useNBT']>>
-</script>
-
-{#if PLUGIN_MODE}
-	<Select
-		label={translate('dialog.bone_config.billboard.title')}
-		tooltip={translate('dialog.bone_config.billboard.description')}
-		options={BILLBOARD_OPTIONS}
-		defaultOption={BoneConfig.prototype.billboard}
-		bind:value={billboard}
-	/>
-
-	<CodeInput
-		label={translate('dialog.bone_config.custom_name.title')}
-		tooltip={translate('dialog.bone_config.custom_name.description')}
-		bind:value={customName}
-		defaultValue={BoneConfig.prototype.customName}
-		valueChecker={customNameChecker}
-		syntax="snbtTextComponent"
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.custom_name_visible.title')}
-		tooltip={translate('dialog.bone_config.custom_name_visible.description')}
-		bind:checked={customNameVisible}
-		defaultValue={BoneConfig.prototype.customNameVisible}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.glowing.title')}
-		tooltip={translate('dialog.bone_config.glowing.description')}
-		bind:checked={glowing}
-		defaultValue={BoneConfig.prototype.glowing}
-	/>
-
-	<ColorPicker
-		label={translate('dialog.bone_config.glow_color.title')}
-		tooltip={translate('dialog.bone_config.glow_color.description')}
-		bind:value={glowColor}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.shadow_radius.title')}
-		tooltip={translate('dialog.bone_config.shadow_radius.description')}
-		bind:value={shadowRadius}
-		defaultValue={BoneConfig.prototype.shadowRadius}
-		min={0}
-		max={64}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.shadow_strength.title')}
-		tooltip={translate('dialog.bone_config.shadow_strength.description')}
-		bind:value={shadowStrength}
-		defaultValue={BoneConfig.prototype.shadowStrength}
-		min={0}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.use_custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.use_custom_brightness.description')}
-		bind:checked={overrideBrightness}
-		defaultValue={BoneConfig.prototype.overrideBrightness}
-	/>
-
-	<NumberSlider
-		label={translate('dialog.bone_config.custom_brightness.title')}
-		tooltip={translate('dialog.bone_config.custom_brightness.description')}
-		bind:value={brightnessOverride}
-		defaultValue={BoneConfig.prototype.brightnessOverride}
-		min={0}
-		max={15}
-		valueStep={1}
-	/>
-
-	<Checkbox
-		label={translate('dialog.bone_config.invisible.title')}
-		tooltip={translate('dialog.bone_config.invisible.description')}
-		bind:checked={invisible}
-		defaultValue={BoneConfig.prototype.invisible}
-	/>
-{:else}
-	<Checkbox
-		label={translate('dialog.bone_config.use_nbt.title')}
-		tooltip={translate('dialog.bone_config.use_nbt.description')}
-		bind:checked={useNBT}
-		defaultValue={BoneConfig.prototype.useNBT}
-	/>
-
-	{#if $useNBT}
-		<p class="use_nbt_warning">
-			{translate('dialog.bone_config.use_nbt.use_nbt_warning')}
-		</p>
-		<CodeInput
-			label={translate('dialog.bone_config.nbt.title')}
-			tooltip={translate('dialog.bone_config.nbt.description')}
-			bind:value={nbt}
-			defaultValue={BoneConfig.prototype.nbt}
-			valueChecker={nbtChecker}
-			syntax="snbtTextComponent"
-		/>
-	{:else}
-		<CodeInput
-			label={translate('dialog.bone_config.custom_name.title')}
-			tooltip={translate('dialog.bone_config.custom_name.description')}
-			bind:value={customName}
-			defaultValue={BoneConfig.prototype.customName}
-			valueChecker={customNameChecker}
-			syntax="snbtTextComponent"
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.custom_name_visible.title')}
-			tooltip={translate('dialog.bone_config.custom_name_visible.description')}
-			bind:checked={customNameVisible}
-			defaultValue={BoneConfig.prototype.customNameVisible}
-		/>
-
-		<Select
-			label={translate('dialog.bone_config.billboard.title')}
-			tooltip={translate('dialog.bone_config.billboard.description')}
-			options={BILLBOARD_OPTIONS}
-			defaultOption={BoneConfig.prototype.billboard}
-			bind:value={billboard}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.glowing.title')}
-			tooltip={translate('dialog.bone_config.glowing.description')}
-			bind:checked={glowing}
-			defaultValue={BoneConfig.prototype.glowing}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.override_glow_color.title')}
-			tooltip={translate('dialog.bone_config.override_glow_color.description')}
-			bind:checked={overrideGlowColor}
-			defaultValue={BoneConfig.prototype.overrideGlowColor}
-		/>
-
-		{#if $overrideGlowColor}
-			<ColorPicker
-				label={translate('dialog.bone_config.glow_color.title')}
-				tooltip={translate('dialog.bone_config.glow_color.description')}
-				bind:value={glowColor}
-			/>
-		{/if}
-
-		<NumberSlider
-			label={translate('dialog.bone_config.shadow_radius.title')}
-			tooltip={translate('dialog.bone_config.shadow_radius.description')}
-			bind:value={shadowRadius}
-			defaultValue={BoneConfig.prototype.shadowRadius}
-			min={0}
-			max={15}
-		/>
-
-		<NumberSlider
-			label={translate('dialog.bone_config.shadow_strength.title')}
-			tooltip={translate('dialog.bone_config.shadow_strength.description')}
-			bind:value={shadowStrength}
-			defaultValue={BoneConfig.prototype.shadowStrength}
-			min={0}
-			max={15}
-		/>
-
-		<Checkbox
-			label={translate('dialog.bone_config.override_brightness.title')}
-			tooltip={translate('dialog.bone_config.override_brightness.description')}
-			bind:checked={overrideBrightness}
-			defaultValue={BoneConfig.prototype.overrideBrightness}
-		/>
-
-		{#if $overrideBrightness}
-			<NumberSlider
-				label={translate('dialog.bone_config.brightness_override.title')}
-				tooltip={translate('dialog.bone_config.brightness_override.description')}
-				bind:value={brightnessOverride}
-				defaultValue={BoneConfig.prototype.brightnessOverride}
-				min={0}
-				max={15}
-				valueStep={1}
-			/>
-		{/if}
-
-		<!-- <Checkbox
-				label={translate('dialog.bone_config.invisible.title')}
-				tooltip={translate('dialog.bone_config.invisible.description')}
-				bind:checked={invisible}
-			/> -->
-	{/if}
-{/if}
-
-<style>
-	.use_nbt_warning {
-		color: var(--color-warning);
-		margin: 0px 18px 16px;
-		font-size: small;
-	}
-</style>
diff --git a/src/components/vanillaItemDisplayElementPanel.svelte b/src/components/vanillaItemDisplayElementPanel.svelte
index bb47c520..8eb3304e 100644
--- a/src/components/vanillaItemDisplayElementPanel.svelte
+++ b/src/components/vanillaItemDisplayElementPanel.svelte
@@ -1,101 +1,63 @@
 <script lang="ts" context="module">
+	import { validateItem } from 'src/util/minecraftUtil'
 	import { ITEM_DISPLAY_ITEM_DISPLAY_SELECT } from '../interface/panel/vanillaItemDisplayElement'
 	import { VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
-	import EVENTS from '../util/events'
-	import { Valuable } from '../util/stores'
 	import { translate } from '../util/translation'
 </script>
 
 <script lang="ts">
-	let selectedDisplay = VanillaItemDisplay.selected.at(0)
-	let lastSelected = selectedDisplay
-
-	let item = new Valuable<string>('')
-	let error = new Valuable<string>('')
-	let itemDisplaySlot: HTMLDivElement
-	let visible = false
-
-	let unsub: (() => void) | undefined
-
-	EVENTS.UPDATE_SELECTION.subscribe(() => {
-		selectedDisplay = VanillaItemDisplay.selected.at(0)
-		if (!selectedDisplay || selected.length > 1) {
-			item = new Valuable('')
-			error = new Valuable('')
-			visible = false
-			return
-		}
-		$item = selectedDisplay.item
-		error = selectedDisplay.error
-		visible = true
-	})
-
-	EVENTS.UPDATE_SELECTION.subscribe(() => {
-		unsub?.()
-
-		lastSelected = selectedDisplay
-		selectedDisplay = VanillaItemDisplay.selected.at(0)
-
-		if (!selectedDisplay) {
-			visible = false
-			return
+	export let selected: VanillaItemDisplay
+
+	let item = selected.item
+	let error = selected.error
+
+	$: {
+		$error = ''
+		if (selected.item !== item) {
+			void validateItem(item)
+				.then(err => {
+					if (err) {
+						$error = err
+						console.log('Item validation error:', err)
+						return
+					}
+					console.log('Changing item to', item)
+					Undo.initEdit({ elements: [selected] })
+
+					selected.item = item
+					Project!.saved = false
+
+					Undo.finishEdit(`Change Item Display Item to "${item}"`, {
+						elements: [selected],
+					})
+				})
+				.catch(err => {
+					$error = err.message
+				})
 		}
+	}
 
-		$item = selectedDisplay.item
-		error = selectedDisplay.error
-		ITEM_DISPLAY_ITEM_DISPLAY_SELECT.set(selectedDisplay.itemDisplay)
-		visible = true
-
-		unsub = item.subscribe(value => {
-			if (selectedDisplay == undefined || selectedDisplay !== lastSelected) {
-				lastSelected = selectedDisplay
-				return
-			}
-			if (value === selectedDisplay.item) return
-
-			Undo.initEdit({ elements: VanillaItemDisplay.selected })
-
-			if (VanillaItemDisplay.selected.length > 1) {
-				for (const display of VanillaItemDisplay.selected) {
-					display.item = value
-				}
-			} else {
-				selectedDisplay.item = value
-			}
-			Project!.saved = false
-
-			Undo.finishEdit(`Change Item Display's Item to "${$item}"`, {
-				elements: VanillaItemDisplay.selected,
-			})
-		})
-	})
-
-	requestAnimationFrame(() => {
-		itemDisplaySlot.appendChild(ITEM_DISPLAY_ITEM_DISPLAY_SELECT.node)
-	})
+	const mountItemDisplaySelect = (node: HTMLDivElement) => {
+		node.appendChild(ITEM_DISPLAY_ITEM_DISPLAY_SELECT.node)
+	}
 </script>
 
-<p class="panel_toolbar_label label" style={!!visible ? '' : 'visibility:hidden; height: 0px;'}>
+<p class="panel_toolbar_label label">
 	{translate('panel.vanilla_item_display.title')}
 </p>
 
-<div
-	class="toolbar custom-toolbar"
-	style={!!visible ? '' : 'visibility:hidden; height: 0px;'}
-	title={translate('panel.vanilla_item_display.description')}
->
+<div class="toolbar custom-toolbar" title={translate('panel.vanilla_item_display.description')}>
 	<div class="content" style="width: 95%;">
-		<input type="text" bind:value={$item} />
+		<input type="text" bind:value={item} />
 	</div>
-	<div class="content" bind:this={itemDisplaySlot}></div>
+	<div class="content" use:mountItemDisplaySelect></div>
 </div>
 
-<div
-	class="error"
-	style={!!$error ? '' : 'visibility:hidden; height: 0px; color: var(--color-error);'}
->
-	{$error}
-</div>
+{#if $error}
+	<div class="error">
+		{$error}
+	</div>
+{/if}
 
 <style>
 	input {
diff --git a/src/formats/blueprint/codec.ts b/src/formats/blueprint/codec.ts
index bc1dc9e1..414dcb11 100644
--- a/src/formats/blueprint/codec.ts
+++ b/src/formats/blueprint/codec.ts
@@ -156,18 +156,22 @@ export const BLUEPRINT_CODEC = registerCodec(
 				}
 			}
 
-			if (model.variants?.default) {
-				Variant.fromJSON(model.variants?.default, true)
-			} else {
-				console.warn('No default Variant found, creating one named "Default"')
-				new Variant('Default', true)
-			}
+			if (model.variants) {
+				Variant.all = []
+
+				if (model.variants.default) {
+					Variant.fromJSON(model.variants?.default, true)
+				} else {
+					console.warn('No default Variant found, creating one named "Default"')
+					new Variant('Default', true)
+				}
 
-			if (model.variants?.list) {
-				for (const variantJSON of model.variants.list) {
-					Variant.fromJSON(variantJSON)
+				if (Array.isArray(model.variants.list)) {
+					for (const variantJSON of model.variants.list) {
+						Variant.fromJSON(variantJSON)
+					}
+					Project.variants = Variant.all
 				}
-				Project.variants = Variant.all
 			}
 
 			if (model.animations) {
@@ -309,8 +313,8 @@ export const BLUEPRINT_CODEC = registerCodec(
 			}
 
 			model.variants = {
-				default: Variant.all.find(v => v.isDefault)!.toJSON(),
-				list: Variant.all.filter(v => !v.isDefault).map(v => v.toJSON()),
+				default: Variant.getDefault().toJSON(),
+				list: Variant.allExcludingDefault().map(v => v.toJSON()),
 			}
 
 			const animationOptions = { bone_names: true, absolute_paths: options.absolute_paths }
diff --git a/src/formats/blueprint/dfu.ts b/src/formats/blueprint/dfu.ts
index ac579710..9d6944a4 100644
--- a/src/formats/blueprint/dfu.ts
+++ b/src/formats/blueprint/dfu.ts
@@ -4,7 +4,7 @@ import { type IBlueprintFormatJSON, getDefaultProjectSettings } from '.'
 import TransparentTexture from '../../assets/transparent.png'
 import { PACKAGE } from '../../constants'
 import { openUnexpectedErrorDialog } from '../../interface/dialog/unexpectedError'
-import { BoneConfig } from '../../nodeConfigs'
+import { DisplayEntityConfig } from '../../nodeConfigs'
 
 export function process(model: any): IBlueprintFormatJSON {
 	if (model?.meta?.model_format === 'animatedJava/ajmodel') {
@@ -85,7 +85,7 @@ export function process(model: any): IBlueprintFormatJSON {
 			delete model.blueprint_settings[key]
 		}
 
-		model.meta.format_version = PACKAGE.version
+		model.meta.format_version = '1.8.0'
 		console.log('Upgrade complete', JSON.parse(JSON.stringify(model)))
 
 		return model
@@ -312,7 +312,7 @@ function updateModelTo1_0pre1(model: any) {
 		if (typeof node === 'string') return
 		bones.push(node.uuid as string)
 		node.configs = {
-			default: new BoneConfig().toJSON(),
+			default: new DisplayEntityConfig().toJSON(),
 			variants: {},
 		}
 		node.children.forEach((child: any) => {
@@ -625,6 +625,33 @@ function updateModelTo1_8_0(model: any) {
 				delete display.backgroundAlpha
 			}
 		}
+		// Update old config structure for display entities
+		const displayEntities = fixed.elements.filter(
+			e =>
+				e.type === AnimatedJava.TextDisplay.type ||
+				e.type === AnimatedJava.VanillaItemDisplay.type ||
+				e.type === AnimatedJava.VanillaBlockDisplay.type
+		)
+		for (const displayEntity of displayEntities) {
+			if (displayEntity.config) {
+				if (displayEntity.config.custom_name !== undefined) {
+					displayEntity.config.on_apply_function ??= ''
+					displayEntity.config.on_apply_function += `\n# Auto-upgraded custom name setting (May need fixing):\ndata modify entity @s CustomName set value '${displayEntity.config.custom_name}'\n`
+					delete displayEntity.config.custom_name
+				}
+				if (displayEntity.config.custom_name_visible) {
+					displayEntity.config.on_apply_function ??= ''
+					displayEntity.config.on_apply_function += `\n# Auto-upgraded custom name visibility setting:\ndata modify entity @s CustomNameVisible set value ${displayEntity.config.custom_name_visible}\n`
+					delete displayEntity.config.custom_name_visible
+				}
+
+				displayEntity.configs = {
+					default: displayEntity.config,
+					variants: {},
+				}
+				delete displayEntity.config
+			}
+		}
 		// Update locators to use new event function names
 		const locators = fixed.elements.filter(e => e.type === Locator.prototype.type)
 		for (const locator of locators) {
@@ -641,7 +668,6 @@ function updateModelTo1_8_0(model: any) {
 
 	// Update commands keyframes to use new keyframe channel name
 	if (Array.isArray(fixed.animations)) {
-		debugger
 		for (const animation of fixed.animations) {
 			for (const animator of Object.values<any>(animation.animators ?? {})) {
 				if (!Array.isArray(animator.keyframes)) continue
diff --git a/src/formats/blueprint/index.ts b/src/formats/blueprint/index.ts
index 4c882733..336a5b81 100644
--- a/src/formats/blueprint/index.ts
+++ b/src/formats/blueprint/index.ts
@@ -4,7 +4,7 @@ import { type VanillaItemDisplay } from 'src/outliner/vanillaItemDisplay'
 import { mountSvelteComponent } from 'src/util/mountSvelteComponent'
 import FormatPageSvelte from '../../components/formatPage.svelte'
 import ProjectTitleSvelte from '../../components/projectTitle.svelte'
-import { type BillboardMode, BoneConfig, LocatorConfig } from '../../nodeConfigs'
+import { DisplayEntityConfig, LocatorConfig } from '../../nodeConfigs'
 import EVENTS from '../../util/events'
 import { sanitizeStorageKey } from '../../util/minecraftUtil'
 import { registerModelFormat } from '../../util/moddingTools'
@@ -30,32 +30,23 @@ declare global {
 	}
 }
 
-let boundingBoxUpdateIntervalId: ReturnType<typeof setInterval> | undefined
-
 export const BLUEPRINT_FORMAT_ID = 'animated-java:format/blueprint'
 
 /**
  * The serialized Variant Bone Config
  */
-export interface IBlueprintBoneConfigJSON {
-	custom_name?: BoneConfig['customName']
-	custom_name_visible?: BoneConfig['customNameVisible']
-	billboard?: BoneConfig['billboard']
-	override_brightness?: BoneConfig['overrideBrightness']
-	brightness_override?: BoneConfig['brightnessOverride']
-	enchanted?: BoneConfig['enchanted']
-	glowing?: BoneConfig['glowing']
-	override_glow_color?: BoneConfig['overrideGlowColor']
-	glow_color?: BoneConfig['glowColor']
-	inherit_settings?: BoneConfig['inheritSettings']
-	invisible?: BoneConfig['invisible']
-	/**
-	 * Custom NBT for the bone that will be merged when this Variant is applied
-	 */
-	nbt?: BoneConfig['nbt']
-	shadow_radius?: BoneConfig['shadowRadius']
-	shadow_strength?: BoneConfig['shadowStrength']
-	use_nbt?: BoneConfig['useNBT']
+export interface IBlueprintDisplayEntityConfigJSON {
+	on_apply_function?: DisplayEntityConfig['__onApplyFunction']
+	billboard?: DisplayEntityConfig['billboard']
+	override_brightness?: DisplayEntityConfig['overrideBrightness']
+	brightness_override?: DisplayEntityConfig['brightnessOverride']
+	enchanted?: DisplayEntityConfig['enchanted']
+	glowing?: DisplayEntityConfig['glowing']
+	override_glow_color?: DisplayEntityConfig['overrideGlowColor']
+	glow_color?: DisplayEntityConfig['glowColor']
+	invisible?: DisplayEntityConfig['invisible']
+	shadow_radius?: DisplayEntityConfig['shadowRadius']
+	shadow_strength?: DisplayEntityConfig['shadowStrength']
 }
 
 /**
@@ -70,26 +61,6 @@ export interface IBlueprintLocatorConfigJSON {
 	on_tick_function?: LocatorConfig['__onTickFunction']
 }
 
-/**
- * The serialized Variant Text Display Config
- */
-export interface IBlueprintTextDisplayConfigJSON {
-	billboard?: BillboardMode
-	override_brightness?: BoneConfig['overrideBrightness']
-	brightness_override?: BoneConfig['brightnessOverride']
-	glowing?: BoneConfig['glowing']
-	override_glow_color?: BoneConfig['overrideGlowColor']
-	glow_color?: BoneConfig['glowColor']
-	invisible?: BoneConfig['invisible']
-	shadow_radius?: BoneConfig['shadowRadius']
-	shadow_strength?: BoneConfig['shadowStrength']
-	use_nbt?: BoneConfig['useNBT']
-	/**
-	 * Custom NBT for the bone that will be merged when this Variant is applied
-	 */
-	nbt?: BoneConfig['nbt']
-}
-
 /**
  * The serialized Variant
  */
@@ -198,20 +169,11 @@ export function getDefaultProjectSettings() {
 	return { ...blueprintSettings.defaultValues }
 }
 
-function initializeRenderBoxPreview() {
-	if (boundingBoxUpdateIntervalId == undefined) {
-		boundingBoxUpdateIntervalId = setInterval(() => {
-			updateRenderBoxPreview()
-		}, 500)
-		EVENTS.PLUGIN_UNLOAD.subscribe(() => clearInterval(boundingBoxUpdateIntervalId), true)
-		EVENTS.PLUGIN_UNINSTALL.subscribe(() => clearInterval(boundingBoxUpdateIntervalId), true)
-	}
-}
-
-export function updateRenderBoxPreview() {
+EVENTS.UPDATE_VIEW.subscribe(() => {
+	// Update the render box preview
 	if (!Project || !activeProjectIsBlueprintFormat()) return
-	if (Project.visualBoundingBox) scene.remove(Project.visualBoundingBox)
 
+	if (Project.visualBoundingBox) scene.remove(Project.visualBoundingBox)
 	if (!Project.animated_java.show_render_box) return
 
 	let width = 0
@@ -227,6 +189,23 @@ export function updateRenderBoxPreview() {
 			)
 			height = Math.max(height, cube.to[1], cube.from[1])
 		}
+
+		for (const display of [
+			...AnimatedJava.TextDisplay.all,
+			...AnimatedJava.VanillaItemDisplay.all,
+			...AnimatedJava.VanillaBlockDisplay.all,
+		]) {
+			const box = new THREE.Box3().setFromObject(display.mesh)
+			width = Math.max(
+				width,
+				Math.abs(box.min.x),
+				Math.abs(box.min.z),
+				Math.abs(box.max.x),
+				Math.abs(box.max.z)
+			)
+			height = Math.max(height, box.max.y)
+		}
+
 		const boundingBoxOverflow = 8
 		width += boundingBoxOverflow
 		height += boundingBoxOverflow
@@ -242,7 +221,7 @@ export function updateRenderBoxPreview() {
 	)
 	Project.visualBoundingBox.position.set(0, height / 2, 0)
 	scene.add(Project.visualBoundingBox)
-}
+})
 
 // region Format
 export const BLUEPRINT_FORMAT = registerModelFormat(
@@ -281,15 +260,6 @@ export const BLUEPRINT_FORMAT = registerModelFormat(
 
 			project.pluginMode = new Valuable(project.animated_java.enable_plugin_mode)
 
-			// project.variants ??= []
-			// if (Variant.all.length === 0) {
-			// 	console.warn('No variants found, creating default variant')
-			// 	new Variant('Default', true)
-			// }
-			// Variant.selectDefault()
-
-			initializeRenderBoxPreview()
-
 			requestAnimationFrame(() => {
 				const projectIndex = ModelProject.all.indexOf(project)
 				const projectTab = document.querySelectorAll('#tab_bar_list .project_tab')[
@@ -435,7 +405,6 @@ EVENTS.UNSELECT_PROJECT.subscribe(project => {
 EVENTS.UPDATE_SELECTION.subscribe(updateRotationLock)
 EVENTS.SELECT_AJ_PROJECT.subscribe(() => {
 	requestAnimationFrame(() => {
-		updateRenderBoxPreview()
 		updateRotationLock()
 	})
 })
diff --git a/src/index.ts b/src/index.ts
index 7012346e..080506dd 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -39,7 +39,7 @@ import { JsonText } from './systems/jsonText'
 import * as assetManager from './systems/minecraft/assetManager'
 import { getLatestVersionClientDownloadUrl } from './systems/minecraft/assetManager'
 import * as blockModelManager from './systems/minecraft/blockModelManager'
-import { BLOCKSTATE_REGISTRY } from './systems/minecraft/blockstateManager'
+import { BLOCKSTATE_REGISTRY, getBlockState } from './systems/minecraft/blockstateManager'
 import { getVanillaFont } from './systems/minecraft/fontManager'
 import * as itemModelManager from './systems/minecraft/itemModelManager'
 import './systems/minecraft/registryManager'
@@ -109,6 +109,7 @@ const AnimatedJavaApi = {
 	},
 	TELLRAW,
 	JsonText,
+	getBlockState,
 }
 window.AnimatedJava = AnimatedJavaApi
 
diff --git a/src/interface/dialog/blueprintSettings.ts b/src/interface/dialog/blueprintSettings.ts
index 43a7cbc5..ef826329 100644
--- a/src/interface/dialog/blueprintSettings.ts
+++ b/src/interface/dialog/blueprintSettings.ts
@@ -3,7 +3,7 @@ import { updateAllCubeOutlines } from 'src/mods/cube'
 import { SUPPORTED_MINECRAFT_VERSIONS } from 'src/systems/global'
 import BlueprintSettingsDialogSvelteComponent from '../../components/blueprintSettingsDialog.svelte'
 import { PACKAGE } from '../../constants'
-import { updateRenderBoxPreview, updateRotationLock } from '../../formats/blueprint'
+import { updateRotationLock } from '../../formats/blueprint'
 import { defaultValues, type ExportMode } from '../../formats/blueprint/settings'
 import { sanitizeStorageKey } from '../../util/minecraftUtil'
 import { Valuable } from '../../util/stores'
@@ -134,7 +134,6 @@ export function openBlueprintSettingsDialog() {
 		preventKeybinds: true,
 		onConfirm() {
 			setSettings(settings)
-			updateRenderBoxPreview()
 			updateRotationLock()
 			updateAllCubeOutlines()
 			Canvas.updateAll()
diff --git a/src/interface/dialog/boneConfig.ts b/src/interface/dialog/boneConfig.ts
deleted file mode 100644
index 23cee162..00000000
--- a/src/interface/dialog/boneConfig.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-import { registerAction } from 'src/util/moddingTools'
-import BoneConfigDialogSvelteComponent from '../../components/boneConfigDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
-import { BoneConfig } from '../../nodeConfigs'
-import { Valuable } from '../../util/stores'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-import { Variant } from '../../variants'
-
-// TODO: These should probably be part of the BoneConfig class
-function propagateInheritanceUp(group: Group, config: BoneConfig, variant?: string): void {
-	// Recurse to the topmost parent that doesn't have inherit_settings enabled, then inherit down from there
-	if (group.parent instanceof Group) {
-		const parentConfig = variant
-			? group.parent.configs.variants[variant]
-			: group.parent.configs.default
-		if (parentConfig) {
-			const parentBoneConfig = BoneConfig.fromJSON(parentConfig)
-			if (parentConfig.inherit_settings) {
-				propagateInheritanceUp(group.parent, parentBoneConfig, variant)
-			}
-			config.inheritFrom(parentBoneConfig)
-			if (variant) group.configs.variants[variant] = config.toJSON()
-			else group.configs.default = config.toJSON()
-		}
-	}
-}
-
-function propagateInheritanceDown(group: Group, config: BoneConfig, variant?: string) {
-	for (const child of group.children) {
-		if (!(child instanceof Group)) continue
-		const childConfig = variant ? child.configs.variants[variant] : child.configs.default
-		if (childConfig?.inherit_settings) {
-			const childBoneConfig = BoneConfig.fromJSON(childConfig)
-			childBoneConfig.inheritFrom(config)
-			if (variant) child.configs.variants[variant] = childBoneConfig.toJSON()
-			else child.configs.default = childBoneConfig.toJSON()
-			propagateInheritanceDown(child, childBoneConfig, variant)
-		}
-	}
-}
-
-export function openBoneConfigDialog(bone: Group) {
-	// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object
-	let boneConfigJSON = (bone.configs.default ??= new BoneConfig().toJSON())
-	let parentConfigJSON =
-		bone.parent instanceof Group
-			? (bone.parent.configs.default ??= new BoneConfig().toJSON())
-			: undefined
-
-	if (Variant.selected && !Variant.selected.isDefault) {
-		// Get the variant's config, or create a new one if it doesn't exist
-		boneConfigJSON = bone.configs.variants[Variant.selected.uuid] ??= new BoneConfig().toJSON()
-		parentConfigJSON =
-			bone.parent instanceof Group
-				? (bone.parent.configs.variants[Variant.selected.uuid] ??=
-						new BoneConfig().toJSON())
-				: undefined
-	}
-
-	const parentConfig = parentConfigJSON
-		? BoneConfig.fromJSON(parentConfigJSON)
-		: BoneConfig.getDefault()
-
-	const oldConfig = BoneConfig.fromJSON(boneConfigJSON)
-
-	const customName = new Valuable(oldConfig.customName)
-	const customNameVisible = new Valuable(oldConfig.customNameVisible)
-	const billboard = new Valuable(oldConfig.billboard as string)
-	const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
-	const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
-	const enchanted = new Valuable(oldConfig.enchanted)
-	const glowing = new Valuable(oldConfig.glowing)
-	const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
-	const glowColor = new Valuable(oldConfig.glowColor)
-	const inheritSettings = new Valuable(oldConfig.inheritSettings)
-	const invisible = new Valuable(oldConfig.invisible)
-	const nbt = new Valuable(oldConfig.nbt)
-	const shadowRadius = new Valuable(oldConfig.shadowRadius)
-	const shadowStrength = new Valuable(oldConfig.shadowStrength)
-	const useNBT = new Valuable(oldConfig.useNBT)
-
-	new SvelteDialog({
-		id: `${PACKAGE.name}:boneConfig`,
-		title: translate('dialog.bone_config.title'),
-		width: 600,
-		content: {
-			component: BoneConfigDialogSvelteComponent,
-			props: {
-				variant: Variant.selected!,
-				customName,
-				customNameVisible,
-				billboard,
-				overrideBrightness,
-				brightnessOverride,
-				enchanted,
-				glowing,
-				overrideGlowColor,
-				glowColor,
-				inheritSettings,
-				invisible,
-				nbt,
-				shadowRadius,
-				shadowStrength,
-				useNBT,
-			},
-		},
-		preventKeybinds: true,
-		onConfirm() {
-			const newConfig = new BoneConfig()
-
-			newConfig.customName = customName.get()
-			newConfig.customNameVisible = customNameVisible.get()
-			newConfig.billboard = billboard.get() as any
-			newConfig.overrideBrightness = overrideBrightness.get()
-			newConfig.brightnessOverride = brightnessOverride.get()
-			newConfig.enchanted = enchanted.get()
-			newConfig.glowing = glowing.get()
-			newConfig.overrideGlowColor = overrideGlowColor.get()
-			newConfig.glowColor = glowColor.get()
-			newConfig.inheritSettings = inheritSettings.get()
-			newConfig.invisible = invisible.get()
-			newConfig.nbt = nbt.get()
-			newConfig.shadowRadius = shadowRadius.get()
-			newConfig.shadowStrength = shadowStrength.get()
-			newConfig.useNBT = useNBT.get()
-
-			// Remove properties that are the same as the parent's
-			newConfig.customName === parentConfig.customName && (newConfig.customName = undefined)
-			newConfig.customNameVisible === parentConfig.customNameVisible &&
-				(newConfig.customNameVisible = undefined)
-			newConfig.billboard === parentConfig.billboard && (newConfig.billboard = undefined)
-			newConfig.overrideBrightness === parentConfig.overrideBrightness &&
-				(newConfig.overrideBrightness = undefined)
-			newConfig.brightnessOverride === parentConfig.brightnessOverride &&
-				(newConfig.brightnessOverride = undefined)
-			newConfig.enchanted === parentConfig.enchanted && (newConfig.enchanted = undefined)
-			newConfig.glowing === parentConfig.glowing && (newConfig.glowing = undefined)
-			newConfig.overrideGlowColor === parentConfig.overrideGlowColor &&
-				(newConfig.overrideGlowColor = undefined)
-			newConfig.glowColor === parentConfig.glowColor && (newConfig.glowColor = undefined)
-			newConfig.invisible === parentConfig.invisible && (newConfig.invisible = undefined)
-			newConfig.nbt === parentConfig.nbt && (newConfig.nbt = undefined)
-			newConfig.shadowRadius === parentConfig.shadowRadius &&
-				(newConfig.shadowRadius = undefined)
-			newConfig.shadowStrength === parentConfig.shadowStrength &&
-				(newConfig.shadowStrength = undefined)
-			newConfig.useNBT === parentConfig.useNBT && (newConfig.useNBT = undefined)
-
-			if (newConfig.checkIfEqual(BoneConfig.fromJSON(bone.configs.default))) {
-				// Don't save the variant config if it's the same as the default
-				delete bone.configs.variants[Variant.selected!.uuid]
-				return
-			}
-
-			if (Variant.selected && !Variant.selected.isDefault) {
-				if (newConfig.inheritSettings) {
-					propagateInheritanceUp(bone, newConfig, Variant.selected.uuid)
-				}
-				bone.configs.variants[Variant.selected.uuid] = newConfig.toJSON()
-				propagateInheritanceDown(bone, newConfig, Variant.selected.uuid)
-			} else {
-				if (newConfig.inheritSettings) {
-					propagateInheritanceUp(bone, newConfig)
-				}
-				bone.configs.default = newConfig.toJSON()
-				propagateInheritanceDown(bone, newConfig)
-			}
-
-			Project!.saved = false
-		},
-	}).show()
-}
-
-export const BONE_CONFIG_ACTION = registerAction(
-	{ id: `animated-java:bone-config` },
-	{
-		icon: 'settings',
-		name: translate('action.open_bone_config.name'),
-		condition: activeProjectIsBlueprintFormat,
-		click: () => {
-			if (!Group.first_selected) return
-			openBoneConfigDialog(Group.first_selected)
-		},
-	}
-)
-
-BONE_CONFIG_ACTION.onCreated(action => {
-	Group.prototype.menu!.addAction(action, 6)
-})
diff --git a/src/interface/dialog/displayEntityConfig.ts b/src/interface/dialog/displayEntityConfig.ts
new file mode 100644
index 00000000..2c5fefb3
--- /dev/null
+++ b/src/interface/dialog/displayEntityConfig.ts
@@ -0,0 +1,174 @@
+import { TextDisplay } from 'src/outliner/textDisplay'
+import { VanillaBlockDisplay } from 'src/outliner/vanillaBlockDisplay'
+import { VanillaItemDisplay } from 'src/outliner/vanillaItemDisplay'
+import { IDisplayEntityConfigs } from 'src/systems/rigRenderer'
+import { registerAction } from 'src/util/moddingTools'
+import { Valuable } from 'src/util/stores'
+import DisplayEntityConfigDialog from '../../components/displayEntityConfigDialog.svelte'
+import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
+import { SvelteDialog } from '../../util/svelteDialog'
+import { translate } from '../../util/translation'
+
+export type DisplayEntity = Group | TextDisplay | VanillaItemDisplay | VanillaBlockDisplay
+
+function isDisplayEntity(object: any): object is DisplayEntity {
+	return (
+		object instanceof Group ||
+		object instanceof TextDisplay ||
+		object instanceof VanillaItemDisplay ||
+		object instanceof VanillaBlockDisplay
+	)
+}
+
+export function openDisplayEntityConfigDialog(displayEntity: DisplayEntity) {
+	const onSummonFunction = new Valuable(displayEntity.onSummonFunction ?? '')
+	const configs = structuredClone(displayEntity.configs)
+
+	new SvelteDialog({
+		id: `animated-java:displayEntityConfig`,
+		title: translate('dialog.display_entity.title', displayEntity.name),
+		width: 600,
+		content: {
+			component: DisplayEntityConfigDialog,
+			props: {
+				displayEntity,
+				onSummonFunction,
+				configs,
+			},
+		},
+		preventKeybinds: true,
+		onConfirm() {
+			console.log('Saving display entity config for', displayEntity.name, configs)
+
+			displayEntity.onSummonFunction = onSummonFunction.get().trim()
+			displayEntity.configs = configs
+
+			Project!.saved = false
+		},
+	}).show()
+}
+
+let clipboard: {
+	sourceName: string
+	onSummonFunction: string
+	configs: IDisplayEntityConfigs
+} | null = null
+
+const COPY_DISPLAY_ENTITY_CONFIG_ACTION = registerAction(
+	{ id: `animated-java:action/copy-display-entity-config` },
+	{
+		icon: 'content_copy',
+		name: translate('action.copy_display_entity_config.name'),
+		click: () => {
+			const displayEntity = Group.first_selected ?? selected.at(0)
+			if (isDisplayEntity(displayEntity)) {
+				clipboard = {
+					sourceName: displayEntity.name,
+					onSummonFunction: displayEntity.onSummonFunction ?? '',
+					configs: structuredClone(displayEntity.configs),
+				}
+				Blockbench.showQuickMessage(
+					translate('action.copy_display_entity_config.message', clipboard.sourceName)
+				)
+			} else {
+				console.error(
+					'Attempted to copy display entity config with no display entity selected'
+				)
+			}
+		},
+	}
+)
+
+const PASTE_DISPLAY_ENTITY_CONFIG_ACTION = registerAction(
+	{ id: `animated-java:action/paste-display-entity-config` },
+	{
+		icon: 'content_paste',
+		name: translate('action.paste_display_entity_config.name'),
+		condition: () => !!clipboard && activeProjectIsBlueprintFormat(),
+		click: () => {
+			if (!clipboard) return
+			const displayEntity = Group.first_selected ?? selected.at(0)
+			if (isDisplayEntity(displayEntity)) {
+				if (displayEntity instanceof Group) {
+					Undo.initEdit({ group: displayEntity })
+				} else {
+					Undo.initEdit({ elements: [displayEntity] })
+				}
+				displayEntity.onSummonFunction = clipboard.onSummonFunction
+				displayEntity.configs = structuredClone(clipboard.configs)
+				const message = translate(
+					'action.paste_display_entity_config.message',
+					clipboard.sourceName
+				)
+				if (displayEntity instanceof Group) {
+					Undo.finishEdit(message, { group: displayEntity })
+				} else {
+					Undo.finishEdit(message, { elements: [displayEntity] })
+				}
+				Blockbench.showQuickMessage(message)
+			} else {
+				console.error(
+					'Attempted to paste display entity config with no display entity selected'
+				)
+			}
+		},
+	}
+)
+
+export const DISPLAY_ENTITY_CONFIG_ACTION = registerAction(
+	{
+		id: `animated-java:action/open-display-entity-config`,
+		dependencies: [
+			'animated-java:action/copy-display-entity-config',
+			'animated-java:action/paste-display-entity-config',
+		],
+	},
+	{
+		icon: 'settings',
+		name: translate('action.open_display_entity_config.name'),
+		condition: activeProjectIsBlueprintFormat,
+		click: () => {
+			const displayEntity = Group.first_selected ?? selected.at(0)
+			if (isDisplayEntity(displayEntity)) {
+				openDisplayEntityConfigDialog(displayEntity)
+			} else {
+				console.error(
+					'Attempted to open display entity config dialog with no display entity selected'
+				)
+			}
+		},
+	}
+)
+
+DISPLAY_ENTITY_CONFIG_ACTION.onCreated(action => {
+	const copyAction = COPY_DISPLAY_ENTITY_CONFIG_ACTION.get()
+	if (!copyAction) {
+		console.error('Copy display entity config action not registered')
+		return
+	}
+	const pasteAction = PASTE_DISPLAY_ENTITY_CONFIG_ACTION.get()
+	if (!pasteAction) {
+		console.error('Paste display entity config action not registered')
+		return
+	}
+
+	Group.prototype.menu!.structure.splice(6, 0, '_')
+	Group.prototype.menu!.addAction(action, 7)
+	Group.prototype.menu!.addAction(copyAction, 8)
+	Group.prototype.menu!.addAction(pasteAction, 9)
+
+	const displayEntityMenu = new Menu([
+		...Outliner.control_menu_group,
+		'_',
+		action,
+		copyAction,
+		pasteAction,
+		'_',
+		'rename',
+		'delete',
+	])
+
+	TextDisplay.prototype.menu = displayEntityMenu
+	VanillaItemDisplay.prototype.menu = displayEntityMenu
+	VanillaBlockDisplay.prototype.menu = displayEntityMenu
+})
diff --git a/src/interface/dialog/textDisplayConfig.ts b/src/interface/dialog/textDisplayConfig.ts
deleted file mode 100644
index fd22aa63..00000000
--- a/src/interface/dialog/textDisplayConfig.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { registerAction } from 'src/util/moddingTools'
-import TextDisplayConfigDialog from '../../components/textDisplayConfigDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
-import { TextDisplayConfig } from '../../nodeConfigs'
-import { TextDisplay } from '../../outliner/textDisplay'
-import { Valuable } from '../../util/stores'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-
-export function openBoneConfigDialog(bone: TextDisplay) {
-	// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object
-	const oldConfig = TextDisplayConfig.fromJSON((bone.config ??= new TextDisplayConfig().toJSON()))
-
-	const billboard = new Valuable(oldConfig.billboard as string)
-	const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
-	const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
-	const glowing = new Valuable(oldConfig.glowing)
-	const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
-	const glowColor = new Valuable(oldConfig.glowColor)
-	const invisible = new Valuable(oldConfig.invisible)
-	const nbt = new Valuable(oldConfig.nbt)
-	const shadowRadius = new Valuable(oldConfig.shadowRadius)
-	const shadowStrength = new Valuable(oldConfig.shadowStrength)
-	const useNBT = new Valuable(oldConfig.useNBT)
-
-	new SvelteDialog({
-		id: `${PACKAGE.name}:textDisplayConfigDialog`,
-		title: translate('dialog.text_display_config.title'),
-		width: 600,
-		content: {
-			component: TextDisplayConfigDialog,
-			props: {
-				billboard,
-				overrideBrightness,
-				brightnessOverride,
-				glowing,
-				overrideGlowColor,
-				glowColor,
-				invisible,
-				nbt,
-				shadowRadius,
-				shadowStrength,
-				useNBT,
-			},
-		},
-		preventKeybinds: true,
-		onConfirm() {
-			const newConfig = new TextDisplayConfig()
-
-			newConfig.billboard = billboard.get() as any
-			newConfig.overrideBrightness = overrideBrightness.get()
-			newConfig.brightnessOverride = brightnessOverride.get()
-			newConfig.glowing = glowing.get()
-			newConfig.overrideGlowColor = overrideGlowColor.get()
-			newConfig.glowColor = glowColor.get()
-			newConfig.invisible = invisible.get()
-			newConfig.nbt = nbt.get()
-			newConfig.shadowRadius = shadowRadius.get()
-			newConfig.shadowStrength = shadowStrength.get()
-			newConfig.useNBT = useNBT.get()
-
-			const defaultConfig = TextDisplayConfig.getDefault()
-
-			newConfig.billboard === defaultConfig.billboard && (newConfig.billboard = undefined)
-			newConfig.overrideBrightness === defaultConfig.overrideBrightness &&
-				(newConfig.overrideBrightness = undefined)
-			newConfig.brightnessOverride === defaultConfig.brightnessOverride &&
-				(newConfig.brightnessOverride = undefined)
-			newConfig.glowing === defaultConfig.glowing && (newConfig.glowing = undefined)
-			newConfig.overrideGlowColor === defaultConfig.overrideGlowColor &&
-				(newConfig.overrideGlowColor = undefined)
-			newConfig.glowColor === defaultConfig.glowColor && (newConfig.glowColor = undefined)
-			newConfig.invisible === defaultConfig.invisible && (newConfig.invisible = undefined)
-			newConfig.nbt === defaultConfig.nbt && (newConfig.nbt = undefined)
-			newConfig.shadowRadius === defaultConfig.shadowRadius &&
-				(newConfig.shadowRadius = undefined)
-			newConfig.shadowStrength === defaultConfig.shadowStrength &&
-				(newConfig.shadowStrength = undefined)
-			newConfig.useNBT === defaultConfig.useNBT && (newConfig.useNBT = undefined)
-
-			bone.config = newConfig.toJSON()
-
-			Project!.saved = false
-		},
-	}).show()
-}
-
-export const TEXT_DISPLAY_CONFIG_ACTION = registerAction(
-	{ id: `animated-java:text-display-config` },
-	{
-		icon: 'settings',
-		name: translate('action.open_text_display_config.name'),
-		condition: () => activeProjectIsBlueprintFormat(),
-		click: () => {
-			if (TextDisplay.selected.length === 0) return
-			openBoneConfigDialog(TextDisplay.selected[0])
-		},
-	}
-)
-
-TEXT_DISPLAY_CONFIG_ACTION.onCreated(action => {
-	TextDisplay.prototype.menu = new Menu([
-		...Outliner.control_menu_group,
-		action,
-		'_',
-		'rename',
-		'delete',
-	])
-})
diff --git a/src/interface/dialog/vanillaBlockDisplayConfig.ts b/src/interface/dialog/vanillaBlockDisplayConfig.ts
deleted file mode 100644
index 8a21ba9c..00000000
--- a/src/interface/dialog/vanillaBlockDisplayConfig.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { registerAction } from 'src/util/moddingTools'
-import VanillaBlockDisplayConfigDialog from '../../components/vanillaBlockDisplayConfigDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
-import { BoneConfig } from '../../nodeConfigs'
-import { VanillaBlockDisplay } from '../../outliner/vanillaBlockDisplay'
-import { Valuable } from '../../util/stores'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-
-export function openVanillaBlockDisplayConfigDialog(display: VanillaBlockDisplay) {
-	// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object
-	const oldConfig = BoneConfig.fromJSON((display.config ??= new BoneConfig().toJSON()))
-
-	const customName = new Valuable(oldConfig.customName)
-	const customNameVisible = new Valuable(oldConfig.customNameVisible)
-	const billboard = new Valuable(oldConfig.billboard as string)
-	const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
-	const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
-	const glowing = new Valuable(oldConfig.glowing)
-	const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
-	const glowColor = new Valuable(oldConfig.glowColor)
-	const invisible = new Valuable(oldConfig.invisible)
-	const nbt = new Valuable(oldConfig.nbt)
-	const shadowRadius = new Valuable(oldConfig.shadowRadius)
-	const shadowStrength = new Valuable(oldConfig.shadowStrength)
-	const useNBT = new Valuable(oldConfig.useNBT)
-
-	new SvelteDialog({
-		id: `${PACKAGE.name}:vanillaItemDisplayConfigDialog`,
-		title: translate('dialog.vanilla_block_display_config.title'),
-		width: 600,
-		content: {
-			component: VanillaBlockDisplayConfigDialog,
-			props: {
-				customName,
-				customNameVisible,
-				billboard,
-				overrideBrightness,
-				brightnessOverride,
-				glowing,
-				overrideGlowColor,
-				glowColor,
-				invisible,
-				nbt,
-				shadowRadius,
-				shadowStrength,
-				useNBT,
-			},
-		},
-		preventKeybinds: true,
-		onConfirm() {
-			const newConfig = new BoneConfig()
-
-			newConfig.customName = customName.get()
-			newConfig.customNameVisible = customNameVisible.get()
-			newConfig.billboard = billboard.get() as any
-			newConfig.overrideBrightness = overrideBrightness.get()
-			newConfig.brightnessOverride = brightnessOverride.get()
-			newConfig.glowing = glowing.get()
-			newConfig.overrideGlowColor = overrideGlowColor.get()
-			newConfig.glowColor = glowColor.get()
-			newConfig.invisible = invisible.get()
-			newConfig.nbt = nbt.get()
-			newConfig.shadowRadius = shadowRadius.get()
-			newConfig.shadowStrength = shadowStrength.get()
-			newConfig.useNBT = useNBT.get()
-
-			const defaultConfig = BoneConfig.getDefault()
-
-			newConfig.customName === defaultConfig.customName && (newConfig.customName = undefined)
-			newConfig.customNameVisible === defaultConfig.customNameVisible &&
-				(newConfig.customNameVisible = undefined)
-			newConfig.billboard === defaultConfig.billboard && (newConfig.billboard = undefined)
-			newConfig.overrideBrightness === defaultConfig.overrideBrightness &&
-				(newConfig.overrideBrightness = undefined)
-			newConfig.brightnessOverride === defaultConfig.brightnessOverride &&
-				(newConfig.brightnessOverride = undefined)
-			newConfig.glowing === defaultConfig.glowing && (newConfig.glowing = undefined)
-			newConfig.overrideGlowColor === defaultConfig.overrideGlowColor &&
-				(newConfig.overrideGlowColor = undefined)
-			newConfig.glowColor === defaultConfig.glowColor && (newConfig.glowColor = undefined)
-			newConfig.invisible === defaultConfig.invisible && (newConfig.invisible = undefined)
-			newConfig.nbt === defaultConfig.nbt && (newConfig.nbt = undefined)
-			newConfig.shadowRadius === defaultConfig.shadowRadius &&
-				(newConfig.shadowRadius = undefined)
-			newConfig.shadowStrength === defaultConfig.shadowStrength &&
-				(newConfig.shadowStrength = undefined)
-			newConfig.useNBT === defaultConfig.useNBT && (newConfig.useNBT = undefined)
-
-			display.config = newConfig.toJSON()
-
-			Project!.saved = false
-		},
-	}).show()
-}
-
-export const VANILLA_BLOCK_DISPLAY_CONFIG_ACTION = registerAction(
-	{ id: `animated-java:open-vanilla-block-display-config` },
-	{
-		icon: 'settings',
-		name: translate('action.open_vanilla_block_display_config.name'),
-		condition: () => activeProjectIsBlueprintFormat(),
-		click: () => {
-			if (VanillaBlockDisplay.selected.length === 0) return
-			openVanillaBlockDisplayConfigDialog(VanillaBlockDisplay.selected[0])
-		},
-	}
-)
-
-VANILLA_BLOCK_DISPLAY_CONFIG_ACTION.onCreated(action => {
-	VanillaBlockDisplay.prototype.menu = new Menu([
-		...Outliner.control_menu_group,
-		action,
-		'_',
-		'rename',
-		'delete',
-	])
-})
diff --git a/src/interface/dialog/vanillaItemDisplayConfig.ts b/src/interface/dialog/vanillaItemDisplayConfig.ts
deleted file mode 100644
index 3af832c0..00000000
--- a/src/interface/dialog/vanillaItemDisplayConfig.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { registerAction } from 'src/util/moddingTools'
-import VanillaItemDisplayConfigDialog from '../../components/vanillaItemDisplayConfigDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
-import { BoneConfig } from '../../nodeConfigs'
-import { VanillaItemDisplay } from '../../outliner/vanillaItemDisplay'
-import { Valuable } from '../../util/stores'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-
-export function openVanillaItemDisplayConfigDialog(display: VanillaItemDisplay) {
-	// Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object
-	const oldConfig = BoneConfig.fromJSON((display.config ??= new BoneConfig().toJSON()))
-
-	const customName = new Valuable(oldConfig.customName)
-	const customNameVisible = new Valuable(oldConfig.customNameVisible)
-	const billboard = new Valuable(oldConfig.billboard as string)
-	const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
-	const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
-	const glowing = new Valuable(oldConfig.glowing)
-	const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
-	const glowColor = new Valuable(oldConfig.glowColor)
-	const invisible = new Valuable(oldConfig.invisible)
-	const nbt = new Valuable(oldConfig.nbt)
-	const shadowRadius = new Valuable(oldConfig.shadowRadius)
-	const shadowStrength = new Valuable(oldConfig.shadowStrength)
-	const useNBT = new Valuable(oldConfig.useNBT)
-
-	new SvelteDialog({
-		id: `${PACKAGE.name}:vanillaItemDisplayConfigDialog`,
-		title: translate('dialog.vanilla_item_display_config.title'),
-		width: 600,
-		content: {
-			component: VanillaItemDisplayConfigDialog,
-			props: {
-				customName,
-				customNameVisible,
-				billboard,
-				overrideBrightness,
-				brightnessOverride,
-				glowing,
-				overrideGlowColor,
-				glowColor,
-				invisible,
-				nbt,
-				shadowRadius,
-				shadowStrength,
-				useNBT,
-			},
-		},
-		preventKeybinds: true,
-		onConfirm() {
-			const newConfig = new BoneConfig()
-
-			newConfig.customName = customName.get()
-			newConfig.customNameVisible = customNameVisible.get()
-			newConfig.billboard = billboard.get() as any
-			newConfig.overrideBrightness = overrideBrightness.get()
-			newConfig.brightnessOverride = brightnessOverride.get()
-			newConfig.glowing = glowing.get()
-			newConfig.overrideGlowColor = overrideGlowColor.get()
-			newConfig.glowColor = glowColor.get()
-			newConfig.invisible = invisible.get()
-			newConfig.nbt = nbt.get()
-			newConfig.shadowRadius = shadowRadius.get()
-			newConfig.shadowStrength = shadowStrength.get()
-			newConfig.useNBT = useNBT.get()
-
-			const defaultConfig = BoneConfig.getDefault()
-
-			newConfig.customName === defaultConfig.customName && (newConfig.customName = undefined)
-			newConfig.customNameVisible === defaultConfig.customNameVisible &&
-				(newConfig.customNameVisible = undefined)
-			newConfig.billboard === defaultConfig.billboard && (newConfig.billboard = undefined)
-			newConfig.overrideBrightness === defaultConfig.overrideBrightness &&
-				(newConfig.overrideBrightness = undefined)
-			newConfig.brightnessOverride === defaultConfig.brightnessOverride &&
-				(newConfig.brightnessOverride = undefined)
-			newConfig.glowing === defaultConfig.glowing && (newConfig.glowing = undefined)
-			newConfig.overrideGlowColor === defaultConfig.overrideGlowColor &&
-				(newConfig.overrideGlowColor = undefined)
-			newConfig.glowColor === defaultConfig.glowColor && (newConfig.glowColor = undefined)
-			newConfig.invisible === defaultConfig.invisible && (newConfig.invisible = undefined)
-			newConfig.nbt === defaultConfig.nbt && (newConfig.nbt = undefined)
-			newConfig.shadowRadius === defaultConfig.shadowRadius &&
-				(newConfig.shadowRadius = undefined)
-			newConfig.shadowStrength === defaultConfig.shadowStrength &&
-				(newConfig.shadowStrength = undefined)
-			newConfig.useNBT === defaultConfig.useNBT && (newConfig.useNBT = undefined)
-
-			display.config = newConfig.toJSON()
-
-			Project!.saved = false
-		},
-	}).show()
-}
-
-export const VANILLA_ITEM_DISPLAY_CONFIG_ACTION = registerAction(
-	{ id: `animated-java:open-vanilla-item-display-config` },
-	{
-		icon: 'settings',
-		name: translate('action.open_vanilla_item_display_config.name'),
-		condition: () => activeProjectIsBlueprintFormat(),
-		click: () => {
-			if (VanillaItemDisplay.selected.length === 0) return
-			openVanillaItemDisplayConfigDialog(VanillaItemDisplay.selected[0])
-		},
-	}
-)
-
-VANILLA_ITEM_DISPLAY_CONFIG_ACTION.onCreated(action => {
-	VanillaItemDisplay.prototype.menu = new Menu([
-		...Outliner.control_menu_group,
-		action,
-		'_',
-		'rename',
-		'delete',
-	])
-})
diff --git a/src/interface/panel/textDisplayElement.ts b/src/interface/panel/textDisplayElement.ts
index edfeb65d..545bfcaf 100644
--- a/src/interface/panel/textDisplayElement.ts
+++ b/src/interface/panel/textDisplayElement.ts
@@ -1,14 +1,45 @@
 import { JsonTextParser } from 'src/systems/jsonText/parser'
-import { registerMountSvelteComponentMod } from 'src/util/mountSvelteComponent'
+import EVENTS from 'src/util/events'
+import { registerProjectMod } from 'src/util/moddingTools'
+import { mountSvelteComponent } from 'src/util/mountSvelteComponent'
 import TextDisplayElementPanel from '../../components/textDisplayElementPanel.svelte'
-import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
+import { activeProjectIsBlueprintFormat, BLUEPRINT_FORMAT_ID } from '../../formats/blueprint'
 import { type Alignment, TextDisplay } from '../../outliner/textDisplay'
 import { translate } from '../../util/translation'
 
-registerMountSvelteComponentMod({
-	id: 'animated-java:panel/text-display',
-	component: TextDisplayElementPanel,
-	target: '#panel_element',
+let mounted: TextDisplayElementPanel | null = null
+
+const destroyMounted = () => {
+	mounted?.$destroy()
+	mounted = null
+}
+
+const updatePanel = () => {
+	destroyMounted()
+	const textDisplay = TextDisplay.selected.at(0)
+	if (textDisplay) {
+		mounted = mountSvelteComponent({
+			component: TextDisplayElementPanel,
+			props: { selected: textDisplay },
+			target: '#panel_element',
+		})
+	}
+}
+
+registerProjectMod({
+	id: 'animated-java:append-element-panel/text-display',
+
+	condition: project => project.format.id === BLUEPRINT_FORMAT_ID,
+
+	apply: () => {
+		const unsubscribers = [EVENTS.UPDATE_SELECTION.subscribe(updatePanel)]
+		return { unsubscribers }
+	},
+
+	revert: ({ unsubscribers }) => {
+		unsubscribers.forEach(u => u())
+		destroyMounted()
+	},
 })
 
 type Grammar = ReturnType<typeof Prism.languages.extend>
@@ -103,6 +134,7 @@ export const TEXT_DISPLAY_WIDTH_SLIDER = new NumSlider(
 			const newLineWidth = Math.clamp(value(selected.lineWidth), 1, 10000)
 			if (selected.lineWidth === newLineWidth) return
 			selected.lineWidth = newLineWidth
+			selected.updateTextMesh()
 			Project.saved = false
 		},
 	}
@@ -135,7 +167,13 @@ TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.set = function (this: ColorPicker, color: t
 
 	const selected = TextDisplay.selected.at(0)
 	if (!selected) return this
+
+	const value = color.toHex8String()
+	if (selected.backgroundColor === value) return this
+
 	selected.backgroundColor = color.toHex8String()
+	selected.updateTextMesh()
+	Project!.saved = false
 	return this
 }
 TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.change = function (
@@ -145,9 +183,13 @@ TEXT_DISPLAY_BACKGROUND_COLOR_PICKER.change = function (
 	if (!Project) return this
 	const selected = TextDisplay.selected.at(0)
 	if (!selected) return this
+
 	const newBackground = color.toHex8String()
+
 	if (selected.backgroundColor === newBackground) return this
+
 	selected.backgroundColor = newBackground
+	selected.updateTextMesh()
 	Project!.saved = false
 	return this
 }
@@ -166,6 +208,7 @@ export const TEXT_DISPLAY_SHADOW_TOGGLE = new Toggle(`animated-java:text-display
 		if (!selected) return
 		if (selected.shadow === TEXT_DISPLAY_SHADOW_TOGGLE.value) return
 		selected.shadow = TEXT_DISPLAY_SHADOW_TOGGLE.value
+		selected.updateTextMesh()
 		Project!.saved = false
 	},
 })
@@ -205,7 +248,12 @@ TEXT_DISPLAY_ALIGNMENT_SELECT.set = function (this: BarSelect<Alignment>, value:
 	if (!this.nodes.includes(this.node)) {
 		$(this.node).find('bb-select').text(name)
 	}
+
+	if (selected.align === value) return this
+
 	selected.align = value
+	selected.updateTextMesh()
+	Project!.saved = false
 	return this
 }
 
@@ -224,6 +272,7 @@ export const TEXT_DISPLAY_SEE_THROUGH_TOGGLE = new Toggle(
 			if (!selected) return
 			if (selected.seeThrough === TEXT_DISPLAY_SEE_THROUGH_TOGGLE.value) return
 			selected.seeThrough = TEXT_DISPLAY_SEE_THROUGH_TOGGLE.value
+			selected.updateTextMesh()
 			Project!.saved = false
 		},
 	}
diff --git a/src/interface/panel/vanillaBlockDisplayElement.ts b/src/interface/panel/vanillaBlockDisplayElement.ts
index f3e135ae..d39937d2 100644
--- a/src/interface/panel/vanillaBlockDisplayElement.ts
+++ b/src/interface/panel/vanillaBlockDisplayElement.ts
@@ -1,8 +1,45 @@
-import { registerMountSvelteComponentMod } from 'src/util/mountSvelteComponent'
+import { BLUEPRINT_FORMAT_ID } from 'src/formats/blueprint'
+import { VanillaBlockDisplay } from 'src/outliner/vanillaBlockDisplay'
+import EVENTS from 'src/util/events'
+import { registerProjectMod } from 'src/util/moddingTools'
+import { mountSvelteComponent } from 'src/util/mountSvelteComponent'
 import VanillaBlockDisplayElementPanel from '../../components/vanillaBlockDisplayElementPanel.svelte'
 
-registerMountSvelteComponentMod({
+let mounted: VanillaBlockDisplayElementPanel | null = null
+
+const destroyMounted = () => {
+	mounted?.$destroy()
+	mounted = null
+}
+
+const updatePanel = () => {
+	destroyMounted()
+	const blockDisplay = VanillaBlockDisplay.selected.at(0)
+	if (blockDisplay) {
+		mounted = mountSvelteComponent({
+			component: VanillaBlockDisplayElementPanel,
+			props: { selected: blockDisplay },
+			target: '#panel_element',
+		})
+	}
+}
+
+registerProjectMod({
 	id: 'animated-java:append-element-panel/vanilla-block-display',
-	component: VanillaBlockDisplayElementPanel,
-	target: '#panel_element',
+
+	condition: project => project.format.id === BLUEPRINT_FORMAT_ID,
+
+	apply: () => {
+		const unsubscribers = [
+			EVENTS.UNDO.subscribe(updatePanel),
+			EVENTS.REDO.subscribe(updatePanel),
+			EVENTS.UPDATE_SELECTION.subscribe(updatePanel),
+		]
+		return { unsubscribers }
+	},
+
+	revert: ({ unsubscribers }) => {
+		unsubscribers.forEach(u => u())
+		destroyMounted()
+	},
 })
diff --git a/src/interface/panel/vanillaItemDisplayElement.ts b/src/interface/panel/vanillaItemDisplayElement.ts
index cf9dbd85..6837ee1c 100644
--- a/src/interface/panel/vanillaItemDisplayElement.ts
+++ b/src/interface/panel/vanillaItemDisplayElement.ts
@@ -1,15 +1,49 @@
-import { registerMountSvelteComponentMod } from 'src/util/mountSvelteComponent'
+import { registerProjectMod } from 'src/util/moddingTools'
+import { mountSvelteComponent } from 'src/util/mountSvelteComponent'
 import VanillaItemDisplayElementPanel from '../../components/vanillaItemDisplayElementPanel.svelte'
 import { PACKAGE } from '../../constants'
-import { activeProjectIsBlueprintFormat } from '../../formats/blueprint'
+import { activeProjectIsBlueprintFormat, BLUEPRINT_FORMAT_ID } from '../../formats/blueprint'
 import { type ItemDisplayMode, VanillaItemDisplay } from '../../outliner/vanillaItemDisplay'
 import EVENTS from '../../util/events'
 import { translate } from '../../util/translation'
 
-registerMountSvelteComponentMod({
+let mounted: VanillaItemDisplayElementPanel | null = null
+
+const destroyMounted = () => {
+	mounted?.$destroy()
+	mounted = null
+}
+
+const updatePanel = () => {
+	destroyMounted()
+	const itemDisplay = VanillaItemDisplay.selected.at(0)
+	if (itemDisplay) {
+		mounted = mountSvelteComponent({
+			component: VanillaItemDisplayElementPanel,
+			props: { selected: itemDisplay },
+			target: '#panel_element',
+		})
+	}
+}
+
+registerProjectMod({
 	id: 'animated-java:append-element-panel/vanilla-item-display',
-	component: VanillaItemDisplayElementPanel,
-	target: '#panel_element',
+
+	condition: project => project.format.id === BLUEPRINT_FORMAT_ID,
+
+	apply: () => {
+		const unsubscribers = [
+			EVENTS.UNDO.subscribe(updatePanel),
+			EVENTS.REDO.subscribe(updatePanel),
+			EVENTS.UPDATE_SELECTION.subscribe(updatePanel),
+		]
+		return { unsubscribers }
+	},
+
+	revert: ({ unsubscribers }) => {
+		unsubscribers.forEach(u => u())
+		destroyMounted()
+	},
 })
 
 export const ITEM_DISPLAY_ITEM_DISPLAY_SELECT = new BarSelect(
diff --git a/src/lang/en.yml b/src/lang/en.yml
index 57f18d0c..e958af20 100644
--- a/src/lang/en.yml
+++ b/src/lang/en.yml
@@ -7,9 +7,8 @@ animated_java.action.open_blueprint_settings.name: Blueprint Settings
 animated_java.action.open_documentation.name: Documentation
 animated_java.action.open_changelog.name: Changelog
 animated_java.action.open_about.name: About
-animated_java.action.open_bone_config.name: Bone Config
+animated_java.action.open_display_entity_config.name: Display Entity Config
 animated_java.action.open_locator_config.name: Locator Config
-animated_java.action.open_text_display_config.name: Text Display Config
 animated_java.action.export.name: Export
 animated_java.action.export_debug.name: Export (Debug)
 animated_java.action.export_all.name: Export All
@@ -23,8 +22,10 @@ animated_java.action.extract.confirm: Confirm Extraction
 animated_java.action.create_text_display.title: Add Text Display
 animated_java.action.create_vanilla_item_display.title: Add Item Display
 animated_java.action.create_vanilla_block_display.title: Add Block Display
-animated_java.action.open_vanilla_item_display_config.name: Item Display Config
-animated_java.action.open_vanilla_block_display_config.name: Block Display Config
+animated_java.action.copy_display_entity_config.name: Copy Display Entity Config
+animated_java.action.copy_display_entity_config.message: Copied Display Entity Config from "{0}"
+animated_java.action.paste_display_entity_config.name: Paste Display Entity Config
+animated_java.action.paste_display_entity_config.message: Pasted Display Entity Config from "{0}"
 
 ### Popups
 animated_java.popup.loading.loading: Loading Animated Java...
@@ -278,79 +279,80 @@ animated_java.dialog.blueprint_settings.json_file.error.no_file_selected: No fil
 animated_java.dialog.blueprint_settings.json_file.error.not_a_file: The selected path is not a file!
 
 ## Bone Config Dialog
-animated_java.dialog.bone_config.title: Bone Config
+animated_java.dialog.display_entity.title: Display Entity Config for "{0}"
 
-animated_java.dialog.bone_config.selected_variant: 'Selected Variant: {0}'
-animated_java.dialog.bone_config.default_variant_subtitle: The settings below will be applied to this bone by default.
-animated_java.dialog.bone_config.selected_variant_subtitle: The settings below will be applied to this bone only when this variant is applied.
+animated_java.dialog.display_entity.node_options.title: Node
+animated_java.dialog.display_entity.per_variant_options.title: Per-Variant
 
-animated_java.dialog.bone_config.use_nbt.title: Use NBT
-animated_java.dialog.bone_config.use_nbt.description: Whether or not to use NBT to configure the bone instead of settings.
-animated_java.dialog.bone_config.use_nbt.use_nbt_warning: Using NBT will override all other settings, and any changes you make will not be visible in the editor. Only use this if you know what you're doing!
+animated_java.dialog.display_entity.on_summon_function.title: On-Summon Function
+animated_java.dialog.display_entity.on_summon_function.description: |-
+  Commands to run `as` the display entity when summoned.
 
-animated_java.dialog.bone_config.inherit_settings.title: Inherit Settings
-animated_java.dialog.bone_config.inherit_settings.description: Whether or not to inherit the settings from the parent bone.
+  Treat this input as if it were a `.mcfunction` file.
+
+  Supports [MC-Build](https://mcbuild.dev) syntax.
+
+animated_java.dialog.display_entity.on_apply_function.title: On-Apply Function
+animated_java.dialog.display_entity.on_apply_function.description: |-
+  Commands to run `as` the display entity when the variant is applied.
+
+  Treat this input as if it were a `.mcfunction` file.
+
+  Supports [MC-Build](https://mcbuild.dev) syntax.
 
-animated_java.dialog.bone_config.custom_name.title: Custom Name
-animated_java.dialog.bone_config.custom_name.description: The custom name of the bone.
-animated_java.dialog.bone_config.custom_name.invalid_json.error: |-
+animated_java.dialog.display_entity.custom_name.title: Custom Name
+animated_java.dialog.display_entity.custom_name.description: The custom name of the node.
+animated_java.dialog.display_entity.custom_name.invalid_json.error: |-
   Invalid JSON Text!
   {0}
 
-animated_java.dialog.bone_config.custom_name_visible.title: Custom Name Visible
-animated_java.dialog.bone_config.custom_name_visible.description: Whether or not the custom name should always be visible.
+animated_java.dialog.display_entity.custom_name_visible.title: Custom Name Visible
+animated_java.dialog.display_entity.custom_name_visible.description: Whether or not the custom name should always be visible.
 
-animated_java.dialog.bone_config.glowing.title: Glowing
-animated_java.dialog.bone_config.glowing.description: Whether or not the bone should glow in-game.
+animated_java.dialog.display_entity.glowing.title: Glowing
+animated_java.dialog.display_entity.glowing.description: Whether or not the node should glow in-game.
 
-animated_java.dialog.bone_config.override_glow_color.title: Override Glow Color
-animated_java.dialog.bone_config.override_glow_color.description: Whether or not to override the default glow color.
+animated_java.dialog.display_entity.override_glow_color.title: Override Glow Color
+animated_java.dialog.display_entity.override_glow_color.description: Whether or not to override the default glow color.
 
-animated_java.dialog.bone_config.glow_color.title: Glow Color
-animated_java.dialog.bone_config.glow_color.description: The color of the glow.
+animated_java.dialog.display_entity.glow_color.title: Glow Color
+animated_java.dialog.display_entity.glow_color.description: The color of the glow.
 
-animated_java.dialog.bone_config.shadow_radius.title: Shadow Radius
-animated_java.dialog.bone_config.shadow_radius.description: The radius of the shadow.
+animated_java.dialog.display_entity.shadow_radius.title: Shadow Radius
+animated_java.dialog.display_entity.shadow_radius.description: The radius of the shadow.
 
-animated_java.dialog.bone_config.shadow_strength.title: Shadow Strength
-animated_java.dialog.bone_config.shadow_strength.description: The strength of the shadow.
+animated_java.dialog.display_entity.shadow_strength.title: Shadow Strength
+animated_java.dialog.display_entity.shadow_strength.description: The strength of the shadow.
 
-animated_java.dialog.bone_config.override_brightness.title: Override Brightness
-animated_java.dialog.bone_config.override_brightness.description: Whether or not to override the default brightness.
+animated_java.dialog.display_entity.override_brightness.title: Override Brightness
+animated_java.dialog.display_entity.override_brightness.description: Whether or not to override the default brightness.
 
-animated_java.dialog.bone_config.brightness_override.title: Brightness
-animated_java.dialog.bone_config.brightness_override.description: The brightness of the bone. This should be a value between 0 and 15.
+animated_java.dialog.display_entity.brightness_override.title: Brightness
+animated_java.dialog.display_entity.brightness_override.description: The brightness of the node. This should be a value between 0 and 15.
 
-animated_java.dialog.bone_config.use_custom_brightness.title: Use Custom Brightness
-animated_java.dialog.bone_config.use_custom_brightness.description: Whether or not to enable the custom brightness override for the bone.
+animated_java.dialog.display_entity.use_custom_brightness.title: Use Custom Brightness
+animated_java.dialog.display_entity.use_custom_brightness.description: Whether or not to enable the custom brightness override for the node.
 
-animated_java.dialog.bone_config.custom_brightness.title: Custom Brightness
-animated_java.dialog.bone_config.custom_brightness.description: The custom brightness of the bone. This should be a value between 0 and 15.
+animated_java.dialog.display_entity.custom_brightness.title: Custom Brightness
+animated_java.dialog.display_entity.custom_brightness.description: The custom brightness of the node. This should be a value between 0 and 15.
 
-animated_java.dialog.bone_config.enchanted.title: Enchanted
-animated_java.dialog.bone_config.enchanted.description: Whether or not the bone should be enchanted.
+animated_java.dialog.display_entity.enchanted.title: Enchanted
+animated_java.dialog.display_entity.enchanted.description: Whether or not the node should be enchanted.
 
-animated_java.dialog.bone_config.invisible.title: Invisible
-animated_java.dialog.bone_config.invisible.description: Whether or not the bone should be invisible.
-
-animated_java.dialog.bone_config.nbt.title: NBT
-animated_java.dialog.bone_config.nbt.description: The NBT to apply to the bone.
-animated_java.dialog.bone_config.nbt.invalid_nbt.not_compound: The NBT must be a compound tag! Eg. {CustomName:'"my name"'}
-animated_java.dialog.bone_config.nbt.invalid_nbt.error: |-
-  Invalid NBT!
-  {0}
+animated_java.dialog.display_entity.invisible.title: Invisible
+animated_java.dialog.display_entity.invisible.description: Whether or not the node should be invisible.
 
-animated_java.dialog.bone_config.billboard.title: Billboard
-animated_java.dialog.bone_config.billboard.description: |-
-  Controls if this entity's model should pivot to face player when rendered.
+animated_java.dialog.display_entity.billboard.title: Billboard
+animated_java.dialog.display_entity.billboard.description: |-
+  Controls if this nodes model should pivot to face player when rendered.
   - **Fixed**: Both vertical and horizontal angles are fixed.
   - **Vertical**: Pivots around vertical axis.
   - **Horizontal**: Pivots around horizontal axis.
   - **Center**: Pivots around center point.
-animated_java.dialog.bone_config.billboard.options.fixed: Fixed
-animated_java.dialog.bone_config.billboard.options.vertical: Vertical
-animated_java.dialog.bone_config.billboard.options.horizontal: Horizontal
-animated_java.dialog.bone_config.billboard.options.center: Center
+animated_java.dialog.display_entity.billboard.options.fixed: Fixed
+animated_java.dialog.display_entity.billboard.options.vertical: Vertical
+animated_java.dialog.display_entity.billboard.options.horizontal: Horizontal
+animated_java.dialog.display_entity.billboard.options.center: Center
 
 ## Locator Config Dialog
 animated_java.dialog.locator_config.title: Locator Config
diff --git a/src/mods/customKeyframes.ts b/src/mods/customKeyframes.ts
index cd52a002..a4348bd5 100644
--- a/src/mods/customKeyframes.ts
+++ b/src/mods/customKeyframes.ts
@@ -44,7 +44,7 @@ registerConditionalPropertyOverrideMod({
 		const uuid = this.data_points.at(0)?.[EFFECT_ANIMATOR_CHANNELS.VARIANT] as
 			| string
 			| undefined
-		if (uuid) return Variant.all.find(v => v.uuid === uuid)
+		if (uuid) return Variant.getByUUID(uuid)
 		console.error('Keyframe variant', uuid, 'not found!')
 	},
 
diff --git a/src/mods/globalCssMod.css b/src/mods/globalCssMod.css
index 42009841..1abcb1c6 100644
--- a/src/mods/globalCssMod.css
+++ b/src/mods/globalCssMod.css
@@ -15,3 +15,14 @@ dialog.dialog pre:has(code) {
 #collection_properties_vue > ul > li {
 	max-width: unset !important;
 }
+
+#edit_history_list ul li {
+	height: unset !important;
+}
+
+#edit_history_list > ul > li label {
+	margin-right: auto !important;
+	overflow-x: auto !important;
+	white-space: nowrap !important;
+	max-width: 75% !important;
+}
diff --git a/src/mods/groupMod.ts b/src/mods/groupMod.ts
index 12631540..dc260097 100644
--- a/src/mods/groupMod.ts
+++ b/src/mods/groupMod.ts
@@ -1,34 +1,22 @@
+import { DisplayEntityConfig } from 'src/nodeConfigs'
 import { sanitizeOutlinerElementName } from 'src/outliner/util'
 import { registerConditionalPropertyOverrideMod, registerMod } from 'src/util/moddingTools'
-import { activeProjectIsBlueprintFormat, type IBlueprintBoneConfigJSON } from '../formats/blueprint'
+import { DeepClonedObjectProperty } from 'src/util/property'
+import {
+	activeProjectIsBlueprintFormat,
+	type IBlueprintDisplayEntityConfigJSON,
+} from '../formats/blueprint'
 
 declare global {
 	interface Group {
+		onSummonFunction: string
 		configs: {
-			default: IBlueprintBoneConfigJSON
+			default: IBlueprintDisplayEntityConfigJSON
 			/**
 			 * @key Variant UUID
 			 * @value Variant Bone Config
 			 */
-			variants: Record<string, IBlueprintBoneConfigJSON>
-		}
-	}
-}
-
-class DeepClonedObjectProperty extends Property<'object'> {
-	constructor(targetClass: any, name: string, options?: PropertyOptions) {
-		super(targetClass, 'object', name, options)
-	}
-
-	merge(instance: any, data: any) {
-		if (typeof data[this.name] === 'object') {
-			instance[this.name] = JSON.parse(JSON.stringify(data[this.name]))
-		}
-	}
-
-	copy(instance: any, target: any) {
-		if (typeof instance[this.name] === 'object') {
-			target[this.name] = JSON.parse(JSON.stringify(instance[this.name]))
+			variants: Record<string, IBlueprintDisplayEntityConfigJSON>
 		}
 	}
 }
@@ -38,16 +26,24 @@ registerMod({
 	id: `animated-java:bone-properties`,
 
 	apply: () => {
-		const configs = new DeepClonedObjectProperty(Group, 'configs', {
-			condition: () => activeProjectIsBlueprintFormat(),
-			default: { default: undefined, variants: {} },
-		})
+		const properties = [
+			new Property(Group, 'string', 'onSummonFunction', {
+				condition: activeProjectIsBlueprintFormat,
+				default: '',
+			}),
+			new DeepClonedObjectProperty(Group, 'configs', {
+				condition: activeProjectIsBlueprintFormat,
+				default: () => {
+					return { default: new DisplayEntityConfig().toJSON(), variants: {} }
+				},
+			}),
+		]
 
-		return { configs }
+		return { properties }
 	},
 
-	revert: ({ configs }) => {
-		configs.delete()
+	revert: ({ properties }) => {
+		properties.forEach(prop => prop.delete())
 	},
 })
 
diff --git a/src/nodeConfigs.ts b/src/nodeConfigs.ts
index 571f7cc9..c5ec2973 100644
--- a/src/nodeConfigs.ts
+++ b/src/nodeConfigs.ts
@@ -1,17 +1,15 @@
-import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtString, NbtTag } from 'deepslate/lib/nbt'
+import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtList, NbtString } from 'deepslate/lib/nbt'
 import type {
-	IBlueprintBoneConfigJSON,
+	IBlueprintDisplayEntityConfigJSON,
 	IBlueprintLocatorConfigJSON,
-	IBlueprintTextDisplayConfigJSON,
 } from './formats/blueprint'
 import { scrubUndefined } from './util/misc'
 
 export type BillboardMode = 'fixed' | 'vertical' | 'horizontal' | 'center'
 
 // TODO: Refactor these configs to inherit from a base class
-export class BoneConfig {
-	private __customName?: string
-	private __customNameVisible?: boolean
+export class DisplayEntityConfig {
+	private __onApplyFunction?: string
 	private __billboard?: BillboardMode
 	private __overrideBrightness?: boolean
 	private __brightnessOverride?: number
@@ -19,17 +17,13 @@ export class BoneConfig {
 	private __glowing?: boolean
 	private __overrideGlowColor?: boolean
 	private __glowColor?: string
-	private __inheritSettings?: boolean
 	private __invisible?: boolean
-	private __nbt?: string
 	private __shadowRadius?: number
 	private __shadowStrength?: number
-	private __useNBT?: boolean
 
-	static getDefault(): BoneConfig {
-		return BoneConfig.fromJSON({
-			custom_name: '',
-			custom_name_visible: false,
+	static getDefault(): DisplayEntityConfig {
+		return DisplayEntityConfig.fromJSON({
+			on_apply_function: '',
 			billboard: 'fixed',
 			override_brightness: false,
 			brightness_override: 0,
@@ -37,154 +31,113 @@ export class BoneConfig {
 			glowing: false,
 			override_glow_color: false,
 			glow_color: '#ffffff',
-			inherit_settings: true,
 			invisible: false,
-			nbt: '{}',
 			shadow_radius: 0,
 			shadow_strength: 1,
-			use_nbt: false,
 		})
 	}
 
-	get customName(): NonNullable<BoneConfig['__customName']> {
-		if (this.__customName !== undefined) return this.__customName
-		const defaultConfig = BoneConfig.getDefault()
-		return defaultConfig.customName
+	get onApplyFunction(): NonNullable<DisplayEntityConfig['__onApplyFunction']> {
+		if (this.__onApplyFunction !== undefined) return this.__onApplyFunction
+		return ''
 	}
-	set customName(value: BoneConfig['__customName']) {
-		this.__customName = value
+	set onApplyFunction(value: DisplayEntityConfig['__onApplyFunction']) {
+		this.__onApplyFunction = value
 	}
 
-	get customNameVisible(): NonNullable<BoneConfig['__customNameVisible']> {
-		if (this.__customNameVisible !== undefined) return this.__customNameVisible
-		const defaultConfig = BoneConfig.getDefault()
-		return defaultConfig.customNameVisible
-	}
-	set customNameVisible(value: BoneConfig['__customNameVisible']) {
-		this.__customNameVisible = value
-	}
-
-	get billboard(): NonNullable<BoneConfig['__billboard']> {
+	get billboard(): NonNullable<DisplayEntityConfig['__billboard']> {
 		if (this.__billboard !== undefined) return this.__billboard
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.billboard
 	}
-	set billboard(value: BoneConfig['__billboard']) {
+	set billboard(value: DisplayEntityConfig['__billboard']) {
 		this.__billboard = value
 	}
 
-	get overrideBrightness(): NonNullable<BoneConfig['__overrideBrightness']> {
+	get overrideBrightness(): NonNullable<DisplayEntityConfig['__overrideBrightness']> {
 		if (this.__overrideBrightness !== undefined) return this.__overrideBrightness
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.overrideBrightness
 	}
-	set overrideBrightness(value: BoneConfig['__overrideBrightness']) {
+	set overrideBrightness(value: DisplayEntityConfig['__overrideBrightness']) {
 		this.__overrideBrightness = value
 	}
 
-	get brightnessOverride(): NonNullable<BoneConfig['__brightnessOverride']> {
+	get brightnessOverride(): NonNullable<DisplayEntityConfig['__brightnessOverride']> {
 		if (this.__brightnessOverride !== undefined) return this.__brightnessOverride
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.brightnessOverride
 	}
-	set brightnessOverride(value: BoneConfig['__brightnessOverride']) {
+	set brightnessOverride(value: DisplayEntityConfig['__brightnessOverride']) {
 		this.__brightnessOverride = value
 	}
 
-	get enchanted(): NonNullable<BoneConfig['__enchanted']> {
+	get enchanted(): NonNullable<DisplayEntityConfig['__enchanted']> {
 		if (this.__enchanted !== undefined) return this.__enchanted
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.enchanted
 	}
-	set enchanted(value: BoneConfig['__enchanted']) {
+	set enchanted(value: DisplayEntityConfig['__enchanted']) {
 		this.__enchanted = value
 	}
 
-	get glowing(): NonNullable<BoneConfig['__glowing']> {
+	get glowing(): NonNullable<DisplayEntityConfig['__glowing']> {
 		if (this.__glowing !== undefined) return this.__glowing
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.glowing
 	}
-	set glowing(value: BoneConfig['__glowing']) {
+	set glowing(value: DisplayEntityConfig['__glowing']) {
 		this.__glowing = value
 	}
 
-	get overrideGlowColor(): NonNullable<BoneConfig['__overrideGlowColor']> {
+	get overrideGlowColor(): NonNullable<DisplayEntityConfig['__overrideGlowColor']> {
 		if (this.__overrideGlowColor !== undefined) return this.__overrideGlowColor
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.overrideGlowColor
 	}
-	set overrideGlowColor(value: BoneConfig['__overrideGlowColor']) {
+	set overrideGlowColor(value: DisplayEntityConfig['__overrideGlowColor']) {
 		this.__overrideGlowColor = value
 	}
 
-	get glowColor(): NonNullable<BoneConfig['__glowColor']> {
+	get glowColor(): NonNullable<DisplayEntityConfig['__glowColor']> {
 		if (this.__glowColor !== undefined) return this.__glowColor
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.glowColor
 	}
-	set glowColor(value: BoneConfig['__glowColor']) {
+	set glowColor(value: DisplayEntityConfig['__glowColor']) {
 		this.__glowColor = value
 	}
 
-	get inheritSettings(): NonNullable<BoneConfig['__inheritSettings']> {
-		if (this.__inheritSettings !== undefined) return this.__inheritSettings
-		const defaultConfig = BoneConfig.getDefault()
-		return defaultConfig.inheritSettings
-	}
-	set inheritSettings(value: BoneConfig['__inheritSettings']) {
-		this.__inheritSettings = value
-	}
-
-	get invisible(): NonNullable<BoneConfig['__invisible']> {
+	get invisible(): NonNullable<DisplayEntityConfig['__invisible']> {
 		if (this.__invisible !== undefined) return this.__invisible
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.invisible
 	}
-	set invisible(value: BoneConfig['__invisible']) {
+	set invisible(value: DisplayEntityConfig['__invisible']) {
 		this.__invisible = value
 	}
 
-	get nbt(): NonNullable<BoneConfig['__nbt']> {
-		if (this.__nbt !== undefined) return this.__nbt
-		const defaultConfig = BoneConfig.getDefault()
-		return defaultConfig.nbt
-	}
-	set nbt(value: BoneConfig['__nbt']) {
-		this.__nbt = value
-	}
-
-	get shadowRadius(): NonNullable<BoneConfig['__shadowRadius']> {
+	get shadowRadius(): NonNullable<DisplayEntityConfig['__shadowRadius']> {
 		if (this.__shadowRadius !== undefined) return this.__shadowRadius
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.shadowRadius
 	}
-	set shadowRadius(value: BoneConfig['__shadowRadius']) {
+	set shadowRadius(value: DisplayEntityConfig['__shadowRadius']) {
 		this.__shadowRadius = value
 	}
 
-	get shadowStrength(): NonNullable<BoneConfig['__shadowStrength']> {
+	get shadowStrength(): NonNullable<DisplayEntityConfig['__shadowStrength']> {
 		if (this.__shadowStrength !== undefined) return this.__shadowStrength
-		const defaultConfig = BoneConfig.getDefault()
+		const defaultConfig = DisplayEntityConfig.getDefault()
 		return defaultConfig.shadowStrength
 	}
-	set shadowStrength(value: BoneConfig['__shadowStrength']) {
+	set shadowStrength(value: DisplayEntityConfig['__shadowStrength']) {
 		this.__shadowStrength = value
 	}
 
-	get useNBT(): NonNullable<BoneConfig['__useNBT']> {
-		if (this.__useNBT !== undefined) return this.__useNBT
-		const defaultConfig = BoneConfig.getDefault()
-		return defaultConfig.useNBT
-	}
-	set useNBT(value: BoneConfig['__useNBT']) {
-		this.__useNBT = value
-	}
-
-	checkIfEqual(other: BoneConfig) {
+	checkIfEqual(other: DisplayEntityConfig) {
 		return (
-			this.__customName === other.__customName &&
-			this.__customNameVisible === other.__customNameVisible &&
+			this.__onApplyFunction === other.__onApplyFunction &&
 			this.__billboard === other.__billboard &&
 			this.__overrideBrightness === other.__overrideBrightness &&
 			this.__brightnessOverride === other.__brightnessOverride &&
@@ -192,23 +145,19 @@ export class BoneConfig {
 			this.__glowing === other.__glowing &&
 			this.__overrideGlowColor === other.__overrideGlowColor &&
 			this.__glowColor === other.__glowColor &&
-			this.__inheritSettings === other.__inheritSettings &&
 			this.__invisible === other.__invisible &&
-			this.__nbt === other.__nbt &&
 			this.__shadowRadius === other.__shadowRadius &&
-			this.__shadowStrength === other.__shadowStrength &&
-			this.__useNBT === other.__useNBT
+			this.__shadowStrength === other.__shadowStrength
 		)
 	}
 
 	isDefault(): boolean {
-		return this.checkIfEqual(BoneConfig.getDefault())
+		return this.checkIfEqual(DisplayEntityConfig.getDefault())
 	}
 
-	toJSON(): IBlueprintBoneConfigJSON {
+	toJSON(): IBlueprintDisplayEntityConfigJSON {
 		return scrubUndefined({
-			custom_name: this.__customName,
-			custom_name_visible: this.__customNameVisible,
+			on_apply_function: this.__onApplyFunction,
 			billboard: this.__billboard,
 			override_brightness: this.__overrideBrightness,
 			brightness_override: this.__brightnessOverride,
@@ -216,19 +165,14 @@ export class BoneConfig {
 			glowing: this.__glowing,
 			override_glow_color: this.__overrideGlowColor,
 			glow_color: this.__glowColor,
-			inherit_settings: this.__inheritSettings,
 			invisible: this.__invisible,
-			nbt: this.__nbt,
 			shadow_radius: this.__shadowRadius,
 			shadow_strength: this.__shadowStrength,
-			use_nbt: this.__useNBT,
 		})
 	}
 
-	inheritFrom(other: BoneConfig) {
-		if (other.__customName !== undefined) this.customName = other.customName
-		if (other.__customNameVisible !== undefined)
-			this.customNameVisible = other.customNameVisible
+	inheritFrom(other: DisplayEntityConfig) {
+		if (other.__onApplyFunction !== undefined) this.onApplyFunction = other.onApplyFunction
 		if (other.__billboard !== undefined) this.billboard = other.billboard
 		if (other.__overrideBrightness !== undefined)
 			this.overrideBrightness = other.overrideBrightness
@@ -239,19 +183,14 @@ export class BoneConfig {
 		if (other.__overrideGlowColor !== undefined)
 			this.overrideGlowColor = other.overrideGlowColor
 		if (other.__glowColor !== undefined) this.glowColor = other.glowColor
-		if (other.__inheritSettings !== undefined) this.inheritSettings = other.inheritSettings
 		if (other.__invisible !== undefined) this.invisible = other.invisible
-		if (other.__nbt !== undefined) this.nbt = other.nbt
 		if (other.__shadowRadius !== undefined) this.shadowRadius = other.shadowRadius
 		if (other.__shadowStrength !== undefined) this.shadowStrength = other.shadowStrength
-		if (other.__useNBT !== undefined) this.useNBT = other.useNBT
 	}
 
-	static fromJSON(json: IBlueprintBoneConfigJSON): BoneConfig {
-		const config = new BoneConfig()
-		if (json.custom_name !== undefined) config.__customName = json.custom_name
-		if (json.custom_name_visible !== undefined)
-			config.__customNameVisible = json.custom_name_visible
+	static fromJSON(json: IBlueprintDisplayEntityConfigJSON): DisplayEntityConfig {
+		const config = new DisplayEntityConfig()
+		if (json.on_apply_function !== undefined) config.__onApplyFunction = json.on_apply_function
 		if (json.billboard !== undefined) config.__billboard = json.billboard
 		if (json.override_brightness !== undefined)
 			config.__overrideBrightness = json.override_brightness
@@ -262,32 +201,13 @@ export class BoneConfig {
 		if (json.override_glow_color !== undefined)
 			config.__overrideGlowColor = json.override_glow_color
 		if (json.glow_color !== undefined) config.__glowColor = json.glow_color
-		if (json.inherit_settings !== undefined) config.__inheritSettings = json.inherit_settings
 		if (json.invisible !== undefined) config.__invisible = json.invisible
-		if (json.nbt !== undefined) config.__nbt = json.nbt
 		if (json.shadow_radius !== undefined) config.__shadowRadius = json.shadow_radius
 		if (json.shadow_strength !== undefined) config.__shadowStrength = json.shadow_strength
-		if (json.use_nbt !== undefined) config.__useNBT = json.use_nbt
 		return config
 	}
 
 	toNBT(compound: NbtCompound = new NbtCompound()): NbtCompound {
-		if (this.useNBT) {
-			const newData = NbtTag.fromString(this.nbt) as NbtCompound
-			for (const key of newData.keys()) {
-				compound.set(key, newData.get(key)!)
-			}
-			return compound
-		}
-
-		if (this.__customName) {
-			compound.set('CustomName', new NbtString(this.customName))
-		}
-
-		if (this.__customNameVisible) {
-			compound.set('CustomNameVisible', new NbtByte(Number(this.customNameVisible)))
-		}
-
 		if (this.__billboard) {
 			compound.set('billboard', new NbtString(this.billboard))
 		}
@@ -302,20 +222,39 @@ export class BoneConfig {
 		}
 
 		if (this.enchanted) {
-			const item = (compound.get('item') as NbtCompound) || new NbtCompound()
-			compound.set(
-				'item',
-				item.set(
-					'components',
-					new NbtCompound().set(
-						'minecraft:enchantments',
-						new NbtCompound().set(
-							'levels',
-							new NbtCompound().set('minecraft:infinity', new NbtInt(1))
-						)
-					)
+			const item = (compound.get('item') as NbtCompound) ?? new NbtCompound()
+			if (!compareVersions('1.21.5', Project!.animated_java.target_minecraft_version)) {
+				// >= 1.21.5
+				const components = (item.get('components') as NbtCompound) ?? new NbtCompound()
+				item.set('components', components)
+				const enchantments =
+					(components.get('minecraft:enchantments') as NbtCompound) ?? new NbtCompound()
+				components.set('minecraft:enchantments', enchantments)
+				enchantments.set('minecraft:infinity', new NbtInt(1))
+			} else if (compareVersions(Project!.animated_java.target_minecraft_version, '1.20.4')) {
+				// 1.20.5 - 1.21.4
+				const components = (item.get('components') as NbtCompound) ?? new NbtCompound()
+				item.set('components', components)
+				const enchantments =
+					(components.get('minecraft:enchantments') as NbtCompound) ?? new NbtCompound()
+				components.set('minecraft:enchantments', enchantments)
+				enchantments.set(
+					'levels',
+					new NbtCompound().set('minecraft:infinity', new NbtInt(1))
 				)
-			)
+			} else {
+				// <= 1.20.4
+				const tag = (item.get('tag') as NbtCompound) ?? new NbtCompound()
+				item.set('tag', tag)
+				const enchantments = (tag.get('Enchantments') as NbtList) ?? new NbtList()
+				tag.set('Enchantments', enchantments)
+				enchantments.add(
+					new NbtCompound()
+						.set('id', new NbtString('minecraft:infinity'))
+						.set('lvl', new NbtInt(1))
+				)
+			}
+			compound.set('item', item)
 		}
 
 		if (this.glowing) {
@@ -458,251 +397,3 @@ export class LocatorConfig {
 		)
 	}
 }
-
-export class TextDisplayConfig {
-	private __billboard?: BillboardMode
-	private __overrideBrightness?: boolean
-	private __brightnessOverride?: number
-	private __glowing?: boolean
-	private __overrideGlowColor?: boolean
-	private __glowColor?: string
-	private __invisible?: boolean
-	private __shadowRadius?: number
-	private __shadowStrength?: number
-	private __useNBT?: boolean
-	private __nbt?: string
-
-	static getDefault(): TextDisplayConfig {
-		return TextDisplayConfig.fromJSON({
-			billboard: 'fixed',
-			override_brightness: false,
-			brightness_override: 0,
-			glowing: false,
-			override_glow_color: false,
-			glow_color: '#ffffff',
-			invisible: false,
-			nbt: '{}',
-			shadow_radius: 0,
-			shadow_strength: 1,
-			use_nbt: false,
-		})
-	}
-
-	get billboard(): NonNullable<TextDisplayConfig['__billboard']> {
-		if (this.__billboard !== undefined) return this.__billboard
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.billboard
-	}
-	set billboard(value: TextDisplayConfig['__billboard']) {
-		this.__billboard = value
-	}
-
-	get overrideBrightness(): NonNullable<TextDisplayConfig['__overrideBrightness']> {
-		if (this.__overrideBrightness !== undefined) return this.__overrideBrightness
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.overrideBrightness
-	}
-	set overrideBrightness(value: TextDisplayConfig['__overrideBrightness']) {
-		this.__overrideBrightness = value
-	}
-
-	get brightnessOverride(): NonNullable<TextDisplayConfig['__brightnessOverride']> {
-		if (this.__brightnessOverride !== undefined) return this.__brightnessOverride
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.brightnessOverride
-	}
-	set brightnessOverride(value: TextDisplayConfig['__brightnessOverride']) {
-		this.__brightnessOverride = value
-	}
-
-	get glowing(): NonNullable<TextDisplayConfig['__glowing']> {
-		if (this.__glowing !== undefined) return this.__glowing
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.glowing
-	}
-	set glowing(value: TextDisplayConfig['__glowing']) {
-		this.__glowing = value
-	}
-
-	get overrideGlowColor(): NonNullable<TextDisplayConfig['__overrideGlowColor']> {
-		if (this.__overrideGlowColor !== undefined) return this.__overrideGlowColor
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.overrideGlowColor
-	}
-	set overrideGlowColor(value: TextDisplayConfig['__overrideGlowColor']) {
-		this.__overrideGlowColor = value
-	}
-
-	get glowColor(): NonNullable<TextDisplayConfig['__glowColor']> {
-		if (this.__glowColor !== undefined) return this.__glowColor
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.glowColor
-	}
-	set glowColor(value: TextDisplayConfig['__glowColor']) {
-		this.__glowColor = value
-	}
-
-	get invisible(): NonNullable<TextDisplayConfig['__invisible']> {
-		if (this.__invisible !== undefined) return this.__invisible
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.invisible
-	}
-	set invisible(value: TextDisplayConfig['__invisible']) {
-		this.__invisible = value
-	}
-
-	get nbt(): NonNullable<TextDisplayConfig['__nbt']> {
-		if (this.__nbt !== undefined) return this.__nbt
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.nbt
-	}
-	set nbt(value: TextDisplayConfig['__nbt']) {
-		this.__nbt = value
-	}
-
-	get shadowRadius(): NonNullable<TextDisplayConfig['__shadowRadius']> {
-		if (this.__shadowRadius !== undefined) return this.__shadowRadius
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.shadowRadius
-	}
-	set shadowRadius(value: TextDisplayConfig['__shadowRadius']) {
-		this.__shadowRadius = value
-	}
-
-	get shadowStrength(): NonNullable<TextDisplayConfig['__shadowStrength']> {
-		if (this.__shadowStrength !== undefined) return this.__shadowStrength
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.shadowStrength
-	}
-	set shadowStrength(value: TextDisplayConfig['__shadowStrength']) {
-		this.__shadowStrength = value
-	}
-
-	get useNBT(): NonNullable<TextDisplayConfig['__useNBT']> {
-		if (this.__useNBT !== undefined) return this.__useNBT
-		const defaultConfig = TextDisplayConfig.getDefault()
-		return defaultConfig.useNBT
-	}
-	set useNBT(value: TextDisplayConfig['__useNBT']) {
-		this.__useNBT = value
-	}
-
-	getDefault(): TextDisplayConfig {
-		return TextDisplayConfig.fromJSON({
-			billboard: 'center',
-		})
-	}
-
-	get tickingCommands(): NonNullable<TextDisplayConfig['__billboard']> {
-		if (this.__billboard !== undefined) return this.__billboard
-		const defaultConfig = this.getDefault()
-		return defaultConfig.tickingCommands
-	}
-	set tickingCommands(value: NonNullable<TextDisplayConfig['__billboard']>) {
-		this.__billboard = value
-	}
-
-	toJSON(): IBlueprintTextDisplayConfigJSON {
-		return scrubUndefined({
-			billboard: this.__billboard,
-			override_brightness: this.__overrideBrightness,
-			brightness_override: this.__brightnessOverride,
-			glowing: this.__glowing,
-			override_glow_color: this.__overrideGlowColor,
-			glow_color: this.__glowColor,
-			invisible: this.__invisible,
-			nbt: this.__nbt,
-			shadow_radius: this.__shadowRadius,
-			shadow_strength: this.__shadowStrength,
-			use_nbt: this.__useNBT,
-		})
-	}
-
-	static fromJSON(json: IBlueprintTextDisplayConfigJSON): TextDisplayConfig {
-		const config = new TextDisplayConfig()
-		if (json.billboard !== undefined) config.__billboard = json.billboard
-		if (json.override_brightness !== undefined)
-			config.__overrideBrightness = json.override_brightness
-		if (json.brightness_override !== undefined)
-			config.__brightnessOverride = json.brightness_override
-		if (json.glowing !== undefined) config.__glowing = json.glowing
-		if (json.override_glow_color !== undefined)
-			config.__overrideGlowColor = json.override_glow_color
-		if (json.glow_color !== undefined) config.__glowColor = json.glow_color
-		if (json.invisible !== undefined) config.__invisible = json.invisible
-		if (json.nbt !== undefined) config.__nbt = json.nbt
-		if (json.shadow_radius !== undefined) config.__shadowRadius = json.shadow_radius
-		if (json.shadow_strength !== undefined) config.__shadowStrength = json.shadow_strength
-		if (json.use_nbt !== undefined) config.__useNBT = json.use_nbt
-
-		return config
-	}
-
-	toNBT(compound = new NbtCompound()) {
-		if (this.useNBT) {
-			const newData = NbtTag.fromString(this.nbt) as NbtCompound
-			for (const key of newData.keys()) {
-				compound.set(key, newData.get(key)!)
-			}
-			return compound
-		}
-
-		if (this.__billboard) {
-			compound.set('billboard', new NbtString(this.billboard))
-		}
-
-		if (this.overrideBrightness) {
-			compound.set(
-				'brightness',
-				new NbtCompound()
-					.set('block', new NbtFloat(this.brightnessOverride))
-					.set('sky', new NbtFloat(this.brightnessOverride))
-			)
-		}
-
-		if (this.glowing) {
-			compound.set('Glowing', new NbtByte(Number(this.glowing)))
-		}
-		if (this.overrideGlowColor) {
-			compound.set(
-				'glow_color_override',
-				new NbtInt(Number(this.glowColor.replace('#', '0x')))
-			)
-		}
-
-		// TODO Figure out a good solution for toggling a bone's visibility...
-		// if (force || config.invisible !== defaultConfig.invisible) {
-		// 	compound.set('invisible', new NbtByte(1))
-		// }
-
-		if (this.__shadowRadius) {
-			compound.set('shadow_radius', new NbtFloat(this.shadowRadius))
-		}
-
-		if (this.__shadowStrength) {
-			compound.set('shadow_strength', new NbtFloat(this.shadowStrength))
-		}
-
-		return compound
-	}
-
-	isDefault(): boolean {
-		return this.checkIfEqual(new TextDisplayConfig())
-	}
-
-	checkIfEqual(other: TextDisplayConfig) {
-		return (
-			this.__billboard === other.__billboard &&
-			this.__overrideBrightness === other.__overrideBrightness &&
-			this.__brightnessOverride === other.__brightnessOverride &&
-			this.__glowing === other.__glowing &&
-			this.__overrideGlowColor === other.__overrideGlowColor &&
-			this.__glowColor === other.__glowColor &&
-			this.__invisible === other.__invisible &&
-			this.__nbt === other.__nbt &&
-			this.__shadowRadius === other.__shadowRadius &&
-			this.__shadowStrength === other.__shadowStrength &&
-			this.__useNBT === other.__useNBT
-		)
-	}
-}
diff --git a/src/outliner/resizableOutlinerElement.ts b/src/outliner/resizableOutlinerElement.ts
index 3905d9d8..942dab0a 100644
--- a/src/outliner/resizableOutlinerElement.ts
+++ b/src/outliner/resizableOutlinerElement.ts
@@ -1,5 +1,7 @@
+import { fixClassPropertyInheritance } from 'src/util/property'
 import { makeNotZero } from '../util/misc'
 
+@fixClassPropertyInheritance
 export class ResizableOutlinerElement extends OutlinerElement {
 	type = 'resizable'
 	// Properties
@@ -58,13 +60,10 @@ export class ResizableOutlinerElement extends OutlinerElement {
 	}
 
 	extend(data: any) {
-		for (const key in ResizableOutlinerElement.properties) {
-			ResizableOutlinerElement.properties[key].merge(this, data)
+		const properties = this.constructor.properties
+		for (const key in properties) {
+			properties[key]!.merge(this, data)
 		}
-		if (data.visibility !== undefined) {
-			this.visibility = data.visibility
-		}
-
 		return this
 	}
 
diff --git a/src/outliner/textDisplay.ts b/src/outliner/textDisplay.ts
index 7573a321..ebbcdae8 100644
--- a/src/outliner/textDisplay.ts
+++ b/src/outliner/textDisplay.ts
@@ -1,12 +1,9 @@
-import { PACKAGE } from '../constants'
-import {
-	type IBlueprintTextDisplayConfigJSON,
-	activeProjectIsBlueprintFormat,
-} from '../formats/blueprint'
-import { registerAction } from '../util/moddingTools'
-// import * as MinecraftFull from '../assets/MinecraftFull.json'
 import { JsonTextParser, JsonTextSyntaxError } from 'src/systems/jsonText/parser'
-import { TextDisplayConfig } from '../nodeConfigs'
+import { IDisplayEntityConfigs } from 'src/systems/rigRenderer'
+import { registerAction } from 'src/util/moddingTools'
+import { DeepClonedObjectProperty, fixClassPropertyInheritance } from 'src/util/property'
+import { PACKAGE } from '../constants'
+import { activeProjectIsBlueprintFormat } from '../formats/blueprint'
 import { JsonText, TextElement } from '../systems/jsonText'
 import { getVanillaFont, MinecraftFont } from '../systems/minecraft/fontManager'
 import EVENTS from '../util/events'
@@ -29,6 +26,7 @@ interface TextDisplayOptions {
 }
 export type Alignment = 'left' | 'center' | 'right'
 
+@fixClassPropertyInheritance
 export class TextDisplay extends ResizableOutlinerElement {
 	static type = `${PACKAGE.name}:text_display`
 	static icon = 'text_fields'
@@ -41,7 +39,7 @@ export class TextDisplay extends ResizableOutlinerElement {
 	needsUniqueName = true
 
 	// Properties
-	config: IBlueprintTextDisplayConfigJSON
+	configs!: IDisplayEntityConfigs
 
 	buttons = [Outliner.buttons.export, Outliner.buttons.locked, Outliner.buttons.visibility]
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -49,6 +47,8 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	textError = new Valuable('')
 
+	needsMeshUpdate = false
+
 	private __pendingMeshUpdate?: ReturnType<MinecraftFont['generateTextDisplayMesh']>
 	private __text = new Valuable('Hello World!')
 	private __lineWidth = TextDisplay.properties.lineWidth.default as number
@@ -56,6 +56,7 @@ export class TextDisplay extends ResizableOutlinerElement {
 	private __shadow = TextDisplay.properties.shadow.default as boolean
 	private __align: Alignment = TextDisplay.properties.align.default as Alignment
 	seeThrough = TextDisplay.properties.seeThrough.default as boolean
+	onSummonFunction = TextDisplay.properties.onSummonFunction.default as string
 
 	constructor(data: TextDisplayOptions, uuid = guid()) {
 		super(data, uuid)
@@ -68,14 +69,6 @@ export class TextDisplay extends ResizableOutlinerElement {
 		this.name = 'text_display'
 		this.extend(data)
 
-		this.name ??= 'text_display'
-		this.position ??= [0, 0, 0]
-		this.rotation ??= [0, 0, 0]
-		this.scale ??= [1, 1, 1]
-		this.align ??= 'center'
-		this.visibility ??= true
-		this.config ??= {}
-
 		this.sanitizeName()
 	}
 
@@ -91,9 +84,9 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	set text(value) {
 		if (this.__text === undefined) return
-		if (value === this.text) return
+		if (value === this.__text.get()) return
 		this.__text.set(value)
-		void this.updateTextMesh()
+		this.needsMeshUpdate = true
 	}
 
 	get lineWidth() {
@@ -104,9 +97,9 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	set lineWidth(value) {
 		if (this.__lineWidth === undefined) return
-		if (value === this.lineWidth) return
+		if (value === this.__lineWidth) return
 		this.__lineWidth = value
-		void this.updateTextMesh()
+		this.needsMeshUpdate = true
 	}
 
 	get backgroundColor() {
@@ -117,9 +110,9 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	set backgroundColor(value) {
 		if (this.__backgroundColor === undefined) return
-		if (value === this.backgroundColor) return
+		if (value === this.__backgroundColor) return
 		this.__backgroundColor = value
-		void this.updateTextMesh()
+		this.needsMeshUpdate = true
 	}
 
 	get shadow() {
@@ -129,9 +122,9 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	set shadow(value) {
 		if (this.__shadow === undefined) return
-		if (value === this.shadow) return
+		if (value === this.__shadow) return
 		this.__shadow = value
-		void this.updateTextMesh()
+		this.needsMeshUpdate = true
 	}
 
 	get align() {
@@ -141,9 +134,9 @@ export class TextDisplay extends ResizableOutlinerElement {
 
 	set align(value) {
 		if (this.__align === undefined) return
-		if (value === this.align) return
+		if (value === this.__align) return
 		this.__align = value
-		void this.updateTextMesh()
+		this.needsMeshUpdate = true
 	}
 
 	getTextValuable() {
@@ -237,17 +230,17 @@ export class TextDisplay extends ResizableOutlinerElement {
 		})
 	}
 
-	private async renderTextMesh(jsonText: JsonText) {
+	private renderTextMesh(jsonText: JsonText) {
 		const promise = getVanillaFont()
-			.then(font =>
-				font.generateTextDisplayMesh({
+			.then(font => {
+				return font.generateTextDisplayMesh({
 					jsonText,
 					maxLineWidth: this.lineWidth,
 					backgroundColor: tinycolor(this.backgroundColor),
 					shadow: this.shadow,
 					alignment: this.align,
 				})
-			)
+			})
 			.then(result => {
 				if (this.__pendingMeshUpdate === promise) {
 					this.__pendingMeshUpdate = undefined
@@ -269,6 +262,10 @@ export class TextDisplay extends ResizableOutlinerElement {
 		text.isTextDisplayText = true
 
 		const mesh = this.mesh as THREE.Mesh
+		if (!mesh) {
+			console.warn('TextDisplay mesh not found')
+			return
+		}
 		mesh.clear()
 		delete mesh.sprite
 		mesh.name = this.uuid
@@ -282,7 +279,8 @@ export class TextDisplay extends ResizableOutlinerElement {
 		mesh.add(outline)
 		mesh.visible = this.visibility
 
-		return text
+		// Dispatch view update without actually doing anything
+		Canvas.updateView({ elements: [], element_aspects: {} })
 	}
 }
 TextDisplay.prototype.icon = TextDisplay.icon
@@ -292,10 +290,9 @@ new Property(TextDisplay, 'string', 'backgroundColor', { default: '#00000040' })
 new Property(TextDisplay, 'string', 'align', { default: 'center' })
 new Property(TextDisplay, 'boolean', 'shadow', { default: false })
 new Property(TextDisplay, 'boolean', 'seeThrough', { default: false })
-new Property(TextDisplay, 'object', 'config', {
-	get default() {
-		return new TextDisplayConfig().toJSON()
-	},
+new Property(TextDisplay, 'string', 'onSummonFunction', { default: '' })
+new DeepClonedObjectProperty(TextDisplay, 'configs', {
+	default: () => ({ default: {}, variants: {} }),
 })
 
 OutlinerElement.registerType(TextDisplay, TextDisplay.type)
@@ -330,7 +327,10 @@ export const PREVIEW_CONTROLLER = new NodePreviewController(TextDisplay, {
 	},
 
 	updateGeometry(el: TextDisplay) {
-		el.updateTextMesh()
+		if (el.needsMeshUpdate) {
+			el.updateTextMesh()
+			el.needsMeshUpdate = false
+		}
 	},
 
 	updateTransform(el: TextDisplay) {
diff --git a/src/outliner/vanillaBlockDisplay.ts b/src/outliner/vanillaBlockDisplay.ts
index e1fa7ee6..646b96cb 100644
--- a/src/outliner/vanillaBlockDisplay.ts
+++ b/src/outliner/vanillaBlockDisplay.ts
@@ -1,13 +1,13 @@
+import { IDisplayEntityConfigs } from 'src/systems/rigRenderer'
 import { registerAction } from 'src/util/moddingTools'
+import { DeepClonedObjectProperty, fixClassPropertyInheritance } from 'src/util/property'
 import { PACKAGE } from '../constants'
-import { type IBlueprintBoneConfigJSON, activeProjectIsBlueprintFormat } from '../formats/blueprint'
-import { BoneConfig } from '../nodeConfigs'
+import { activeProjectIsBlueprintFormat } from '../formats/blueprint'
 import { BlockModelMesh, getBlockModel } from '../systems/minecraft/blockModelManager'
 import { type BlockStateValue, getBlockState } from '../systems/minecraft/blockstateManager'
 import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
-import { getCurrentVersion } from '../systems/minecraft/versionManager'
 import EVENTS from '../util/events'
-import { parseBlock } from '../util/minecraftUtil'
+import { validateBlock } from '../util/minecraftUtil'
 import { Valuable } from '../util/stores'
 import { translate } from '../util/translation'
 import { ResizableOutlinerElement } from './resizableOutlinerElement'
@@ -25,6 +25,7 @@ interface VanillaBlockDisplayOptions {
 	visibility?: boolean
 }
 
+@fixClassPropertyInheritance
 export class VanillaBlockDisplay extends ResizableOutlinerElement {
 	static type = `${PACKAGE.name}:vanilla_block_display`
 	static icon = 'deployed_code'
@@ -37,7 +38,8 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 
 	// Properties
 	private __block = new Valuable('minecraft:stone')
-	config: IBlueprintBoneConfigJSON
+	onSummonFunction = VanillaBlockDisplay.properties.onSummonFunction.default as string
+	configs!: IDisplayEntityConfigs
 
 	error = new Valuable('')
 
@@ -56,36 +58,10 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 		this.name = 'block_display'
 		this.extend(data)
 
-		this.block ??= 'minecraft:stone'
-		this.config ??= {}
-
 		this.sanitizeName()
 
-		const updateBlock = async (newBlock: string) => {
-			if (!MINECRAFT_REGISTRY.block) {
-				requestAnimationFrame(() => void updateBlock(newBlock))
-				return
-			}
-			const parsed = await parseBlock(newBlock)
-			if (!parsed) {
-				this.error.set('Invalid block ID.')
-			} else if (
-				(parsed.resource.namespace === 'minecraft' || parsed.resource.namespace === '') &&
-				MINECRAFT_REGISTRY.block.has(parsed.resource.name)
-			) {
-				this.error.set('')
-				this.preview_controller.updateGeometry(this)
-			} else {
-				this.error.set(`This block does not exist in Minecraft ${getCurrentVersion()!.id}.`)
-			}
-			if (this.mesh?.outline instanceof THREE.LineSegments) {
-				if (this.error.get()) this.mesh.outline.material = ERROR_OUTLINE_MATERIAL
-				else this.mesh.outline.material = Canvas.outlineMaterial
-			}
-		}
-
-		this.__block.subscribe(value => {
-			void updateBlock(value)
+		this.__block.subscribe(() => {
+			void this.updateBlock()
 		})
 	}
 
@@ -99,6 +75,10 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 		this.__block.set(value)
 	}
 
+	getBlockValuable() {
+		return this.__block
+	}
+
 	sanitizeName(): string {
 		this.name = sanitizeOutlinerElementName(this.name, this.uuid)
 		return this.name
@@ -164,6 +144,19 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 		this.preview_controller.updateHighlight(this)
 	}
 
+	async updateBlock() {
+		const error = await validateBlock(this.block)
+		if (error) {
+			this.error.set(error)
+			if (this.mesh?.outline instanceof THREE.LineSegments) {
+				if (this.error.get()) this.mesh.outline.material = ERROR_OUTLINE_MATERIAL
+				else this.mesh.outline.material = Canvas.outlineMaterial
+			}
+			return
+		}
+		this.preview_controller.updateGeometry(this)
+	}
+
 	applyBlockModel(blockModel: BlockModelMesh) {
 		const mesh = this.mesh as THREE.Mesh
 		mesh.name = this.uuid
@@ -180,15 +173,13 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
 		this.preview_controller.updateHighlight(this)
 		this.preview_controller.updateTransform(this)
 		mesh.visible = this.visibility
-		TickUpdates.selection = true
 	}
 }
 VanillaBlockDisplay.prototype.icon = VanillaBlockDisplay.icon
 new Property(VanillaBlockDisplay, 'string', 'block', { default: 'minecraft:stone' })
-new Property(VanillaBlockDisplay, 'object', 'config', {
-	get default() {
-		return new BoneConfig().toJSON()
-	},
+new Property(VanillaBlockDisplay, 'string', 'onSummonFunction', { default: '' })
+new DeepClonedObjectProperty(VanillaBlockDisplay, 'configs', {
+	default: () => ({ default: {}, variants: {} }),
 })
 OutlinerElement.registerType(VanillaBlockDisplay, VanillaBlockDisplay.type)
 
@@ -223,10 +214,9 @@ export const PREVIEW_CONTROLLER = new NodePreviewController(VanillaBlockDisplay,
 			.then(result => {
 				if (!result?.mesh) return
 				el.applyBlockModel(result)
-				TickUpdates.selection = true
 			})
 			.catch(err => {
-				console.error(err)
+				console.error('Failed to get block model:', err)
 				if (typeof err.message === 'string') {
 					el.error.set(err.message as string)
 				}
diff --git a/src/outliner/vanillaItemDisplay.ts b/src/outliner/vanillaItemDisplay.ts
index 77052fd0..2b8215a1 100644
--- a/src/outliner/vanillaItemDisplay.ts
+++ b/src/outliner/vanillaItemDisplay.ts
@@ -1,10 +1,10 @@
 import { getItemModel } from 'src/systems/minecraft/itemModelManager'
+import { IDisplayEntityConfigs } from 'src/systems/rigRenderer'
+import { validateItem } from 'src/util/minecraftUtil'
 import { registerAction } from 'src/util/moddingTools'
+import { DeepClonedObjectProperty, fixClassPropertyInheritance } from 'src/util/property'
 import { PACKAGE } from '../constants'
-import { type IBlueprintBoneConfigJSON, activeProjectIsBlueprintFormat } from '../formats/blueprint'
-import { BoneConfig } from '../nodeConfigs'
-import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
-import { getCurrentVersion } from '../systems/minecraft/versionManager'
+import { activeProjectIsBlueprintFormat } from '../formats/blueprint'
 import EVENTS from '../util/events'
 import { Valuable } from '../util/stores'
 import { translate } from '../util/translation'
@@ -32,6 +32,7 @@ interface VanillaItemDisplayOptions {
 	visibility?: boolean
 }
 
+@fixClassPropertyInheritance
 export class VanillaItemDisplay extends ResizableOutlinerElement {
 	static type = `${PACKAGE.name}:vanilla_item_display`
 	static icon = 'icecream'
@@ -45,7 +46,8 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
 	// Properties
 	private __item = new Valuable('minecraft:diamond')
 	private __itemDisplay = new Valuable<ItemDisplayMode>('none')
-	config: IBlueprintBoneConfigJSON
+	onSummonFunction = VanillaItemDisplay.properties.onSummonFunction.default as string
+	configs!: IDisplayEntityConfigs
 
 	error = new Valuable('')
 
@@ -64,39 +66,10 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
 		this.name = 'item_display'
 		this.extend(data)
 
-		this.item ??= 'minecraft:diamond'
-		this.itemDisplay ??= 'none'
-		this.position ??= [0, 0, 0]
-		this.rotation ??= [0, 0, 0]
-		this.scale ??= [1, 1, 1]
-		this.visibility ??= true
-		this.config ??= {}
-
 		this.sanitizeName()
 
-		const updateItem = (newItem: string) => {
-			if (!MINECRAFT_REGISTRY.item) {
-				requestAnimationFrame(() => updateItem(newItem))
-				return
-			}
-			let [namespace, id] = newItem.split(':')
-			if (!id) {
-				id = namespace
-				namespace = 'minecraft'
-			}
-			if (
-				(namespace === 'minecraft' || namespace === '') &&
-				MINECRAFT_REGISTRY.item.has(id)
-			) {
-				this.error.set('')
-				this.preview_controller.updateGeometry(this)
-			} else {
-				this.error.set(`This item does not exist in Minecraft ${getCurrentVersion()!.id}.`)
-			}
-		}
-
-		this.__item.subscribe(value => {
-			updateItem(value)
+		this.__item.subscribe(() => {
+			void this.updateItem()
 		})
 	}
 
@@ -182,14 +155,23 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
 		TickUpdates.selection = true
 		this.preview_controller.updateHighlight(this)
 	}
+
+	async updateItem() {
+		const error = await validateItem(this.item)
+		if (error) {
+			this.error.set(error)
+			return
+		}
+		this.error.set('')
+		this.preview_controller.updateGeometry(this)
+	}
 }
 VanillaItemDisplay.prototype.icon = VanillaItemDisplay.icon
 new Property(VanillaItemDisplay, 'string', 'item', { default: 'minecraft:diamond' })
 new Property(VanillaItemDisplay, 'string', 'itemDisplay', { default: 'none' })
-new Property(VanillaItemDisplay, 'object', 'config', {
-	get default() {
-		return new BoneConfig().toJSON()
-	},
+new Property(VanillaItemDisplay, 'string', 'onSummonFunction', { default: '' })
+new DeepClonedObjectProperty(VanillaItemDisplay, 'configs', {
+	default: () => ({ default: {}, variants: {} }),
 })
 OutlinerElement.registerType(VanillaItemDisplay, VanillaItemDisplay.type)
 
diff --git a/src/pluginPackage/changelog.json b/src/pluginPackage/changelog.json
index 6c5c95b9..c953714f 100644
--- a/src/pluginPackage/changelog.json
+++ b/src/pluginPackage/changelog.json
@@ -347,5 +347,37 @@
 				]
 			}
 		]
+	},
+	"1.8.0-beta.2": {
+		"title": "v1.8.0-beta.2",
+		"author": "Titus Evans (SnaveSutit)",
+		"date": "2025-10-15",
+		"categories": [
+			{
+				"title": "Changes",
+				"list": [
+					"[BREAKING] Removed `custom_name`, `custom_name_visible`, `useNbt`, and `nbt` from Display Entity Configs. Use the new 'On Summon Function' and 'On Apply Function' settings to configure entity NBT instead.",
+					"[BREAKING] Removed `inherit_settings` from Display Entity Configs. It didn't work properly and was causing more issues than it solved. Use the new copy / paste config actions instead.",
+					"Replaced unique node configs with universal DisplayEntityConfig.",
+					"Added 'Copy Display Entity Config' and 'Paste Display Entity Config' actions to context menus for Groups, Text Displays, Item Displays, and Block Displays.",
+					"Added 'On Summon Function' to Display Entity Configs.",
+					"Added 'On Apply Function' to Per-variant Display Entity Configs.",
+					"Improved undo / redo history and behavior for TextDisplays, ItemDisplays, and BlockDisplays.",
+					"Improved the Render Box preview's reactivity."
+				]
+			},
+			{
+				"title": "Fixes",
+				"list": [
+					"Fixed rotation validation not checking the correct version, and marking any rotation as invalid.",
+					"Fixed Blueprints becoming unsavable after opening.",
+					"Fixed Blueprints becoming unsavable after converting from another format.",
+					"Fixed annoying element panel UI flicker when selecting or transforming TextDisplays, ItemDisplays, or BlockDisplays.",
+					"Fixed uncaught error when deleting a text display.",
+					"Fixed outdated warning not appearing until the second reload after rig_hash was modified.",
+					"Fixed custom outliner elements inheriting the same properties list, and therefor causing every node which inherits it to include every other node's properties in it's saved data."
+				]
+			}
+		]
 	}
 }
diff --git a/src/systems/datapackCompiler/1.20.4/animation.mcb b/src/systems/datapackCompiler/1.20.4/animation.mcb
index 126c0a2b..ee70d9e7 100644
--- a/src/systems/datapackCompiler/1.20.4/animation.mcb
+++ b/src/systems/datapackCompiler/1.20.4/animation.mcb
@@ -149,7 +149,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run tp @s ~ ~ ~ ~ ~
 	}
 } ELSE {
@@ -969,33 +968,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.tag.CustomModelData set value 1
 									} ELSE {
-										data modify entity @s item.tag.CustomModelData set value <%variant.models[bone.uuid].custom_model_data%>
+										data modify entity @s item.tag.CustomModelData set value <%variant.models[node.uuid].custom_model_data%>
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.20.4/global.mcb b/src/systems/datapackCompiler/1.20.4/global.mcb
index 1f6d833c..5f829fe7 100644
--- a/src/systems/datapackCompiler/1.20.4/global.mcb
+++ b/src/systems/datapackCompiler/1.20.4/global.mcb
@@ -12,11 +12,11 @@ dir global {
 
 		# Purposefully load gu first, as other functions depend on it.
 		function *global/gu/on_load
+		function #*global/on_load
 		IF (debug_mode) {
 			scoreboard players reset * <%OBJECTIVES.IS_RIG_LOADED()%>
 			execute as @e[type=item_display,tag=<%TAGS.GLOBAL_ROOT()%>] at @s run function *global/root/on_load
 		}
-		function #*global/on_load
 	}
 
 	IF (debug_mode) {
diff --git a/src/systems/datapackCompiler/1.20.4/static.mcb b/src/systems/datapackCompiler/1.20.4/static.mcb
index ace84064..c77f2767 100644
--- a/src/systems/datapackCompiler/1.20.4/static.mcb
+++ b/src/systems/datapackCompiler/1.20.4/static.mcb
@@ -108,7 +108,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run tp @s ~ ~ ~ ~ ~
 	}
 } ELSE {
@@ -550,33 +549,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.tag.CustomModelData set value 1
 									} ELSE {
-										data modify entity @s item.tag.CustomModelData set value <%variant.models[bone.uuid].custom_model_data%>
+										data modify entity @s item.tag.CustomModelData set value <%variant.models[node.uuid].custom_model_data%>
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.20.5/animation.mcb b/src/systems/datapackCompiler/1.20.5/animation.mcb
index 1992824a..ba5dbaac 100644
--- a/src/systems/datapackCompiler/1.20.5/animation.mcb
+++ b/src/systems/datapackCompiler/1.20.5/animation.mcb
@@ -149,7 +149,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run tp @s ~ ~ ~ ~ ~
 	}
 } ELSE {
@@ -969,33 +968,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.components."minecraft:custom_model_data" set value 1
 									} ELSE {
-										data modify entity @s item.components."minecraft:custom_model_data" set value <%variant.models[bone.uuid].custom_model_data%>
+										data modify entity @s item.components."minecraft:custom_model_data" set value <%variant.models[node.uuid].custom_model_data%>
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.20.5/static.mcb b/src/systems/datapackCompiler/1.20.5/static.mcb
index e48e021e..3fb33900 100644
--- a/src/systems/datapackCompiler/1.20.5/static.mcb
+++ b/src/systems/datapackCompiler/1.20.5/static.mcb
@@ -108,7 +108,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run tp @s ~ ~ ~ ~ ~
 	}
 } ELSE {
@@ -550,33 +549,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.components."minecraft:custom_model_data" set value 1
 									} ELSE {
-										data modify entity @s item.components."minecraft:custom_model_data" set value <%variant.models[bone.uuid].custom_model_data%>
+										data modify entity @s item.components."minecraft:custom_model_data" set value <%variant.models[node.uuid].custom_model_data%>
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.21.2/animation.mcb b/src/systems/datapackCompiler/1.21.2/animation.mcb
index c449aca6..65e8ee77 100644
--- a/src/systems/datapackCompiler/1.21.2/animation.mcb
+++ b/src/systems/datapackCompiler/1.21.2/animation.mcb
@@ -149,7 +149,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run rotate @s ~ ~
 	}
 } ELSE {
@@ -969,33 +968,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.components."minecraft:item_model" set value "animated_java:empty"
 									} ELSE {
-										data modify entity @s item.components."minecraft:item_model" set value "<%variant.models[bone.uuid].item_model%>"
+										data modify entity @s item.components."minecraft:item_model" set value "<%variant.models[node.uuid].item_model%>"
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.21.2/global.mcb b/src/systems/datapackCompiler/1.21.2/global.mcb
index 8c4140d9..f28ef446 100644
--- a/src/systems/datapackCompiler/1.21.2/global.mcb
+++ b/src/systems/datapackCompiler/1.21.2/global.mcb
@@ -12,11 +12,11 @@ dir global {
 
 		# Purposefully load gu first, as other functions depend on it.
 		function *global/gu/on_load
+		function #*global/on_load
 		IF (debug_mode) {
 			scoreboard players reset * <%OBJECTIVES.IS_RIG_LOADED()%>
 			execute as @e[type=item_display,tag=<%TAGS.GLOBAL_ROOT()%>] at @s run function *global/root/on_load
 		}
-		function #*global/on_load
 	}
 
 	IF (debug_mode) {
diff --git a/src/systems/datapackCompiler/1.21.2/static.mcb b/src/systems/datapackCompiler/1.21.2/static.mcb
index 77677f17..67903177 100644
--- a/src/systems/datapackCompiler/1.21.2/static.mcb
+++ b/src/systems/datapackCompiler/1.21.2/static.mcb
@@ -108,7 +108,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run rotate @s ~ ~
 	}
 } ELSE {
@@ -550,33 +549,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.components."minecraft:item_model" set value "animated_java:empty"
 									} ELSE {
-										data modify entity @s item.components."minecraft:item_model" set value "<%variant.models[bone.uuid].item_model%>"
+										data modify entity @s item.components."minecraft:item_model" set value "<%variant.models[node.uuid].item_model%>"
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.21.4/animation.mcb b/src/systems/datapackCompiler/1.21.4/animation.mcb
index 58ea6320..f30d83d0 100644
--- a/src/systems/datapackCompiler/1.21.4/animation.mcb
+++ b/src/systems/datapackCompiler/1.21.4/animation.mcb
@@ -149,7 +149,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run rotate @s ~ ~
 	}
 } ELSE {
@@ -969,33 +968,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.components."minecraft:custom_model_data".strings[0] set value "AJ_INTERNAL_EMPTY"
 									} ELSE {
 										data modify entity @s item.components."minecraft:custom_model_data".strings[0] set value "<%variant.name%>"
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.21.4/static.mcb b/src/systems/datapackCompiler/1.21.4/static.mcb
index eeea27a7..37de5f68 100644
--- a/src/systems/datapackCompiler/1.21.4/static.mcb
+++ b/src/systems/datapackCompiler/1.21.4/static.mcb
@@ -108,7 +108,6 @@ IF (!auto_update_rig_orientation) {
 				if entity @s[tag=<%TAGS.GLOBAL_DATA()%>] \
 			run function ./on_tick/transform_floating_entities
 		}
-
 		execute at @s on passengers run rotate @s ~ ~
 	}
 } ELSE {
@@ -550,33 +549,40 @@ IF (Object.keys(rig.variants).length > 1) {
 					debug assert executed_as_root_entity
 
 					<%%
-						global.filteredBones = Object.values(rig.nodes).filter(
-							node => node.type === 'bone' &&
-							!variant.excluded_nodes.includes(node.uuid) &&
-							(	// Variant has a model override or a config override for this bone.
-								variant.models[node.uuid] !== undefined ||
+						global.filteredNodes = Object.values(rig.nodes).filter(
+							node => (
+								node.type === 'bone' &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								(	// Variant has a model override or a config override for this bone.
+									variant.models[node.uuid] !== undefined ||
+									node.configs.variants[variant.uuid] !== undefined
+								)
+							) || (
+								BONE_TYPES.includes(node.type) &&
+								!variant.excluded_nodes.includes(node.uuid) &&
+								// Variant has a config override for this node.
 								node.configs.variants[variant.uuid] !== undefined
 							)
 						)
 					%%>
 
-					REPEAT (global.filteredBones) as bone {
+					REPEAT (global.filteredNodes) as node {
 						execute \
 							on passengers \
-							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, bone.storage_name)%>] \
+							if entity @s[tag=<%TAGS.PROJECT_NODE_NAMED(export_namespace, node.storage_name)%>] \
 						run \
-							block zzz/apply_to_bone_<%bone.storage_name%> {
-								IF (variant.models[bone.uuid] !== undefined) {
+							block zzz/apply_to_node_<%node.storage_name%> {
+								IF (node.type === 'bone' && variant.models[node.uuid] !== undefined) {
 									# Special case for `animated_java:empty` model.
-									IF (variant.models[bone.uuid].model === null) {
+									IF (variant.models[node.uuid].model === null) {
 										data modify entity @s item.components."minecraft:custom_model_data".strings[0] set value "AJ_INTERNAL_EMPTY"
 									} ELSE {
 										data modify entity @s item.components."minecraft:custom_model_data".strings[0] set value "<%variant.name%>"
 									}
 								}
-								IF (bone.configs.variants[variant.uuid]) {
+								IF (node.configs.variants[variant.uuid]) {
 									<%%
-										global.config = BoneConfig.fromJSON(bone.configs.variants[variant.uuid])
+										global.config = DisplayEntityConfig.fromJSON(node.configs.variants[variant.uuid])
 									%%>
 									IF (!global.config.isDefault()) {
 										data merge entity @s <%global.config.toNBT(undefined, variant.is_default)%>
diff --git a/src/systems/datapackCompiler/1.21.5/global.mcb b/src/systems/datapackCompiler/1.21.5/global.mcb
index c1f9476a..9c7fafaf 100644
--- a/src/systems/datapackCompiler/1.21.5/global.mcb
+++ b/src/systems/datapackCompiler/1.21.5/global.mcb
@@ -12,11 +12,11 @@ dir global {
 
 		# Purposefully load gu first, as other functions depend on it.
 		function *global/gu/on_load
+		function #*global/on_load
 		IF (debug_mode) {
 			scoreboard players reset * <%OBJECTIVES.IS_RIG_LOADED()%>
 			execute as @e[type=item_display,tag=<%TAGS.GLOBAL_ROOT()%>] at @s run function *global/root/on_load
 		}
-		function #*global/on_load
 	}
 
 	IF (debug_mode) {
diff --git a/src/systems/datapackCompiler/index.ts b/src/systems/datapackCompiler/index.ts
index 8064da58..f57759f9 100644
--- a/src/systems/datapackCompiler/index.ts
+++ b/src/systems/datapackCompiler/index.ts
@@ -1,7 +1,7 @@
 import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtList, NbtString } from 'deepslate/lib/nbt'
 import { projectTargetVersionIsAtLeast } from 'src/formats/blueprint'
 import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
-import { BoneConfig, TextDisplayConfig } from '../../nodeConfigs'
+import { DisplayEntityConfig } from '../../nodeConfigs'
 import { isFunctionTagPath } from '../../util/fileUtil'
 import {
 	DataPackTag,
@@ -512,7 +512,7 @@ async function generateRootEntityPassengers(
 				}
 
 				if (node.configs?.default) {
-					BoneConfig.fromJSON(node.configs.default).toNBT(passenger)
+					DisplayEntityConfig.fromJSON(node.configs.default).toNBT(passenger)
 				}
 				break
 			}
@@ -548,8 +548,8 @@ async function generateRootEntityPassengers(
 					throw new Error(`Unsupported Minecraft version '${version}' for text display!`)
 				}
 
-				if (node.config) {
-					TextDisplayConfig.fromJSON(node.config).toNBT(passenger)
+				if (node.configs?.default) {
+					DisplayEntityConfig.fromJSON(node.configs.default).toNBT(passenger)
 				}
 				break
 			}
@@ -566,8 +566,8 @@ async function generateRootEntityPassengers(
 					break
 				}
 
-				if (node.config) {
-					BoneConfig.fromJSON(node.config).toNBT(passenger)
+				if (node.configs?.default) {
+					DisplayEntityConfig.fromJSON(node.configs.default).toNBT(passenger)
 				}
 				break
 			}
@@ -592,8 +592,8 @@ async function generateRootEntityPassengers(
 							.set('Properties', states)
 					)
 
-				if (node.config) {
-					BoneConfig.fromJSON(node.config).toNBT(passenger)
+				if (node.configs?.default) {
+					DisplayEntityConfig.fromJSON(node.configs.default).toNBT(passenger)
 				}
 				break
 			}
@@ -969,7 +969,7 @@ const dataPackCompiler: DataPackCompiler = async ({
 		rig_hash: rigHash,
 		animation_hash: animationHash,
 		boundingBox: aj.render_box,
-		BoneConfig,
+		DisplayEntityConfig,
 		roundTo,
 		nodeSorter,
 		getRotationFromQuaternion: eulerFromQuaternion,
diff --git a/src/systems/jsonCompiler.ts b/src/systems/jsonCompiler.ts
index 7bd46de0..2dba4d0c 100644
--- a/src/systems/jsonCompiler.ts
+++ b/src/systems/jsonCompiler.ts
@@ -2,7 +2,7 @@
 /// <reference path="D:/github-repos/snavesutit/blockbench-types/types/index.d.ts"/>
 /// <reference path="../global.d.ts"/>
 
-import type { IBlueprintBoneConfigJSON } from '../formats/blueprint'
+import type { IBlueprintDisplayEntityConfigJSON } from '../formats/blueprint'
 import { type defaultValues } from '../formats/blueprint/settings'
 import type { EasingKey } from '../util/easing'
 import { resolvePath } from '../util/fileUtil'
@@ -46,7 +46,7 @@ type ExportedRenderedNode = Omit<
 > & {
 	default_transform: ExportedNodetransform
 	bounding_box?: { min: ArrayVector3; max: ArrayVector3 }
-	configs?: Record<string, IBlueprintBoneConfigJSON>
+	configs?: Record<string, IBlueprintDisplayEntityConfigJSON>
 }
 type ExportedAnimationFrame = Omit<IRenderedFrame, 'nodes' | 'node_transforms'> & {
 	node_transforms: Record<string, ExportedNodetransform>
diff --git a/src/systems/minecraft/blockModelManager.ts b/src/systems/minecraft/blockModelManager.ts
index a01e7f58..6b84ac52 100644
--- a/src/systems/minecraft/blockModelManager.ts
+++ b/src/systems/minecraft/blockModelManager.ts
@@ -51,7 +51,6 @@ export async function getBlockModel(block: string): Promise<BlockModelMesh | und
 	await assetsLoaded()
 	let result = BLOCK_MODEL_CACHE.get(block)
 	if (!result) {
-		// console.warn(`Found no cached item model mesh for '${block}'`)
 		const parsed = await parseBlock(block)
 		if (!parsed) return undefined
 		if (BLACKLISTED_BLOCKS.has(block)) {
@@ -404,6 +403,31 @@ async function loadTexture(textures: IBlockModel['textures'], key: string): Prom
 	return texture
 }
 
+export function validateBlockState(block: IParsedBlock) {
+	if (!block.blockStateRegistryEntry) {
+		if (Object.keys(block.states).length > 0) {
+			return `${block.resource.name} has no block states`
+		}
+	} else {
+		for (const [k, v] of Object.entries(block.states)) {
+			if (!block.blockStateRegistryEntry.stateValues[k]) {
+				return (
+					`Invalid block state '${k}' for '${block.resource.name}'` +
+					` Expected one of: ${Object.keys(
+						block.blockStateRegistryEntry.stateValues
+					).join(', ')}`
+				)
+			} else if (!block.blockStateRegistryEntry.stateValues[k].includes(v)) {
+				return (
+					`Invalid block state value '${v.toString()}' for '${k}'.` +
+					` Expected one of: ${block.blockStateRegistryEntry.stateValues[k].join(', ')}`
+				)
+			}
+		}
+	}
+	return ''
+}
+
 export async function parseBlockState(block: IParsedBlock): Promise<BlockModelMesh> {
 	const path = getPathFromResourceLocation(block.resourceLocation, 'blockstates')
 	const blockstate = (await getJSONAsset(path + '.json')) as IBlockState
diff --git a/src/systems/rigRenderer.ts b/src/systems/rigRenderer.ts
index 39dd2609..ebd12d1e 100644
--- a/src/systems/rigRenderer.ts
+++ b/src/systems/rigRenderer.ts
@@ -1,11 +1,9 @@
 import * as crypto from 'crypto'
 import type {
-	IBlueprintBoneConfigJSON,
+	IBlueprintDisplayEntityConfigJSON,
 	IBlueprintLocatorConfigJSON,
-	IBlueprintTextDisplayConfigJSON,
 	IBlueprintVariantJSON,
 } from '../formats/blueprint'
-import { BoneConfig } from '../nodeConfigs'
 import { type Alignment, TextDisplay } from '../outliner/textDisplay'
 import { VanillaBlockDisplay } from '../outliner/vanillaBlockDisplay'
 import { type ItemDisplayMode, VanillaItemDisplay } from '../outliner/vanillaItemDisplay'
@@ -81,6 +79,15 @@ export interface IRenderedNode {
 	default_transform: INodeTransform
 }
 
+export interface IRenderedDisplayEntityNode extends IRenderedNode {
+	/**
+	 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
+	 */
+	base_scale: number
+	bounding_box: THREE.Box3
+	configs?: IDisplayEntityConfigs
+}
+
 export interface ICamera extends OutlinerElement {
 	name: string
 	path: string
@@ -92,34 +99,16 @@ export interface ICamera extends OutlinerElement {
 	preview_controller: NodePreviewController
 }
 
+export interface IDisplayEntityConfigs {
+	default: IBlueprintDisplayEntityConfigJSON
+	variants: Record<string, IBlueprintDisplayEntityConfigJSON>
+}
+
 export interface IRenderedNodes {
-	Bone: IRenderedNode & {
+	Bone: IRenderedDisplayEntityNode & {
 		type: 'bone'
-		bounding_box: THREE.Box3
-		/**
-		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
-		 */
-		base_scale: number
-		configs?: {
-			default?: IBlueprintBoneConfigJSON
-			variants: Record<string, IBlueprintBoneConfigJSON>
-		}
 	}
-	Struct: IRenderedNode & {
-		type: 'struct'
-	}
-	Camera: IRenderedNode & {
-		type: 'camera'
-		/** The maximum distance this node travels away from the root entity while animating. */
-		max_distance: number
-	}
-	Locator: IRenderedNode & {
-		type: 'locator'
-		/** The maximum distance this node travels away from the root entity while animating. */
-		max_distance: number
-		config?: IBlueprintLocatorConfigJSON
-	}
-	TextDisplay: IRenderedNode & {
+	TextDisplay: IRenderedDisplayEntityNode & {
 		type: 'text_display'
 		text: string
 		line_width: number
@@ -128,30 +117,29 @@ export interface IRenderedNodes {
 		align: Alignment
 		shadow: boolean
 		see_through: boolean
-		/**
-		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
-		 */
-		base_scale: number
-		config?: IBlueprintTextDisplayConfigJSON
 	}
-	ItemDisplay: IRenderedNode & {
+	ItemDisplay: IRenderedDisplayEntityNode & {
 		type: 'item_display'
 		item: string
 		item_display: ItemDisplayMode
-		/**
-		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
-		 */
-		base_scale: number
-		config?: IBlueprintBoneConfigJSON
 	}
-	BlockDisplay: IRenderedNode & {
+	BlockDisplay: IRenderedDisplayEntityNode & {
 		type: 'block_display'
 		block: string
-		/**
-		 * The base scale of the bone, used to offset any rescaling done to the bone's model due to exceeding the 3x3x3 model size limit.
-		 */
-		base_scale: number
-		config?: IBlueprintBoneConfigJSON
+	}
+	Struct: IRenderedNode & {
+		type: 'struct'
+	}
+	Camera: IRenderedNode & {
+		type: 'camera'
+		/** The maximum distance this node travels away from the root entity while animating. */
+		max_distance: number
+	}
+	Locator: IRenderedNode & {
+		type: 'locator'
+		/** The maximum distance this node travels away from the root entity while animating. */
+		max_distance: number
+		config?: IBlueprintLocatorConfigJSON
 	}
 }
 
@@ -311,26 +299,34 @@ export function getTextureResourceLocation(texture: Texture, rig: IRenderedRig)
 	throw new Error(`Invalid texture path: ${path}`)
 }
 
-function getBoneBoundingBox(group: Group) {
-	const children = group.children.filter(e => e instanceof Cube) as Cube[]
+function getNodeBoundingBox(node: Group | TextDisplay | VanillaItemDisplay | VanillaBlockDisplay) {
 	const box = new THREE.Box3()
-	box.expandByPoint(new THREE.Vector3(group.origin[0], group.origin[1], group.origin[2]))
-	for (const child of children) {
-		box.expandByPoint(
-			new THREE.Vector3(
-				child.from[0] - child.inflate,
-				child.from[1] - child.inflate,
-				child.from[2] - child.inflate
+	if (node instanceof Group) {
+		const children = node.children.filter(e => e instanceof Cube) as Cube[]
+		for (const child of children) {
+			box.expandByPoint(
+				new THREE.Vector3(
+					child.from[0] - child.inflate,
+					child.from[1] - child.inflate,
+					child.from[2] - child.inflate
+				)
 			)
-		)
-		box.expandByPoint(
-			new THREE.Vector3(
-				child.to[0] + child.inflate,
-				child.to[1] + child.inflate,
-				child.to[2] + child.inflate
+			box.expandByPoint(
+				new THREE.Vector3(
+					child.to[0] + child.inflate,
+					child.to[1] + child.inflate,
+					child.to[2] + child.inflate
+				)
 			)
-		)
-	}
+		}
+	} else if (
+		node instanceof TextDisplay ||
+		node instanceof VanillaItemDisplay ||
+		node instanceof VanillaBlockDisplay
+	) {
+		box.setFromObject(node.mesh)
+	}
+	box.expandByPoint(new THREE.Vector3(node.origin[0], node.origin[1], node.origin[2]))
 	return box
 }
 
@@ -356,7 +352,7 @@ function renderGroup(
 		storage_name: sanitizeStorageKey(group.name),
 		uuid: group.uuid,
 		parent: parentId,
-		bounding_box: getBoneBoundingBox(group),
+		bounding_box: getNodeBoundingBox(group),
 		base_scale: 1,
 		configs: group.configs,
 		// This is a placeholder value that will be updated later once the animation renderer is run.
@@ -468,7 +464,8 @@ function renderItemDisplay(display: VanillaItemDisplay, rig: IRenderedRig) {
 		item: display.item,
 		item_display: display.itemDisplay,
 		base_scale: 1,
-		config: display.config,
+		configs: display.configs,
+		bounding_box: getNodeBoundingBox(display),
 		default_transform: {} as INodeTransform,
 	}
 
@@ -495,7 +492,8 @@ function renderBlockDisplay(display: VanillaBlockDisplay, rig: IRenderedRig) {
 		block: display.block,
 		parent: parentId,
 		base_scale: 1,
-		config: display.config,
+		configs: display.configs,
+		bounding_box: getNodeBoundingBox(display),
 		default_transform: {} as INodeTransform,
 	}
 
@@ -529,7 +527,8 @@ function renderTextDisplay(display: TextDisplay, rig: IRenderedRig): INodeStruct
 		shadow: display.shadow,
 		see_through: display.seeThrough,
 		base_scale: 1,
-		config: display.config,
+		configs: display.configs,
+		bounding_box: getNodeBoundingBox(display),
 		default_transform: {} as INodeTransform,
 	}
 
@@ -650,36 +649,28 @@ export function hashRig(rig: IRenderedRig) {
 		hash.update(node.default_transform.matrix.elements.toString())
 		switch (node.type) {
 			case 'bone': {
-				const model = rig.variants[Variant.getDefault().uuid].models[nodeUuid]
-				hash.update(';' + JSON.stringify(model) || '')
-				if (!node.configs) break // Skip if there are no configs
-				if (node.configs.default) {
-					const defaultConfig = BoneConfig.fromJSON(node.configs.default)
-					if (!defaultConfig.isDefault()) {
-						hash.update('defaultconfig;')
-						hash.update(defaultConfig.toNBT().toString())
-					}
-				}
-				for (const [variantName, config] of Object.entries(node.configs.variants)) {
-					const variantConfig = BoneConfig.fromJSON(config)
-					if (!variantConfig.isDefault()) {
-						hash.update('variantconfig;')
-						hash.update(variantName)
-						hash.update(variantConfig.toNBT().toString())
-					}
-				}
+				hash.update(
+					';' + JSON.stringify(rig.variants[Variant.getDefault().uuid].models[nodeUuid])
+				)
+				if (node.configs) hash.update(';' + JSON.stringify(node.configs))
 				break
 			}
-			case 'locator': {
-				if (node.config) {
-					hash.update(';' + JSON.stringify(node.config))
-				}
+			case 'block_display':
+				hash.update(`;${node.block}`)
+				if (node.configs) hash.update(';' + JSON.stringify(node.configs))
 				break
-			}
-			case 'camera':
+
+			case 'item_display':
+				hash.update(`;${node.item};${node.item_display}`)
+				if (node.configs) hash.update(';' + JSON.stringify(node.configs))
 				break
-			case 'text_display': {
+
+			case 'text_display':
 				hash.update(`;${node.text}`)
+				if (node.configs) hash.update(';' + JSON.stringify(node.configs))
+				break
+
+			case 'locator': {
 				if (node.config) {
 					hash.update(';' + JSON.stringify(node.config))
 				}
diff --git a/src/systems/util.ts b/src/systems/util.ts
index 427793ee..d48006b1 100644
--- a/src/systems/util.ts
+++ b/src/systems/util.ts
@@ -102,7 +102,7 @@ export function isCubeValid(cube: Cube): '1.21.6+' | 'valid' | 'invalid' {
 		totalRotation === cube.rotation[1] ||
 		totalRotation === cube.rotation[2]
 
-	if (isSingleAxisRotation && projectTargetVersionIsAtLeast('1.21.4')) return '1.21.6+'
+	if (isSingleAxisRotation && projectTargetVersionIsAtLeast('1.21.6')) return '1.21.6+'
 
 	const isRotationInAllowedSteps =
 		totalRotation === -45 ||
@@ -116,11 +116,6 @@ export function isCubeValid(cube: Cube): '1.21.6+' | 'valid' | 'invalid' {
 	return 'invalid'
 }
 
-export function getFunctionNamespace(version: string): 'function' | 'functions' {
-	// If the target version is 1.21.0 or higher, use the 'function' namespace instead of 'functions'
-	return compareVersions(version, '1.20.10000') ? 'function' : 'functions'
-}
-
 export async function sleepForAnimationFrame() {
 	return new Promise(resolve => requestAnimationFrame(resolve))
 }
diff --git a/src/util/events.ts b/src/util/events.ts
index 2d8e280f..4707671f 100644
--- a/src/util/events.ts
+++ b/src/util/events.ts
@@ -42,6 +42,8 @@ const EVENTS = {
 
 	UPDATE_SELECTION: subscribable<void>(),
 
+	UPDATE_VIEW: subscribable<void>(),
+
 	UNDO: subscribable<UndoEntry>(),
 	REDO: subscribable<UndoEntry>(),
 }
@@ -53,12 +55,9 @@ Blockbench.on<EventName>('select_project', ({ project }: { project: ModelProject
 Blockbench.on<EventName>('unselect_project', ({ project }: { project: ModelProject }) => {
 	EVENTS.UNSELECT_PROJECT.publish(project)
 })
-// Blockbench.on('loaded_plugin', ({ plugin }: { plugin: BBPlugin }) => {
-// 	if (plugin.id === PACKAGE.name) return
-// 	EVENTS.EXTERNAL_PLUGIN_LOAD.publish(plugin)
-// })
 Blockbench.on<EventName>('close_project', () => EVENTS.CLOSE_PROJECT.publish(Project!))
 Blockbench.on<EventName>('update_keyframe_selection', EVENTS.UPDATE_KEYFRAME_SELECTION.publish)
 Blockbench.on<EventName>('update_selection', EVENTS.UPDATE_SELECTION.publish)
+Blockbench.on<EventName>('update_view', EVENTS.UPDATE_VIEW.publish)
 Blockbench.on<EventName>('undo', EVENTS.UNDO.publish)
 Blockbench.on<EventName>('redo', EVENTS.REDO.publish)
diff --git a/src/util/minecraftUtil.ts b/src/util/minecraftUtil.ts
index e748556d..8fd808dd 100644
--- a/src/util/minecraftUtil.ts
+++ b/src/util/minecraftUtil.ts
@@ -1,4 +1,8 @@
 import * as pathjs from 'path'
+import { assetsLoaded } from 'src/systems/minecraft/assetManager'
+import { validateBlockState } from 'src/systems/minecraft/blockModelManager'
+import { MINECRAFT_REGISTRY } from 'src/systems/minecraft/registryManager'
+import { getCurrentVersion } from 'src/systems/minecraft/versionManager'
 import { SUPPORTED_MINECRAFT_VERSIONS } from '../systems/global'
 import {
 	BlockStateRegistryEntry,
@@ -259,6 +263,38 @@ export interface IParsedBlock {
 	blockStateRegistryEntry: BlockStateRegistryEntry | undefined
 }
 
+export async function validateItem(item: string) {
+	if (!MINECRAFT_REGISTRY.item) {
+		await assetsLoaded()
+		return
+	}
+	let [namespace, id] = item.split(':')
+	if (!id) {
+		id = namespace
+		namespace = 'minecraft'
+	}
+	if ((namespace === 'minecraft' || namespace === '') && MINECRAFT_REGISTRY.item.has(id)) {
+		return ''
+	} else {
+		return `This item does not exist in Minecraft ${getCurrentVersion()!.id}.`
+	}
+}
+
+export async function validateBlock(block: string) {
+	if (!MINECRAFT_REGISTRY.block) await assetsLoaded()
+	const parsed = await parseBlock(block)
+	if (!parsed) {
+		return 'Invalid block ID.'
+	} else if (
+		(parsed.resource.namespace === 'minecraft' || parsed.resource.namespace === '') &&
+		MINECRAFT_REGISTRY.block.has(parsed.resource.name)
+	) {
+		return validateBlockState(parsed)
+	} else {
+		return `This block does not exist in Minecraft ${getCurrentVersion()!.id}.`
+	}
+}
+
 export async function parseBlock(block: string): Promise<IParsedBlock | undefined> {
 	const states: Record<string, ReturnType<typeof resolveBlockstateValueType>> = {}
 	if (block.includes('[')) {
diff --git a/src/util/moddingTools.ts b/src/util/moddingTools.ts
index f07f40b9..60f2da96 100644
--- a/src/util/moddingTools.ts
+++ b/src/util/moddingTools.ts
@@ -200,7 +200,6 @@ export function registerProjectMod<ID extends string, RevertContext extends any
 		apply: () => {
 			return [
 				EVENTS.PRE_SELECT_PROJECT.subscribe(project => {
-					console.log('Checking project mod condition for', options.id, project)
 					if (!options.condition(project)) return
 					console.log(`Applying project mod '${options.id}'`)
 					revertContext = options.apply()
@@ -620,8 +619,3 @@ export class ObjectProperty extends Property<'object'> {
 		}
 	}
 }
-
-export const fixClassPropertyInheritance: ClassDecorator = target => {
-	target.properties = { ...target.properties }
-	return target
-}
diff --git a/src/util/property.ts b/src/util/property.ts
new file mode 100644
index 00000000..28ea6ec1
--- /dev/null
+++ b/src/util/property.ts
@@ -0,0 +1,22 @@
+export class DeepClonedObjectProperty extends Property<'object'> {
+	constructor(targetClass: any, name: string, options?: PropertyOptions) {
+		super(targetClass, 'object', name, options)
+	}
+
+	merge(instance: any, data: any) {
+		if (typeof data[this.name] === 'object') {
+			instance[this.name] = JSON.parse(JSON.stringify(data[this.name]))
+		}
+	}
+
+	copy(instance: any, target: any) {
+		if (typeof instance[this.name] === 'object') {
+			target[this.name] = JSON.parse(JSON.stringify(instance[this.name]))
+		}
+	}
+}
+
+export const fixClassPropertyInheritance: ClassDecorator = target => {
+	target.properties = { ...target.properties }
+	return target
+}
diff --git a/src/variants.ts b/src/variants.ts
index 97504b70..083d9b7f 100644
--- a/src/variants.ts
+++ b/src/variants.ts
@@ -93,11 +93,13 @@ export class Variant {
 		this.textureMap = new TextureMap()
 		this.id = Variant.all.length
 		if (this.isDefault) {
+			if (Variant.hasDefault()) {
+				throw new Error('There can only be one default variant!')
+			}
 			this.displayName = 'Default'
 			this.name = 'default'
 		}
 		Variant.all.push(this)
-		// this.select()
 		EVENTS.CREATE_VARIANT.publish(this)
 	}
 
@@ -225,12 +227,23 @@ export class Variant {
 	}
 
 	static selectDefault() {
-		const variant = Variant.all.find(v => v.isDefault)
-		if (variant) variant.select()
+		Variant.getDefault().select()
+	}
+
+	static getByUUID(uuid: string): Variant | undefined {
+		return Variant.all.find(v => v.uuid === uuid)
+	}
+
+	static allExcludingDefault(): Variant[] {
+		return Variant.all.filter(v => !v.isDefault)
+	}
+
+	static hasDefault(): boolean {
+		return Variant.all.some(v => v.isDefault)
 	}
 
 	static getDefault(): Variant {
-		return Variant.all.find(v => v.isDefault) ?? Variant.all[0]
+		return Variant.all.find(v => v.isDefault) ?? new Variant('Default', true)
 	}
 }
 
diff --git a/test-packs/1.20.4/blueprints/armor_stand_1.20.4.ajblueprint b/test-packs/1.20.4/blueprints/armor_stand_1.20.4.ajblueprint
index 3c1e8863..8b01582e 100644
--- a/test-packs/1.20.4/blueprints/armor_stand_1.20.4.ajblueprint
+++ b/test-packs/1.20.4/blueprints/armor_stand_1.20.4.ajblueprint
@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated-java:format/blueprint",
-		"format_version": "1.8.0-beta.1",
+		"format_version": "1.8.0-beta.2",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\old-animated-java\\test-packs\\1.20.4\\blueprints\\armor_stand_1.20.4.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
@@ -866,16 +866,43 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
-			"item": "minecraft:diamond",
-			"itemDisplay": "none",
 			"text": "[\n\t{0x00aced}yeah', 'I' '[{love light_purple}' 'text]{' displays''#FF5555'}\n\t'\\n'[{#55_FF_55}definitly' 'quite' 'cursed]\n\t'\\n'{what red}{amI #6395EE}{evenlookingat #c02c38}\n]",
 			"lineWidth": 400,
 			"backgroundColor": "#00000040",
 			"align": "center",
 			"shadow": true,
-			"seeThrough": true
+			"seeThrough": true,
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#6f114b",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "vertical",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": false,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#6f114b",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		},
 		{
 			"name": "camera",
@@ -899,16 +926,39 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
 			"item": "minecraft:diamond",
 			"itemDisplay": "none",
-			"text": "\"Hello World!\"",
-			"lineWidth": 200,
-			"backgroundColor": "#000000",
-			"align": "center",
-			"shadow": false,
-			"seeThrough": false
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#ffffff",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "fixed",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": true,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#99ff00",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		}
 	],
 	"outliner": [
@@ -916,6 +966,7 @@
 			"name": "root",
 			"origin": [0, 0, 0],
 			"color": 0,
+			"onSummonFunction": "",
 			"configs": {
 				"default": {
 					"billboard": "fixed",
@@ -945,6 +996,7 @@
 					"name": "baseplate_root",
 					"origin": [0, 0, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -974,6 +1026,7 @@
 							"name": "baseplate_pivot_a",
 							"origin": [0, 1, 6],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1006,6 +1059,7 @@
 					"name": "armor_stand_root",
 					"origin": [0, 1, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -1036,6 +1090,7 @@
 							"name": "waist_pivot",
 							"origin": [0, 12, 0],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1068,6 +1123,7 @@
 									"name": "body_waist_pivot",
 									"origin": [0, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1100,6 +1156,7 @@
 											"name": "body",
 											"origin": [0, 24, 0],
 											"color": 0,
+											"onSummonFunction": "",
 											"configs": {
 												"default": {
 													"billboard": "fixed",
@@ -1167,6 +1224,7 @@
 													"name": "head",
 													"origin": [0, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1215,6 +1273,7 @@
 													"name": "left_arm",
 													"origin": [-6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1263,6 +1322,7 @@
 													"name": "right_arm",
 													"origin": [6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1320,6 +1380,7 @@
 									"name": "left_leg",
 									"origin": [2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1366,6 +1427,7 @@
 									"name": "right_leg",
 									"origin": [-2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
diff --git a/test-packs/1.20.5/blueprints/armor_stand_1.20.5.ajblueprint b/test-packs/1.20.5/blueprints/armor_stand_1.20.5.ajblueprint
index 30cc102d..216dfef2 100644
--- a/test-packs/1.20.5/blueprints/armor_stand_1.20.5.ajblueprint
+++ b/test-packs/1.20.5/blueprints/armor_stand_1.20.5.ajblueprint
@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated-java:format/blueprint",
-		"format_version": "1.8.0",
+		"format_version": "1.8.0-beta.2",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\old-animated-java\\test-packs\\1.20.5\\blueprints\\armor_stand_1.20.5.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
@@ -866,16 +866,43 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
-			"item": "minecraft:diamond",
-			"itemDisplay": "none",
 			"text": "[\n\t{0x00aced}yeah', 'I' '[{love light_purple}' 'text]{' displays''#FF5555'}\n\t'\\n'[{#55_FF_55}definitly' 'quite' 'cursed]\n\t'\\n'{what red}{amI #6395EE}{evenlookingat #c02c38}\n]",
 			"lineWidth": 400,
 			"backgroundColor": "#00000040",
 			"align": "center",
 			"shadow": true,
-			"seeThrough": true
+			"seeThrough": true,
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#6f114b",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "vertical",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": false,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#6f114b",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		},
 		{
 			"name": "camera",
@@ -899,16 +926,39 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
 			"item": "minecraft:diamond",
 			"itemDisplay": "none",
-			"text": "\"Hello World!\"",
-			"lineWidth": 200,
-			"backgroundColor": "#000000",
-			"align": "center",
-			"shadow": false,
-			"seeThrough": false
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#ffffff",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "fixed",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": true,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#99ff00",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		}
 	],
 	"outliner": [
@@ -916,6 +966,7 @@
 			"name": "root",
 			"origin": [0, 0, 0],
 			"color": 0,
+			"onSummonFunction": "",
 			"configs": {
 				"default": {
 					"billboard": "fixed",
@@ -945,6 +996,7 @@
 					"name": "baseplate_root",
 					"origin": [0, 0, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -974,6 +1026,7 @@
 							"name": "baseplate_pivot_a",
 							"origin": [0, 1, 6],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1006,6 +1059,7 @@
 					"name": "armor_stand_root",
 					"origin": [0, 1, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -1036,6 +1090,7 @@
 							"name": "waist_pivot",
 							"origin": [0, 12, 0],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1068,6 +1123,7 @@
 									"name": "body_waist_pivot",
 									"origin": [0, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1100,6 +1156,7 @@
 											"name": "body",
 											"origin": [0, 24, 0],
 											"color": 0,
+											"onSummonFunction": "",
 											"configs": {
 												"default": {
 													"billboard": "fixed",
@@ -1167,6 +1224,7 @@
 													"name": "head",
 													"origin": [0, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1215,6 +1273,7 @@
 													"name": "left_arm",
 													"origin": [-6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1263,6 +1322,7 @@
 													"name": "right_arm",
 													"origin": [6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1320,6 +1380,7 @@
 									"name": "left_leg",
 									"origin": [2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1366,6 +1427,7 @@
 									"name": "right_leg",
 									"origin": [-2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
diff --git a/test-packs/1.20.5/datapacks/animated_java/pack.mcmeta b/test-packs/1.20.5/datapacks/animated_java/pack.mcmeta
index 04a53ff1..98042a67 100644
--- a/test-packs/1.20.5/datapacks/animated_java/pack.mcmeta
+++ b/test-packs/1.20.5/datapacks/animated_java/pack.mcmeta
@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 41,
-		"description": "AJ Testing DP"
+		"description": "AJ Testing DP",
+		"supported_formats": {
+			"min_inclusive": 41,
+			"max_inclusive": 56
+		}
 	}
 }
\ No newline at end of file
diff --git a/test-packs/1.20.5/resources/pack.mcmeta b/test-packs/1.20.5/resources/pack.mcmeta
index 3ac81056..f1216214 100644
--- a/test-packs/1.20.5/resources/pack.mcmeta
+++ b/test-packs/1.20.5/resources/pack.mcmeta
@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 32,
-		"description": "AJ Testing RP"
+		"description": "AJ Testing RP",
+		"supported_formats": {
+			"min_inclusive": 32,
+			"max_inclusive": 41
+		}
 	}
 }
\ No newline at end of file
diff --git a/test-packs/1.21.2/blueprints/armor_stand_1.21.2.ajblueprint b/test-packs/1.21.2/blueprints/armor_stand_1.21.2.ajblueprint
index e04fb958..1d15cf52 100644
--- a/test-packs/1.21.2/blueprints/armor_stand_1.21.2.ajblueprint
+++ b/test-packs/1.21.2/blueprints/armor_stand_1.21.2.ajblueprint
@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated-java:format/blueprint",
-		"format_version": "1.8.0",
+		"format_version": "1.8.0-beta.2",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\old-animated-java\\test-packs\\1.21.2\\blueprints\\armor_stand_1.21.2.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
@@ -866,16 +866,43 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
-			"item": "minecraft:diamond",
-			"itemDisplay": "none",
 			"text": "[\n\t{0x00aced}yeah', 'I' '[{love light_purple}' 'text]{' displays''#FF5555'}\n\t'\\n'[{#55_FF_55}definitly' 'quite' 'cursed]\n\t'\\n'{what red}{amI #6395EE}{evenlookingat #c02c38}\n]",
 			"lineWidth": 400,
 			"backgroundColor": "#00000040",
 			"align": "center",
 			"shadow": true,
-			"seeThrough": true
+			"seeThrough": true,
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#6f114b",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "vertical",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": false,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#6f114b",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		},
 		{
 			"name": "camera",
@@ -899,16 +926,39 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
 			"item": "minecraft:diamond",
 			"itemDisplay": "none",
-			"text": "\"Hello World!\"",
-			"lineWidth": 200,
-			"backgroundColor": "#000000",
-			"align": "center",
-			"shadow": false,
-			"seeThrough": false
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#ffffff",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "fixed",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": true,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#99ff00",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		}
 	],
 	"outliner": [
@@ -916,6 +966,7 @@
 			"name": "root",
 			"origin": [0, 0, 0],
 			"color": 0,
+			"onSummonFunction": "",
 			"configs": {
 				"default": {
 					"billboard": "fixed",
@@ -945,6 +996,7 @@
 					"name": "baseplate_root",
 					"origin": [0, 0, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -974,6 +1026,7 @@
 							"name": "baseplate_pivot_a",
 							"origin": [0, 1, 6],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1006,6 +1059,7 @@
 					"name": "armor_stand_root",
 					"origin": [0, 1, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -1036,6 +1090,7 @@
 							"name": "waist_pivot",
 							"origin": [0, 12, 0],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1068,6 +1123,7 @@
 									"name": "body_waist_pivot",
 									"origin": [0, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1100,6 +1156,7 @@
 											"name": "body",
 											"origin": [0, 24, 0],
 											"color": 0,
+											"onSummonFunction": "",
 											"configs": {
 												"default": {
 													"billboard": "fixed",
@@ -1167,6 +1224,7 @@
 													"name": "head",
 													"origin": [0, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1215,6 +1273,7 @@
 													"name": "left_arm",
 													"origin": [-6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1263,6 +1322,7 @@
 													"name": "right_arm",
 													"origin": [6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1320,6 +1380,7 @@
 									"name": "left_leg",
 									"origin": [2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1366,6 +1427,7 @@
 									"name": "right_leg",
 									"origin": [-2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
diff --git a/test-packs/1.21.2/datapacks/animated_java/pack.mcmeta b/test-packs/1.21.2/datapacks/animated_java/pack.mcmeta
index a0177a18..43a4901c 100644
--- a/test-packs/1.21.2/datapacks/animated_java/pack.mcmeta
+++ b/test-packs/1.21.2/datapacks/animated_java/pack.mcmeta
@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 57,
-		"description": "AJ Testing DP"
+		"description": "AJ Testing DP",
+		"supported_formats": {
+			"min_inclusive": 57,
+			"max_inclusive": 60
+		}
 	}
 }
\ No newline at end of file
diff --git a/test-packs/1.21.2/resources/pack.mcmeta b/test-packs/1.21.2/resources/pack.mcmeta
index e9f04eb9..e027f972 100644
--- a/test-packs/1.21.2/resources/pack.mcmeta
+++ b/test-packs/1.21.2/resources/pack.mcmeta
@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 42,
-		"description": "AJ Testing RP"
+		"description": "AJ Testing RP",
+		"supported_formats": {
+			"min_inclusive": 42,
+			"max_inclusive": 45
+		}
 	}
 }
\ No newline at end of file
diff --git a/test-packs/1.21.4/blueprints/armor_stand_1.21.4.ajblueprint b/test-packs/1.21.4/blueprints/armor_stand_1.21.4.ajblueprint
index 199f153a..c658225d 100644
--- a/test-packs/1.21.4/blueprints/armor_stand_1.21.4.ajblueprint
+++ b/test-packs/1.21.4/blueprints/armor_stand_1.21.4.ajblueprint
@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated-java:format/blueprint",
-		"format_version": "1.8.0",
+		"format_version": "1.8.0-beta.2",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\old-animated-java\\test-packs\\1.21.4\\blueprints\\armor_stand_1.21.4.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
@@ -866,16 +866,43 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
-			"item": "minecraft:diamond",
-			"itemDisplay": "none",
 			"text": "[\n\t{0x00aced}yeah', 'I' '[{love light_purple}' 'text]{' displays''#FF5555'}\n\t'\\n'[{#55_FF_55}definitly' 'quite' 'cursed]\n\t'\\n'{what red}{amI #6395EE}{evenlookingat #c02c38}\n]",
 			"lineWidth": 400,
 			"backgroundColor": "#00000040",
 			"align": "center",
 			"shadow": true,
-			"seeThrough": true
+			"seeThrough": true,
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#6f114b",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "vertical",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": false,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#6f114b",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		},
 		{
 			"name": "camera",
@@ -899,16 +926,39 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
 			"item": "minecraft:diamond",
 			"itemDisplay": "none",
-			"text": "\"Hello World!\"",
-			"lineWidth": 200,
-			"backgroundColor": "#000000",
-			"align": "center",
-			"shadow": false,
-			"seeThrough": false
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#ffffff",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "fixed",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": true,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#99ff00",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		}
 	],
 	"outliner": [
@@ -916,6 +966,7 @@
 			"name": "root",
 			"origin": [0, 0, 0],
 			"color": 0,
+			"onSummonFunction": "",
 			"configs": {
 				"default": {
 					"billboard": "fixed",
@@ -945,6 +996,7 @@
 					"name": "baseplate_root",
 					"origin": [0, 0, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -974,6 +1026,7 @@
 							"name": "baseplate_pivot_a",
 							"origin": [0, 1, 6],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1006,6 +1059,7 @@
 					"name": "armor_stand_root",
 					"origin": [0, 1, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -1036,6 +1090,7 @@
 							"name": "waist_pivot",
 							"origin": [0, 12, 0],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1068,6 +1123,7 @@
 									"name": "body_waist_pivot",
 									"origin": [0, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1100,6 +1156,7 @@
 											"name": "body",
 											"origin": [0, 24, 0],
 											"color": 0,
+											"onSummonFunction": "",
 											"configs": {
 												"default": {
 													"billboard": "fixed",
@@ -1167,6 +1224,7 @@
 													"name": "head",
 													"origin": [0, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1215,6 +1273,7 @@
 													"name": "left_arm",
 													"origin": [-6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1263,6 +1322,7 @@
 													"name": "right_arm",
 													"origin": [6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1320,6 +1380,7 @@
 									"name": "left_leg",
 									"origin": [2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1366,6 +1427,7 @@
 									"name": "right_leg",
 									"origin": [-2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
diff --git a/test-packs/1.21.4/datapacks/animated_java/pack.mcmeta b/test-packs/1.21.4/datapacks/animated_java/pack.mcmeta
index 348aa12d..1e344e49 100644
--- a/test-packs/1.21.4/datapacks/animated_java/pack.mcmeta
+++ b/test-packs/1.21.4/datapacks/animated_java/pack.mcmeta
@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 61,
-		"description": "AJ Testing DP"
+		"description": "AJ Testing DP",
+		"supported_formats": {
+			"min_inclusive": 61,
+			"max_inclusive": 70
+		}
 	}
 }
\ No newline at end of file
diff --git a/test-packs/1.21.4/resources/pack.mcmeta b/test-packs/1.21.4/resources/pack.mcmeta
index 9a4b5693..fce73eb7 100644
--- a/test-packs/1.21.4/resources/pack.mcmeta
+++ b/test-packs/1.21.4/resources/pack.mcmeta
@@ -1,6 +1,10 @@
 {
 	"pack": {
 		"pack_format": 46,
-		"description": "AJ Testing RP"
+		"description": "AJ Testing DP",
+		"supported_formats": {
+			"min_inclusive": 46,
+			"max_inclusive": 54
+		}
 	}
 }
\ No newline at end of file
diff --git a/test-packs/1.21.5/blueprints/armor_stand_1.21.5.ajblueprint b/test-packs/1.21.5/blueprints/armor_stand_1.21.5.ajblueprint
index 2ad5af18..3e22b15b 100644
--- a/test-packs/1.21.5/blueprints/armor_stand_1.21.5.ajblueprint
+++ b/test-packs/1.21.5/blueprints/armor_stand_1.21.5.ajblueprint
@@ -1,7 +1,7 @@
 {
 	"meta": {
 		"format": "animated-java:format/blueprint",
-		"format_version": "1.8.0",
+		"format_version": "1.8.0-beta.2",
 		"uuid": "167b27cd-b559-3f13-a97c-0841fe21f1d1",
 		"save_location": "D:\\github-repos\\animated-java\\old-animated-java\\test-packs\\1.21.5\\blueprints\\armor_stand_1.21.5.ajblueprint",
 		"last_used_export_namespace": "armor_stand"
@@ -866,16 +866,43 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
-			"item": "minecraft:diamond",
-			"itemDisplay": "none",
 			"text": "[\n\t{0x00aced}yeah', 'I' '[{love light_purple}' 'text]{' displays''#FF5555'}\n\t'\\n'[{#55_FF_55}definitly' 'quite' 'cursed]\n\t'\\n'{what red}{amI #6395EE}{evenlookingat #c02c38}\n]",
 			"lineWidth": 400,
 			"backgroundColor": "#00000040",
 			"align": "center",
 			"shadow": true,
-			"seeThrough": true
+			"seeThrough": true,
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#6f114b",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "vertical",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": false,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#6f114b",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		},
 		{
 			"name": "camera",
@@ -899,16 +926,39 @@
 			"visibility": true,
 			"locked": false,
 			"export": true,
-			"block": "minecraft:stone",
-			"config": {},
 			"item": "minecraft:diamond",
 			"itemDisplay": "none",
-			"text": "\"Hello World!\"",
-			"lineWidth": 200,
-			"backgroundColor": "#000000",
-			"align": "center",
-			"shadow": false,
-			"seeThrough": false
+			"onSummonFunction": "",
+			"configs": {
+				"default": {
+					"on_apply_function": "",
+					"billboard": "fixed",
+					"override_brightness": false,
+					"brightness_override": 0,
+					"enchanted": false,
+					"glowing": false,
+					"override_glow_color": false,
+					"glow_color": "#ffffff",
+					"invisible": false,
+					"shadow_radius": 0,
+					"shadow_strength": 1
+				},
+				"variants": {
+					"49521f4b-b970-e4bd-b594-2e05d2d46027": {
+						"on_apply_function": "",
+						"billboard": "fixed",
+						"override_brightness": false,
+						"brightness_override": 0,
+						"enchanted": true,
+						"glowing": true,
+						"override_glow_color": true,
+						"glow_color": "#99ff00",
+						"invisible": false,
+						"shadow_radius": 0,
+						"shadow_strength": 1
+					}
+				}
+			}
 		}
 	],
 	"outliner": [
@@ -916,6 +966,7 @@
 			"name": "root",
 			"origin": [0, 0, 0],
 			"color": 0,
+			"onSummonFunction": "",
 			"configs": {
 				"default": {
 					"billboard": "fixed",
@@ -945,6 +996,7 @@
 					"name": "baseplate_root",
 					"origin": [0, 0, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -974,6 +1026,7 @@
 							"name": "baseplate_pivot_a",
 							"origin": [0, 1, 6],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1006,6 +1059,7 @@
 					"name": "armor_stand_root",
 					"origin": [0, 1, 0],
 					"color": 0,
+					"onSummonFunction": "",
 					"configs": {
 						"default": {
 							"billboard": "fixed",
@@ -1036,6 +1090,7 @@
 							"name": "waist_pivot",
 							"origin": [0, 12, 0],
 							"color": 0,
+							"onSummonFunction": "",
 							"configs": {
 								"default": {
 									"billboard": "fixed",
@@ -1068,6 +1123,7 @@
 									"name": "body_waist_pivot",
 									"origin": [0, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1100,6 +1156,7 @@
 											"name": "body",
 											"origin": [0, 24, 0],
 											"color": 0,
+											"onSummonFunction": "",
 											"configs": {
 												"default": {
 													"billboard": "fixed",
@@ -1167,6 +1224,7 @@
 													"name": "head",
 													"origin": [0, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1215,6 +1273,7 @@
 													"name": "left_arm",
 													"origin": [-6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1263,6 +1322,7 @@
 													"name": "right_arm",
 													"origin": [6, 23, 0],
 													"color": 0,
+													"onSummonFunction": "",
 													"configs": {
 														"default": {
 															"billboard": "fixed",
@@ -1320,6 +1380,7 @@
 									"name": "left_leg",
 									"origin": [2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",
@@ -1366,6 +1427,7 @@
 									"name": "right_leg",
 									"origin": [-2, 12, 0],
 									"color": 0,
+									"onSummonFunction": "",
 									"configs": {
 										"default": {
 											"billboard": "fixed",