diff --git a/VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Mid Distance (less).preset b/VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Mid Distance (less).preset
new file mode 100644
index 000000000..a8ec4424c
--- /dev/null
+++ b/VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Mid Distance (less).preset	
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!181963792 &2655988077585873504
+Preset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Mid Distance (less)
+  m_TargetType:
+    m_NativeTypeID: 4
+    m_ManagedTypePPtr: {fileID: 0}
+    m_ManagedTypeFallback: 
+  m_Properties:
+  - target: {fileID: 0}
+    propertyPath: m_LocalRotation.x
+    value: 0.27781588
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalRotation.y
+    value: 0.36497167
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalRotation.z
+    value: -0.1150751
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalRotation.w
+    value: 0.8811196
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalPosition.x
+    value: -0.0819
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalPosition.y
+    value: 0.1051
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalPosition.z
+    value: -0.0819
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalScale.x
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalScale.y
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalScale.z
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ConstrainProportionsScale
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalEulerAnglesHint.x
+    value: 35
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalEulerAnglesHint.y
+    value: 45
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LocalEulerAnglesHint.z
+    value: 0
+    objectReference: {fileID: 0}
+  m_ExcludedProperties: []
+  m_CoupledType:
+    m_NativeTypeID: 0
+    m_ManagedTypePPtr: {fileID: 0}
+    m_ManagedTypeFallback: 
+  m_CoupledProperties: []
diff --git a/VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Mid Distance (less).preset.meta b/VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Mid Distance (less).preset.meta
new file mode 100644
index 000000000..15a921cd0
--- /dev/null
+++ b/VisualPinball.Unity/Assets/Presets/Asset Thumbcam/Mid Distance (less).preset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0032d5f974510d47a3825e7cf7b4ed7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2655988077585873504
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/Assets/Resources/Materials/Dot Matrix Display (SRP).mat b/VisualPinball.Unity/Assets/Resources/Materials/Dot Matrix Display (SRP).mat
index efb2476c7..cb87fca25 100644
--- a/VisualPinball.Unity/Assets/Resources/Materials/Dot Matrix Display (SRP).mat	
+++ b/VisualPinball.Unity/Assets/Resources/Materials/Dot Matrix Display (SRP).mat	
@@ -24,8 +24,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Dot Matrix Display (SRP)
-  m_Shader: {fileID: -6465566751694194690, guid: 3dfbd2115636a284d89d71fdefd9b4d2,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 3dfbd2115636a284d89d71fdefd9b4d2, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -197,6 +196,7 @@ Material:
     - _DoubleSidedGIMode: 0
     - _DoubleSidedNormalMode: 1
     - _DstBlend: 0
+    - _DstBlend2: 0
     - _EmissiveColorMode: 1
     - _EmissiveExposureWeight: 1
     - _EmissiveIntensity: 1
@@ -205,6 +205,7 @@ Material:
     - _EnableFogOnTransparent: 1
     - _EnableGeometricSpecularAA: 0
     - _EnergyConservingSpecularColor: 1
+    - _ExcludeFromTUAndAA: 0
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
     - _HeightMapParametrization: 0
@@ -220,6 +221,7 @@ Material:
     - _IridescenceThickness: 1
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
+    - _MaterialTypeMask: 2
     - _Metallic: 0
     - _MetallicRemapMax: 1
     - _MetallicRemapMin: 0
@@ -231,6 +233,9 @@ Material:
     - _PPDMinSamples: 5
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
+    - _PerPixelSorting: 0
+    - _QueueControl: -1
+    - _QueueOffset: 0
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
@@ -250,10 +255,10 @@ Material:
     - _StencilRefGBuffer: 10
     - _StencilRefMV: 40
     - _StencilWriteMask: 6
-    - _StencilWriteMaskDepth: 8
+    - _StencilWriteMaskDepth: 9
     - _StencilWriteMaskDistortionVec: 4
-    - _StencilWriteMaskGBuffer: 14
-    - _StencilWriteMaskMV: 40
+    - _StencilWriteMaskGBuffer: 15
+    - _StencilWriteMaskMV: 41
     - _SubsurfaceMask: 1
     - _SupportDecals: 1
     - _SurfaceType: 0
@@ -287,8 +292,7 @@ Material:
     - __SkewAngle: 0
     m_Colors:
     - Color_754dade2513142578632eb55adb8f59b: {r: 1, g: 0.36865607, b: 0, a: 0}
-    - Color_a1cf9b5e0df34a8c907984367d220f54: {r: 0.25471696, g: 0.25471696, b: 0.25471696,
-        a: 0}
+    - Color_a1cf9b5e0df34a8c907984367d220f54: {r: 0.25471696, g: 0.25471696, b: 0.25471696, a: 0}
     - Vector2_59fda9737b9e42259b122fbd66ccd94d: {r: 0.7, g: 0.28, b: 0, a: 0}
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
@@ -311,6 +315,7 @@ Material:
     - __Padding: {r: 0.3, g: 0.5, b: 0, a: 0}
     - __UnlitColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &3792289215621747627
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -323,4 +328,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 9
diff --git a/VisualPinball.Unity/Assets/Resources/Materials/Segment Display (SRP).mat b/VisualPinball.Unity/Assets/Resources/Materials/Segment Display (SRP).mat
index 923011b22..f53e3bc1c 100644
--- a/VisualPinball.Unity/Assets/Resources/Materials/Segment Display (SRP).mat	
+++ b/VisualPinball.Unity/Assets/Resources/Materials/Segment Display (SRP).mat	
@@ -24,8 +24,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Segment Display (SRP)
-  m_Shader: {fileID: -6465566751694194690, guid: d54eb986991300e419411008eb1f597d,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: d54eb986991300e419411008eb1f597d, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
@@ -115,6 +114,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SegmentDisplayCustomFunction_a94cb738cee9426e8bf076adaa3b6811_SegmentData_2_Texture2D:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _SpecularColorMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -196,6 +199,7 @@ Material:
     - _DoubleSidedGIMode: 0
     - _DoubleSidedNormalMode: 1
     - _DstBlend: 0
+    - _DstBlend2: 0
     - _EmissiveColorMode: 1
     - _EmissiveExposureWeight: 1
     - _EmissiveIntensity: 1
@@ -204,6 +208,7 @@ Material:
     - _EnableFogOnTransparent: 1
     - _EnableGeometricSpecularAA: 0
     - _EnergyConservingSpecularColor: 1
+    - _ExcludeFromTUAndAA: 0
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
     - _HeightMapParametrization: 0
@@ -219,6 +224,7 @@ Material:
     - _IridescenceThickness: 1
     - _LinkDetailsWithBase: 1
     - _MaterialID: 1
+    - _MaterialTypeMask: 2
     - _Metallic: 0
     - _MetallicRemapMax: 1
     - _MetallicRemapMin: 0
@@ -230,6 +236,9 @@ Material:
     - _PPDMinSamples: 5
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
+    - _PerPixelSorting: 0
+    - _QueueControl: -1
+    - _QueueOffset: 0
     - _RayTracing: 0
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
@@ -249,10 +258,10 @@ Material:
     - _StencilRefGBuffer: 10
     - _StencilRefMV: 40
     - _StencilWriteMask: 6
-    - _StencilWriteMaskDepth: 8
+    - _StencilWriteMaskDepth: 9
     - _StencilWriteMaskDistortionVec: 4
-    - _StencilWriteMaskGBuffer: 14
-    - _StencilWriteMaskMV: 40
+    - _StencilWriteMaskGBuffer: 15
+    - _StencilWriteMaskMV: 41
     - _SubsurfaceMask: 1
     - _SupportDecals: 1
     - _SurfaceType: 0
@@ -276,6 +285,7 @@ Material:
     - _ZTestGBuffer: 4
     - _ZTestTransparent: 4
     - _ZWrite: 1
+    - __Emission: 1
     - __HorizontalMiddle: 0
     - __NumChars: 2
     - __NumSegments: 14
@@ -285,8 +295,7 @@ Material:
     - __SkewAngle: 0
     m_Colors:
     - Color_754dade2513142578632eb55adb8f59b: {r: 1, g: 0.36865607, b: 0, a: 0}
-    - Color_a1cf9b5e0df34a8c907984367d220f54: {r: 0.25471696, g: 0.25471696, b: 0.25471696,
-        a: 0}
+    - Color_a1cf9b5e0df34a8c907984367d220f54: {r: 0.25471696, g: 0.25471696, b: 0.25471696, a: 0}
     - Vector2_59fda9737b9e42259b122fbd66ccd94d: {r: 0.7, g: 0.28, b: 0, a: 0}
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
@@ -309,6 +318,7 @@ Material:
     - __SeparatorPos: {r: 1.4, g: 0, b: 0, a: 0}
     - __UnlitColor: {r: 0.25471696, g: 0.25471696, b: 0.25471696, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &6529312484818753363
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -321,4 +331,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 5
+  version: 9
diff --git a/VisualPinball.Unity/Documentation~/creators-guide/editor/asset-library-styleguide.md b/VisualPinball.Unity/Documentation~/creators-guide/editor/asset-library-styleguide.md
index 45ca3a137..c4428ccd7 100644
--- a/VisualPinball.Unity/Documentation~/creators-guide/editor/asset-library-styleguide.md
+++ b/VisualPinball.Unity/Documentation~/creators-guide/editor/asset-library-styleguide.md
@@ -204,7 +204,6 @@ The smoothness map (the inverse of a roughness map) defines how regularly light
 All texture maps must use power-of-two dimensions for width and height (e.g., 256, 512, 1024). They don't have to be square.
 
 <img src="assetlib-map-sizes.png" style="max-height:200px" /><br>
-<i>Metallicness set to 1 with smoothness going from 0 to 1.</i>
 
 We're aiming for a resolution of about 6 pixels per millimeter (approximately 150 DPI). For a playfield texture, this means roughly 4096×8192 pixels. Use this resolution when possible, but don't upscale images — the highest resolution should be from your source. This applies to both color and normal maps. For metallic/smoothness maps, half the resolution of the color map is a good balance between performance and visual fidelity.
 
@@ -224,15 +223,14 @@ We're aiming for a resolution of about 6 pixels per millimeter (approximately 15
 > 
 > So, a texture map at 296×296 would correspond to 6px / mm. Since we're at power of twos, we could go for either 512×512 or 256×256.   
 
+### Compression
 
-### File Format
-
-Export your texture maps in **PNG format**. Use 32-bit if they include an alpha channel; otherwise, 24-bit is sufficient.
+Export your texture maps in **PNG format**. Use 32-bit if they include an alpha channel; otherwise, 24-bit is sufficient. Use halved resolution for the mask map. Don't quantize / TinyPNG your maps, since together with the GPU's block compression they will result in artifacts.
 
 > [!note]
 > Many artists prefer to export their textures as TGA due to faster read/write speeds, but TGA files consume significantly more space. PNG uses lossless compression, and once imported, Unity stores textures in a GPU-friendly format anyway. Additionally, when exporting to the `.vpe` format, image textures are converted into a runtime-optimized format.
 
-In terms of *packaging*, Unity's HDRP stores metallic, ambient occlusion and smoothness in what they call a [mask map](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@17.2/manual/Mask-Map-and-Detail-Map.html). Substance Painter exports this out of the box, but it should be pretty easy to do with Blender as well. 
+In terms of *packaging*, Unity's HDRP stores metallic, ambient occlusion and smoothness in what they call a [mask map](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@17.2/manual/Mask-Map-and-Detail-Map.html). Substance Painter exports this out of the box, but it should be pretty easy to do with Blender as well.
 
 ### Wear
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.cs
index 74c85f262..b2eb65d7a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.cs
@@ -50,8 +50,6 @@ public partial class AssetBrowser : EditorWindow, IDragHandler
 		[NonSerialized]
 		public AssetQuery Query;
 
-		public const int ThumbSize = 256;
-
 		private AssetResult LastSelectedResult {
 			set => _detailsElement.Asset = value?.Asset;
 		}
@@ -98,7 +96,7 @@ private void RefreshLibraries()
 			Libraries = AssetDatabase.FindAssets($"t:{typeof(AssetLibrary)}")
 				.Select(AssetDatabase.GUIDToAssetPath)
 				.Select(AssetDatabase.LoadAssetAtPath<AssetLibrary>)
-				.Where(asset => asset != null).ToList();
+				.Where(lib => lib != null).ToList();
 
 			// toggle label
 			if (Libraries.Count == 0) {
@@ -198,115 +196,123 @@ private void UpdateQueryResults(List<AssetResult> results, long duration)
 			_statusLabel.text = $"Found {results.Count} asset" + (results.Count == 1 ? "" : "s") + $" in {duration}ms.";
 		}
 
-		private void AddAssetContextMenu(ContextualMenuPopulateEvent evt)
-		{
-			if (evt.target is not VisualElement ve || !_resultByElement.ContainsKey(ve)) {
-				return;
-			}
-
-			var clickedAsset = _resultByElement[ve];
-			var lib = _resultByElement[ve].Asset.Library;
-			if (lib.IsLocked) {
-				return;
-			}
-
-			// lib is not locked, and asset is known.
-			evt.menu.AppendAction("Remove from Library", _ => {
-				if (!_selectedResults.Contains(clickedAsset)) {
-					_selectedResults.Add(clickedAsset);
-					ToggleSelectionClass(_elementByAsset[clickedAsset.Asset]);
+			private void AddAssetContextMenu(ContextualMenuPopulateEvent evt)
+			{
+				if (evt.target is not VisualElement target) {
+					Debug.Log("Early out in AddAssetContextMenu, target is no VisualElement.");
+					return;
 				}
-				var numRemovedAssets = 0;
-				foreach (var assetResult in _selectedResults.Where(a => !a.Asset.Library.IsLocked).ToList()) {
-					_selectedResults.Remove(assetResult);
-					assetResult.Asset.Library.RemoveAsset(assetResult.Asset);
-					if (_thumbCache.ContainsKey(assetResult.Asset.GUID)) {
-						DestroyImmediate(_thumbCache[assetResult.Asset.GUID]);
-						_thumbCache.Remove(assetResult.Asset.GUID);
-					}
-					numRemovedAssets++;
+
+				if (!_resultByElement.ContainsKey(target.parent.parent)) {
+					Debug.Log($"Early out in AddAssetContextMenu, {target.parent.parent} not in resultByElement.");
+					return;
 				}
 
-				RefreshCategories();
-				RefreshAssets();
-				_statusLabel.text = $"Removed {numRemovedAssets} assets from library.";
-			});
+				var clickedAsset = _resultByElement[target.parent.parent];
+				var libs = clickedAsset.Asset.Libraries;
+				if (libs.All(l => l.IsLocked)) {
+					Debug.Log("Early out in AddAssetContextMenu, all libraries are locked.");
+					return;
+				}
 
-			if (_selectedResults.Count > 1) {
-				var srcAsset = clickedAsset.Asset;
-				evt.menu.AppendSeparator();
-				evt.menu.AppendAction("Add Attributes to Selected", _ => {
-					var destAssets = OtherSelected(clickedAsset).ToList();
-					foreach (var destAsset in destAssets) {
-						foreach (var attr in srcAsset.Attributes) {
-							destAsset.AddAttribute(attr.Key, attr.Value);
-						}
-						destAsset.Save();
-					}
-					EditorUtility.DisplayDialog("Add Attributes to Selected", $"Added {srcAsset.Attributes.Count} attributes to {destAssets.Count} other assets.", "OK");
-
-				});
-				evt.menu.AppendAction("Replace Attributes in Selected", _ => {
-					var destAssets = OtherSelected(clickedAsset).ToList();
-					foreach (var destAsset in destAssets) {
-						foreach (var attr in srcAsset.Attributes) {
-							destAsset.ReplaceAttribute(attr.Key, attr.Value);
+				// lib is not locked, and asset is known.
+				foreach (var lib in libs.Where(l => !l.IsLocked)) {
+					evt.menu.AppendAction($"Remove from {lib.Name}", _ => {
+						if (_selectedResults.Add(clickedAsset)) {
+							ToggleSelectionClass(_elementByAsset[clickedAsset.Asset]);
 						}
-						destAsset.Save();
-					}
-					EditorUtility.DisplayDialog("Replace Attributes to Selected", $"Replaced {srcAsset.Attributes.Count} attributes in {destAssets.Count} other assets.", "OK");
-				});
-
-				evt.menu.AppendSeparator();
-				evt.menu.AppendAction("Add Tags to Selected", _ => {
-					var destAssets = OtherSelected(clickedAsset).ToList();
-					foreach (var destAsset in destAssets) {
-						foreach (var tag in srcAsset.Tags) {
-							destAsset.AddTag(tag.TagName);
+						var numRemovedAssets = 0;
+						foreach (var assetResult in _selectedResults.Where(a => lib.HasAsset(a.Asset.GUID)).ToList()) {
+							_selectedResults.Remove(assetResult);
+							lib.DeleteAsset(assetResult.Asset);
+							if (libs.Length == 1 && _thumbCache.ContainsKey(assetResult.Asset.GUID)) {
+								DestroyImmediate(_thumbCache[assetResult.Asset.GUID]);
+								_thumbCache.Remove(assetResult.Asset.GUID);
+							}
+							numRemovedAssets++;
 						}
-						destAsset.Save();
-					}
-					EditorUtility.DisplayDialog("Add Tags to Selected", $"Added {srcAsset.Tags.Count} tags to {destAssets.Count} other assets.", "OK");
-				});
-
-				evt.menu.AppendAction("Replace Tags in Selected", _ => {
-					var destAssets = OtherSelected(clickedAsset).ToList();
-					foreach (var destAsset in destAssets) {
-						destAsset.Tags.Clear();
-						foreach (var tag in srcAsset.Tags) {
-							destAsset.AddTag(tag.TagName);
+
+						RefreshCategories();
+						RefreshAssets();
+						_statusLabel.text = $"Removed {numRemovedAssets} asset(s) from library {lib.Name}.";
+					});
+				}
+
+				if (_selectedResults.Count > 1) {
+					var srcAsset = clickedAsset.Asset;
+					evt.menu.AppendSeparator();
+					evt.menu.AppendAction("Add Attributes to Selected", _ => {
+						var destAssets = OtherSelected(clickedAsset).ToList();
+						foreach (var destAsset in destAssets) {
+							foreach (var attr in srcAsset.Attributes) {
+								destAsset.AddAttribute(attr.Key, attr.Value);
+							}
+							destAsset.Save();
 						}
-						destAsset.Save();
-					}
-					EditorUtility.DisplayDialog("Replace Tags in Selected", $"Replaced {srcAsset.Tags.Count} tags in {destAssets.Count} other assets.", "OK");
-				});
-
-				evt.menu.AppendSeparator();
-				evt.menu.AppendAction("Copy All to Selected", _ => {
-					var destAssets = OtherSelected(clickedAsset).ToList();
-					foreach (var destAsset in destAssets) {
-						if (string.IsNullOrEmpty(destAsset.Description)) {
-							destAsset.Description = srcAsset.Description;
+						EditorUtility.DisplayDialog("Add Attributes to Selected", $"Added {srcAsset.Attributes.Count} attributes to {destAssets.Count} other assets.", "OK");
+
+					});
+					evt.menu.AppendAction("Replace Attributes in Selected", _ => {
+						var destAssets = OtherSelected(clickedAsset).ToList();
+						foreach (var destAsset in destAssets) {
+							foreach (var attr in srcAsset.Attributes) {
+								destAsset.ReplaceAttribute(attr.Key, attr.Value);
+							}
+							destAsset.Save();
 						}
-						foreach (var tag in srcAsset.Tags) {
-							destAsset.AddTag(tag.TagName);
+						EditorUtility.DisplayDialog("Replace Attributes to Selected", $"Replaced {srcAsset.Attributes.Count} attributes in {destAssets.Count} other assets.", "OK");
+					});
+
+					evt.menu.AppendSeparator();
+					evt.menu.AppendAction("Add Tags to Selected", _ => {
+						var destAssets = OtherSelected(clickedAsset).ToList();
+						foreach (var destAsset in destAssets) {
+							foreach (var tag in srcAsset.Tags) {
+								destAsset.AddTag(tag.TagName);
+							}
+							destAsset.Save();
 						}
-						foreach (var attr in srcAsset.Attributes) {
-							destAsset.AddAttribute(attr.Key, attr.Value);
+						EditorUtility.DisplayDialog("Add Tags to Selected", $"Added {srcAsset.Tags.Count} tags to {destAssets.Count} other assets.", "OK");
+					});
+
+					evt.menu.AppendAction("Replace Tags in Selected", _ => {
+						var destAssets = OtherSelected(clickedAsset).ToList();
+						foreach (var destAsset in destAssets) {
+							destAsset.Tags.Clear();
+							foreach (var tag in srcAsset.Tags) {
+								destAsset.AddTag(tag.TagName);
+							}
+							destAsset.Save();
 						}
-						foreach (var link in srcAsset.Links.Where(link => destAsset.Links.FirstOrDefault(l => l.Name == link.Name) != null)) {
-							destAsset.Links.Add(new AssetLink(link.Name, link.Url));
+						EditorUtility.DisplayDialog("Replace Tags in Selected", $"Replaced {srcAsset.Tags.Count} tags in {destAssets.Count} other assets.", "OK");
+					});
+
+					evt.menu.AppendSeparator();
+					evt.menu.AppendAction("Copy All to Selected", _ => {
+						var destAssets = OtherSelected(clickedAsset).ToList();
+						foreach (var destAsset in destAssets) {
+							if (string.IsNullOrEmpty(destAsset.Description)) {
+								destAsset.Description = srcAsset.Description;
+							}
+							foreach (var tag in srcAsset.Tags) {
+								destAsset.AddTag(tag.TagName);
+							}
+							foreach (var attr in srcAsset.Attributes) {
+								destAsset.AddAttribute(attr.Key, attr.Value);
+							}
+							foreach (var link in srcAsset.Links.Where(link => destAsset.Links.FirstOrDefault(l => l.Name == link.Name) != null)) {
+								destAsset.Links.Add(new AssetLink(link.Name, link.Url));
+							}
+
+							destAsset.Quality = srcAsset.Quality;
+							destAsset.ThumbCameraPreset = srcAsset.ThumbCameraPreset;
+
+							destAsset.Save();
 						}
-
-						destAsset.Quality = srcAsset.Quality;
-						destAsset.ThumbCameraPreset = srcAsset.ThumbCameraPreset;
-
-						destAsset.Save();
-					}
-					EditorUtility.DisplayDialog("Copy All to Selected", $"Copied data of to {destAssets.Count} other assets.", "OK");
-				});
+						EditorUtility.DisplayDialog("Copy All to Selected", $"Copied data of to {destAssets.Count} other assets.", "OK");
+					});
+				}
 			}
-		}
 
 		private IEnumerable<Asset> OtherSelected(AssetResult src)
 		{
@@ -574,16 +580,13 @@ private void OnThumbSizeChanged(ChangeEvent<float> evt)
 		{
 			_thumbnailSize = (int)evt.newValue;
 			foreach (var e in _elementByAsset.Values) {
-				e.style.width = _thumbnailSize;
-				e.style.height = _thumbnailSize;
+				e.Q<LibraryAssetElement>().SetSize(_thumbnailSize);
 			}
 		}
 
 		public void AttachData(AssetResult clickedResult)
 		{
-			if (!_selectedResults.Contains(clickedResult)) {
-				_selectedResults.Add(clickedResult);
-			}
+			_selectedResults.Add(clickedResult);
 			DragAndDrop.objectReferences = _selectedResults.Select(result => result.Asset.Object).ToArray();
 			StartDraggingAssets(_selectedResults);
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.uss b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.uss
index d33227f88..129c05d00 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.uss
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.uss
@@ -24,6 +24,10 @@
 	-unity-text-align: middle-center;
 }
 
+.library-element--dragover {
+	background-color: #515151 !important;
+}
+
 /*AssetDetails > TemplateContainer {
 	flex-grow: 1;
 }*/
@@ -60,7 +64,6 @@ LibraryCategoryView {
 #gridContent .unity-image {
 	width: 150px;
 	height: 150px;
-	margin: 10px 10px 5px 10px;
 }
 
 #dragErrorContainer, #dragErrorContainerLeft {
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser_Init.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser_Init.cs
index c6acdb4a9..a109b2434 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser_Init.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser_Init.cs
@@ -15,7 +15,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System.Collections.Generic;
-using System.IO;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
@@ -42,9 +41,12 @@ public partial class AssetBrowser
 		private Slider _sizeSlider;
 
 		private VisualTreeAsset _assetTree;
+		private StyleSheet _assetStyle;
 
 		private readonly Dictionary<string, Texture2D> _thumbCache = new();
 
+		private const string ClassDrag = "library-element--dragover";
+
 		public string DragErrorLeft {
 			get => _dragErrorContainerLeft.ClassListContains("hidden") ? null : _dragErrorLabelLeft.text;
 			set {
@@ -84,6 +86,7 @@ public void CreateGUI()
 			var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetBrowser.uxml");
 			visualTree.CloneTree(rootVisualElement);
 			_assetTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uxml");
+			_assetStyle = AssetDatabase.LoadAssetAtPath<StyleSheet>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss");
 
 			var ui = rootVisualElement;
 
@@ -148,33 +151,33 @@ private VisualElement NewItem(AssetResult result)
 		{
 			var item = new VisualElement();
 			_assetTree.CloneTree(item);
-			item.Q<LibraryAssetElement>().Result = result;
+			item.styleSheets.Add(_assetStyle);
+			var assetElement = item.Q<LibraryAssetElement>();
+			assetElement.Result = result;
 
 			LoadThumb(item, result.Asset);
-			item.style.width = _thumbnailSize;
-			item.style.height = _thumbnailSize;
+			var img = item.Q<VisualElement>("thumbnail-mask");
+			assetElement.SetSize(_thumbnailSize);
+
 			var label = item.Q<Label>("label");
 			label.text = result.Asset.Name;
 			label.style.textOverflow = TextOverflow.Ellipsis;
 			item.RegisterCallback<ClickEvent>(evt => OnAssetClicked(evt, item));
 
-			item.Q<LibraryAssetElement>().RegisterDrag(this);
-			item.AddManipulator(new ContextualMenuManipulator(AddAssetContextMenu));
+			assetElement.RegisterDrag(this);
+			img.AddManipulator(new ContextualMenuManipulator(AddAssetContextMenu));
+			label.AddManipulator(new ContextualMenuManipulator(AddAssetContextMenu));
 			return item;
 		}
 
 		private void LoadThumb(VisualElement el, Asset asset)
 		{
 			if (!_thumbCache.ContainsKey(asset.GUID)) {
-				var thumbPath = $"{asset.Library.ThumbnailRoot}/{asset.GUID}.png";
-				if (File.Exists(thumbPath)) {
-					var tex = new Texture2D(ThumbSize, ThumbSize);
-					tex.LoadImage(File.ReadAllBytes(thumbPath));
-
+				if (asset.HasThumbnail) {
+					var tex = asset.LoadThumbTexture(asset.ThumbnailPath);
 					_thumbCache[asset.GUID] = tex;
 				}
 			}
-
 			if (_thumbCache.ContainsKey(asset.GUID)) {
 				var img = el.Q<Image>("thumbnail");
 				img.image = _thumbCache[asset.GUID];
@@ -197,14 +200,107 @@ private VisualElement NewAssetLibrary(AssetLibrary lib)
 				image = lib.IsLocked ? Icons.Locked(IconSize.Small) : Icons.Unlocked(IconSize.Small)
 			};
 			icon.RegisterCallback<MouseDownEvent>(evt => OnLibraryLockClicked(evt, lib, icon));
+
 			item.Add(icon);
 
 			toggle.value = lib.IsActive;
 			toggle.RegisterValueChangedCallback(evt => OnLibraryToggled(lib, evt.newValue));
 			label.RegisterCallback<MouseDownEvent>(evt => OnLibraryLabelClicked(evt, lib, toggle, icon));
+
+			item.RegisterCallback<DragUpdatedEvent>(OnDragUpdated);
+			item.RegisterCallback<DragPerformEvent>(OnDragPerform);
+			item.RegisterCallback<DragEnterEvent>(OnDragEnter);
+			item.RegisterCallback<DragLeaveEvent>(OnDragLeave);
+			item.userData = lib;
+
 			return item;
 		}
 
+		private void OnDragPerform(DragPerformEvent evt)
+		{
+			if (!IsValidDrag(evt.currentTarget)) {
+				return;
+			}
+			if (evt.currentTarget is not VisualElement item) {
+				return;
+			}
+			var lib = item.userData as AssetLibrary;
+			if (lib == null) {
+				return;
+			}
+			item.RemoveFromClassList(ClassDrag);
+
+			if (EditorUtility.DisplayDialog("Asset Library", "Are you sure you want to move the assets to this library?", "Yes", "No")) {
+				DragAndDrop.AcceptDrag();
+
+				var assets = DragAndDrop.GetGenericData("assets") as HashSet<AssetResult>;
+				foreach (var asset in assets) {
+					asset.Asset.Library.MoveAsset(asset.Asset, lib);
+				}
+				AssetDatabase.SaveAssets();
+				AssetDatabase.Refresh();
+			}
+		}
+
+		private static void OnDragUpdated(DragUpdatedEvent evt)
+		{
+			DragAndDrop.visualMode = IsValidDrag(evt.currentTarget)
+				? DragAndDropVisualMode.Move
+				: DragAndDropVisualMode.Rejected;
+		}
+
+		private static bool IsValidDrag(IEventHandler currentTarget)
+		{
+			DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
+			if (currentTarget is not VisualElement item) {
+				return false;
+			}
+			var lib = item.userData as AssetLibrary;
+			if (lib == null || lib.IsLocked) {
+				return false;
+			}
+			if (DragAndDrop.GetGenericData("assets") is not HashSet<AssetResult> assets) {
+				return false;
+			}
+
+			foreach (var asset in assets) {
+				// check for locked libraries
+				if (asset.Asset.Library.IsLocked) {
+					DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
+					return false;
+				}
+
+				if (asset.Asset.Library == lib) {
+					// don't allow dragging to the same library
+					return false;
+				}
+			}
+			return true;
+		}
+
+		private void OnDragEnter(DragEnterEvent evt)
+		{
+			if (!IsValidDrag(evt.currentTarget)) {
+				return;
+			}
+			if (evt.currentTarget is not VisualElement item) {
+				return;
+			}
+			if (IsDraggingExistingAssets) {
+				item.AddToClassList(ClassDrag);
+			} else {
+				return;
+			}
+		}
+
+		private void OnDragLeave(DragLeaveEvent evt)
+		{
+			if (evt.currentTarget is not VisualElement item) {
+				return;
+			}
+			item.RemoveFromClassList(ClassDrag);
+		}
+
 		private void OnLibraryLabelClicked(IMouseEvent evt, AssetLibrary lib, Toggle toggle, VisualElement icon)
 		{
 			if (!lib.IsLocked && (evt.ctrlKey || evt.commandKey)) {
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs
index cc49fd08c..2924c4d76 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibrary.cs
@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 using UnityEditor.Presets;
 using UnityEngine;
@@ -73,6 +74,22 @@ public bool AddAsset(Object obj, AssetCategory category)
 			return wasAdded;
 		}
 
+		public void AddAsset(Asset asset)
+		{
+			if (IsLocked) {
+				throw new InvalidOperationException($"Cannot add new asset because library {Name} is locked.");
+			}
+
+			_db.AddAsset(asset, this);
+			asset.Category = !_db.HasCategory(asset.Category.Name)
+				? _db.AddCategory(asset.Category.Name)
+				: _db.GetCategoryByName(asset.Category.Name);
+			asset.Library = this;
+			EditorUtility.SetDirty(asset);
+			AssetDatabase.SaveAssetIfDirty(asset);
+			SaveLibrary();
+		}
+
 		public void SaveAsset(Asset asset)
 		{
 			if (IsLocked) {
@@ -83,18 +100,77 @@ public void SaveAsset(Asset asset)
 
 		public IEnumerable<AssetResult> GetAssets(LibraryQuery q) => _db.GetAssets(q);
 
-		public void RemoveAsset(Asset asset)
+		/// <summary>
+		/// Physically deletes the asset from the library, including thumbnails.
+		/// </summary>
+		/// <param name="asset">Asset to delete</param>
+		/// <exception cref="InvalidOperationException"></exception>
+		public void DeleteAsset(Asset asset)
 		{
 			if (IsLocked) {
 				throw new InvalidOperationException($"Cannot delete asset because library {Name} is locked.");
 			}
 
-			RecordUndo("remove asset from library");
-			_db.RemoveAsset(asset);
+			RecordUndo("delete asset from library");
+			_db.DeleteAsset(asset);
 			SaveLibrary();
 		}
 
+		/// <summary>
+		/// Removes the asset from the database, but keeps the file and thumbs in place.
+		/// </summary>
+		/// <param name="asset">Asset to remove</param>
+		/// <exception cref="InvalidOperationException"></exception>
+		public void RemoveAsset(Asset asset)
+		{
+			if (IsLocked) {
+				throw new InvalidOperationException($"Cannot remove asset because library {Name} is locked.");
+			}
+			_db.RemoveAsset(asset);
+		}
+
+		public void MoveAsset(Asset asset, AssetLibrary destLibrary)
+		{
+			if (destLibrary == this) {
+				return;
+			}
+			var srcLibrary = asset.Library;
+
+			// move data asset along with thumbs
+			if (!_db.MoveAsset(asset, destLibrary)) {
+				return;
+			}
+
+			// move prefab and its refs
+			var prefabPath = AssetDatabase.GetAssetPath(asset.Object);
+			var allPaths = AssetDatabase.GetDependencies(prefabPath, true).Distinct().ToArray();
+			foreach (var path in allPaths) {
+				if (path.StartsWith(destLibrary.LibraryRoot)) {
+					Debug.LogWarning($"Not moving asset {path} because it is already in the destination library {destLibrary.LibraryRoot}.");
+					continue;
+				}
+
+				if (!path.StartsWith(srcLibrary.LibraryRoot)) {
+					Debug.LogWarning($"Not moving asset {path} because it is not in the source library {srcLibrary.LibraryRoot}.");
+					continue;
+				}
+
+				var newPath = path.Replace(srcLibrary.LibraryRoot, destLibrary.LibraryRoot);
+				var newDirectory = Path.GetDirectoryName(newPath);
+				if (newDirectory != null && !Directory.Exists(newDirectory)) {
+					Directory.CreateDirectory(newDirectory);
+					AssetDatabase.ImportAsset(newDirectory, ImportAssetOptions.ForceSynchronousImport);
+				}
+				Debug.Log($"Moving asset {path} to {newPath}");
+				var error = AssetDatabase.MoveAsset(path, newPath);
+				if (!string.IsNullOrEmpty(error)) {
+					Debug.LogError($"Could not move asset {path} to {newPath}: {error}");
+				}
+			}
+		}
+
 		public bool HasAsset(string guid) => _db.HasAsset(guid);
+		public bool HasAsset(Asset asset) => _db.HasAsset(asset.GUID);
 		public Asset GetAsset(string guid) => _db.GetAsset(guid);
 
 		#endregion
@@ -252,6 +328,5 @@ private void SaveLibrary()
 		}
 
 		#endregion
-
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibraryInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibraryInspector.cs
new file mode 100644
index 000000000..fed5c3b04
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibraryInspector.cs
@@ -0,0 +1,86 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using UnityEditor;
+using UnityEngine;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomEditor(typeof(AssetLibrary))]
+	public class AssetLibrarInspector : UnityEditor.Editor
+	{
+		public override void OnInspectorGUI()
+		{
+			if (GUILayout.Button("Assign all local assets")) {
+				var library = (AssetLibrary)target;
+				if (library.IsLocked) {
+					Debug.LogError("Cannot assign assets to a locked library. Please unlock the library first.");
+					return;
+				}
+				var assets = AssetDatabase.FindAssets("t:Asset", new[] { library.DatabaseRoot });
+				Debug.Log($"Found {assets.Length} assets in library '{library.Name}'.");
+				foreach (var assetGuid in assets) {
+					var assetPath = AssetDatabase.GUIDToAssetPath(assetGuid);
+					var asset = AssetDatabase.LoadAssetAtPath<Asset>(assetPath);
+					if (asset == null) {
+						Debug.LogError($"Cannot load asset at {assetPath}.");
+						continue;
+					}
+
+					var libs = asset.Libraries;
+
+					// everything fine?
+					if (libs.Length == 1 && libs[0] == asset.Library) {
+						continue;
+					}
+
+					// if no lib assigned, assign to current library
+					if (libs.Length == 0) {
+						Debug.LogWarning($"Asset {asset.Name} is not in any library, assigning to {library.Name}.");
+						library.AddAsset(asset);
+						continue;
+					}
+
+					// multiple libs. remove from other libs and add to current if not already.
+					var inCurrentLib = false;
+					foreach (var otherLib in libs) {
+						if (otherLib == library) {
+							inCurrentLib = true;
+							asset.Library = library;
+							EditorUtility.SetDirty(asset);
+							continue;
+						}
+
+						if (otherLib.IsLocked) {
+							Debug.LogError($"Cannot remove asset {asset.Name} from locked library {otherLib.Name}. Please unlock the library first.");
+						} else {
+							Debug.Log($"Removing asset {asset.Name} from library {otherLib.Name}.");
+							otherLib.RemoveAsset(asset);
+						}
+					}
+					if (!inCurrentLib) {
+						Debug.Log($"Adding asset {asset.Name} to library {library.Name}.");
+						library.AddAsset(asset);
+					}
+					AssetDatabase.SaveAssetIfDirty(asset);
+				}
+			}
+			base.OnInspectorGUI();
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibraryInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibraryInspector.cs.meta
new file mode 100644
index 000000000..2df4e0d56
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetLibraryInspector.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 063aa2261ea64166902946156894cf2c
+timeCreated: 1749121554
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetQuery.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetQuery.cs
index cdc30ae89..5d49a192a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetQuery.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetQuery.cs
@@ -83,9 +83,7 @@ public void Search(string q)
 			_tags.Clear();
 			var tagRegex = new Regex(@"\[([^\]]+)\]");
 			foreach (Match match in tagRegex.Matches(q)) {
-				if (!_tags.Contains(match.Groups[1].Value)) {
-					_tags.Add(match.Groups[1].Value);
-				}
+				_tags.Add(match.Groups[1].Value);
 				q = q.Replace(match.Value, "");
 			}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/Asset.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/Asset.cs
index 53f30bebf..b75065f74 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/Asset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/Asset.cs
@@ -18,10 +18,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
+using NetVips;
 using UnityEditor;
 using UnityEditor.Presets;
 using UnityEngine;
+using Debug = UnityEngine.Debug;
 using Object = UnityEngine.Object;
 
 namespace VisualPinball.Unity.Editor
@@ -60,9 +64,22 @@ public class Asset : ScriptableObject
 		public List<AssetLink> Links;
 
 		[SerializeField]
-		[NonReorderable] // see https://answers.unity.com/questions/1828499/nested-class-lists-inspector-overlapping-bug.html
+		public AssetMaterialVariationGroupConfig GroupBy;
+
+		[SerializeField]
+		// [NonReorderable] // see https://answers.unity.com/questions/1828499/nested-class-lists-inspector-overlapping-bug.html
 		public List<AssetMaterialVariation> MaterialVariations;
 
+		[SerializeField]
+		// [NonReorderable] // see https://answers.unity.com/questions/1828499/nested-class-lists-inspector-overlapping-bug.html
+		public List<AssetMaterialVariation> DecalVariations;
+
+		[SerializeField]
+		public List<AssetMaterialDefault> MaterialDefaults;
+
+		[SerializeField]
+		public List<AssetMaterialCombinationRule> MaterialCombinationRules;
+
 		[SerializeField]
 		public string EnvironmentGameObjectName;
 		
@@ -71,6 +88,8 @@ public class Asset : ScriptableObject
 
 		[SerializeField]
 		public float ThumbCameraHeight;
+		public Vector3 ThumbCameraPos;
+		public Vector3 ThumbCameraRot;
 
 		[SerializeField]
 		public bool UnpackPrefab;
@@ -81,6 +100,12 @@ public class Asset : ScriptableObject
 		[NonSerialized]
 		private AssetCategory _category;
 
+		public AssetLibrary[] Libraries =>
+			AssetDatabase.FindAssets("t:AssetLibrary")
+				.Select(guid => AssetDatabase.LoadAssetAtPath<AssetLibrary>(AssetDatabase.GUIDToAssetPath(guid)))
+				.Where(lib => lib != null && lib.HasAsset(GUID))
+				.ToArray();
+
 		public DateTime AddedAt {
 			get => string.IsNullOrEmpty(_addedAt) ? DateTime.Now : Convert.ToDateTime(_addedAt);
 			set => _addedAt = value.ToString("o");
@@ -95,6 +120,9 @@ public string GUID {
 			}
 		}
 
+		public string ThumbnailPath => Path.GetFullPath($"{Library.ThumbnailRoot}/{GUID}.webp");
+		public bool HasThumbnail => File.Exists(ThumbnailPath);
+
 		public Asset SetCategory(LibraryDatabase lib)
 		{
 			_category = lib.GetCategory(_categoryId);
@@ -171,5 +199,111 @@ private static void AddValuesToAttribute(AssetAttribute attr, string values)
 				}
 			}
 		}
+
+		public Texture2D LoadThumbTexture(string thumbnailPath)
+		{
+			var sw = Stopwatch.StartNew();
+
+			// Load the image using NetVips
+			var image = Image.NewFromBuffer(File.ReadAllBytes(thumbnailPath), access: Enums.Access.Sequential);
+
+			// only use rgb
+			if (image.Bands > 3) {
+				image = image.ExtractBand(0, 3); // Use only the first 3 channels
+			}
+
+			// Ensure format is 8-bit unsigned char
+			if (image.Format != Enums.BandFormat.Uchar) {
+				image = image.Cast(Enums.BandFormat.Uchar);
+			}
+
+			image = image.Flip(Enums.Direction.Vertical);
+
+			// Get raw pixel data in RGBA format
+			var raw = image.WriteToMemory();
+			var width = image.Width;
+			var height = image.Height;
+			image.Close();
+			image.Dispose();
+
+			// Create Texture2D
+			var texture = new Texture2D(width, height, TextureFormat.RGB24, false);
+			texture.LoadRawTextureData(raw);
+			texture.Apply();
+
+			Debug.Log($"Texture loaded in {sw.ElapsedMilliseconds}ms: {width}x{height}");
+			return texture;
+		}
+
+		/// <summary>
+		/// So this is basically a counter where the positions are the variations, and the figures are the overrides.
+		/// When the last override of the last variation has counted up, we're done.
+		/// </summary>
+		/// <param name="asset"></param>
+		/// <param name="materials"></param>
+		/// <param name="decals"></param>
+		/// <param name="onlyValid"></param>
+		/// <returns></returns>
+		public IEnumerable<AssetMaterialCombination> GetCombinations(bool materials, bool decals, bool onlyValid = true)
+		{
+			if (!materials && !decals) {
+				throw new ArgumentException("Either materials or decals must be true to get combinations.");
+			}
+
+			var variations = new List<AssetMaterialVariation>();
+
+			if (materials) {
+				foreach (var childAsset in GetNestedAssets()) {
+					variations.AddRange(childAsset.MaterialVariations.Select(mv => mv.AsNested()));
+				}
+				variations.AddRange(MaterialVariations);
+			}
+
+			if (decals && DecalVariations.Count > 0) {
+				//variations.AddRange(DecalVariations.Select(dv => dv.AsDecal()));
+				variations.AddRange(DecalVariations
+					.GroupBy(dv => dv.Target)
+					.Select(target => new AssetMaterialVariation {
+						Name = string.Join("|", target.Select(t => t.Name)),
+						Target = target.Key,
+						Overrides = target.SelectMany(dv => dv.Overrides.Select(o => o.WithVariationName(dv.Name))).ToList()
+					}.AsDecal())
+				);
+			}
+
+			var counters = new AssetMaterialCombination.Counter[variations.Count];
+			AssetMaterialCombination.Counter nextCounter = null;
+			for (var i = variations.Count - 1; i >= 0; i--) {
+				counters[i] = new AssetMaterialCombination.Counter(variations[i].Overrides.Count, nextCounter);
+				nextCounter = counters[i];
+			}
+
+			var combinations = new List<AssetMaterialCombination>();
+			if (counters.Length == 0) {
+				combinations.Add(new AssetMaterialCombination(this));
+				return combinations;
+			}
+			do {
+				var combination = new AssetMaterialCombination(this, counters, variations);
+				if (!onlyValid || combination.IsValidCombination) {
+					combinations.Add(combination);
+				}
+			} while (counters[0].Increase());
+
+			return combinations;
+		}
+
+		public IEnumerable<AssetMaterialCombination> CombineWith(AssetMaterialCombination materialCombination)
+		{
+			if (materialCombination == null) {
+				return GetCombinations(true, true)
+					.Where(x => x.Asset.MaterialDefaults.All(x.Matches));
+			}
+
+			return GetCombinations(true, true)
+				.Where(combination => combination.Overrides.Length > 0 && materialCombination.Overrides.All(combination.Matches));
+		}
+
+		public override string ToString() => Name;
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDecalVariationsElement.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDecalVariationsElement.cs
new file mode 100644
index 000000000..7fc16ebfa
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDecalVariationsElement.cs
@@ -0,0 +1,218 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace VisualPinball.Unity.Editor
+{
+	/// <summary>
+	/// The element that makes radio buttons out of the <see cref="AssetMaterialCombinationElement"/>s and
+	/// exposes which is selected.
+	/// </summary>
+	[UxmlElement]
+	public partial class AssetDecalVariationsElement : VisualElement
+	{
+		public AssetMaterialCombinationElement SelectedMaterialCombination { get; private set; }
+
+		public event EventHandler<AssetMaterialCombinationElement> OnSelected;
+
+		private readonly Foldout _foldout;
+
+		[UxmlAttribute("text")]
+		private string Text { set => _foldout.text = value; }
+
+		[UxmlAttribute("tooltip")]
+		private string Tooltip { set => _foldout.tooltip = value; }
+
+		public AssetDecalVariationsElement()
+		{
+			_foldout = new Foldout();
+			Add(_foldout);
+		}
+
+		public void SetValue(Asset asset, AssetMaterialCombination materialCombination)
+		{
+			if (asset.DecalVariations == null || asset.DecalVariations.Count == 0) {
+				SetVisibility(_foldout, false);
+				SelectedMaterialCombination = null;
+				return;
+			}
+			Clear();
+
+			switch (asset.GroupBy.GroupBy) {
+				case AssetVariationGroupBy.Decal:
+					Render(GroupByDecal(asset, materialCombination), asset, materialCombination);
+					break;
+				case AssetVariationGroupBy.Object:
+					Render(GroupByObject(asset, materialCombination, asset.GroupBy.Object), asset, materialCombination);
+					break;
+			}
+			SetVisibility(_foldout, true);
+		}
+
+		private static IEnumerable<IGrouping<string, AssetMaterialCombination>> GroupByDecal(Asset asset, AssetMaterialCombination materialCombination)
+		{
+			return asset.CombineWith(materialCombination)
+				.Where(mc => !mc.EqualsOverrides(materialCombination))
+				.GroupBy(x => x.DecalVariationNames);
+		}
+
+		private static IEnumerable<IGrouping<AssetMaterialVariationOverride, AssetMaterialCombination>> GroupByObject(Asset asset, AssetMaterialCombination materialCombination, Object obj)
+		{
+			return asset.CombineWith(materialCombination)
+				.GroupBy(dv => dv.Overrides?.FirstOrDefault(o => o.Variation?.Target?.Object == obj));
+		}
+
+		private void Render<T>(IEnumerable<IGrouping<T, AssetMaterialCombination>> combinations, Asset asset, AssetMaterialCombination materialCombination)
+		{
+			foreach (var group in combinations) {
+				var label = new Label {
+					text = GetContainerTitle(asset, group),
+					style = { marginBottom = 5, marginTop = 10 }
+				};
+				var container = new ScrollView { mode = ScrollViewMode.Horizontal };
+				_foldout.Add(label);
+				_foldout.Add(container);
+
+				foreach (var combination in group) {
+					var combinationEl = new AssetMaterialCombinationElement(combination, asset, GetElementTitle(asset, group, combination));
+					combinationEl.OnClicked += OnVariationClicked;
+					container.Add(combinationEl);
+				}
+			}
+		}
+
+		private static string GetElementTitle<T>(Asset asset, IGrouping<T, AssetMaterialCombination> group, AssetMaterialCombination combination)
+		{
+			var overrides = combination.Overrides
+				.Where(o => asset.DecalVariations
+					.Any(dv => dv.Target.Object == o.Variation.Target.Object))
+				.ToArray();
+
+			switch (asset.GroupBy.GroupBy) {
+
+				case AssetVariationGroupBy.Object: {
+					var overridesWithoutObject = overrides
+						.Where(o => o.Variation.Target.Object != asset.GroupBy.Object)
+						.ToArray();
+
+					if (overridesWithoutObject.Length > 0) {
+						return string.Join(", ", overridesWithoutObject.Select(o => o.Override.VariationName));
+					}
+
+					var variationsWithDefaults = combination.VariationsWithDefaults
+						.Where(vd => {
+							if (vd.Target.Object == asset.GroupBy.Object) {
+								return false;
+							}
+							if (asset.DecalVariations.All(dv => dv.Target.Object != vd.Target.Object)) {
+								return false;
+							}
+							return true;
+						});
+
+					if (group.Key is AssetMaterialVariationOverride variationOverride) {
+						return string.Join(", ", variationsWithDefaults
+							.Where(vd => vd.Target.Object != variationOverride.Variation.Target.Object)
+							.Select(vd => vd.VariationName)
+						);
+					}
+
+					// no overrides, read name from variations with defaults, by exclusion.
+					if (group.Key == null) {
+						return string.Join(", ", variationsWithDefaults.Select(vd => vd.VariationName));
+					}
+
+					return string.Empty;
+				}
+				case AssetVariationGroupBy.Decal:
+					return combination.DecalOverrideNames;
+			}
+			return string.Empty;
+		}
+
+		private static string GetContainerTitle<T>(Asset asset, IGrouping<T, AssetMaterialCombination> group)
+		{
+			if (group.Key is string decalName) {
+				return decalName;
+			}
+
+			if (group.Key is AssetMaterialVariationOverride variationOverride) {
+				if (asset.GroupBy.GroupBy == AssetVariationGroupBy.Object) {
+					return $"{variationOverride.Override.VariationName} {asset.GroupBy.Object.name}";
+				}
+				return variationOverride.Variation?.Name ?? "Unknown Variation";
+			}
+
+			if (asset.GroupBy.GroupBy == AssetVariationGroupBy.Object && asset.GroupBy.Object != null) {
+				var def = asset.MaterialDefaults.FirstOrDefault(md => md.Target.Object == asset.GroupBy.Object);
+				if (def != null) {
+					return $"{def.VariationName} {asset.GroupBy.Object.name}";
+				}
+			}
+
+			return string.Empty;
+		}
+
+		private void OnVariationClicked(object clickedVariation, bool enabled)
+		{
+			if (enabled) {
+				foreach (var container in _foldout.Children()) {
+					foreach (var variation in container.Children().Select(c => c as AssetMaterialCombinationElement)) {
+						if (clickedVariation != variation) {
+							variation!.Enabled = false;
+						}
+					}
+				}
+
+				SelectedMaterialCombination = clickedVariation as AssetMaterialCombinationElement;
+				OnSelected?.Invoke(this, SelectedMaterialCombination);
+
+			} else {
+				SelectedMaterialCombination = null;
+				OnSelected?.Invoke(this, null);
+			}
+		}
+
+		private new void Clear()
+		{
+			foreach (var container in _foldout.Children()) {
+				foreach (var child in container.Children()) {
+					(child as AssetMaterialCombinationElement)!.OnClicked -= OnVariationClicked;
+				}
+				container.Clear();
+			}
+			_foldout.Clear();
+		}
+
+		private static void SetVisibility(VisualElement element, bool isVisible)
+		{
+			switch (isVisible) {
+				case false when !element.ClassListContains("hidden"):
+					element.AddToClassList("hidden");
+					break;
+				case true when element.ClassListContains("hidden"):
+					element.RemoveFromClassList("hidden");
+					break;
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDecalVariationsElement.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDecalVariationsElement.cs.meta
new file mode 100644
index 000000000..77c144b5f
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDecalVariationsElement.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8e6cd29d74c540ac9f21acb82e6518d9
+timeCreated: 1750016263
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.cs
index 2874f767e..95e985aa6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.cs
@@ -74,9 +74,11 @@ public Asset Asset {
 		private readonly Label _emptyLabel;
 
 		private readonly AssetMaterialVariationsElement _materialVariations;
+		private readonly AssetDecalVariationsElement _decalVariations;
 		private readonly Toggle _replaceSelectedKeepName;
 		private readonly Button _addButton;
 		private readonly string _addButtonText;
+		private AssetMaterialCombinationElement _selectedMaterialElement;
 
 		public AssetDetails()
 		{
@@ -108,10 +110,12 @@ public AssetDetails()
 			_addButton = _bodyReadOnly.Q<Button>("add-selected");
 			_addButtonText = _addButton.text;
 			_materialVariations = _bodyReadOnly.Q<AssetMaterialVariationsElement>("material-variations");
+			_decalVariations = _bodyReadOnly.Q<AssetDecalVariationsElement>("decal-variations");
 			_replaceSelectedKeepName = _bodyReadOnly.Q<Toggle>("replace-selected-keep-name");
 
 			// setup events
 			_materialVariations.OnSelected += OnVariationSelected;
+			_decalVariations.OnSelected += OnDecalVariationSelected;
 			_body.Q<ListView>("variations").itemsAdded += OnNewMaterialVariation;
 			_bodyReadOnly.Q<Button>("replace-selected").clicked += OnReplaceSelected;
 			_addButton.clicked += OnAddSelected;
@@ -126,8 +130,7 @@ private void OnNewMaterialVariation(IEnumerable<int> ints)
 		{
 			foreach (var i in ints) {
 				_asset.MaterialVariations[i].Name = string.Empty;
-				_asset.MaterialVariations[i].Object = null;
-				_asset.MaterialVariations[i].Slot = 0;
+				_asset.MaterialVariations[i].Target = new AssetMaterialTarget();
 				_asset.MaterialVariations[i].Overrides = new List<AssetMaterialOverride>();
 			}
 		}
@@ -147,7 +150,27 @@ public void Bind(Asset asset)
 		{
 			_header.Q<Label>("title").text = asset.Name;
 			_header.Q<Image>("library-icon").image = Icons.AssetLibrary(IconSize.Small);
-			_header.Q<Label>("library-name").text = asset.Library != null ? asset.Library.Name : "<no library>";
+
+			if (asset.ThumbCameraPos == default) {
+				asset.ThumbCameraPos = new Vector3(0, asset.ThumbCameraHeight, 0);
+			}
+
+			var libraries = asset.Libraries;
+			switch (libraries.Length) {
+				case 0:
+					_header.Q<Label>("library-name").text = "<no library>";
+					break;
+				case > 0:
+					if (libraries.Length == 1 && asset.Library != libraries[0]) {
+						_header.Q<Label>("library-name").text = $"{libraries[0].Name} (⚠️ \u2260{asset.Library.Name})";
+					} else {
+						_header.Q<Label>("library-name").text = string.Join(", ", libraries.Select(l => l.Name));
+					}
+					break;
+				default:
+					_header.Q<Label>("library-name").text = asset.Library != null ? asset.Library.Name : "<no library>";
+					break;
+			}
 
 			_header.Q<Image>("category-icon").image = EditorGUIUtility.IconContent("d_Folder Icon").image;
 			_header.Q<Label>("category-name").text = asset.Category?.Name ?? "<no category>";
@@ -172,14 +195,14 @@ private void BindBackgroundObjects()
 		{
 			var bgo = _body.Q<ObjectDropdownElement>("environment-field");
 			var bgParent = SceneManager.GetActiveScene().GetRootGameObjects()
-					.FirstOrDefault(go => go.name == "_BackgroundObjects");
+					.FirstOrDefault(go => go.name == "Environment");
 			
 			if (bgParent == null) {
 				bgo.visible = false;
 				return;
 			}
 			bgo.visible = true;
-			bgo.Value = _asset.EnvironmentGameObjectName != null ? bgParent.transform.Find(_asset.EnvironmentGameObjectName)?.gameObject : null;
+			bgo.Value = _asset?.EnvironmentGameObjectName != null ? bgParent.transform.Find(_asset.EnvironmentGameObjectName)?.gameObject : null;
 			bgo.AddObjectsToDropdown<MeshRenderer>(bgParent, true);
 			bgo.RegisterValueChangedCallback(OnThumbEnvironmentChanged);
 		}
@@ -213,6 +236,7 @@ private void BindReadOnly(Asset asset)
 		{
 			// material variations
 			_materialVariations.SetValue(asset);
+			_decalVariations.SetValue(asset, null);
 			_addButton.text = _addButtonText;
 
 			// tags
@@ -273,8 +297,8 @@ private void OnAddSelected()
 			var go = InstantiateAsset(parentTransform);
 
 			// move to the middle of the playfield
-			go.transform.localPosition = new Vector3(Physics.ScaleToWorld(pf.Width / 2), 0, -Physics.ScaleToWorld(pf.Height / 2));
 			if (pf != null && go.GetComponent(typeof(IMainRenderableComponent)) is IMainRenderableComponent comp) {
+				go.transform.localPosition = new Vector3(Physics.ScaleToWorld(pf.Width / 2), 0, -Physics.ScaleToWorld(pf.Height / 2));
 				comp.UpdateTransforms();
 			}
 
@@ -310,7 +334,6 @@ private void OnReplaceSelected()
 				if (go.GetComponent(typeof(IMainRenderableComponent)) is IMainRenderableComponent comp) {
 					comp.CopyFromObject(selected);
 				}
-				go.name = selected.name;
 				go.transform.localPosition = selected.transform.localPosition;
 				go.transform.localRotation = selected.transform.localRotation;
 				go.transform.localScale = selected.transform.localScale;
@@ -365,14 +388,29 @@ private static void UpdateReferences<TMapping, TComponent>(List<TMapping> mappin
 
 		private void ApplyVariation(GameObject go)
 		{
-			_materialVariations.SelectedMaterialCombination?.Combination.ApplyMaterial(go);
+			if (_decalVariations.SelectedMaterialCombination != null) {
+				_decalVariations.SelectedMaterialCombination.Combination.ApplyMaterial(go);
+			} else {
+				_materialVariations.SelectedMaterialCombination?.Combination.ApplyMaterial(go);
+			}
 		}
 
 		private void OnVariationSelected(object sender, AssetMaterialCombinationElement el)
 		{
 			_addButton.text = el == null
 				? _addButtonText
-				: $"Add {el.Name}";
+				: $"Add {el.Q<Label>()?.text ?? "selected"}";
+			_selectedMaterialElement = el;
+			_decalVariations.SetValue(Asset, el?.Combination);
+		}
+
+		private void OnDecalVariationSelected(object sender, AssetMaterialCombinationElement decalEl)
+		{
+			if (decalEl == null) {
+				OnVariationSelected(null, _selectedMaterialElement);
+			} else {
+				_addButton.text = $"Add {decalEl.Q<Label>()?.text ?? "decal variation"}";
+			}
 		}
 
 		#endregion
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.uss b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.uss
index cc084fe99..d139fa516 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.uss
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails.uss
@@ -100,10 +100,10 @@ PreviewEditorElement {
 	padding: 8px;
 }
 
-ListView#variations PropertyField {
+.padded-first-property-field PropertyField {
 	padding: 4px 8px 8px 20px;
 }
-
-ListView#variations PropertyField ListView PropertyField {
-	padding: 0 !important;
+.padded-first-property-field PropertyField ListView PropertyField,
+PropertyField.property-field-inner {
+	padding: 0;
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body.uxml
index 8d69bf8e3..34288097b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body.uxml
@@ -9,9 +9,35 @@
 	<!-- Unpack Prefab -->
 	<uie:PropertyField binding-path="UnpackPrefab" label="Unpack Prefab" class="top-space" />
 
+	<uie:PropertyField binding-path="GroupBy" label="Group By" class="top-space" />
+
+	<!-- Material Defaults -->
+	<ui:ListView name="defaults"
+				 reorderable="true"
+				 virtualization-method="DynamicHeight"
+				 binding-path="MaterialDefaults"
+				 show-add-remove-footer="true"
+				 show-border="true"
+				 show-foldout-header="true"
+				 show-bound-collection-size="false"
+				 header-title="Material Defaults"
+				 class="top-space padded-first-property-field"/>
+
+	<!-- Material Combination Rules -->
+	<ui:ListView name="combinationRules"
+				 reorderable="true"
+				 virtualization-method="DynamicHeight"
+				 binding-path="MaterialCombinationRules"
+				 show-add-remove-footer="true"
+				 show-border="true"
+				 show-foldout-header="true"
+				 show-bound-collection-size="false"
+				 header-title="Material Combination Rules"
+				 class="top-space"/>
+
 	<!-- Material Overrides -->
 	<ui:ListView name="variations"
-				 reorderable="false"
+				 reorderable="true"
 				 virtualization-method="DynamicHeight"
 				 binding-path="MaterialVariations"
 				 show-add-remove-footer="true"
@@ -19,15 +45,27 @@
 				 show-foldout-header="true"
 				 show-bound-collection-size="false"
 				 header-title="Material Variations"
-				 class="top-space"/>
+				 class="top-space padded-first-property-field"/>
 
-	<!-- Attributes -->
+	<!-- Decals -->
+	<ui:ListView name="decals"
+				 reorderable="true"
+				 virtualization-method="DynamicHeight"
+				 binding-path="DecalVariations"
+				 show-add-remove-footer="true"
+				 show-border="true"
+				 show-foldout-header="true"
+				 show-bound-collection-size="false"
+				 header-title="Decal Variations"
+				 class="top-space padded-first-property-field"/>
+
+	<!-- Tags -->
 	<uie:PropertyField binding-path="Tags" label="Tags" class="top-space" />
 
 	<!-- Attributes -->
 	<uie:PropertyField binding-path="Attributes" label="Attributes" />
 
-	<!-- Tags -->
+	<!-- Links -->
 	<uie:PropertyField binding-path="Links" label="Links" class="top-space" />
 
 	<!-- Geometry -->
@@ -36,6 +74,8 @@
 			<uivpe:ObjectDropdownElement name="environment-field" label="Environment" />
 			<uivpe:PresetDropdownElement name="thumb-camera-preset" binding-path="ThumbCameraPreset" label="Camera" preset-path="Packages/org.visualpinball.engine.unity/VisualPinball.Unity/Assets/Presets/Asset Thumbcam" />
 			<uie:PropertyField binding-path="ThumbCameraHeight" label="Z-Position" />
+			<uie:PropertyField binding-path="ThumbCameraPos" label="Position" />
+			<uie:PropertyField binding-path="ThumbCameraRot" label="Rotation" />
 		</ui:VisualElement>
 	</ui:Foldout>
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body_ReadOnly.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body_ReadOnly.uxml
index 753a1f099..ae300bff3 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body_ReadOnly.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetDetails_Body_ReadOnly.uxml
@@ -13,6 +13,9 @@
 	<!-- Material Variations -->
 	<uivpe:AssetMaterialVariationsElement name="material-variations" text="Material Variations"/>
 
+	<!-- Decal Variations -->
+	<uivpe:AssetDecalVariationsElement name="decal-variations" text="Decal Variations"/>
+
 	<!-- Tags -->
 	<ui:Foldout text="Tags" name="tags-foldout">
 		<ui:VisualElement name="tags-container" class="left-indent"/>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombination.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombination.cs
index c96617dd4..c170b79d6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombination.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombination.cs
@@ -22,79 +22,194 @@
 
 namespace VisualPinball.Unity.Editor
 {
+	/// <summary>
+	/// A material combination is an asset that gets one or more of its material slots overriden
+	/// by a <see cref="AssetMaterialOverride"/> (which is linked to a <see cref="AssetMaterialVariation"/>).
+	///
+	/// Among those overrides, the AssetMaterialVariations are unique, i.e. a material slot can only be
+	/// overridden once. The overrides aren't always complete, i.e. some material slots may not be overridden.
+	/// </summary>
 	public class AssetMaterialCombination
 	{
-		public string Name => string.Join(", ", _variations.Select(v => $"{v.Item2.Name} {v.Item1.Name}"));
+		#region Public Members
+
+		public readonly Asset Asset;
+		public readonly AssetMaterialVariationOverride[] Overrides;
+
+		public string DecalVariationNames =>
+			string.Join("|", Overrides.Where(o => o.Variation.IsDecal).Select(o => o.Override.VariationName).OrderBy(name => name));
+
+		public string DecalOverrideNames =>
+			string.Join("|", Overrides.Where(o => o.Variation.IsDecal).Select(o => o.Override.Name).OrderBy(name => name));
 
 		public string ThumbId => GenerateThumbID();
-		public string ThumbPath => $"{Asset.Library.ThumbnailRoot}/{ThumbId}.png";
+		public string ThumbPath => $"{Asset.Library.ThumbnailRoot}/{ThumbId}.webp";
 
-		public bool IsOriginal => _variations.Length == 0;
+		public bool IsOriginal => Overrides.Length == 0;
 
 		public bool HasThumbnail => File.Exists(ThumbPath);
 
-		public readonly Asset Asset;
-		private readonly (AssetMaterialVariation, AssetMaterialOverride)[] _variations;
+		public bool IsValidCombination {
+			get {
+				if (Asset.MaterialCombinationRules == null || Asset.MaterialCombinationRules.Count == 0) {
+					return true;
+				}
+
+				var varsWithDefaults = VariationsWithDefaults;
+				foreach (var rule in Asset.MaterialCombinationRules) {
+					switch (rule.Type) {
+						case AssetMaterialCombinationType.MustAllBeEqual: {
+							var allEqual = varsWithDefaults
+								.Where(v => rule.Targets.Any(t => t == v.Target))
+								.GroupBy(v => v.OverrideName)
+								.Count() == 1;
+							if (!allEqual) {
+								return false;
+							}
+							break;
+						}
+
+						case AssetMaterialCombinationType.MustAllBeDifferent: {
+							var allDifferent = varsWithDefaults
+								.Where(v => rule.Targets.Any(t => t == v.Target))
+								.GroupBy(v => v.OverrideName)
+								.Count() == varsWithDefaults.Length;
+							if (!allDifferent) {
+								return false;
+							}
+							break;
+						}
+					}
+				}
+				return true;
+			}
+		}
+
+		#endregion
+
+		#region Private Members
 
 		private string _thumbId;
 
+		public string Name => string.Join(", ",
+			(Overrides.Any(v => v.IsDecal)
+				? Overrides.Where(v => v.IsDecal)
+				: Overrides
+			).Select(v => $"{v.Override.Name} {v.Variation.Name}")
+		);
+
+		internal VariationWithDefault[] VariationsWithDefaults =>
+			Overrides
+				.Select(v => new VariationWithDefault(v.Variation.Target, v.Variation.Name, v.Override.Name))
+				.Concat(Asset.MaterialDefaults
+					.Where(md => Overrides.All(v => v.Variation.Target != md.Target))
+					.Select(md => new VariationWithDefault(md.Target, md.VariationName, md.OverrideName)))
+				.ToArray();
+
+		#endregion
+
+		#region Constructors
+
 		public AssetMaterialCombination(Asset asset)
 		{
 			Asset = asset;
-			_variations = Array.Empty<(AssetMaterialVariation, AssetMaterialOverride)>();
+			Overrides = Array.Empty<AssetMaterialVariationOverride>();
 		}
 
+		internal AssetMaterialCombination(Asset asset, IReadOnlyList<Counter> counters, IReadOnlyList<AssetMaterialVariation> variations)
+		{
+			Asset = asset;
+			Overrides = new AssetMaterialVariationOverride[counters.Count];
+			for (var i = 0; i < counters.Count; i++) {
+				var overrideIndex = counters[i].Value;
+				Overrides[i] = new AssetMaterialVariationOverride(
+					overrideIndex == 0 ? null : variations[i],
+					overrideIndex == 0 ? null : variations[i].Overrides[overrideIndex - 1]
+				);
+			}
+			Overrides = Overrides.Where(mv => mv.Variation != null).ToArray();
+		}
+
+		#endregion
+
+		#region Matching
+
 		/// <summary>
-		/// So this is basically a counter where the positions are the variations, and the figures are the overrides.
-		/// When the last override of the last variation has counted up, we're done.
+		/// Returns whether the overrides of the given <see cref="AssetMaterialCombination"/> match the overridden targets
+		/// of this combination. Name is ignored. If the given combination is null, then this combination is considered to
+		/// match if it has no overrides.
 		/// </summary>
-		/// <param name="asset"></param>
-		/// <returns></returns>
-		public static IEnumerable<AssetMaterialCombination> GetCombinations(Asset asset)
+		/// <param name="materialCombination">Combination to compare with</param>
+		/// <returns>True of overrides of combination have the same targets, false otherwise.</returns>
+		public bool EqualsOverrides(AssetMaterialCombination materialCombination)
 		{
-			var variations = new List<AssetMaterialVariation>();
-			foreach (var childAsset in asset.GetNestedAssets()) {
-				variations.AddRange(childAsset.MaterialVariations.Select(mv => mv.Nested));
+			if (materialCombination == null && Overrides.Length == 0) {
+				return true;
 			}
-
-			variations.AddRange(asset.MaterialVariations);
-			var counters = new Counter[variations.Count];
-			Counter nextCounter = null;
-			for (var i = variations.Count - 1; i >= 0; i--) {
-				counters[i] = new Counter(variations[i].Overrides.Count, nextCounter);
-				nextCounter = counters[i];
+			if (materialCombination == null || Overrides.Length != materialCombination.Overrides.Length) {
+				return false;
 			}
 
-			var combinations = new List<AssetMaterialCombination>();
-			if (counters.Length == 0) {
-				combinations.Add(new AssetMaterialCombination(asset));
-				return combinations;
+			return Overrides
+				.Select(vo => materialCombination.Overrides
+					.FirstOrDefault(o => o.Variation.Target == vo.Variation.Target))
+				.All(matchingOverride => matchingOverride != null);
+		}
+
+		private bool Matches(AssetMaterialCombination combination)
+		{
+			if (combination == null || combination.Overrides.Length == 0) {
+				return false;
 			}
-			do {
-				combinations.Add(new AssetMaterialCombination(asset, counters, variations));
-			} while (counters[0].Increase());
+			return combination.Overrides.All(ovr => Overrides.Contains(ovr));
+		}
 
-			return combinations;
+		/// <summary>
+		/// Checks whether a given <see cref="AssetMaterialDefault"/> matches this combination, i.e.
+		/// if there is an override for the target of the default, and if that override's name matches.
+		///
+		/// If there is no override for the target, then the default is considered to match.
+		/// </summary>
+		/// <param name="md"></param>
+		/// <returns></returns>
+		public bool Matches(AssetMaterialDefault md)
+		{
+			if (md == null || md.Target == null) {
+				return false;
+			}
+			var o = Overrides.FirstOrDefault(o => o.Variation.Target == md.Target);
+			if (o == null) {
+				return true;
+			}
+			return o.Override.Name == md.OverrideName;
 		}
 
-		public void ApplyObjectPos(GameObject go)
+		/// <summary>
+		/// Same as <see cref="Matches(AssetMaterialDefault)"/>, but for an <see cref="AssetMaterialVariationOverride"/>.
+		/// </summary>
+		/// <param name="vo"></param>
+		/// <returns></returns>
+		public bool Matches(AssetMaterialVariationOverride vo)
 		{
-			var pos = go.transform.position;
-			pos.y = Asset.ThumbCameraHeight;
-			go.transform.position = pos;
+			if (vo == null || vo.Variation.Target == null) {
+				return false;
+			}
+			var o = Overrides.FirstOrDefault(o => o.Variation.Target == vo.Variation.Target);
+			if (o == null) {
+				return false;
+			}
+			return o.Override.Name == vo.Override.Name;
 		}
 
-		public void ApplyMaterial(GameObject go)
+		#endregion
+
+		#region Thumbnails
+
+		public void MoveThumb(AssetLibrary destLibrary)
 		{
-			foreach (var (materialVariation, materialOverride) in _variations) {
-				var obj = materialVariation.Match(go);
-				if (obj == null) {
-					Debug.LogError("Unable to determine which to object the material needs to be applied to.");
-					return;
-				}
-				var materials = obj.gameObject.GetComponent<MeshRenderer>().sharedMaterials;
-				materials[materialVariation.Slot] = materialOverride.Material;
-				obj.gameObject.GetComponent<MeshRenderer>().sharedMaterials = materials;
+			if (File.Exists(ThumbPath)) {
+				var destPath = $"{destLibrary.ThumbnailRoot}/{ThumbId}.webp";
+				File.Move(ThumbPath, destPath);
 			}
 		}
 
@@ -108,14 +223,14 @@ private string GenerateThumbID()
 				return _thumbId;
 			}
 
-			if (_variations.Length == 0) {
+			if (Overrides.Length == 0) {
 				_thumbId = Asset.GUID;
 
 			} else {
 				const int byteCount = 16;
 				var guid1 = new Guid(Asset.GUID);
-				foreach (var (v, o) in _variations) {
-					var guid2 = new Guid(o.Id);
+				foreach (var v in Overrides) {
+					var guid2 = new Guid(v.Override.Id);
 					var destByte = new byte[byteCount];
 					var guid1Byte = guid1.ToByteArray();
 					var guid2Byte = guid2.ToByteArray();
@@ -129,21 +244,53 @@ private string GenerateThumbID()
 			return _thumbId;
 		}
 
-		private AssetMaterialCombination(Asset asset, IReadOnlyList<Counter> counters, IReadOnlyList<AssetMaterialVariation> variations)
+		#endregion
+
+		#region Application
+
+		public void ApplyObjectPos(GameObject go)
 		{
-			Asset = asset;
-			_variations = new (AssetMaterialVariation, AssetMaterialOverride)[counters.Count];
-			for (var i = 0; i < counters.Count; i++) {
-				var overrideIndex = counters[i].Value;
-				_variations[i] = (
-					overrideIndex == 0 ? null : variations[i],
-					overrideIndex == 0 ? null : variations[i].Overrides[overrideIndex - 1]
-				);
+			if (Asset.ThumbCameraPos == default) {
+				Asset.ThumbCameraPos = new Vector3(0, Asset.ThumbCameraHeight, 0);
 			}
-			_variations = _variations.Where(mv => mv.Item1 != null).ToArray();
+			go.transform.position = Asset.ThumbCameraPos;
+			go.transform.rotation = Quaternion.Euler(Asset.ThumbCameraRot);
 		}
 
-		private class Counter
+		public void ApplyMaterial(GameObject go)
+		{
+			foreach (var v in Overrides) {
+				var obj = v.Variation.Match(go);
+				if (obj == null) {
+					Debug.LogError("Unable to determine which to object the material needs to be applied to.");
+					return;
+				}
+
+				if (!obj.activeSelf) {
+					obj.SetActive(true);
+				}
+				var materials = obj.gameObject.GetComponent<MeshRenderer>().sharedMaterials;
+				materials[v.Variation.Target.Slot] = v.Override.Material;
+				obj.gameObject.GetComponent<MeshRenderer>().sharedMaterials = materials;
+			}
+		}
+
+		#endregion
+
+		#region Combining
+
+		public AssetMaterialCombination GetValidCombination()
+		{
+			if (IsValidCombination) {
+				return this;
+			}
+
+			return Asset.GetCombinations(true, true)
+				.Where(c => c.Matches(this))
+				.FirstOrDefault(c => c.IsValidCombination);
+		}
+
+		internal class Counter
 		{
 			public int Value;
 			private readonly int _size;
@@ -169,6 +316,26 @@ public bool Increase()
 			}
 		}
 
-		public override string ToString() => Name;
+		#endregion
+
+		#region Helpers / Debug
+
+		public override string ToString() => $"{string.Join(" | ", Overrides.Select(v => $"{v.Override.Name} {v.Variation.Name} ({v.Override.Material.name})"))}";
+
+		internal readonly struct VariationWithDefault
+		{
+			public readonly AssetMaterialTarget Target;
+			public readonly string VariationName;
+			public readonly string OverrideName;
+
+			public VariationWithDefault(AssetMaterialTarget target, string variationName, string overrideName)
+			{
+				Target = target;
+				VariationName = variationName;
+				OverrideName = overrideName;
+			}
+		}
+
+		#endregion
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.cs
index 3fd7e88df..67df1cf99 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.cs
@@ -16,24 +16,26 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 using UnityEditor.UIElements;
-using UnityEngine;
 using UnityEngine.UIElements;
+using Image = UnityEngine.UIElements.Image;
 
 namespace VisualPinball.Unity.Editor
 {
-	public class AssetMaterialCombinationElement: VisualElement
+	public class AssetMaterialCombinationElement : VisualElement
 	{
 		public bool Enabled { set => _toggle.SetValueWithoutNotify(value); }
-		public string Name => Combination.Name;
-		public event EventHandler<bool> OnClicked;
+		public string Name => Combination.Name; //_isDecalVariation ? Combination.Name : Combination.MaterialName;
 
-		private readonly ToolbarToggle _toggle;
+		public event EventHandler<bool> OnClicked;
 
 		public readonly AssetMaterialCombination Combination;
 
-		public AssetMaterialCombinationElement(AssetMaterialCombination combination, Asset asset)
+		private readonly ToolbarToggle _toggle;
+
+		public AssetMaterialCombinationElement(AssetMaterialCombination combination, Asset asset, string name)
 		{
 			Combination = combination;
 
@@ -47,15 +49,11 @@ public AssetMaterialCombinationElement(AssetMaterialCombination combination, Ass
 			_toggle = ui.Q<ToolbarToggle>("toggle");
 			_toggle.RegisterValueChangedCallback(val => OnClicked?.Invoke(this, val.newValue));
 
-			ui.Q<Label>("label").text = Name;
-
-			var thumbPath = $"{asset.Library.ThumbnailRoot}/{Combination.ThumbId}.png";
-			if (File.Exists(thumbPath)) {
-				var tex = new Texture2D(AssetBrowser.ThumbSize, AssetBrowser.ThumbSize);
-				tex.LoadImage(File.ReadAllBytes(thumbPath));
+			ui.Q<Label>("label").text = name;
+			if (File.Exists(Combination.ThumbPath)) {
+				var tex = asset.LoadThumbTexture(Combination.ThumbPath);
 				ui.Q<Image>("thumbnail").image = tex;
 			}
-
 			Add(ui);
 		}
 	}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.uss b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.uss
index bb7572967..fe22d3a66 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.uss
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationElement.uss
@@ -10,4 +10,5 @@ ToolbarToggle {
 	padding: 16px;
 	border-width: 1px;
 	align-items: center;
+	width: 120px;
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationRule.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationRule.cs
new file mode 100644
index 000000000..d4657f67b
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationRule.cs
@@ -0,0 +1,36 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+using System;
+using System.Collections.Generic;
+
+namespace VisualPinball.Unity.Editor
+{
+	[Serializable]
+	public class AssetMaterialCombinationRule
+	{
+		public AssetMaterialCombinationType Type;
+
+		public List<AssetMaterialTarget> Targets;
+	}
+
+	public enum AssetMaterialCombinationType
+	{
+		MustAllBeEqual,
+		MustAllBeDifferent,
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationRule.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationRule.cs.meta
new file mode 100644
index 000000000..f13431819
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialCombinationRule.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5666744d803b457b8b1bec490d33395b
+timeCreated: 1750275329
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/IRotatableAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefault.cs
similarity index 69%
rename from VisualPinball.Unity/VisualPinball.Unity/VPT/IRotatableAnimationComponent.cs
rename to VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefault.cs
index bdee830cd..19b5fda51 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/IRotatableAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefault.cs
@@ -1,27 +1,31 @@
-// Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-namespace VisualPinball.Unity
-{
-	/// <summary>
-	/// Components implementing this interface will get angle updates from the physics
-	/// engine, and can either relay them to their children or perform their own rotation.
-	/// </summary>
-	public interface IRotatableAnimationComponent
-	{
-		void OnRotationUpdated(float angleRad);
-	}
-}
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+#if UNITY_EDITOR
+using System;
+
+namespace VisualPinball.Unity.Editor
+{
+	[Serializable]
+	public class AssetMaterialDefault
+	{
+		public string VariationName;
+		public string OverrideName;
+		public AssetMaterialTarget Target;
+	}
+}
+#endif
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefault.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefault.cs.meta
new file mode 100644
index 000000000..566bebf5c
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefault.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e71d5efe6f6140f081d6ebe64454ed52
+timeCreated: 1750198779
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.cs
new file mode 100644
index 000000000..eef9e600e
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.cs
@@ -0,0 +1,39 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine.UIElements;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomPropertyDrawer(typeof(AssetMaterialDefault))]
+	public class AssetMaterialDefaultPropertyDrawer : PropertyDrawer
+	{
+		// property drawers are recycled, so don't store anything in the members!
+
+		public override VisualElement CreatePropertyGUI(SerializedProperty property)
+		{
+			var ui = new VisualElement();
+			var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml");
+			visualTree.CloneTree(ui);
+
+			var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uss");
+			ui.styleSheets.Add(styleSheet);
+
+			return ui;
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.cs.meta
new file mode 100644
index 000000000..a22e03ce7
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 56cc65ed1cb5473cae309b9d11a79dfb
+timeCreated: 1750199118
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml
new file mode 100644
index 000000000..d2bd210aa
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml
@@ -0,0 +1,5 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns:uivpe="VisualPinball.Unity.Editor" editor-extension-mode="True">
+	<uie:PropertyField binding-path="Target" label="Apply to" tooltip="The target to which the material will be applied" class="property-field-inner"/>
+	<ui:TextField picking-mode="Ignore" label="Variation Name" binding-path="VariationName" />
+	<ui:TextField picking-mode="Ignore" label="Override Name" binding-path="OverrideName" />
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml.meta
new file mode 100644
index 000000000..3700b38a7
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialDefaultPropertyDrawer.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: eca23bcc4f7943178b71132e0047d967
+timeCreated: 1750199374
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverride.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverride.cs
index ac081831d..e811801a9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverride.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverride.cs
@@ -21,13 +21,39 @@
 
 namespace VisualPinball.Unity.Editor
 {
+	/// <summary>
+	/// A material override defines a material that is used to override a material slot in asset.
+	/// </summary>
 	[Serializable]
 	public class AssetMaterialOverride : ISerializationCallbackReceiver
 	{
+		/// <summary>
+		/// The name of the override is used as an ID for the combination rules.
+		/// </summary>
 		public string Name;
+
+		/// <summary>
+		/// The material to be assigned to the material slot of the asset.
+		/// </summary>
 		public Material Material;
+
+		/// <summary>
+		/// An internal ID to identify the override, so we can rename it without breaking any references.
+		/// </summary>
 		public string Id;
 
+		/// <summary>
+		/// For grouping
+		/// </summary>
+		[NonSerialized]
+		internal string VariationName;
+
+		internal AssetMaterialOverride WithVariationName(string name)
+		{
+			VariationName = name;
+			return this;
+		}
+
 		public void OnBeforeSerialize()
 		{
 			if (string.IsNullOrEmpty(Id)) {
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverridePropertyDrawer.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverridePropertyDrawer.uxml
index 34a308e85..58ccb59d4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverridePropertyDrawer.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialOverridePropertyDrawer.uxml
@@ -1,4 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
-	<uie:PropertyField binding-path="Name" label="Name" />
-	<uie:PropertyField binding-path="Material" label="Material" />
+	<uie:PropertyField binding-path="Name" label="Name" class="material-override-field" />
+	<uie:PropertyField binding-path="Material" label="Material" class="material-override-field" />
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTarget.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTarget.cs
new file mode 100644
index 000000000..d9ecb20dd
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTarget.cs
@@ -0,0 +1,89 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+#if UNITY_EDITOR
+using System;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace VisualPinball.Unity.Editor
+{
+	/// <summary>
+	/// A material target is a reference to where a material should be applied to within a prefab.
+	/// It consists of the target object and the material slot of that object.
+	/// </summary>
+	[Serializable]
+	public class AssetMaterialTarget : IEquatable<AssetMaterialTarget>
+	{
+		/// <summary>
+		/// Reference to the object that is targeted by this material variation.
+		/// </summary>
+		[SerializeReference]
+		public Object Object;
+
+		/// <summary>
+		/// Material slot of the object that is targeted by this material variation.
+		/// </summary>
+		public int Slot;
+
+		#region IEquatable
+
+		public static bool operator ==(AssetMaterialTarget obj1, AssetMaterialTarget obj2)
+		{
+			if (ReferenceEquals(obj1, obj2)) {
+				return true;
+			}
+
+			if (ReferenceEquals(obj1, null)) {
+				return false;
+			}
+
+			return !ReferenceEquals(obj2, null) && obj1.Equals(obj2);
+		}
+
+		public static bool operator !=(AssetMaterialTarget obj1, AssetMaterialTarget obj2) => !(obj1 == obj2);
+
+		public bool Equals(AssetMaterialTarget other)
+		{
+			if (other == null) {
+				return false;
+			}
+			return Equals(Object, other.Object) && Slot == other.Slot;
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (obj is null) {
+				return false;
+			}
+
+			if (ReferenceEquals(this, obj)) {
+				return true;
+			}
+
+			return obj.GetType() == GetType() && Equals((AssetMaterialTarget)obj);
+		}
+
+		public override int GetHashCode()
+		{
+			return HashCode.Combine(Object, Slot);
+		}
+
+		#endregion
+	}
+}
+#endif
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTarget.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTarget.cs.meta
new file mode 100644
index 000000000..7e2908a9d
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTarget.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6adadba39fe24539a926e1dca37e068c
+timeCreated: 1750198643
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.cs
new file mode 100644
index 000000000..17b7d9a50
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.cs
@@ -0,0 +1,64 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Object = UnityEngine.Object;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomPropertyDrawer(typeof(AssetMaterialTarget))]
+	public class AssetMaterialTargetPropertyDrawer : PropertyDrawer
+	{
+		public override VisualElement CreatePropertyGUI(SerializedProperty property)
+		{
+			var ui = new VisualElement();
+			var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml");
+			visualTree.CloneTree(ui);
+
+			if (property.serializedObject.targetObject is Asset asset) {
+
+				var objField = ui.Q<ObjectDropdownElement>("object-field");
+				var slotField = ui.Q<MaterialSlotDropdownElement>("slot-field");
+
+				// object dropdown
+				objField.AddObjectsToDropdown<Renderer>(asset.Object, true);
+				objField.RegisterValueChangedCallback(obj => OnObjectChanged(slotField, obj));
+				var obj = property.FindPropertyRelative(nameof(AssetMaterialVariation.Target.Object));
+				if (obj != null && obj.objectReferenceValue != null) {
+					objField.SetValue(obj.objectReferenceValue);
+				}
+
+				// material slot dropdown
+				if (objField.HasValue) {
+					slotField.PopulateChoices(objField.Value as GameObject);
+				}
+				var slot = property.FindPropertyRelative(nameof(AssetMaterialVariation.Target.Slot));
+				slotField.SetValue(slot.intValue);
+			}
+
+			return ui;
+		}
+
+		private static void OnObjectChanged(MaterialSlotDropdownElement slotField, Object obj)
+		{
+			if (slotField != null && obj is GameObject go) {
+				slotField.PopulateChoices(go);
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.cs.meta
new file mode 100644
index 000000000..f5b63bcb0
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fd06e8676d2f4fe19764a141b3fd5542
+timeCreated: 1750198896
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml
new file mode 100644
index 000000000..939fd73c1
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml
@@ -0,0 +1,4 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns:uivpe="VisualPinball.Unity.Editor" editor-extension-mode="True">
+	<uivpe:ObjectDropdownElement name="object-field" label="Apply to" binding-path="Object" tooltip="The game object to which the material will be applied" />
+	<uivpe:MaterialSlotDropdownElement name="slot-field" label="Slot" binding-path="Slot" tooltip="The material slot on which the material will be applied."/>
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml.meta
new file mode 100644
index 000000000..c010ba769
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialTargetPropertyDrawer.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 81b499a9318d4492971bde403bee9854
+timeCreated: 1751100860
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariation.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariation.cs
index 3bf22728d..3c44c6810 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariation.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariation.cs
@@ -18,27 +18,48 @@
 #if UNITY_EDITOR
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace VisualPinball.Unity.Editor
 {
+	/// <summary>
+	/// A material variation defines a target (object and material slot of the object) and a list of materials that can
+	/// be applied to that target.
+	///
+	/// Both the variation itself and the overrides can be named.
+	/// </summary>
 	[Serializable]
 	public class AssetMaterialVariation
 	{
 		public string Name;
-		[SerializeReference]
-		public Object Object;
-		public int Slot;
+		public AssetMaterialTarget Target;
 		public List<AssetMaterialOverride> Overrides;
-		
+
+		/// <summary>
+		/// If a variation is nested, that means it's part of another asset while looping through material combinations.
+		/// </summary>
 		[NonSerialized]
 		public bool IsNested;
+
+		[NonSerialized]
+		public bool IsDecal;
 		
-		public string GUID => AssetDatabase.TryGetGUIDAndLocalFileIdentifier(Object, out var guid, out long _) ? guid : null;
-		
-		public AssetMaterialVariation Nested { get { IsNested = true; return this; }}
+		public string GUID => AssetDatabase.TryGetGUIDAndLocalFileIdentifier(Target?.Object, out var guid, out long _) ? guid : null;
+
+		public AssetMaterialVariation AsNested()
+		{
+			IsNested = true;
+			return this;
+		}
+
+		public AssetMaterialVariation AsDecal()
+		{
+			IsDecal = true;
+			return this;
+		}
 
 		public GameObject Match(GameObject go)
 		{
@@ -47,10 +68,9 @@ public GameObject Match(GameObject go)
 				return matchedGo;
 			}
 
-			return go.name == Object.name 
+			return go.name == Target.Object.name
 				? go 
-				: go!.transform.Find(Object.name)?.gameObject;
-
+				: go!.GetComponentsInChildren<Transform>(true).FirstOrDefault(t => t.gameObject.name == Target.Object.name)?.gameObject;
 		}
 
 		/// <summary>
@@ -68,7 +88,7 @@ private GameObject MatchByGuid(GameObject go)
 			if (objectGuid == null) {
 				return null;
 			}
-			foreach (var child in go.GetComponentsInChildren<Transform>()) {
+			foreach (var child in go.GetComponentsInChildren<Transform>(true)) {
 				// get reference to prefab
 				var prefab = PrefabUtility.GetCorrespondingObjectFromOriginalSource(child.gameObject);
 				if (prefab == null) {
@@ -83,6 +103,27 @@ private GameObject MatchByGuid(GameObject go)
 			}
 			return null;
 		}
+
+		public override bool Equals(object obj)
+		{
+			if (obj is AssetMaterialVariation other) {
+				return Target == other.Target && Overrides.SequenceEqual(other.Overrides);
+			}
+			return false;
+		}
+
+		protected bool Equals(AssetMaterialVariation other)
+		{
+			return Name == other.Name && Equals(Overrides, other.Overrides);
+		}
+
+		public override int GetHashCode()
+		{
+			return HashCode.Combine(Name, Overrides);
+		}
+
+		public override string ToString()
+			=> $"{Name} - {string.Join(" | ", Overrides.Select(o => o.Name))} ({Target.Object.name}@{Target.Slot})";
 	}
 }
 #endif
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfig.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfig.cs
new file mode 100644
index 000000000..46d95ce37
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfig.cs
@@ -0,0 +1,36 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using System;
+using Object = UnityEngine.Object;
+
+namespace VisualPinball.Unity.Editor
+{
+	[Serializable]
+	public class AssetMaterialVariationGroupConfig
+	{
+		public AssetVariationGroupBy GroupBy;
+		public Object Object;
+	}
+
+	public enum AssetVariationGroupBy
+	{
+		Object,
+		Decal
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfig.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfig.cs.meta
new file mode 100644
index 000000000..80aedc456
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfig.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d3d58705211d49d6bc5f568826b036da
+timeCreated: 1751104289
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfigPropertyDrawer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfigPropertyDrawer.cs
new file mode 100644
index 000000000..0492c3924
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfigPropertyDrawer.cs
@@ -0,0 +1,58 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomPropertyDrawer(typeof(AssetMaterialVariationGroupConfig))]
+	public class AssetMaterialVariationGroupConfigPropertyDrawer : PropertyDrawer
+	{
+		// property drawers are recycled, so don't store anything in the members!
+
+		public override VisualElement CreatePropertyGUI(SerializedProperty property)
+		{
+			var root = new VisualElement();
+
+			var groupByProp = property.FindPropertyRelative(nameof(AssetMaterialVariationGroupConfig.GroupBy));
+			var objectProp  = property.FindPropertyRelative(nameof(AssetMaterialVariationGroupConfig.Object));
+
+			var groupByField = new PropertyField(groupByProp, "Group By");
+			var objectField = new ObjectDropdownElement(objectProp, "Object");
+
+			if (property.serializedObject.targetObject is Asset asset) {
+				objectField.AddObjectsToDropdown<Renderer>(asset.Object, true);
+			}
+
+			root.Add(groupByField);
+			root.Add(objectField);
+
+			UpdateObjectVisibility();
+			groupByField.RegisterCallback<SerializedPropertyChangeEvent>(_ => UpdateObjectVisibility());
+
+			return root;
+
+			void UpdateObjectVisibility()
+			{
+				var show = (AssetVariationGroupBy)groupByProp.enumValueIndex == AssetVariationGroupBy.Object;
+				objectField.style.display = show ? DisplayStyle.Flex : DisplayStyle.None;
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfigPropertyDrawer.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfigPropertyDrawer.cs.meta
new file mode 100644
index 000000000..9712a534e
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationGroupConfigPropertyDrawer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 077310facef948d7a98645763ffa9f82
+timeCreated: 1751104477
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationOverride.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationOverride.cs
new file mode 100644
index 000000000..56a1abc98
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationOverride.cs
@@ -0,0 +1,50 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+
+namespace VisualPinball.Unity.Editor
+{
+	/// <summary>
+	/// This class represents an Override with a link to its Variation.
+	///
+	/// (We used tuples for this in the past which turned out to be not very readable.)
+	/// </summary>
+	public class AssetMaterialVariationOverride : IEquatable<AssetMaterialVariationOverride>
+	{
+		public readonly AssetMaterialVariation Variation;
+		public readonly AssetMaterialOverride Override;
+		public bool IsDecal => Variation is { IsDecal: true };
+
+		public AssetMaterialVariationOverride(AssetMaterialVariation variation, AssetMaterialOverride @override)
+		{
+			Variation = variation;
+			Override = @override;
+		}
+
+		public override string ToString() => $"{Variation?.Name ?? "<null>"}: {Override?.Name ?? "<null>"}";
+
+		#region IEquatable
+
+		public bool Equals(AssetMaterialVariationOverride other) => Equals(Variation, other?.Variation) && Override?.Id == other?.Override?.Id;
+
+		public override bool Equals(object obj) => obj is AssetMaterialVariationOverride other && Equals(other);
+
+		public override int GetHashCode() => HashCode.Combine(Variation, Override?.Id);
+
+		#endregion
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationOverride.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationOverride.cs.meta
new file mode 100644
index 000000000..9ce98cda9
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationOverride.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 99075aaa01d4444e80f936f08178c58a
+timeCreated: 1751191496
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.cs
index 674a08874..edad3a420 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.cs
@@ -16,9 +16,7 @@
 
 using System;
 using UnityEditor;
-using UnityEngine;
 using UnityEngine.UIElements;
-using Object = UnityEngine.Object;
 
 namespace VisualPinball.Unity.Editor
 {
@@ -29,6 +27,7 @@ public class AssetMaterialVariationPropertyDrawer : PropertyDrawer
 
 		public override VisualElement CreatePropertyGUI(SerializedProperty property)
 		{
+
 			var ui = new VisualElement();
 			var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uxml");
 			visualTree.CloneTree(ui);
@@ -36,53 +35,25 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
 			var styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uss");
 			ui.styleSheets.Add(styleSheet);
 
-			if (property.serializedObject.targetObject is Asset asset) {
-
-				var objField = ui.Q<ObjectDropdownElement>("object-field");
-				var slotField = ui.Q<MaterialSlotDropdownElement>("slot-field");
-
-				// object dropdown
-				objField.AddObjectsToDropdown<Renderer>(asset.Object);
-				objField.RegisterValueChangedCallback(obj => OnObjectChanged(slotField, obj));
-				var obj = property.FindPropertyRelative(nameof(AssetMaterialVariation.Object));
-				if (obj != null && obj.objectReferenceValue != null) {
-					objField.SetValue(obj.objectReferenceValue);
-				}
-
-				// material slot dropdown
-				if (objField.HasValue) {
-					slotField.PopulateChoices(objField.Value as GameObject);
+			// overrides - unity tries to be "smart" and copies over the values of the last element when adding
+			//             a new element, which includes our unique Id, which only gets generated when it's not
+			//             set. so we reset it manually here, which is annoying and ugly AF, but the alternative
+			//             would be to re-implement the whole fucking ListView.
+			var overridesList = ui.Q<ListView>("overrides");
+			overridesList.itemsAdded += ints => {
+				foreach (var i in ints) {
+					var guid = Guid.NewGuid().ToString();
+					var idProp = property.FindPropertyRelative($"Overrides.Array.data[{i}].{nameof(AssetMaterialOverride.Id)}");
+					idProp.stringValue = guid;
+					var nameProp = property.FindPropertyRelative($"Overrides.Array.data[{i}].{nameof(AssetMaterialOverride.Name)}");
+					nameProp.stringValue = string.Empty;
+					var matProp = property.FindPropertyRelative($"Overrides.Array.data[{i}].{nameof(AssetMaterialOverride.Material)}");
+					matProp.objectReferenceValue = null;
+					idProp.serializedObject.ApplyModifiedPropertiesWithoutUndo();
 				}
-				var slot = property.FindPropertyRelative(nameof(AssetMaterialVariation.Slot));
-				slotField.SetValue(slot.intValue);
-
-				// overrides - unity tries to be "smart" and copies over the values of the last element when adding
-				//             a new element, which includes our unique Id, which only gets generated when it's not
-				//             set. so we reset it manually here, which is annoying and ugly AF, but the alternative
-				//             would be to re-implement the whole fucking ListView.
-				var overridesList = ui.Q<ListView>("overrides");
-				overridesList.itemsAdded += ints => {
-					foreach (var i in ints) {
-						var guid = Guid.NewGuid().ToString();
-						var idProp = property.FindPropertyRelative($"Overrides.Array.data[{i}].{nameof(AssetMaterialOverride.Id)}");
-						idProp.stringValue = guid;
-						var nameProp = property.FindPropertyRelative($"Overrides.Array.data[{i}].{nameof(AssetMaterialOverride.Name)}");
-						nameProp.stringValue = string.Empty;
-						var matProp = property.FindPropertyRelative($"Overrides.Array.data[{i}].{nameof(AssetMaterialOverride.Material)}");
-						matProp.objectReferenceValue = null;
-						idProp.serializedObject.ApplyModifiedPropertiesWithoutUndo();
-					}
-				};
-			}
+			};
 
 			return ui;
 		}
-
-		private static void OnObjectChanged(MaterialSlotDropdownElement slotField, Object obj)
-		{
-			if (slotField != null && obj is GameObject go) {
-				slotField.PopulateChoices(go);
-			}
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uss b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uss
index 0e73c0674..2026fbc64 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uss
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uss
@@ -1,3 +1,7 @@
 .unity-base-field > Label {
 	min-width: 65px;
 }
+
+ListView PropertyField {
+	padding: 0;
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uxml
index 91055ff1c..70e2fe1c8 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationPropertyDrawer.uxml
@@ -1,7 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns:uivpe="VisualPinball.Unity.Editor" editor-extension-mode="True">
 	<ui:TextField picking-mode="Ignore" label="Material" value="filler text" text="filler text" binding-path="Name" />
-	<uivpe:ObjectDropdownElement name="object-field" label="Apply to" binding-path="Object" tooltip="The game object to which the material will be applied" />
-	<uivpe:MaterialSlotDropdownElement name="slot-field" label="Slot" binding-path="Slot" tooltip="The material slot on which the material will be applied."/>
+	<uie:PropertyField binding-path="Target" label="Apply to" tooltip="The target to which the material will be applied" class="property-field-inner" />
 	<ui:ListView name="overrides"
 				 reorder-mode="Animated"
 				 binding-path="Overrides"
@@ -10,6 +9,6 @@
 				 show-foldout-header="true"
 				 show-bound-collection-size="false"
 				 header-title="Overrides"
-				 fixed-item-height="45"
+				 virtualization-method="DynamicHeight"
 				 tooltip="Add the different materials here."/>
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationsElement.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationsElement.cs
index 7fedead79..cc26cec28 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationsElement.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/AssetStructure/AssetMaterialVariationsElement.cs
@@ -15,9 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
@@ -53,8 +51,7 @@ public AssetMaterialVariationsElement()
 
 		public void SetValue(Asset asset)
 		{
-
-			var materialCombinations = AssetMaterialCombination.GetCombinations(asset)
+			var materialCombinations = asset.GetCombinations(true, false, false)
 				.Where(c => !c.IsOriginal)
 				.ToArray();
 
@@ -63,7 +60,11 @@ public void SetValue(Asset asset)
 				Clear();
 
 				foreach (var combination in materialCombinations) {
-					var combinationEl = new AssetMaterialCombinationElement(combination, asset);
+					var validCombination = combination.GetValidCombination();
+					if (validCombination == null) {
+						continue; // skip invalid combinations
+					}
+					var combinationEl = new AssetMaterialCombinationElement(validCombination, asset, combination.Name);
 					combinationEl.OnClicked += OnVariationClicked;
 					_container.Add(combinationEl);
 				}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/Elements/ObjectDropdownElement.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/Elements/ObjectDropdownElement.cs
index 25b0b4bc6..a92f4d6f4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/Elements/ObjectDropdownElement.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/Elements/ObjectDropdownElement.cs
@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -31,13 +32,13 @@ public partial class ObjectDropdownElement : VisualElement
 		private readonly ObjectField _objectPicker;
 
 		[UxmlAttribute("label")]
-		private string Label { set => _dropdown.label = value; }
+		public string Label { set => _dropdown.label = value; }
 
 		[UxmlAttribute("binding-path")]
-		private string BindingPath { set => _objectPicker.bindingPath = value; }
+		public string BindingPath { set => _objectPicker.bindingPath = value; }
 
 		[UxmlAttribute("tooltip")]
-		private string Tooltip { set => _dropdown.tooltip = value; }
+		public string Tooltip { set => _dropdown.tooltip = value; }
 
 		public Object Value { get => _objectPicker.value; set => SetValue(value); }
 		public bool HasValue => _objectPicker.value as GameObject != null;
@@ -60,6 +61,12 @@ public ObjectDropdownElement()
 			Add(_dropdown);
 		}
 
+		public ObjectDropdownElement(SerializedProperty property, string label) : this()
+		{
+			Label = label;
+			BindingPath = property.propertyPath;
+		}
+
 		public void RegisterValueChangedCallback(Action<Object> onValueChanged)
 		{
 			_onValueChanged = onValueChanged;
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.cs
index 81a260266..0bb1937c9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.cs
@@ -27,6 +27,8 @@ public partial class LibraryAssetElement : VisualElement
 	{
 		public AssetResult Result;
 
+		public const float RadiusRatio = 0.1f;
+
 		private enum DragState
 		{
 			AtRest,
@@ -54,6 +56,20 @@ private void OnMouseDown(MouseDownEvent evt)
 			}
 		}
 
+		public void SetSize(int size)
+		{
+			var img = this.Q<VisualElement>("thumbnail-mask");
+			img.style.width = size;
+			img.style.height = size;
+			img.style.borderBottomLeftRadius = size * RadiusRatio;
+			img.style.borderBottomRightRadius = size * RadiusRatio;
+			img.style.borderTopLeftRadius = size * RadiusRatio;
+			img.style.borderTopRightRadius = size * RadiusRatio;
+
+			var label = this.Q<VisualElement>("label");
+			label.style.maxWidth = size;
+		}
+
 		public void RegisterDrag(IDragHandler handler) => _dragHandler = handler;
 
 		private void OnPointerDownEvent(PointerDownEvent evt)
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss
new file mode 100644
index 000000000..204e4f959
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss
@@ -0,0 +1,4 @@
+#thumbnail-mask {
+	overflow: hidden;
+	margin: 10px 10px 5px 10px;
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss.meta
new file mode 100644
index 000000000..cd44a7a9c
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0fec3215574c4de090d1908d73768c0d
+timeCreated: 1747772703
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uxml
index 5085133c1..977acc0a1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uxml
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryAssetElement.uxml
@@ -1,7 +1,9 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements"
 		 xsi="http://www.w3.org/2001/XMLSchema-instance" editor-extension-mode="True">
 	<VisualPinball.Unity.Editor.LibraryAssetElement class="thumb-item">
-		<ui:Image name="thumbnail" />
+		<ui:VisualElement name="thumbnail-mask">
+			<ui:Image name="thumbnail" class="thumbnail-image"/>
+		</ui:VisualElement>
 		<ui:Label name="label"/>
 	</VisualPinball.Unity.Editor.LibraryAssetElement>
 </ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryCategoryElement.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryCategoryElement.cs
index 2b07ed4d1..1641961ea 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryCategoryElement.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryCategoryElement.cs
@@ -17,6 +17,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace VisualPinball.Unity.Editor
@@ -219,6 +220,7 @@ private void OnDragPerformEvent(DragPerformEvent evt)
 				foreach (var d in data) {
 					var category = Categories.FirstOrDefault(i => i.Item1 == d.Asset.Library).Item2 ?? d.Asset.Library.AddCategory(Name);
 					d.Asset.Library.SetCategory(d.Asset, category);
+					Debug.Log($"Moved {d.Asset.Name} to category {category?.Name} ({d.Asset.Library.Name}).");
 				}
 				_libraryCategoryView.Refresh();
 				AssetBrowser.StopDraggingAssets();
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryDatabase.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryDatabase.cs
index 2b375684a..dbe1ec6ff 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryDatabase.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryDatabase.cs
@@ -120,6 +120,7 @@ public bool AddAsset(Object obj, AssetCategory category, AssetLibrary lib)
 			asset.Tags = new List<AssetTag>();
 			asset.Links = new List<AssetLink>();
 			asset.MaterialVariations = new List<AssetMaterialVariation>();
+			asset.DecalVariations = new List<AssetMaterialVariation>();
 			asset.AddedAt = DateTime.Now;
 
 			var assetMetaPath = AssetMetaPath(asset, lib);
@@ -133,11 +134,34 @@ public bool AddAsset(Object obj, AssetCategory category, AssetLibrary lib)
 			return true;
 		}
 
-		public void RemoveAsset(Asset asset)
+		public bool AddAsset(Asset asset, AssetLibrary lib)
+		{
+			if (Assets.Contains(asset.Object)) {
+				return false;
+			}
+			var assetMetaPath = AssetMetaPath(asset, lib);
+			var assetMetaFolder = Path.GetDirectoryName(assetMetaPath);
+			if (!Directory.Exists(assetMetaFolder)) {
+				Directory.CreateDirectory(assetMetaFolder!);
+			}
+			Assets.Add(asset);
+
+			return true;
+		}
+
+		public bool RemoveAsset(Asset asset)
 		{
 			if (Assets.Contains(asset)) {
 				Assets.Remove(asset);
-				foreach (var materialCombination in AssetMaterialCombination.GetCombinations(asset)) { // includes the original
+				return true;
+			}
+			return false;
+		}
+
+		public void DeleteAsset(Asset asset)
+		{
+			if (RemoveAsset(asset)) {
+				foreach (var materialCombination in asset.GetCombinations(true, true)) { // includes the original
 					if (File.Exists(materialCombination.ThumbPath)) {
 						File.Delete(materialCombination.ThumbPath);
 					}
@@ -147,6 +171,49 @@ public void RemoveAsset(Asset asset)
 			}
 		}
 
+		public bool MoveAsset(Asset asset, AssetLibrary destLibrary)
+		{
+			if (Assets.Contains(asset)) {
+
+				// first, move material combination thumbs before we switch the reference to the library.
+				foreach (var materialCombination in asset.GetCombinations(true, true)) { // includes the original
+					materialCombination.MoveThumb(destLibrary);
+				}
+				// move the .asset file to the new library.
+				var assetSrc = AssetMetaPath(asset, asset.Library);
+				var assetDest = AssetMetaPath(asset, destLibrary);
+
+				Debug.Log($"Moving database asset {assetSrc} to {assetDest}");
+				var error = AssetDatabase.MoveAsset(assetSrc, assetDest);
+				if (!string.IsNullOrEmpty(error)) {
+					Debug.LogError($"Could not move asset {assetSrc} to {assetDest}: {error}");
+				}
+
+				// move the reference in the database.
+				destLibrary.AddAsset(asset);
+
+				// finally, remove the reference from the old library.
+				Assets.Remove(asset);
+				return true;
+			}
+
+			if (destLibrary.HasAsset(asset.GUID)) {
+				if (asset.Library != destLibrary) {
+					Debug.Log($"Updated asset's library reference from {asset.Library.Name} to {destLibrary.Name}.");
+					asset.Library = destLibrary;
+					EditorUtility.SetDirty(asset);
+					AssetDatabase.SaveAssetIfDirty(asset);
+
+				} else {
+					Debug.LogWarning($"Asset {asset.Name} ({asset.GUID}) already exists in {destLibrary.Name}. Cannot move.");
+				}
+				return false;
+			}
+
+			Debug.LogWarning($"Database does not contain asset {asset.Name} ({asset.GUID}). Cannot move to {destLibrary.Name}.");
+			return false;
+		}
+
 		public bool HasAsset(string guid) => Assets.Contains(guid);
 		public Asset GetAsset(string guid) => Assets[guid];
 		private string AssetMetaPath(Asset asset, AssetLibrary lib) => $"{lib.DatabaseRoot}/{asset.GUID}.asset";
@@ -171,10 +238,14 @@ public void RenameCategory(AssetCategory category, string newName)
 			category.Name = newName;
 		}
 
-		public AssetCategory GetCategory(string id) => Categories[id];
+		public AssetCategory GetCategory(string id) => Categories.ContainsKey(id) ? Categories[id] : null;
+
+		public AssetCategory GetCategoryByName(string name) => Categories.Values.First(c=> c.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
 
 		public IEnumerable<AssetCategory> GetCategories() => Categories.Values.OrderBy(c => c.Name).ToList();
 
+		public bool HasCategory(string name) => Categories.Contains(c => c.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
+
 		public void SetCategory(Asset asset, AssetCategory category)
 		{
 			asset.Category = category;
@@ -286,6 +357,11 @@ internal class Categories : SerializableDictionary<string, AssetCategory>
 	{
 		public void Add(AssetCategory category) => this[category.Id] = category;
 		public bool Remove(AssetCategory category) => Remove(category.Id);
+
+		public bool Contains(Func<AssetCategory, bool> predicate)
+		{
+			return Values.Any(predicate);
+		}
 	}
 
 	[Serializable]
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryQuery.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryQuery.cs
index 6246e8df9..f0fd0c9b0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryQuery.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/AssetBrowser/LibraryQuery.cs
@@ -48,7 +48,7 @@ public List<AssetCategory> Categories
 		private List<AssetCategory> _categories;
 		private HashSet<string> _categoryIds;
 		public bool HasCategories => Categories is { Count: > 0 };
-		public bool HasCategory(AssetCategory category) => _categoryIds.Contains(category.Id);
+		public bool HasCategory(AssetCategory category) => category != null && _categoryIds.Contains(category.Id);
 
 		#endregion
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/ControlPoint.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/ControlPoint.cs
index 5f169a3c9..da4ca312e 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/ControlPoint.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/ControlPoint.cs
@@ -43,12 +43,10 @@ public class ControlPoint
 		/// </summary>
 		public Vector3 AbsolutePosition => new(DragPoint.Center.X, DragPoint.Center.Y, DragPoint.CalcHeight);
 
-		public Vector3 EditorPositionVpx => AbsolutePosition + new Vector3(0, 0, _dragPointsInspector.ZOffset);
-
 		/// <summary>
 		/// Position in world space
 		/// </summary>
-		public Vector3 EditorPositionWorld => EditorPositionVpx.TranslateToWorld(_dragPointsInspector.Transform);
+		public Vector3 EditorPositionWorld => AbsolutePosition.TranslateToWorld(_dragPointsInspector.Transform);
 
 		public float HandleSize => HandleUtility.GetHandleSize(EditorPositionWorld) * ScreenRadius;
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsHandler.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsHandler.cs
index 0eea5b2ae..5eb064053 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsHandler.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsHandler.cs
@@ -388,7 +388,7 @@ private void OnSceneLayout()
 			if (SelectedControlPoints.Count > 0) {
 				_centerSelected = Vector3.zero;
 				foreach (var controlPoint in SelectedControlPoints) {
-					_centerSelected += controlPoint.EditorPositionVpx;
+					_centerSelected += controlPoint.AbsolutePosition;
 				}
 				_centerSelected /= SelectedControlPoints.Count;
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsSceneViewHandler.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsSceneViewHandler.cs
index d73c40760..8ba9fb8f7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsSceneViewHandler.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/DragPointsSceneViewHandler.cs
@@ -85,7 +85,7 @@ private void DisplayCurve()
 				for (var i = 0; i < _handler.ControlPoints.Count; i++) {
 					var pos = _handler.ControlPoints[i].AbsolutePosition.ToVertex3D();
 					dragPointsVpx[i] = new DragPointData(_handler.ControlPoints[i].DragPoint) {
-						Center = new Vertex3D(pos.X, pos.Y, pos.Z + _handler.DragPointInspector.ZOffset),
+						Center = new Vertex3D(pos.X, pos.Y, pos.Z),
 						Id = _handler.ControlPoints[i].DragPoint.Id
 					};
 				}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/IDragPointsInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/IDragPointsInspector.cs
index 959a7d0ef..6e30d55bd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/IDragPointsInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/DragPoint/IDragPointsInspector.cs
@@ -86,11 +86,6 @@ public interface IDragPointsInspector
 		DragPointTransformType HandleType { get; }
 
 		DragPointsInspectorHelper DragPointsHelper { get; }
-		
-		/// <summary>
-		/// The global z-offset of all drag points, to render properly in editor.
-		/// </summary>
-		float ZOffset { get; }
 
 		float[] TopBottomZ { get; }
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Event.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event.meta
new file mode 100644
index 000000000..bbd82cf2b
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4aad062492344f33a606aa70918bcea0
+timeCreated: 1747134745
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.cs
new file mode 100644
index 000000000..09188c868
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.cs
@@ -0,0 +1,57 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomEditor(typeof(EventRotateComponent))]
+	public class EventRotateInspector : UnityEditor.Editor
+	{
+		public override VisualElement CreateInspectorGUI()
+		{
+			var ui = new VisualElement();
+			var eventEmitterComponents = (target as MonoBehaviour)?.GetComponents<IPinballEventEmitter>();
+			if (eventEmitterComponents == null || eventEmitterComponents.Length == 0) {
+				var csharpHelpBox = new HelpBox("This component must be added on a component that emits events.", HelpBoxMessageType.Error);
+				ui.Add(csharpHelpBox);
+				return ui;
+			}
+
+			var visualTree = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>("Packages/org.visualpinball.engine.unity/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml");
+			visualTree.CloneTree(ui);
+
+			var nameDropdown = ui.Q<DropdownField>("eventName");
+			var validUnits = new[] {
+				PinballEventUnit.None,
+				PinballEventUnit.Degrees,
+				PinballEventUnit.DegreesPerSecond,
+				PinballEventUnit.Radians,
+				PinballEventUnit.RadiansPerSecond,
+			};
+			nameDropdown.choices = eventEmitterComponents
+				.SelectMany(c => c.Events)
+				.Where(c => validUnits.Contains(c.Unit))
+				.Select(c => c.Name)
+				.ToList();
+
+			return ui;
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.cs.meta
new file mode 100644
index 000000000..085fab49b
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8e7e2118f0074a57be21d0df07b991f6
+timeCreated: 1747134777
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml
new file mode 100644
index 000000000..f697a7e59
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml
@@ -0,0 +1,7 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+    <ui:DropdownField name="eventName" label="Event" binding-path="EventName" />
+    <uie:PropertyField label="Axis" binding-path="Axis" />
+    <uie:PropertyField label="Global Rotation" binding-path="RotateGlobally" />
+    <uie:PropertyField label="Factor" binding-path="Factor" />
+    <uie:PropertyField label="Offset" binding-path="Offset" />
+</ui:UXML>
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml.meta
new file mode 100644
index 000000000..351892c00
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Event/EventRotateInspector.uxml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: af750ecd78564a099465f8feb407b4b4
+timeCreated: 1747135603
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs
index 1655ca5af..6e1595750 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/Utils/Icons.cs
@@ -344,7 +344,7 @@ public void DisableGizmoIcons()
 			Icons.DisableGizmo<DropTargetComponent>();
 			Icons.DisableGizmo<DropTargetBankComponent>();
 			Icons.DisableGizmo<DropTargetColliderComponent>();
-			Icons.DisableGizmo<DropTargetAnimationComponent>();
+			Icons.DisableGizmo<DropTargetAnimationComponentLegacy>();
 			//Icons.DisableGizmo<FlasherComponent>();
 			Icons.DisableGizmo<FlipperComponent>();
 			Icons.DisableGizmo<FlipperColliderComponent>();
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/AnimationInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/AnimationInspector.cs
index cd23917f4..6dc9791df 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/AnimationInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/AnimationInspector.cs
@@ -23,7 +23,7 @@
 namespace VisualPinball.Unity.Editor
 {
 	public class AnimationInspector<TData, TMainComponent, TMovementComponent> : ItemInspector
-		where TMovementComponent : AnimationComponent<TData, TMainComponent>
+		where TMovementComponent : AnimationComponentLegacy<TData, TMainComponent>
 		where TData : ItemData
 		where TMainComponent : MainRenderableComponent<TData>
 	{
@@ -51,7 +51,7 @@ protected bool HasErrors()
 
 		private static void NoDataError()
 		{
-			EditorGUILayout.HelpBox($"Cannot find main component!\n\nYou must have a {typeof(TMainComponent).Name} component on either this GameObject, its parent or grand parent.", MessageType.Error);
+			EditorGUILayout.HelpBox($"Cannot find main component!\n\nYou must have a {typeof(TMainComponent).Name} component on either this GameObject or one of its parents.", MessageType.Error);
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Bumper/BumperRingAnimationInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Bumper/BumperRingAnimationInspector.cs
index f2276c375..f375ba9af 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Bumper/BumperRingAnimationInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Bumper/BumperRingAnimationInspector.cs
@@ -17,16 +17,19 @@
 // ReSharper disable AssignmentInConditionalExpression
 
 using UnityEditor;
+using UnityEngine;
 using VisualPinball.Engine.VPT.Bumper;
 
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(BumperRingAnimationComponent)), CanEditMultipleObjects]
-	public class BumperRingAnimationInspector : AnimationInspector<BumperData, BumperComponent, BumperRingAnimationComponent>
+	public class BumperRingAnimationInspector : ItemInspector
 	{
 		private SerializedProperty _ringSpeedProperty;
 		private SerializedProperty _ringDropOffsetProperty;
 
+		protected override MonoBehaviour UndoTarget => target as MonoBehaviour;
+
 		protected override void OnEnable()
 		{
 			base.OnEnable();
@@ -36,10 +39,6 @@ protected override void OnEnable()
 
 		public override void OnInspectorGUI()
 		{
-			if (HasErrors()) {
-				return;
-			}
-
 			BeginEditing();
 
 			PropertyField(_ringSpeedProperty, "Ring Speed");
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Gate/GateColliderInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Gate/GateColliderInspector.cs
index 3ba0c1c2a..67b2cc6b0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Gate/GateColliderInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Gate/GateColliderInspector.cs
@@ -59,8 +59,8 @@ public override void OnInspectorGUI()
 
 			OnPreInspectorGUI();
 
-			PropertyField(_zLowProperty, "Z-Low");
-			PropertyField(_distanceProperty, "Distance");
+			PropertyField(_zLowProperty, "Z-Low", updateColliders: true);
+			PropertyField(_distanceProperty, "Distance", updateColliders: true);
 			PropertyField(_angleMinProperty, "Close Angle");
 			PropertyField(_angleMaxProperty, "Open Angle");
 			PropertyField(_elasticityProperty);
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/DropTargetAnimationInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/DropTargetAnimationInspector.cs
index e37c19ec7..8943cbdcb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/DropTargetAnimationInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/DropTargetAnimationInspector.cs
@@ -17,34 +17,32 @@
 // ReSharper disable AssignmentInConditionalExpression
 
 using UnityEditor;
-using VisualPinball.Engine.VPT.HitTarget;
+using UnityEngine;
 
 namespace VisualPinball.Unity.Editor
 {
-	[CustomEditor(typeof(DropTargetAnimationComponent)), CanEditMultipleObjects]
-	public class DropTargetAnimationInspector : AnimationInspector<HitTargetData, DropTargetComponent, DropTargetAnimationComponent>
+	[CustomEditor(typeof(DropTargetAnimationComponentLegacy)), CanEditMultipleObjects]
+	public class DropTargetAnimationInspector : ItemInspector
 	{
 		private SerializedProperty _isDroppedProperty;
 		private SerializedProperty _speedProperty;
 		private SerializedProperty _raiseDelayProperty;
 		private SerializedProperty _dropDistanceProperty;
 
+		protected override MonoBehaviour UndoTarget => target as MonoBehaviour;
+
 		protected override void OnEnable()
 		{
 			base.OnEnable();
 
-			_isDroppedProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponent.IsDropped));
-			_speedProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponent.Speed));
-			_raiseDelayProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponent.RaiseDelay));
-			_dropDistanceProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponent.DropDistance));
+			_isDroppedProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponentLegacy.IsDropped));
+			_speedProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponentLegacy.Speed));
+			_raiseDelayProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponentLegacy.RaiseDelay));
+			_dropDistanceProperty = serializedObject.FindProperty(nameof(DropTargetAnimationComponentLegacy.DropDistance));
 		}
 
 		public override void OnInspectorGUI()
 		{
-			if (HasErrors()) {
-				return;
-			}
-
 			BeginEditing();
 
 			OnPreInspectorGUI();
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/HitTargetAnimationInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/HitTargetAnimationInspector.cs
index fd7888c9c..684da3ae2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/HitTargetAnimationInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/HitTarget/HitTargetAnimationInspector.cs
@@ -17,16 +17,18 @@
 // ReSharper disable AssignmentInConditionalExpression
 
 using UnityEditor;
-using VisualPinball.Engine.VPT.HitTarget;
+using UnityEngine;
 
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(HitTargetAnimationComponent)), CanEditMultipleObjects]
-	public class HitTargetAnimationInspector : AnimationInspector<HitTargetData, HitTargetComponent, HitTargetAnimationComponent>
+	public class HitTargetAnimationInspector : ItemInspector
 	{
 		private SerializedProperty _speedProperty;
 		private SerializedProperty _maxAngleProperty;
 
+		protected override MonoBehaviour UndoTarget => target as MonoBehaviour;
+
 		protected override void OnEnable()
 		{
 			base.OnEnable();
@@ -37,10 +39,6 @@ protected override void OnEnable()
 
 		public override void OnInspectorGUI()
 		{
-			if (HasErrors()) {
-				return;
-			}
-
 			BeginEditing();
 
 			OnPreInspectorGUI();
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerColliderInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerColliderInspector.cs
index 9fd51afe8..5d06af5fa 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerColliderInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerColliderInspector.cs
@@ -22,12 +22,14 @@ namespace VisualPinball.Unity.Editor
 	[CustomEditor(typeof(SpinnerColliderComponent)), CanEditMultipleObjects]
 	public class SpinnerColliderInspector : ColliderInspector<SpinnerData, SpinnerComponent, SpinnerColliderComponent>
 	{
+		private SerializedProperty _massProperty;
 		private SerializedProperty _elasticityProperty;
 		private SerializedProperty _zPosProperty;
 
 		protected override void OnEnable()
 		{
 			base.OnEnable();
+			_massProperty = serializedObject.FindProperty(nameof(SpinnerColliderComponent.Mass));
 			_elasticityProperty = serializedObject.FindProperty(nameof(SpinnerColliderComponent.Elasticity));
 			_zPosProperty = serializedObject.FindProperty(nameof(SpinnerColliderComponent.ZPosition));
 		}
@@ -42,8 +44,9 @@ public override void OnInspectorGUI()
 
 			OnPreInspectorGUI();
 
+			PropertyField(_massProperty);
 			PropertyField(_elasticityProperty, updateTransforms: true);
-			PropertyField(_zPosProperty);
+			PropertyField(_zPosProperty, updateColliders: true);
 
 			base.OnInspectorGUI();
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerLeverAnimationInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerLeverAnimationInspector.cs
new file mode 100644
index 000000000..5c5e0ca5e
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerLeverAnimationInspector.cs
@@ -0,0 +1,64 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEditor;
+using UnityEngine;
+
+namespace VisualPinball.Unity.Editor
+{
+	[CustomEditor(typeof(SpinnerLeverAnimationComponent)), CanEditMultipleObjects]
+	public class SpinnerLeverAnimationInspector : ItemInspector
+	{
+		private SerializedProperty _animationEmitterProperty;
+		private SerializedProperty _rotationAngleProperty;
+		private SerializedProperty _shiftProperty;
+		private SerializedProperty _offsetProperty;
+		private SerializedProperty _minAngleProperty;
+		private SerializedProperty _maxAngleProperty;
+
+		protected override MonoBehaviour UndoTarget => target as MonoBehaviour;
+
+		protected override void OnEnable()
+		{
+			base.OnEnable();
+
+			_animationEmitterProperty = serializedObject.FindProperty(nameof(AnimationComponent<float>._emitter));
+			_rotationAngleProperty = serializedObject.FindProperty(nameof(SpinnerLeverAnimationComponent.RotationAngle));
+			_shiftProperty = serializedObject.FindProperty(nameof(SpinnerLeverAnimationComponent.Shift));
+			_offsetProperty = serializedObject.FindProperty(nameof(SpinnerLeverAnimationComponent.Offset));
+			_minAngleProperty = serializedObject.FindProperty(nameof(SpinnerLeverAnimationComponent.MinAngle));
+			_maxAngleProperty = serializedObject.FindProperty(nameof(SpinnerLeverAnimationComponent.MaxAngle));
+		}
+
+		public override void OnInspectorGUI()
+		{
+			BeginEditing();
+
+			OnPreInspectorGUI();
+
+			PropertyField(_animationEmitterProperty, "Rotation Emitter");
+			PropertyField(_rotationAngleProperty);
+			PropertyField(_shiftProperty);
+			PropertyField(_offsetProperty);
+			PropertyField(_minAngleProperty);
+			PropertyField(_maxAngleProperty);
+
+			base.OnInspectorGUI();
+
+			EndEditing();
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerLeverAnimationInspector.cs.meta b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerLeverAnimationInspector.cs.meta
new file mode 100644
index 000000000..07c3b5120
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerLeverAnimationInspector.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1f5c418e513d4c309be8a50b2f96f76f
+timeCreated: 1755192740
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerPlateAnimationInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerPlateAnimationInspector.cs
index 48fd4a424..a8b18da38 100644
--- a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerPlateAnimationInspector.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Spinner/SpinnerPlateAnimationInspector.cs
@@ -15,20 +15,38 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using UnityEditor;
-using VisualPinball.Engine.VPT.Spinner;
+using UnityEngine;
 
 namespace VisualPinball.Unity.Editor
 {
 	[CustomEditor(typeof(SpinnerPlateAnimationComponent)), CanEditMultipleObjects]
-	public class SpinnerPlateAnimationInspector : AnimationInspector<SpinnerData, SpinnerComponent, SpinnerPlateAnimationComponent>
+	public class SpinnerPlateAnimationInspector : ItemInspector
 	{
+		private SerializedProperty _animationEmitterProperty;
+		private SerializedProperty _rotationVectorProperty;
+
+		protected override MonoBehaviour UndoTarget => target as MonoBehaviour;
+
+		protected override void OnEnable()
+		{
+			base.OnEnable();
+
+			_animationEmitterProperty = serializedObject.FindProperty(nameof(AnimationComponent<float>._emitter));
+			_rotationVectorProperty = serializedObject.FindProperty(nameof(SpinnerPlateAnimationComponent.RotationVector));
+		}
+
 		public override void OnInspectorGUI()
 		{
-			if (HasErrors()) {
-				return;
-			}
+			BeginEditing();
+
+			OnPreInspectorGUI();
+
+			PropertyField(_animationEmitterProperty, "Rotation Emitter");
+			PropertyField(_rotationVectorProperty);
+
+			base.OnInspectorGUI();
 
-			EditorGUILayout.HelpBox("This component animates the spinner plate. It's parameterized by its parent.", MessageType.Info);
+			EndEditing();
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event.meta b/VisualPinball.Unity/VisualPinball.Unity/Event.meta
new file mode 100644
index 000000000..28a044637
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e35f10973fe4484d943021689f732b10
+timeCreated: 1746211835
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event/EventRotateComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Event/EventRotateComponent.cs
new file mode 100644
index 000000000..eb7347bde
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event/EventRotateComponent.cs
@@ -0,0 +1,101 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using System.Linq;
+using Unity.Mathematics;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	public class EventRotateComponent : MonoBehaviour
+	{
+		public string EventName;
+		public Vector3 Axis;
+		public bool RotateGlobally;
+
+		public float Factor = 1f;
+		public float Offset;
+
+		private IPinballEventEmitter _eventEmitter;
+		private Quaternion _initialRotation;
+
+		#region Runtime
+
+		private void Awake()
+		{
+			var eventEmittersComponents = GetComponents<IPinballEventEmitter>();
+			if (eventEmittersComponents != null) {
+				foreach (var eventEmitter in eventEmittersComponents) {
+					if (eventEmitter.Events.Select(e => e.Name).Contains(EventName)) {
+						_eventEmitter = eventEmitter;
+						break;
+					}
+				}
+			}
+			_initialRotation = RotateGlobally ? transform.rotation : transform.localRotation;
+		}
+
+		private void Start()
+		{
+			if (_eventEmitter == null) {
+				return;
+			}
+			_eventEmitter.OnPinballEvent += OnPinballEvent;
+		}
+
+		private void OnPinballEvent(object sender, PinballEventArgs e)
+		{
+			if (e.Name != EventName) {
+				return;
+			}
+			Rotate(e.Value, e.Unit);
+		}
+
+		private void Rotate(float value, PinballEventUnit unit)
+		{
+			float angleDeg;
+			switch (unit) {
+				case PinballEventUnit.Degrees:
+					angleDeg = value;
+					break;
+				case PinballEventUnit.Radians:
+					angleDeg = math.degrees(value);
+					break;
+				default:
+					Debug.Log("Unsupported rotation unit: " + unit);
+					return;
+			}
+			var delta = Quaternion.AngleAxis(angleDeg * Factor + Offset, Axis);
+			if (RotateGlobally) {
+				transform.rotation = delta * _initialRotation;
+			} else {
+				transform.localRotation = delta * _initialRotation;
+			}
+		}
+
+		private void OnDestroy()
+		{
+			if (_eventEmitter == null) {
+				return;
+			}
+			_eventEmitter.OnPinballEvent -= OnPinballEvent;
+		}
+
+		#endregion
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event/EventRotateComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Event/EventRotateComponent.cs.meta
new file mode 100644
index 000000000..ade64f135
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event/EventRotateComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7db2f3644bfa4375b7a31131d5fde28d
+timeCreated: 1747134614
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event/EventTranslateComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/Event/EventTranslateComponent.cs
new file mode 100644
index 000000000..fd7ebc1e9
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event/EventTranslateComponent.cs
@@ -0,0 +1,126 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using System.Collections;
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	public class EventTransformComponent : MonoBehaviour
+	{
+		public bool TwoWay;
+		public bool TranslateGlobally;
+
+		public AnimationCurve EnterAnimationCurve = AnimationCurve.EaseInOut(0, 0, 1f, 1);
+		public AnimationCurve ExitAnimationCurve = AnimationCurve.EaseInOut(0, 0, 1f, 1);
+
+		public float EnterAnimationDurationSeconds = 0.3f;
+		public float ExitAnimationDurationSeconds = 0.3f;
+
+		public Vector3 Direction;
+
+		private IWireableComponent _wireComponent;
+
+		private Vector3 _initialPosition;
+		private Coroutine _enterCoroutine;
+
+		#region Runtime
+
+		private void Awake()
+		{
+			_wireComponent = GetComponentInParent<IWireableComponent>();
+			_initialPosition = TranslateGlobally ? transform.position : transform.localPosition;
+		}
+
+		private void Start()
+		{
+			if (_wireComponent == null) {
+				return;
+			}
+
+			foreach (var deviceItem in _wireComponent.AvailableWireDestinations) {
+				if (_wireComponent is ICoilDeviceComponent coilDevice) {
+					var coil = coilDevice.CoilDevice(deviceItem.Id);
+					coil.CoilStatusChanged += OnCoilChanged;
+				}
+			}
+		}
+
+		private void OnDestroy()
+		{
+			if (_wireComponent == null) {
+				return;
+			}
+			foreach (var deviceItem in _wireComponent.AvailableWireDestinations) {
+				if (_wireComponent is ICoilDeviceComponent coilDevice) {
+					var coil = coilDevice.CoilDevice(deviceItem.Id);
+					coil.CoilStatusChanged -= OnCoilChanged;
+				}
+			}
+		}
+
+		#endregion
+
+		private void OnCoilChanged(object sender, NoIdCoilEventArgs e)
+		{
+			if (e.IsEnergized) {
+				OnEnter();
+			} else if (TwoWay) {
+				OnExit();
+			}
+		}
+
+		private void OnEnter()
+		{
+			if (_enterCoroutine != null) {
+				StopCoroutine(_enterCoroutine);
+			}
+			_enterCoroutine = StartCoroutine(Animate(EnterAnimationDurationSeconds, EnterAnimationCurve));
+		}
+
+		private IEnumerator Animate(float duration, AnimationCurve curve)
+		{
+			var t = 0f;
+			while (t < duration) {
+				var f = curve.Evaluate(t / duration);
+
+				if (TranslateGlobally) {
+					transform.position = _initialPosition + Direction * f;
+				} else {
+					transform.localPosition = _initialPosition + Direction * f;
+				}
+				t += Time.deltaTime;
+				yield return null;                               // wait one frame
+			}
+
+			if (!TwoWay) {
+				if (TranslateGlobally) {
+					transform.position = _initialPosition;
+				} else {
+					transform.localPosition = _initialPosition;
+				}
+			}
+			_enterCoroutine = null;
+		}
+
+		private void OnExit()
+		{
+
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event/EventTranslateComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Event/EventTranslateComponent.cs.meta
new file mode 100644
index 000000000..888b84347
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event/EventTranslateComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dbaf21decadd49edb2dc71b2c7d56a8a
+timeCreated: 1746211892
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event/IEventEmitter.cs b/VisualPinball.Unity/VisualPinball.Unity/Event/IEventEmitter.cs
new file mode 100644
index 000000000..db4a78aca
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event/IEventEmitter.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace VisualPinball.Unity
+{
+	public interface IPinballEventEmitter
+	{
+		public PinballEvent[] Events { get; }
+		public event EventHandler<PinballEventArgs> OnPinballEvent;
+	}
+
+	public readonly struct PinballEvent
+	{
+		public readonly string Name;
+		public readonly PinballEventUnit Unit;
+
+		public PinballEvent(string name, PinballEventUnit unit)
+		{
+			Name = name;
+			Unit = unit;
+		}
+	}
+
+	public readonly struct PinballEventArgs
+	{
+		public readonly string Name;
+		public readonly float Value;
+		public readonly PinballEventUnit Unit;
+
+		public PinballEventArgs(string name, float value, PinballEventUnit unit)
+		{
+			Name = name;
+			Value = value;
+			Unit = unit;
+		}
+	}
+
+	public enum PinballEventUnit
+	{
+		None,
+		Percent,
+		Degrees,
+		DegreesPerSecond,
+		Meters,
+		MetersPerSecond,
+		Radians,
+		RadiansPerSecond,
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Event/IEventEmitter.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Event/IEventEmitter.cs.meta
new file mode 100644
index 000000000..1ffa49b55
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Event/IEventEmitter.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 159afb99626344b1ba38cb568fd8e382
+timeCreated: 1747133146
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/CameraTranslateAndOrbit.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/CameraTranslateAndOrbit.cs
index 1df65ee2d..894ad8663 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Game/CameraTranslateAndOrbit.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Game/CameraTranslateAndOrbit.cs
@@ -1,245 +1,306 @@
-using UnityEngine;
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using UnityEngine;
 using UnityEngine.InputSystem;
-using UnityEngine.InputSystem.EnhancedTouch;
-using Touch = UnityEngine.InputSystem.EnhancedTouch.Touch;
-using TouchPhase = UnityEngine.InputSystem.TouchPhase;
+using VisualPinball.Unity;
 
-/// <summary>
-/// A simple camera orbit script that works with Unity's new Input System.
-/// </summary>
 public class CameraTranslateAndOrbit : MonoBehaviour
 {
-	public float panSpeed = 0.5f;
-	public float orbitSpeed = 0.4f;
-	public float zoomSpeed = 0.1f;
-
-	public float smoothing = 1f;
+	[Header("Speeds")] public float panSpeed = 10f;
+	public float orbitSpeed = 10f;
+	public float zoomSpeed = 10f;
+	public float smoothing = 10f;
+	public float ballCamSmoothing = 10f;
 
+	[Header("Optional scene references")]
 	public Transform initialOrbit;
+	public Transform lockTarget;
 
-	private Transform _transformCache;
-	public bool isAnimating;
+	public Player player;
+
+	private const float RadiusMin = 0.5f;
 
+	private Transform _transformCache;
 	private GameObject _dummyForRotation;
 	private Transform _dummyTransform;
 
 	private float _radius;
-
 	private Vector3 _focusPoint;
 	private float _radiusCurrent = 15f;
 
-	private bool _isTrackingTouch0;
-	private Vector2 _touch0StartPosition;
-
-	private float _startMultiTouchRadius;
-	private float _startMultiTouchDistance;
+	private Vector3 _positionOffsetCurrent = Vector3.zero;
+	private Quaternion _rot2 = Quaternion.identity;
 
+	/* input tracking state (unchanged from original – trimmed for brevity) */
 	private bool _isTrackingMouse0;
 	private Vector2 _mouse0StartPosition;
-
 	private bool _isTrackingMouse1;
 	private Vector2 _mouse1StartPosition;
+	private bool _isTrackingBall;
+	private bool _isTrackingBallTarget;				// ★ NEW: shift-B look-at lock
+
+	// *** BALL-LOCK – offset we keep between camera and ball while tracking
+	private Vector3 _ballFollowOffset = Vector3.zero;
+	private Vector3 _ballFollowVel = Vector3.zero;
+	private float   _orbitYaw;                 // ★ track user-added yaw
+	private float   _orbitPitch;               // ★   …and pitch
+	private Vector3 _smoothedBallPos;
+	private Vector3 _ballPosVel;
+	private Vector3 _ballFollowOffsetTarget;    // ★ where the user wants the offset
+	private Vector3 _ballOffsetVel;             // ★ velocity for SmoothDamp
 
 	public Vector3 positionOffset = Vector3.zero;
-	private Vector3 _positionOffsetCurrent = Vector3.zero;
-
-	private Quaternion _rot2 = Quaternion.identity;
-
-	private const float RadiusMin = 0.5f;
+	public bool isAnimating;
+	private Keyboard _keyboard;
+	private Mouse _mouse;
+	private PhysicsEngine _physicsEngine;
 
-	private void Awake()
-	{
-		EnhancedTouchSupport.Enable();
-	}
+	/* -------------------------------------------------------- */
 
 	private void Start()
 	{
-		var pfr = initialOrbit == null ? null : initialOrbit.GetComponent<Renderer>();
-		if (pfr != null) {
-			positionOffset = pfr.bounds.center;
+		// same logic you had before to center on renderer bounds, etc.
+		if (initialOrbit != null) {
+			var pfr = initialOrbit.GetComponent<Renderer>();
+			if (pfr != null) positionOffset = pfr.bounds.center;
 		}
 
-		_radius = Vector3.Distance(Vector3.zero, transform.position);
 		_transformCache = transform;
-		_focusPoint = _transformCache.forward * -1f * _radius;
+		_radius = Vector3.Distance(Vector3.zero, _transformCache.position);
+		_focusPoint = -_transformCache.forward * _radius;
 		_positionOffsetCurrent = positionOffset;
 		_radiusCurrent = _radius;
-		_dummyForRotation = new GameObject();
-		_dummyTransform = _dummyForRotation.transform;
 
-		_dummyTransform.rotation = _transformCache.rotation;
+		_dummyForRotation = new GameObject("[Camera-Dummy-Rotation]");
+		_dummyTransform = _dummyForRotation.transform;
 		_dummyTransform.position = _transformCache.position;
+		_dummyTransform.rotation = _transformCache.rotation;
 		_rot2 = _transformCache.rotation;
-	}
 
-	private void OrbitAroundObject(Vector3 newOffset, float radiusRef)
-	{
-		positionOffset = newOffset;
-		_positionOffsetCurrent = positionOffset;
-		_radius = radiusRef;
-		_radiusCurrent = _radius;
+		if (player) {
+			_physicsEngine = player.GetComponentInChildren<PhysicsEngine>();
+		}
+		_keyboard = Keyboard.current;
+		_mouse = Mouse.current;
 	}
 
-	// Update is called once per frame
 	private void Update()
 	{
-		if (Touchscreen.current != null) {
-			UpdateTouchscreen();
+		// toggle ball lock if "b" pressed
+		if (player && _keyboard.bKey.wasPressedThisFrame) {
+
+			if (_keyboard.shiftKey.isPressed) {					// ⇧B → target-lock
+				if (_isTrackingBallTarget) {
+					lockTarget = null;
+					_isTrackingBallTarget = false;
+				} else {
+					LockBallTarget();
+					_isTrackingBallTarget = lockTarget != null;
+					_isTrackingBall = false;
+				}
+
+			} else {											// B → follow-lock
 
-			return;
+				if (_isTrackingBall) {
+					lockTarget = null;
+
+				} else {
+					LockBall();
+				}
+				_isTrackingBall = !_isTrackingBall;
+				if (_isTrackingBall) _isTrackingBallTarget = false;
+			}
+		}
+		// if (_isTrackingBall && lockTarget == null) {			// if ball got destroyed but still tracking, try to lock again.
+		// 	LockBall();
+		// }
+		if (_isTrackingBallTarget && lockTarget == null) {
+			LockBallTarget();
 		}
 
-		if (Mouse.current != null) {
+		if (_mouse != null) {
 			UpdateMouse();
 		}
 	}
 
-	private void UpdateTouchscreen()
+	private void LateUpdate()
 	{
-		if (Touch.activeFingers.Count == 1) {
-			Touch touch = Touch.activeTouches[0];
-
-			_transformCache.position = _dummyTransform.position = Vector3.zero;
-
-			var hasHitRestrictedHitArea = false;
-
-			if (touch.phase == TouchPhase.Began) {
-				_touch0StartPosition = touch.screenPosition;
-				_isTrackingTouch0 = true;
-			}
-
-			if (_touch0StartPosition.x < 200f && _touch0StartPosition.y > Screen.height - 200f) {
-				hasHitRestrictedHitArea = true;
-			}
-
-			if (!hasHitRestrictedHitArea) {
-				if (_isTrackingTouch0) {
-					Vector3 touchPositionDifference = touch.screenPosition - _touch0StartPosition;
-					_dummyTransform.Rotate(Vector3.up, touchPositionDifference.x * orbitSpeed / 4, Space.World);
-
-					_dummyTransform.Rotate(_dummyTransform.right.normalized, touchPositionDifference.y * -orbitSpeed,
-						Space.World);
-					_rot2 = _dummyTransform.rotation;
-					_touch0StartPosition = touch.screenPosition;
-				}
-				_transformCache.rotation = Quaternion.Lerp(_transformCache.rotation, _rot2, Time.deltaTime / smoothing * 4);
-			}
-
-			if (touch.phase == TouchPhase.Ended || touch.phase == TouchPhase.Canceled) {
-				_isTrackingTouch0 = false;
-			}
+		if (lockTarget == null) return;
+
+		/* --- 1. smooth the ball itself --- */
+		_smoothedBallPos = Vector3.SmoothDamp(
+			_smoothedBallPos,
+			lockTarget.position,
+			ref _ballPosVel,
+			ballCamSmoothing * Time.deltaTime);
+
+		/* --- follow-lock moves camera; target-lock doesn’t --- */
+		if (_isTrackingBall) {
+
+			/* --- 2. smooth the user-driven orbit offset --- */
+			_ballFollowOffset = Vector3.SmoothDamp(
+				_ballFollowOffset,
+				_ballFollowOffsetTarget,
+				ref _ballOffsetVel,
+				ballCamSmoothing * Time.deltaTime);
+
+			/* --- 3. final camera placement --- */
+			_transformCache.position = _smoothedBallPos + _ballFollowOffset;
 		}
-		else if (Touch.activeFingers.Count == 2) {
-			var firstTouch = Touch.activeTouches[0];
-			var secondTouch = Touch.activeTouches[1];
 
-			_transformCache.position = _dummyTransform.position = Vector3.zero;
+		/* -------- look-at rotation (shared) -------- */
+		_transformCache.rotation = Quaternion.LookRotation(
+			_smoothedBallPos - _transformCache.position,
+			Vector3.up);
+		/* ------------------------------------------- */
 
-			if (firstTouch.phase == TouchPhase.Began || secondTouch.phase == TouchPhase.Began) {
-				_startMultiTouchDistance = Vector2.Distance(firstTouch.screenPosition, secondTouch.screenPosition);
+		/* keep helpers coherent so you can unlock cleanly */
+		_dummyTransform.position = _transformCache.position;
+		_dummyTransform.rotation = _transformCache.rotation;
+		_rot2 = _transformCache.rotation;
+	}
 
-				_startMultiTouchRadius = _radius;
+	private void LockBall()
+	{
+		if (player.BallManager.FindBall(out var ballData)) {
+			lockTarget = _physicsEngine.GetTransform(ballData.Id);
+			if (lockTarget != null) {
+				_ballFollowOffset       =
+					_ballFollowOffsetTarget = _transformCache.position - lockTarget.position;   // ★ init both
+				_ballFollowVel          = Vector3.zero;
+				_ballOffsetVel          = Vector3.zero;                                     // ★
+				_orbitYaw   = 0f;
+				_orbitPitch = 0f;
+				_smoothedBallPos = lockTarget.position;
 			}
+		}
+	}
 
-			if (firstTouch.phase == TouchPhase.Moved || secondTouch.phase == TouchPhase.Moved) {
-				_radius = _startMultiTouchRadius;
-
-				var distance = Vector2.Distance(firstTouch.screenPosition, secondTouch.screenPosition) - _startMultiTouchDistance;
-				var delta = distance / 250 * zoomSpeed * -_radius;
-
-				_radius += delta;
-
-				if (_radius < RadiusMin) {
-					var radDiff = RadiusMin - _radius;
-					positionOffset += _transformCache.forward * (radDiff * 4f);
-					_radius = RadiusMin;
-				}
+	private void LockBallTarget()
+	{
+		if (player.BallManager.FindBall(out var ballData)) {
+			lockTarget = _physicsEngine.GetTransform(ballData.Id);
+			if (lockTarget != null) {
+				_smoothedBallPos = lockTarget.position;
+				_ballPosVel = Vector3.zero;
 			}
 		}
-
-		_positionOffsetCurrent = Vector3.Lerp(_positionOffsetCurrent, positionOffset, Time.deltaTime * 4f);
-		_radiusCurrent = Mathf.Lerp(_radiusCurrent, _radius, Time.deltaTime * 4f);
-		_focusPoint = _transformCache.forward * -1f * _radiusCurrent;
-		_transformCache.position = _focusPoint + _positionOffsetCurrent;
-		_dummyTransform.position = _transformCache.position;
 	}
 
 	private void UpdateMouse()
 	{
-		_transformCache.position = _dummyTransform.position = Vector3.zero;
+		/* -------------- KEEP THIS NEW BLOCK AT THE VERY TOP -------------- */
+		// ★ When we’re **not** locked-on, keep the “dummy” pivot parked at
+		//   (0,0,0) every frame so free-orbit behaves exactly like before.
+		if (lockTarget == null)
+		{
+			_transformCache.position  = Vector3.zero;
+			_dummyTransform.position  = Vector3.zero;
+		}
+		/* ----------------------------------------------------------------- */
 
-		var hasHitRestrictedHitArea = false;
+		bool hasHitRestrictedHitArea = false;
 
-		if (Mouse.current.leftButton.wasPressedThisFrame) {
-			_mouse0StartPosition = Mouse.current.position.ReadValue();
+		/* ========== ORBIT (left mouse) ========== */
+		if (_mouse.leftButton.wasPressedThisFrame) {
+			_mouse0StartPosition = _mouse.position.ReadValue();
 			_isTrackingMouse0 = true;
 		}
 
-		if (_mouse0StartPosition.x < 200f && _mouse0StartPosition.y > Screen.height - 200f) {
-			hasHitRestrictedHitArea = true;
-		}
+		/* ---------------- ORBIT (left mouse) ---------------- */
+		if (_isTrackingMouse0) {
+			var delta = _mouse.position.ReadValue() - _mouse0StartPosition;
+			_mouse0StartPosition = _mouse.position.ReadValue();
+
+			if (!hasHitRestrictedHitArea) {
+				float yawDelta   =  delta.x * orbitSpeed / 75f;
+				float pitchDelta = -delta.y * orbitSpeed / 75f;
 
-		if (!hasHitRestrictedHitArea) {
-			if (_isTrackingMouse0) {
-				Vector3 mousePositionDifference = Mouse.current.position.ReadValue() - _mouse0StartPosition;
-				_dummyTransform.Rotate(Vector3.up, mousePositionDifference.x * orbitSpeed, Space.World);
+				if (lockTarget != null && _isTrackingBall) {
+					/* ---------- locked-on orbit (already working) ---------- */
+					_orbitYaw   += yawDelta;
+					_orbitPitch  = Mathf.Clamp(_orbitPitch + pitchDelta, -80f, 80f);
 
-				_dummyTransform.Rotate(_dummyTransform.right.normalized, mousePositionDifference.y * -orbitSpeed,
-					Space.World);
-				_rot2 = _dummyTransform.rotation;
-				_mouse0StartPosition = Mouse.current.position.ReadValue();
+					Quaternion q = Quaternion.Euler(_orbitPitch, _orbitYaw, 0f);
+					float r = _ballFollowOffsetTarget.magnitude;
+					_ballFollowOffsetTarget = q * (Vector3.back * r);
+				}
+				else if (lockTarget == null) {
+					/* ---------- FREE ORBIT  —  PUT THESE LINES BACK ---------- */
+					_transformCache.position  = Vector3.zero;         // pivot at world-origin
+					_dummyTransform.position  = Vector3.zero;
+
+					_dummyTransform.Rotate(Vector3.up,              yawDelta,   Space.World);
+					_dummyTransform.Rotate(_dummyTransform.right.normalized,   pitchDelta, Space.World);
+
+					_rot2 = _dummyTransform.rotation;                 // used by smoothing
+				}
 			}
-			_transformCache.rotation = Quaternion.Lerp(_transformCache.rotation, _rot2, Time.deltaTime / smoothing * 4);
 		}
 
-		if (Mouse.current.leftButton.wasReleasedThisFrame) {
+		if (_mouse.leftButton.wasReleasedThisFrame) {
 			_isTrackingMouse0 = false;
 		}
 
-		if (Mouse.current.rightButton.wasPressedThisFrame) {
-			_mouse1StartPosition = Mouse.current.position.ReadValue();
-			_isTrackingMouse1 = true;
-		}
+		if (lockTarget == null) {
 
-		if (!hasHitRestrictedHitArea) {
-			if (_isTrackingMouse1) {
-				var mousePositionDifference = Mouse.current.position.ReadValue() - _mouse1StartPosition;
-				//Vector3 XZPlanerDirection = transformCache.forward.normalized;
-				//XZPlanerDirection.y = 0;
-
-				positionOffset += _transformCache.up.normalized * (mousePositionDifference.y * -(_radius * panSpeed / 100f));
-				positionOffset += _transformCache.right.normalized * (mousePositionDifference.x * -(_radius * panSpeed / 100f));
-
-				/*
-				if(positionOffset.y < 0){
-					positionOffset.y = 0;
-				}*/
+			/* ---------------- right mouse: pan ---------------- */
+			if (_mouse.rightButton.wasPressedThisFrame) {
+				_mouse1StartPosition = _mouse.position.ReadValue();
+				_isTrackingMouse1 = true;
+			}
 
-				_mouse1StartPosition = Mouse.current.position.ReadValue();
+			if (!hasHitRestrictedHitArea && _isTrackingMouse1) {
+				var delta = _mouse.position.ReadValue() - _mouse1StartPosition;
+				positionOffset += _transformCache.up * (-delta.y * (_radius * panSpeed / 60000f));
+				positionOffset += _transformCache.right * (-delta.x * (_radius * panSpeed / 60000f));
+				_mouse1StartPosition = _mouse.position.ReadValue();
 			}
-		}
 
-		if (Mouse.current.rightButton.wasReleasedThisFrame) {
-			_isTrackingMouse1 = false;
+			if (_mouse.rightButton.wasReleasedThisFrame) {
+				_isTrackingMouse1 = false;
+			}
 		}
 
-		if (!hasHitRestrictedHitArea) {
-			if (!isAnimating) {
-				var delta = Mouse.current.scroll.y.ReadValue() / 10f * zoomSpeed * -_radius;
-				_radius += delta;
-				if (_radius < RadiusMin) {
-					var radDiff = RadiusMin - _radius;
-					positionOffset += _transformCache.forward * (radDiff * 4f);
-					_radius = RadiusMin;
-				}
+		/* ========== ZOOM (scroll) ========== */
+		if (!isAnimating && !hasHitRestrictedHitArea) {
+			float deltaScroll = _mouse.scroll.y.ReadValue() / 300f * zoomSpeed;
+			/* ---------------  UpdateMouse() – ZOOM in lock  --------------- */
+			if (lockTarget != null && _isTrackingBall) {      // ★ only follow-lock zooms
+				float r = Mathf.Max(_ballFollowOffsetTarget.magnitude * (1f - deltaScroll), RadiusMin);
+				_ballFollowOffsetTarget = _ballFollowOffsetTarget.normalized * r;
+			} else if (lockTarget == null) {
+				/* original zoom path (unchanged) */
+				_radius  = Mathf.Max(_radius  - deltaScroll * _radius, RadiusMin);
 			}
 		}
 
-		_positionOffsetCurrent = Vector3.Lerp(_positionOffsetCurrent, positionOffset, Time.deltaTime / smoothing * 4);
-		_radiusCurrent = Mathf.Lerp(_radiusCurrent, _radius, Time.deltaTime / smoothing * 4);
+		/* ========== free-orbit smoothing (only when unlocked) ========== */
+		if (lockTarget == null) {
+			_transformCache.rotation = Quaternion.Lerp(
+				_transformCache.rotation, _rot2, Time.deltaTime / smoothing * 80f);
 
-		_focusPoint = _transformCache.forward * -1f * _radiusCurrent;
-		_transformCache.position = _focusPoint + _positionOffsetCurrent;
-		_dummyTransform.position = _transformCache.position;
+			_positionOffsetCurrent = Vector3.Lerp(
+				_positionOffsetCurrent, positionOffset, Time.deltaTime / smoothing * 80f);
+			_radiusCurrent = Mathf.Lerp(_radiusCurrent, _radius, Time.deltaTime / smoothing * 80f);
+
+			_focusPoint          = _transformCache.forward * -_radiusCurrent;
+			_transformCache.position = _focusPoint + _positionOffsetCurrent;
+			_dummyTransform.position = _transformCache.position;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/DebugShortCutManager.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/DebugShortCutManager.cs
new file mode 100644
index 000000000..0c5d63f14
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Game/DebugShortCutManager.cs
@@ -0,0 +1,159 @@
+// Visual Pinball Engine
+// Copyright (C) 2025 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+namespace VisualPinball.Unity
+{
+	public class DebugShortcutManager : MonoBehaviour
+	{
+		[Serializable]
+		public class DebugShortcut
+		{
+			public string description;
+			public string itemId;
+			public Key key;
+			public DebugAction action;
+			public float value;
+			public PressMode mode;
+
+			private float _previousValue = float.NaN;
+
+			public float AlternatingValue { get {
+					{
+						if (mode == PressMode.Const) {
+							return value;
+						}
+						// start with value
+						if (float.IsNaN(_previousValue)) {
+							_previousValue = value;
+							return value;
+						}
+						// return inverted value
+						// ReSharper disable once CompareOfFloatsByEqualityOperator
+						if (_previousValue == InvValue) {
+							_previousValue = value;
+							return value;
+						}
+						_previousValue = InvValue;
+						return InvValue;
+					}
+				}
+			}
+
+			public float InvValue => value == 0 ? 1 : 0;
+		}
+
+		public enum PressMode
+		{
+			/// <summary>
+			/// Key press always sends the same signal.
+			/// </summary>
+			Const,
+
+			/// <summary>
+			/// Key press sens inverted signal every second time
+			/// </summary>
+			Toggle,
+
+			/// <summary>
+			/// Key down sends signal, key up inverted signal
+			/// </summary>
+			Momentary
+		}
+
+		public enum DebugAction
+		{
+			None,
+			Coil,
+			Switch,
+			Lamp,
+		}
+
+		[Header("Debug Shortcuts")]
+		public List<DebugShortcut> shortcuts = new();
+
+		private IGamelogicEngine _gle;
+		private IGamelogicBridge _gleBridge;
+		private Keyboard _keyboard;
+
+		private void Start()
+		{
+			_gle = GetComponentInParent<IGamelogicEngine>();
+			_gleBridge = GetComponentInParent<IGamelogicBridge>();
+			_keyboard = Keyboard.current;
+		}
+
+		private void Update()
+		{
+			if (_gle == null || _gleBridge == null) {
+				return;
+			}
+			foreach (var shortcut in shortcuts) {
+				if (_keyboard[shortcut.key].wasPressedThisFrame) {
+					switch (shortcut.mode) {
+						case PressMode.Const:
+						case PressMode.Momentary:
+							ExecuteAction(shortcut, shortcut.value);
+							break;
+						case PressMode.Toggle:
+							ExecuteAction(shortcut, shortcut.AlternatingValue);
+							break;
+						default:
+							throw new ArgumentOutOfRangeException();
+					}
+				}
+				if (_keyboard[shortcut.key].wasReleasedThisFrame) {
+					switch (shortcut.mode) {
+						case PressMode.Const:
+						case PressMode.Toggle:
+							// do nothing
+							break;
+						case PressMode.Momentary:
+							ExecuteAction(shortcut, shortcut.AlternatingValue);
+							break;
+						default:
+							throw new ArgumentOutOfRangeException();
+					}
+				}
+			}
+		}
+
+		private void ExecuteAction(DebugShortcut shortcut, float value)
+		{
+			switch (shortcut.action) {
+				case DebugAction.Coil:
+					_gleBridge.SetCoil(shortcut.itemId, value != 0);
+					break;
+
+				case DebugAction.Switch:
+					_gle.Switch(shortcut.itemId, value != 0);
+					break;
+
+				case DebugAction.Lamp:
+					_gleBridge.SetLamp(shortcut.itemId, value);
+					break;
+
+				case DebugAction.None:
+				default:
+					break;
+			}
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/DebugShortCutManager.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/Game/DebugShortCutManager.cs.meta
new file mode 100644
index 000000000..24c6d8592
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/Game/DebugShortCutManager.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0cc90637ead34f6ab7e84e25b9179862
+timeCreated: 1745669055
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs
index 1077c089f..810047fcc 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs
@@ -87,7 +87,7 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
 
 		#region Transforms
 
-		[NonSerialized] private readonly Dictionary<int, Transform> _transforms = new();
+		[NonSerialized] private readonly Dictionary<int, BallComponent> _ballComponents = new();
 
 		/// <summary>
 		/// Last transforms of kinematic items, so we can detect changes.
@@ -111,9 +111,10 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
 		/// for items where the original physics engine doesn't.
 		/// </remarks>
 		[NonSerialized] private readonly LazyInit<NativeParallelHashMap<int, float4x4>> _nonTransformableColliderTransforms = new(() => new NativeParallelHashMap<int, float4x4>(0, Allocator.Persistent));
-		[NonSerialized] private readonly Dictionary<int, SkinnedMeshRenderer[]> _skinnedMeshRenderers = new();
 
-		[NonSerialized] private readonly Dictionary<int, IRotatableAnimationComponent> _rotatableComponent = new();
+		[NonSerialized] private readonly Dictionary<int, IAnimationValueEmitter<bool>> _boolAnimatedComponents = new();
+		[NonSerialized] private readonly Dictionary<int, IAnimationValueEmitter<float>> _floatAnimatedComponents = new();
+		[NonSerialized] private readonly Dictionary<int, IAnimationValueEmitter<float2>> _float2AnimatedComponents = new();
 
 		#endregion
 
@@ -167,7 +168,6 @@ internal void Register<T>(T item) where T : MonoBehaviour
 		{
 			var go = item.gameObject;
 			var itemId = go.GetInstanceID();
-			_transforms.TryAdd(itemId, go.transform);
 
 			// states
 			switch (item) {
@@ -175,6 +175,7 @@ internal void Register<T>(T item) where T : MonoBehaviour
 					if (!_ballStates.Ref.ContainsKey(itemId)) {
 						_ballStates.Ref[itemId] = c.CreateState();
 					}
+					_ballComponents.TryAdd(itemId, c);
 					break;
 				case BumperComponent c: _bumperStates.Ref[itemId] = c.CreateState(); break;
 				case FlipperComponent c:
@@ -186,7 +187,6 @@ internal void Register<T>(T item) where T : MonoBehaviour
 				case KickerComponent c: _kickerStates.Ref[itemId] = c.CreateState(); break;
 				case PlungerComponent c:
 					_plungerStates.Ref[itemId] = c.CreateState();
-					_skinnedMeshRenderers[itemId] = c.GetComponentsInChildren<SkinnedMeshRenderer>();
 					break;
 				case SpinnerComponent c: _spinnerStates.Ref[itemId] = c.CreateState(); break;
 				case SurfaceComponent c: _surfaceStates.Ref[itemId] = c.CreateState(); break;
@@ -194,18 +194,24 @@ internal void Register<T>(T item) where T : MonoBehaviour
 			}
 
 			// animations
-			if (item is IRotatableAnimationComponent rotatableComponent) {
-				_rotatableComponent.TryAdd(itemId, rotatableComponent);
+			if (item is IAnimationValueEmitter<bool> boolAnimatedComponent) {
+				_boolAnimatedComponents.TryAdd(itemId, boolAnimatedComponent);
+			}
+			if (item is IAnimationValueEmitter<float> floatAnimatedComponent) {
+				_floatAnimatedComponents.TryAdd(itemId, floatAnimatedComponent);
+			}
+			if (item is IAnimationValueEmitter<float2> float2AnimatedComponent) {
+				_float2AnimatedComponents.TryAdd(itemId, float2AnimatedComponent);
 			}
 		}
 
-		internal Transform UnregisterBall(int ballId)
+		internal BallComponent UnregisterBall(int ballId)
 		{
-			var t = _transforms[ballId];
-			_transforms.Remove(ballId);
+			var b = _ballComponents[ballId];
+			_ballComponents.Remove(ballId);
 			_ballStates.Ref.Remove(ballId);
 			_insideOfs.SetOutsideOfAll(ballId);
-			return t;
+			return b;
 		}
 
 		internal bool IsColliderEnabled(int itemId) => !_disabledCollisionItems.Ref.Contains(itemId);
@@ -223,7 +229,7 @@ internal void DisableCollider(int itemId)
 			}
 		}
 
-		internal Transform GetTransform(int itemId) => _transforms[itemId];
+		public BallComponent GetBall(int itemId) => _ballComponents[itemId];
 
 		#endregion
 
@@ -397,15 +403,15 @@ private void Update()
 
 			#region Movements
 
-			_physicsMovements.ApplyBallMovement(ref state, _transforms);
-			_physicsMovements.ApplyFlipperMovement(ref _flipperStates.Ref, _transforms);
-			_physicsMovements.ApplyBumperMovement(ref _bumperStates.Ref, _transforms);
-			_physicsMovements.ApplyDropTargetMovement(ref _dropTargetStates.Ref, _transforms);
-			_physicsMovements.ApplyHitTargetMovement(ref _hitTargetStates.Ref, _transforms);
-			_physicsMovements.ApplyGateMovement(ref _gateStates.Ref, _rotatableComponent);
-			_physicsMovements.ApplyPlungerMovement(ref _plungerStates.Ref, _skinnedMeshRenderers);
-			_physicsMovements.ApplySpinnerMovement(ref _spinnerStates.Ref, _rotatableComponent);
-			_physicsMovements.ApplyTriggerMovement(ref _triggerStates.Ref, _transforms);
+			_physicsMovements.ApplyBallMovement(ref state, _ballComponents);
+			_physicsMovements.ApplyFlipperMovement(ref _flipperStates.Ref, _floatAnimatedComponents);
+			_physicsMovements.ApplyBumperMovement(ref _bumperStates.Ref, _floatAnimatedComponents, _float2AnimatedComponents);
+			_physicsMovements.ApplyDropTargetMovement(ref _dropTargetStates.Ref, _floatAnimatedComponents);
+			_physicsMovements.ApplyHitTargetMovement(ref _hitTargetStates.Ref, _floatAnimatedComponents);
+			_physicsMovements.ApplyGateMovement(ref _gateStates.Ref, _floatAnimatedComponents);
+			_physicsMovements.ApplyPlungerMovement(ref _plungerStates.Ref, _floatAnimatedComponents);
+			_physicsMovements.ApplySpinnerMovement(ref _spinnerStates.Ref, _floatAnimatedComponents);
+			_physicsMovements.ApplyTriggerMovement(ref _triggerStates.Ref, _floatAnimatedComponents);
 
 			#endregion
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsMovements.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsMovements.cs
index 21ae1524f..6037d0861 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsMovements.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsMovements.cs
@@ -17,15 +17,12 @@
 using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Mathematics;
-using UnityEngine;
 
 namespace VisualPinball.Unity
 {
 	internal class PhysicsMovements
 	{
-		private readonly BumperTransform _bumperTransform = new();
-
-		internal void ApplyBallMovement(ref PhysicsState state, Dictionary<int, Transform> transforms)
+		internal void ApplyBallMovement(ref PhysicsState state, Dictionary<int, BallComponent> ballComponents)
 		{
 			using var enumerator = state.Balls.GetEnumerator();
 			while (enumerator.MoveNext()) {
@@ -33,97 +30,107 @@ internal void ApplyBallMovement(ref PhysicsState state, Dictionary<int, Transfor
 				if (ball.IsFrozen) {
 					continue;
 				}
-				BallMovementPhysics.Move(ball, transforms[ball.Id]);
+				ballComponents[ball.Id].Move(ball);
 			}
 		}
 
-		internal void ApplyFlipperMovement(ref NativeParallelHashMap<int, FlipperState> flipperStates, Dictionary<int, Transform> transforms)
+		internal void ApplyFlipperMovement(ref NativeParallelHashMap<int, FlipperState> flipperStates,
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = flipperStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var flipperState = ref enumerator.Current.Value;
-				var transform = transforms[enumerator.Current.Key];
-
-				transform.SetLocalYRotation(flipperState.Movement.Angle);
+				var emitter = floatAnimatedComponent[enumerator.Current.Key];
+				emitter.UpdateAnimationValue(flipperState.Movement.Angle);
 			}
 		}
 
-		internal void ApplyBumperMovement(ref NativeParallelHashMap<int, BumperState> bumperStates, Dictionary<int, Transform> transforms)
-		{
+		internal void ApplyBumperMovement(
+			ref NativeParallelHashMap<int, BumperState> bumperStates,
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent,
+			Dictionary<int, IAnimationValueEmitter<float2>> float2AnimatedComponent
+		) {
 			using var enumerator = bumperStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var bumperState = ref enumerator.Current.Value;
-				if (bumperState.SkirtItemId != 0) {
-					_bumperTransform.UpdateSkirt(in bumperState.SkirtAnimation, transforms[bumperState.SkirtItemId]);
-				}
+
 				if (bumperState.RingItemId != 0) {
-					_bumperTransform.UpdateRing(bumperState.RingItemId, in bumperState.RingAnimation, transforms[bumperState.RingItemId]);
+					var ringEmitter = floatAnimatedComponent[enumerator.Current.Key];
+					ringEmitter.UpdateAnimationValue(bumperState.RingAnimation.Offset);
+				}
+
+				if (bumperState.SkirtItemId != 0) {
+					var skirtEmitter = float2AnimatedComponent[enumerator.Current.Key];
+					skirtEmitter.UpdateAnimationValue(bumperState.SkirtAnimation.Rotation);
 				}
 			}
 		}
 
-		internal void ApplyDropTargetMovement(ref NativeParallelHashMap<int, DropTargetState> dropTargetStates, Dictionary<int, Transform> transforms)
+		internal void ApplyDropTargetMovement(ref NativeParallelHashMap<int, DropTargetState> dropTargetStates,
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = dropTargetStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var dropTargetState = ref enumerator.Current.Value;
-				var dropTargetTransform = transforms[dropTargetState.AnimatedItemId];
-				var localYDirection = dropTargetTransform.up;
-
-				// Compute the new position by moving along the local Y-axis
-				var newPosition = (Vector3)dropTargetState.Static.InitialPosition + localYDirection * Physics.ScaleToWorld(dropTargetState.Animation.ZOffset);
+				if (dropTargetState.AnimatedItemId == 0) { // 0 means no animation component
+					continue;
+				}
 
-				// Apply the new position
-				dropTargetTransform.localPosition = newPosition;
+				var emitter = floatAnimatedComponent[enumerator.Current.Key];
+				emitter.UpdateAnimationValue(dropTargetState.Animation.ZOffset);
 			}
 		}
 
-		internal void ApplyHitTargetMovement(ref NativeParallelHashMap<int, HitTargetState> hitTargetStates, Dictionary<int, Transform> transforms)
+		internal void ApplyHitTargetMovement(ref NativeParallelHashMap<int, HitTargetState> hitTargetStates,
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = hitTargetStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var hitTargetState = ref enumerator.Current.Value;
-				var transform = transforms[enumerator.Current.Key];
-				transform.SetLocalXRotation(math.radians(hitTargetState.Animation.XRotation + hitTargetState.Static.InitialXRotation));
+				if (hitTargetState.AnimatedItemId == 0) {
+					continue;
+				}
+
+				var emitter = floatAnimatedComponent[enumerator.Current.Key];
+				emitter.UpdateAnimationValue(hitTargetState.Animation.XRotation);
 			}
 		}
 
 		internal void ApplyGateMovement(ref NativeParallelHashMap<int, GateState> gateStates,
-			Dictionary<int, IRotatableAnimationComponent> rotatableComponent)
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = gateStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var gateState = ref enumerator.Current.Value;
-				var component = rotatableComponent[enumerator.Current.Key];
-				component.OnRotationUpdated(gateState.Movement.Angle);
+				var component = floatAnimatedComponent[enumerator.Current.Key];
+				component.UpdateAnimationValue(gateState.Movement.Angle);
 			}
 		}
 
 		internal void ApplyPlungerMovement(ref NativeParallelHashMap<int, PlungerState> plungerStates,
-			Dictionary<int, SkinnedMeshRenderer[]> skinnedMeshRenderers)
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = plungerStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var plungerState = ref enumerator.Current.Value;
-				foreach (var skinnedMeshRenderer in skinnedMeshRenderers[enumerator.Current.Key]) {
-					skinnedMeshRenderer.SetBlendShapeWeight(0, plungerState.Animation.Position);
-				}
+				var component = floatAnimatedComponent[enumerator.Current.Key];
+				component.UpdateAnimationValue(plungerState.Animation.Position);
 			}
 		}
 
 		internal void ApplySpinnerMovement(ref NativeParallelHashMap<int, SpinnerState> spinnerStates,
-			Dictionary<int, IRotatableAnimationComponent> rotatableComponent)
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = spinnerStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
 				ref var spinnerState = ref enumerator.Current.Value;
-				var component = rotatableComponent[enumerator.Current.Key];
-				component.OnRotationUpdated(spinnerState.Movement.Angle);
+				var component = floatAnimatedComponent[enumerator.Current.Key];
+				component.UpdateAnimationValue(spinnerState.Movement.Angle);
 			}
 		}
 
 		internal void ApplyTriggerMovement(ref NativeParallelHashMap<int, TriggerState> triggerStates,
-			Dictionary<int, Transform> transforms)
+			Dictionary<int, IAnimationValueEmitter<float>> floatAnimatedComponent)
 		{
 			using var enumerator = triggerStates.GetEnumerator();
 			while (enumerator.MoveNext()) {
@@ -131,15 +138,8 @@ internal void ApplyTriggerMovement(ref NativeParallelHashMap<int, TriggerState>
 				if (triggerState.AnimatedItemId == 0) {
 					continue;
 				}
-				var triggerTransform = transforms[triggerState.AnimatedItemId];
-
-				var localYDirection = triggerTransform.up;
-
-				// Compute the new position by moving along the local Y-axis
-				var newPosition = (Vector3)triggerState.Static.InitialPosition + localYDirection * Physics.ScaleToWorld(triggerState.Movement.HeightOffset);
-
-				// Apply the new position
-				triggerTransform.localPosition = newPosition;
+				var component = floatAnimatedComponent[enumerator.Current.Key];
+				component.UpdateAnimationValue(triggerState.Movement.HeightOffset);
 			}
 		}
 	}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchPlayer.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchPlayer.cs
index a8beaf2e5..9e01abac4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchPlayer.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Game/SwitchPlayer.cs
@@ -26,17 +26,17 @@ public class SwitchPlayer
 		/// <summary>
 		/// Maps the switch component to the API class.
 		/// </summary>
-		private readonly Dictionary<ISwitchDeviceComponent, IApiSwitchDevice> _switchDevices = new Dictionary<ISwitchDeviceComponent, IApiSwitchDevice>();
+		private readonly Dictionary<ISwitchDeviceComponent, IApiSwitchDevice> _switchDevices = new();
 
 		/// <summary>
 		/// Maps the switch configuration ID to a switch status.
 		/// </summary>
-		internal readonly Dictionary<string, IApiSwitchStatus> SwitchStatuses = new Dictionary<string, IApiSwitchStatus>();
+		internal readonly Dictionary<string, IApiSwitchStatus> SwitchStatuses = new();
 
 		/// <summary>
 		/// Maps the input action to a list of switch statuses
 		/// </summary>
-		private readonly Dictionary<string, List<KeyboardSwitch>> _keySwitchAssignments = new Dictionary<string, List<KeyboardSwitch>>();
+		private readonly Dictionary<string, List<KeyboardSwitch>> _keySwitchAssignments = new();
 
 		private TableComponent _tableComponent;
 		private IGamelogicEngine _gamelogicEngine;
@@ -77,12 +77,11 @@ public void OnStart()
 							}
 
 							// check if device exists
-							if (!_switchDevices.ContainsKey(switchMapping.Device)) {
+							if (!_switchDevices.TryGetValue(switchMapping.Device, out var device)) {
 								Logger.Error($"Unknown switch device \"{switchMapping.Device}\".");
 								break;
 							}
 
-							var device = _switchDevices[switchMapping.Device];
 							var deviceSwitch = device.Switch(switchMapping.DeviceItem);
 							if (deviceSwitch != null) {
 								var existingSwitchStatus = SwitchStatuses.ContainsKey(switchMapping.Id) ? SwitchStatuses[switchMapping.Id] : null;
@@ -127,9 +126,9 @@ private void HandleKeyInput(object obj, InputActionChange change)
 				case InputActionChange.ActionStarted:
 				case InputActionChange.ActionCanceled:
 					var action = (InputAction)obj;
-					if (_keySwitchAssignments.ContainsKey(action.name)) {
+					if (_keySwitchAssignments.TryGetValue(action.name, out var assignment)) {
 						if (_gamelogicEngine != null) {
-							foreach (var sw in _keySwitchAssignments[action.name]) {
+							foreach (var sw in assignment) {
 								sw.IsSwitchEnabled = change == InputActionChange.ActionStarted;
 								_gamelogicEngine.Switch(sw.SwitchId, sw.IsSwitchClosed);
 							}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/ColliderUtils.cs b/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/ColliderUtils.cs
index 2bbdd0eae..8110cdf81 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/ColliderUtils.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/ColliderUtils.cs
@@ -77,13 +77,13 @@ public static void GenerateCollidersFromMesh(Mesh mesh, ColliderInfo info, ref C
 
 				if (!onlyTriangles) {
 					if (addedEdges.ShouldAddHitEdge(i0, i1)) {
-						colliders.Add(new Line3DCollider(rgv0, rgv2, info), matrix);
+						colliders.Add(new Line3DCollider(rgv0, rgv1, info), matrix);
 					}
 					if (addedEdges.ShouldAddHitEdge(i1, i2)) {
-						colliders.Add(new Line3DCollider(rgv2, rgv1, info), matrix);
+						colliders.Add(new Line3DCollider(rgv1, rgv2, info), matrix);
 					}
 					if (addedEdges.ShouldAddHitEdge(i2, i0)) {
-						colliders.Add(new Line3DCollider(rgv1, rgv0, info), matrix);
+						colliders.Add(new Line3DCollider(rgv2, rgv0, info), matrix);
 					}
 				}
 			}
@@ -119,13 +119,13 @@ public static void GenerateCollidersFromMesh(in NativeArray<Vector3> vertices, i
 				if (!onlyTriangles) {
 
 					if (addedEdges.ShouldAddHitEdge(i0, i1)) {
-						colliders.Add(new Line3DCollider(rgv0, rgv2, info), matrix);
+						colliders.Add(new Line3DCollider(rgv0, rgv1, info), matrix);
 					}
 					if (addedEdges.ShouldAddHitEdge(i1, i2)) {
-						colliders.Add(new Line3DCollider(rgv2, rgv1, info), matrix);
+						colliders.Add(new Line3DCollider(rgv1, rgv2, info), matrix);
 					}
 					if (addedEdges.ShouldAddHitEdge(i2, i0)) {
-						colliders.Add(new Line3DCollider(rgv1, rgv0, info), matrix);
+						colliders.Add(new Line3DCollider(rgv2, rgv0, info), matrix);
 					}
 				}
 			}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Physics/Collision/Aabb.cs b/VisualPinball.Unity/VisualPinball.Unity/Physics/Collision/Aabb.cs
index 061927a0a..e0dfb9fb6 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/Physics/Collision/Aabb.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/Physics/Collision/Aabb.cs
@@ -114,7 +114,7 @@ public static implicit operator NativeTrees.AABB(Aabb aabb)
 
 		public static implicit operator NativeTrees.AABB2D(Aabb aabb)
 		{
-			return new NativeTrees.AABB2D(new float2(aabb.Min.x, aabb.Min.y), new float2(aabb.Min.x, aabb.Max.y));
+			return new NativeTrees.AABB2D(new float2(aabb.Min.x, aabb.Min.y), new float2(aabb.Max.x, aabb.Max.y));
 		}
 
 		public static bool operator ==(Aabb a, Aabb b) => a.Equals(b);
@@ -124,7 +124,7 @@ public static implicit operator NativeTrees.AABB2D(Aabb aabb)
 		public readonly bool Equals(Aabb a)
 		{
 			return
-				a.Right == Left &&
+				a.Right == Right &&
 				a.Left == Left &&
 				a.Bottom == Bottom &&
 				a.Top == Top &&
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs
index 45e37be59..48dbef200 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs
@@ -1,5 +1,5 @@
 // Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
+// Copyright (C) 2025 freezy and VPE Team
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,21 +14,69 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using VisualPinball.Engine.VPT;
+// ReSharper disable InconsistentNaming
+
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace VisualPinball.Unity
 {
-	public abstract class AnimationComponent<TData, TMainComponent> : SubComponent<TData, TMainComponent>,
-		IAnimationComponent
-		where TData : ItemData
-		where TMainComponent : MainRenderableComponent<TData>
+	/// <summary>
+	/// New and (simple?) class that does the wiring for rotating components.
+	/// </summary>
+	public abstract class AnimationComponent<T> : MonoBehaviour
 	{
-		public void UpdateTransforms() => MainComponent.UpdateTransforms();
+		private IAnimationValueEmitter<T> Emitter {
+			get => _emitter as IAnimationValueEmitter<T>;
+			set => _emitter = value as MonoBehaviour;
+		}
+
+		[FormerlySerializedAs("_animationEmitter")]
+		[SerializeField]
+		[TypeRestriction(typeof(IAnimationValueEmitter), PickerLabel = "Emitter")]
+		[Tooltip("The component that emits animation values to which this component rotates.")]
+		public MonoBehaviour _emitter;
+
+		protected abstract void OnAnimationValueChanged(T value);
+
+		protected void Awake()
+		{
+			if (_emitter != null && _emitter is IAnimationValueEmitter<T> e1) {
+				Emitter = e1;
+			} else {
+				// Fallback: search parents for any MonoBehaviour that implements the interface
+				var candidates = GetComponentsInParent<IAnimationValueEmitter>();
+				Emitter = candidates.OfType<IAnimationValueEmitter<T>>().FirstOrDefault();
+			}
+
+			if (Emitter == null) {
+				Debug.LogError($"{GetType().Name} requires an IAnimationValueEmitter<{typeof(T).Name}>.", this);
+			}
+		}
+
+		private void OnEnable()
+		{
+			if (Emitter != null) {
+				Emitter.OnAnimationValueChanged += OnAnimationValueChanged;
+			}
+		}
+
+		private void OnDisable()
+		{
+			if (Emitter != null) {
+				Emitter.OnAnimationValueChanged -= OnAnimationValueChanged;
+			}
+		}
 
-		private void Awake()
+#if UNITY_EDITOR
+		// Editor-time safety: warn if someone drags the wrong thing into the field
+		protected virtual void OnValidate()
 		{
-			// todo remove when all animation components are translated through their main component
-			RegisterPhysics();
+			if (_emitter != null && !(_emitter is IAnimationValueEmitter<T>)) {
+				Debug.LogError($"{name}: Assigned emitter does not implement IAnimationValueEmitter<{typeof(T).Name}>. It will be ignored.",this);
+			}
 		}
+#endif
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs.meta
index 9ad013041..8a82b459b 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponent.cs.meta
@@ -1,11 +1,3 @@
-fileFormatVersion: 2
-guid: 745c944a81e487841b9d464e2488c61a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 236185f0ca0d49ebba1a7c15fbcbd6f9
+timeCreated: 1755188156
\ No newline at end of file
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponentLegacy.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponentLegacy.cs
new file mode 100644
index 000000000..76f2f62c3
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponentLegacy.cs
@@ -0,0 +1,36 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using VisualPinball.Engine.VPT;
+
+namespace VisualPinball.Unity
+{
+	[Obsolete("Use new subscriber pattern through AnimationComponent.")]
+	public abstract class AnimationComponentLegacy<TData, TMainComponent> : SubComponent<TData, TMainComponent>,
+		IAnimationComponent
+		where TData : ItemData
+		where TMainComponent : MainRenderableComponent<TData>
+	{
+		public void UpdateTransforms() => MainComponent.UpdateTransforms();
+
+		private void Awake()
+		{
+			// todo remove when all animation components are translated through their main component
+			RegisterPhysics();
+		}
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperTransform.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponentLegacy.cs.meta
similarity index 83%
rename from VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperTransform.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponentLegacy.cs.meta
index 36f123a1d..9ad013041 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperTransform.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/AnimationComponentLegacy.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2fe2aa90c1a61424dbb3032607d2d277
+guid: 745c944a81e487841b9d464e2488c61a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallComponent.cs
index a8daa38d7..9b56e7da8 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallComponent.cs
@@ -46,6 +46,77 @@ internal BallState CreateState()
 			};
 		}
 
+		public void Move(BallState ball)
+		{
+			var ballTransform = transform;
+
+			// if ball was destroyed, don't do anything.
+			if (!ballTransform || !ballTransform.gameObject) {
+				return;
+			}
+
+			// calculate/adapt height of ball
+			var zHeight = !ball.IsFrozen ? ball.Position.z : ball.Position.z - ball.Radius;
+			ballTransform.localPosition = Physics.TranslateToWorld(ball.Position.x, ball.Position.y, zHeight);
+
+			var or = ball.BallOrientationForUnity;
+
+			var vpX = new Vector3(or.c0.x, or.c1.x, or.c2.x);
+			var vpY = new Vector3(or.c0.y, or.c1.y, or.c2.y);
+			var vpZ = new Vector3(or.c0.z, or.c1.z, or.c2.z);
+
+			// Debug.Log("c0: (" + or.c0.x + ", " + or.c0.y + ", " + or.c0.z + ")");
+			// Debug.Log("c1: (" + or.c1.x + ", " + or.c1.y + ", " + or.c1.z + ")");
+			// Debug.Log("c2: (" + or.c2.x + ", " + or.c2.y + ", " + or.c2.z + ")");
+
+			// for security reasons, so that we don't get NaN, NaN, NaN, NaN erroro, when vectors are not fully orthonormalized because of skewMatrix operation
+			Vector3.OrthoNormalize(ref vpZ, ref vpY, ref vpX);
+
+			Quaternion q = Quaternion.LookRotation(vpZ, vpY);
+
+			// flip Z axis
+			q = FlipZAxis(q);
+
+			ballTransform.localRotation = q.RotateToWorld();
+
+			static Quaternion FlipZAxis(Quaternion q)
+			{
+				// which actually flips x and y axis visually...
+				return new Quaternion(q.x, q.y, -q.z, -q.w);
+			}
+
+			/*
+			 * I let these two in here, just in case we need them.
+			static float3x3 transpose(float3x3 or)
+			{
+				float3x3 or2;
+				or2.c0.x = or.c0.x;
+				or2.c0.y = or.c1.x;
+				or2.c0.z = or.c2.x;
+				or2.c1.x = or.c0.y;
+				or2.c1.y = or.c1.y;
+				or2.c1.z = or.c2.y;
+				or2.c2.x = or.c0.z;
+				or2.c2.y = or.c1.z;
+				or2.c2.z = or.c2.z;
+				return or2;
+			}
+			static Quaternion QuaternionFromMatrix(Matrix4x4 m)
+			{
+				// Adapted from: http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToQuaternion/index.htm
+				Quaternion q = new Quaternion();
+				q.w = Mathf.Sqrt(Mathf.Max(0, 1 + m[0, 0] + m[1, 1] + m[2, 2])) / 2;
+				q.x = Mathf.Sqrt(Mathf.Max(0, 1 + m[0, 0] - m[1, 1] - m[2, 2])) / 2;
+				q.y = Mathf.Sqrt(Mathf.Max(0, 1 - m[0, 0] + m[1, 1] - m[2, 2])) / 2;
+				q.z = Mathf.Sqrt(Mathf.Max(0, 1 - m[0, 0] - m[1, 1] + m[2, 2])) / 2;
+				q.x *= Mathf.Sign(q.x * (m[2, 1] - m[1, 2]));
+				q.y *= Mathf.Sign(q.y * (m[0, 2] - m[2, 0]));
+				q.z *= Mathf.Sign(q.z * (m[1, 0] - m[0, 1]));
+				return q;
+			}
+			*/
+		}
+
 #if UNITY_EDITOR
 		private PhysicsEngine _physicsEngine;
 		private float4x4 _playfieldToWorld;
@@ -85,6 +156,9 @@ private void DrawPhysicsDebug(UnityEditor.SceneView sceneView)
 
 		private static void DrawArrow(Vector3 pos, Vector3 direction, Color color, float arrowHeadLength = 0.025f, float arrowHeadAngle = 20.0f)
 		{
+			if (direction == Vector3.zero) {
+				return;
+			}
 			Debug.DrawRay(pos, direction, color);
 			var right = Quaternion.LookRotation(direction) * Quaternion.Euler(0,180+arrowHeadAngle,0) * new Vector3(0,0,1);
 			var left = Quaternion.LookRotation(direction) * Quaternion.Euler(0,180-arrowHeadAngle,0) * new Vector3(0,0,1);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallManager.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallManager.cs
index e12a128a3..6ab5688c0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallManager.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Ball/BallManager.cs
@@ -69,11 +69,24 @@ public int CreateBall(IBallCreationPosition ballCreator, float radius = 25f, flo
 
 		public void DestroyBall(int ballId)
 		{
-			var ballTransform = _physicsEngine.UnregisterBall(ballId);
-			_player.BallDestroyed(ballId, ballTransform.gameObject);
+			var ballComponent = _physicsEngine.UnregisterBall(ballId);
+			_player.BallDestroyed(ballId, ballComponent.gameObject);
 
 			// destroy game object
-			Object.DestroyImmediate(ballTransform.gameObject);
+			Object.DestroyImmediate(ballComponent.gameObject);
+		}
+
+		public bool FindBall(out BallState ball)
+		{
+			var ballFound = false;
+			using var enumerator = _physicsEngine.Balls.GetEnumerator();
+			ball = default;
+			while (enumerator.MoveNext()) {
+				ball = enumerator.Current.Value;
+				ballFound = true;
+				break;
+			}
+			return ballFound;
 		}
 
 		public bool FindNearest(float2 fromPosition, out BallState nearestBall)
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs
index d7565a0b5..588410756 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs
@@ -37,7 +37,8 @@ namespace VisualPinball.Unity
 	[SelectionBase]
 	[PackAs("Bumper")]
 	[AddComponentMenu("Pinball/Game Item/Bumper")]
-	public class BumperComponent : MainRenderableComponent<BumperData>, ISwitchDeviceComponent, ICoilDeviceComponent, IPackable
+	public class BumperComponent : MainRenderableComponent<BumperData>, ISwitchDeviceComponent, ICoilDeviceComponent, IPackable,
+		IAnimationValueEmitter<float>, IAnimationValueEmitter<float2>
 	{
 		#region Data
 
@@ -150,6 +151,8 @@ private void Start()
 			}
 		};
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)BumperApi).Coil(deviceId);
+
 		IEnumerable<GamelogicEngineCoil> IDeviceComponent<GamelogicEngineCoil>.AvailableDeviceItems => AvailableCoils;
 		IEnumerable<GamelogicEngineSwitch> IDeviceComponent<GamelogicEngineSwitch>.AvailableDeviceItems => AvailableSwitches;
 		IEnumerable<IGamelogicEngineDeviceItem> IWireableComponent.AvailableWireDestinations => AvailableCoils;
@@ -362,5 +365,45 @@ internal BumperState CreateState()
 		}
 
 		#endregion
+
+		#region IAnimationValueEmitter
+
+		private float _lastFloatValue;
+		private float2 _lastFloat2Value;
+
+		private event Action<float> OnFloatAnimationValueChanged;
+		private event Action<float2> OnFloat2AnimationValueChanged;
+
+		public void UpdateAnimationValue(float value)
+		{
+			if (HasAngleChanged(_lastFloatValue, value)) {
+				_lastFloatValue = value;
+				OnFloatAnimationValueChanged?.Invoke(value);
+			}
+		}
+
+		public void UpdateAnimationValue(float2 value)
+		{
+			if (!value.Equals(_lastFloat2Value)) {
+				_lastFloat2Value = value;
+				OnFloat2AnimationValueChanged?.Invoke(value);
+			}
+		}
+
+		event Action<float2> IAnimationValueEmitter<float2>.OnAnimationValueChanged {
+			add => OnFloat2AnimationValueChanged += value;
+			remove => OnFloat2AnimationValueChanged += value;
+		event Action<float2> IAnimationValueEmitter<float2>.OnAnimationValueChanged {
+			add => OnFloat2AnimationValueChanged += value;
+			remove => OnFloat2AnimationValueChanged -= value;
+		}
+
+		event Action<float> IAnimationValueEmitter<float>.OnAnimationValueChanged
+		{
+			add => OnFloatAnimationValueChanged += value;
+			remove => OnFloatAnimationValueChanged -= value;
+		}
+
+		#endregion
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperRingAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperRingAnimationComponent.cs
index b5f3bbd51..fa677f95a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperRingAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperRingAnimationComponent.cs
@@ -17,13 +17,12 @@
 // ReSharper disable InconsistentNaming
 
 using UnityEngine;
-using VisualPinball.Engine.VPT.Bumper;
 
 namespace VisualPinball.Unity
 {
 	[PackAs("BumperRingAnimation")]
 	[AddComponentMenu("Pinball/Animation/Bumper Ring Animation")]
-	public class BumperRingAnimationComponent : AnimationComponent<BumperData, BumperComponent>, IPackable
+	public class BumperRingAnimationComponent : AnimationComponent<float>, IPackable
 	{
 		#region Data
 
@@ -35,6 +34,29 @@ public class BumperRingAnimationComponent : AnimationComponent<BumperData, Bumpe
 
 		#endregion
 
+		#region Runtime
+
+		private float _initialOffset;
+
+		private void Start()
+		{
+			_initialOffset = transform.position.y;
+		}
+
+		protected override void OnAnimationValueChanged(float value)
+		{
+			var worldPos = transform.position;
+
+			var limit = RingDropOffset + 0.5f; // dropped height scale here because this shouldn't be relevant in vpe.
+			var localLimit = _initialOffset + limit;
+			var localOffset = localLimit / limit * value;
+
+			worldPos.y = _initialOffset + Physics.ScaleToWorld(localOffset);
+			transform.position = worldPos;
+		}
+
+		#endregion
+
 		#region Packaging
 
 		public byte[] Pack() => BumperRingAnimationPackable.Pack(this);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperSkirtAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperSkirtAnimationComponent.cs
index bfabe681a..ff957e3aa 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperSkirtAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperSkirtAnimationComponent.cs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+using Unity.Mathematics;
 using UnityEngine;
 using VisualPinball.Engine.VPT.Bumper;
 
@@ -21,7 +22,7 @@ namespace VisualPinball.Unity
 {
 	[PackAs("BumperSkirtAnimation")]
 	[AddComponentMenu("Pinball/Animation/Bumper Skirt Animation")]
-	public class BumperSkirtAnimationComponent : AnimationComponent<BumperData, BumperComponent>, IPackable
+	public class BumperSkirtAnimationComponent : AnimationComponent<float2>, IPackable
 	{
 		#region Data
 
@@ -41,5 +42,11 @@ public class BumperSkirtAnimationComponent : AnimationComponent<BumperData, Bump
 		public void UnpackReferences(byte[] bytes, Transform root, PackagedRefs refs, PackagedFiles files) { }
 
 		#endregion
+
+		protected override void OnAnimationValueChanged(float2 value)
+		{
+			var parentRotation = transform.parent.rotation;
+			transform.rotation = Quaternion.Euler(value.x, 0, -value.y) * parentRotation;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperTransform.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperTransform.cs
deleted file mode 100644
index 3dcd70d12..000000000
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperTransform.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Visual Pinball Engine
-// Copyright (C) 2023 freezy and VPE Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace VisualPinball.Unity
-{
-	/// <summary>
-	/// Applies the state to the scene, aka the transform of the game objects.
-	/// </summary>
-	internal class BumperTransform
-	{
-		private readonly Dictionary<int, float> _initialOffset = new();
-
-		internal void UpdateRing(int itemId, in BumperRingAnimationState state, Transform transform)
-		{
-			var worldPos = transform.position;
-			_initialOffset.TryAdd(itemId, worldPos.y);
-
-			var limit = state.DropOffset + state.HeightScale * 0.5f;
-			var localLimit = _initialOffset[itemId] + limit;
-			var localOffset = localLimit / limit * state.Offset;
-
-			worldPos.y = _initialOffset[itemId] + Physics.ScaleToWorld(localOffset);
-			transform.position = worldPos;
-		}
-
-		internal void UpdateSkirt(in BumperSkirtAnimationState state, Transform transform)
-		{
-			var parentRotation = transform.parent.rotation;
-			transform.rotation = Quaternion.Euler(state.Rotation.x, 0, -state.Rotation.y) * parentRotation;
-		}
-	}
-}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/DropTargetBank/DropTargetBankComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/DropTargetBank/DropTargetBankComponent.cs
index e1fd39745..40aa518fe 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/DropTargetBank/DropTargetBankComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/DropTargetBank/DropTargetBankComponent.cs
@@ -44,6 +44,8 @@ public class DropTargetBankComponent : MonoBehaviour, ICoilDeviceComponent, ISwi
 			}
 		};
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)DropTargetBankApi).Coil(deviceId);
+
 		public IEnumerable<GamelogicEngineSwitch> AvailableSwitches => new[] {
 			new GamelogicEngineSwitch(SequenceCompletedSwitchItem) {
 				Description = "Sequence Completed Switch"
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperComponent.cs
index e632d0091..8a903d104 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperComponent.cs
@@ -43,8 +43,8 @@ namespace VisualPinball.Unity
 	[AddComponentMenu("Pinball/Game Item/Flipper")]
 	[HelpURL("https://docs.visualpinball.org/creators-guide/manual/mechanisms/flippers.html")]
 	public class FlipperComponent : MainRenderableComponent<FlipperData>,
-		IFlipperData, ISwitchDeviceComponent, ICoilDeviceComponent,
-		IRotatableComponent, IPackable
+		IFlipperData, ISwitchDeviceComponent, ICoilDeviceComponent, IAnimationValueEmitter<float>,
+		IPackable
 	{
 		#region Data
 
@@ -164,6 +164,8 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
 			}
 			: new[] { new GamelogicEngineCoil(MainCoilItem) };
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)FlipperApi).Coil(deviceId);
+
 		IEnumerable<GamelogicEngineCoil> IDeviceComponent<GamelogicEngineCoil>.AvailableDeviceItems => AvailableCoils;
 		IEnumerable<GamelogicEngineSwitch> IDeviceComponent<GamelogicEngineSwitch>.AvailableDeviceItems => AvailableSwitches;
 		IEnumerable<IGamelogicEngineDeviceItem> IWireableComponent.AvailableWireDestinations => AvailableCoils;
@@ -188,23 +190,6 @@ public float4x4 LocalToWorldPhysicsMatrix
 		}
 
 		private FlipperApi _flipperApi;
-		public float _originalRotateZ;
-
-		public float RotateZ {
-			set {
-				StartAngle = _originalRotateZ + value;
-				_flipperApi.StartAngle = _originalRotateZ + value;
-				UpdateTransforms();
-			}
-		}
-
-		public float2 RotatedPosition {
-			get => new(Position.x, Position.y);
-			set {
-				Position = new Vector3(value.x, value.y, Position.z);
-				UpdateTransforms();
-			}
-		}
 
 		#endregion
 
@@ -367,6 +352,9 @@ protected void OnDrawGizmosSelected()
 				(start, end) = (end, start);
 			}
 			AddPolyArc(arrow, Vector3.zero, FlipperRadiusMax - 20F, start, end, height: height);
+			if (arrow.Count == 0) {
+				return;
+			}
 			for (int i = 1, j = 0; i < arrow.Count; j = i++) {
 				Gizmos.DrawLine(transform.TransformPoint(arrow[j].TranslateToWorld()), transform.TransformPoint(arrow[i].TranslateToWorld()));
 			}
@@ -464,10 +452,12 @@ public List<Vector3> GetEnclosingPolygon(float margin = 0.0F, float stepSize = 5
 		#region Runtime
 
 		public FlipperApi FlipperApi { get; private set; }
+		public event Action<float> OnAnimationValueChanged;
+
+		private float _lastRotationAngle;
 
 		private void Awake()
 		{
-			_originalRotateZ = StartAngle;
 			var player = GetComponentInParent<Player>();
 			var physicsEngine = GetComponentInParent<PhysicsEngine>();
 			FlipperApi = new FlipperApi(gameObject, player, physicsEngine);
@@ -481,6 +471,15 @@ private void Start()
 			_flipperApi = GetComponentInParent<Player>().TableApi.Flipper(this);
 		}
 
+		public void UpdateAnimationValue(float value)
+		{
+			if (HasAngleChanged(_lastRotationAngle, value)) {
+				_lastRotationAngle = value;
+				transform.SetLocalYRotation(value);
+				OnAnimationValueChanged?.Invoke(value);
+			}
+		}
+
 		#endregion
 
 		#region State
@@ -716,5 +715,7 @@ private static void Discretize(AnimationCurve curve, IList<float2> outArray)
 		}
 
 		#endregion
+
+
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateCollider.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateCollider.cs
index fd103a97c..c0f40ffa0 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateCollider.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateCollider.cs
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+using System;
 using Unity.Collections;
 using Unity.Mathematics;
 
@@ -138,7 +139,7 @@ public void Transform(GateCollider collider, float4x4 matrix)
 		{
 			#if UNITY_EDITOR
 			if (!IsTransformable(matrix)) {
-				throw new System.InvalidOperationException($"Matrix {matrix} cannot transform gate.");
+				throw new InvalidOperationException($"Matrix {matrix} cannot transform gate.");
 			}
 			#endif
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderComponent.cs
index 949095edc..c830a8539 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderComponent.cs
@@ -36,8 +36,8 @@ public class GateColliderComponent : ColliderComponent<GateData, GateComponent>,
 		[ToolboxItem("Angle of bracket/plate when closed")]
 		public float _angleMin;
 
-		[Range(-75, -50f)]
-		[ToolboxItem("Bottom Z position of the gate collider, relative to the axis.")]
+		[Range(-50f, 50f)]
+		[ToolboxItem("Bottom Z position of the gate collider, relative to the origin.")]
 		public float ZLow = -50f;
 
 		[Range(-50, 50)]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderGenerator.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderGenerator.cs
index b149772e0..e8ef8671d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderGenerator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderGenerator.cs
@@ -30,7 +30,7 @@ internal class GateColliderGenerator
 
 		private readonly float _zLow;
 		private readonly float _dist;
-		private const float ZHigh = 0;
+		private const float ZHeight = 50;
 
 		internal GateColliderGenerator(GateApi gateApi, IGateData data, IGateColliderData collData, float zLow, float dist, float4x4 matrix)
 		{
@@ -74,8 +74,8 @@ private void GenerateGateCollider(ref ColliderReference colliders)
 			var v1 = new float2(-(halfLength + PhysicsConstants.PhysSkin), _dist);
 			var v2 = new float2(halfLength + PhysicsConstants.PhysSkin, _dist);
 
-			var lineSeg0 = new LineCollider(v1, v2, _zLow, ZHigh, _api.GetColliderInfo());
-			var lineSeg1 = new LineCollider(v2, v1, _zLow, ZHigh, _api.GetColliderInfo());
+			var lineSeg0 = new LineCollider(v1, v2, _zLow, _zLow + ZHeight, _api.GetColliderInfo());
+			var lineSeg1 = new LineCollider(v2, v1, _zLow, _zLow + ZHeight, _api.GetColliderInfo());
 
 			colliders.Add(new GateCollider(in lineSeg0, in lineSeg1, _api.GetColliderInfo()), _matrix);
 		}
@@ -92,11 +92,11 @@ private void GenerateLineCollider(ref ColliderReference colliders)
 
 			// oversize by the ball's radius to prevent the ball from clipping through
 			const float halfLength = 10f;
-			var rgv0 = new float2(halfLength + PhysicsConstants.PhysSkin, 0f);
-			var rgv1 = new float2(-(halfLength + PhysicsConstants.PhysSkin), 0f);
+			var rgv0 = new float2(halfLength + PhysicsConstants.PhysSkin, _dist);
+			var rgv1 = new float2(-(halfLength + PhysicsConstants.PhysSkin), _dist);
 
 			var info = _api.GetColliderInfo(ItemType.Invalid); // hack to not treat this line seg as gate
-			colliders.Add(new LineCollider(rgv0, rgv1, -2f * PhysicsConstants.PhysSkin, 0, info), _matrix); //!! = ball diameter
+			colliders.Add(new LineCollider(rgv0, rgv1, _zLow, _zLow + ZHeight, info), _matrix); //!! = ball diameter
 		}
 
 		/// <summary>
@@ -111,7 +111,7 @@ private void GenerateBracketColliders(ref ColliderReference colliders)
 				new float2(halfLength, 0),
 				1f,
 				_zLow,
-				0,
+				_zLow + ZHeight,
 				_api.GetColliderInfo(ItemType.Invalid) // hack to not treat this hit circle as gate
 			), _matrix);
 
@@ -119,7 +119,7 @@ private void GenerateBracketColliders(ref ColliderReference colliders)
 				new float2(-halfLength, 0),
 				1f,
 				_zLow,
-				0,
+				_zLow + ZHeight,
 				_api.GetColliderInfo(ItemType.Invalid) // hack to not treat this hit circle as gate
 			), _matrix);
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateComponent.cs
index 1f1911053..abc1189f9 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateComponent.cs
@@ -23,7 +23,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Unity.Mathematics;
 using UnityEngine;
 using VisualPinball.Engine.Common;
@@ -38,7 +37,7 @@ namespace VisualPinball.Unity
 	[PackAs("Gate")]
 	[AddComponentMenu("Pinball/Game Item/Gate")]
 	public class GateComponent : MainRenderableComponent<GateData>,
-		IGateData, ISwitchDeviceComponent, IRotatableAnimationComponent, IPackable
+		IGateData, ISwitchDeviceComponent, IAnimationValueEmitter<float>, IPackable
 	{
 		#region Data
 
@@ -115,9 +114,6 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
 
 		#region Runtime
 
-		[NonSerialized]
-		private IRotatableAnimationComponent[] _animatedComponents;
-
 		public GateApi GateApi { get; private set; }
 
 		private void Awake()
@@ -130,10 +126,6 @@ private void Awake()
 			if (GetComponent<GateColliderComponent>()) {
 				RegisterPhysics(physicsEngine);
 			}
-
-			_animatedComponents = GetComponentsInChildren<GateWireAnimationComponent>()
-				.Select(gwa => gwa as IRotatableAnimationComponent)
-				.ToArray();
 		}
 
 		#endregion
@@ -295,12 +287,16 @@ internal GateState CreateState()
 
 		#endregion
 
-		#region IRotatableAnimationComponent
+		#region IAnimationValueEmitter
+
+		public event Action<float> OnAnimationValueChanged;
+		private float _lastAngleRad;
 
-		public void OnRotationUpdated(float angleRad)
+		public void UpdateAnimationValue(float value)
 		{
-			foreach (var animatedComponent in _animatedComponents) {
-				animatedComponent.OnRotationUpdated(angleRad);
+			if (HasAngleChanged(_lastAngleRad, value)) {
+				_lastAngleRad = value;
+				OnAnimationValueChanged?.Invoke(value);
 			}
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateDisplacementPhysics.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateDisplacementPhysics.cs
index ca417bfd8..32d8e1b96 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateDisplacementPhysics.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateDisplacementPhysics.cs
@@ -38,7 +38,7 @@ internal static void UpdateDisplacement(int itemId, ref GateMovementState moveme
 
 					if (!movementState.ForcedMove) {
 						movementState.AngleSpeed = -movementState.AngleSpeed;
-						movementState.AngleSpeed *= state.Damping * 0.8f;           // just some extra damping to reduce the angleSpeed a bit faster
+							movementState.AngleSpeed *= state.Damping * 0.8f;           // just some extra damping to reduce the angleSpeed a bit faster
 					} else if (movementState.AngleSpeed > 0.0) {
 						movementState.AngleSpeed = 0.0f;
 					}
@@ -57,6 +57,8 @@ internal static void UpdateDisplacement(int itemId, ref GateMovementState moveme
 					}
 				}
 			} else {
+
+				//Debug.Log($"Minimum angle: {math.degrees(state.AngleMin)}, maximum angle: {math.degrees(state.AngleMax)}, current angle: {math.degrees(movementState.Angle)}");
 				var direction = movementState.HitDirection ? -1f : 1f;
 				if (direction * movementState.Angle > state.AngleMax) {
 					movementState.Angle = direction * state.AngleMax;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateLifterComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateLifterComponent.cs
index f0cadc06b..9fe69fd2d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateLifterComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateLifterComponent.cs
@@ -60,6 +60,8 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs lookup, P
 			}
 		};
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)GateLifterApi).Coil(deviceId);
+
 		#endregion
 
 		public GateLifterApi GateLifterApi { get; private set; }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateMovementState.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateMovementState.cs
index 7af0d54bb..cb24a1520 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateMovementState.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateMovementState.cs
@@ -18,10 +18,26 @@ namespace VisualPinball.Unity
 {
 	internal struct GateMovementState
 	{
+
+		/// <summary>
+		/// Current angle of the gate bracket, in radians.
+		/// </summary>
 		public float Angle;
 		public float AngleSpeed;
+
+		/// <summary>
+		/// This is from VPX, there it's set when a gate is moved by script and not by the physics engine.
+		/// </summary>
 		public bool ForcedMove;
+
+		/// <summary>
+		/// If open, the gate is letting through the in both directions.
+		/// </summary>
 		public bool IsOpen;
+
+		/// <summary>
+		/// From which side the ball is hitting the gate.
+		/// </summary>
 		public bool HitDirection;
 
 		public bool IsLifting;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GatePackable.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GatePackable.cs
index dbdf89bf6..e098875a2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GatePackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GatePackable.cs
@@ -90,22 +90,19 @@ public static void Unpack(byte[] bytes, GateLifterComponent comp)
 
 	public struct GateWireAnimationPackable
 	{
-		public float Min;
-		public float Max;
+		public PackableFloat3 RotationVector;
 
 		public static byte[] Pack(GateWireAnimationComponent comp)
 		{
 			return PackageApi.Packer.Pack(new GateWireAnimationPackable {
-				Min = comp.min,
-				Max = comp.max,
+				RotationVector = comp.RotationVector,
 			});
 		}
 
 		public static void Unpack(byte[] bytes, GateWireAnimationComponent comp)
 		{
 			var data = PackageApi.Packer.Unpack<GateWireAnimationPackable>(bytes);
-			comp.min = data.Min;
-			comp.max = data.Max;
+			comp.RotationVector = data.RotationVector;
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateStaticState.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateStaticState.cs
index 5f9f02b28..212beda98 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateStaticState.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateStaticState.cs
@@ -18,7 +18,14 @@ namespace VisualPinball.Unity
 {
 	internal struct GateStaticState
 	{
+		/// <summary>
+		/// Minimum angle in radian.
+		/// </summary>
 		public float AngleMin;
+
+		/// <summary>
+		/// Maximal angle in radian
+		/// </summary>
 		public float AngleMax;
 		public float Height;
 		public float GravityFactor;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateWireAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateWireAnimationComponent.cs
index 7c81e560d..d952cb5cd 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateWireAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateWireAnimationComponent.cs
@@ -14,27 +14,30 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
+// ReSharper disable InconsistentNaming
+
 using Unity.Mathematics;
 using UnityEngine;
-using VisualPinball.Engine.VPT.Gate;
 
 namespace VisualPinball.Unity
 {
 	[PackAs("GateWireAnimation")]
-	public class GateWireAnimationComponent : AnimationComponent<GateData, GateComponent>, IRotatableAnimationComponent, IPackable
+	public class GateWireAnimationComponent : AnimationComponent<float>, IPackable
 	{
-		public float min = float.MaxValue;
-		public float max = float.MinValue;
+		public Vector3 RotationVector = Vector3.left;
+		private Quaternion _initialRotation;
 
-		public void OnRotationUpdated(float angleRad)
+		private new void Awake()
 		{
-			min = math.min(angleRad, min);
-			max = math.max(angleRad, max);
-
-			// Debug.Log($"Rotate: {angleRad} ({math.degrees(angleRad)}) [{math.degrees(min)} - {math.degrees(max)}]");
+			_initialRotation = transform.localRotation;
+			base.Awake();
+		}
 
-			transform.localRotation = quaternion.RotateX(-angleRad);
+		protected override void OnAnimationValueChanged(float value)
+		{
+			var axis = RotationVector.normalized;
+			var rotation = Quaternion.AngleAxis(math.degrees(value), axis);
+			transform.localRotation = _initialRotation * rotation;
 		}
 
 		#region Packaging
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs
index 3e3720a20..e03189e56 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs
@@ -16,41 +16,167 @@
 
 // ReSharper disable InconsistentNaming
 
+using System.Collections;
+using NLog;
+using Unity.Mathematics;
 using UnityEngine;
-using VisualPinball.Engine.VPT.HitTarget;
+using UnityEngine.InputSystem;
+using Logger = NLog.Logger;
 
 namespace VisualPinball.Unity
 {
-	[PackAs("DropTargetAnimation")]
+	//[PackAs("DropTargetAnimation")]
 	[AddComponentMenu("Pinball/Animation/Drop Target Animation")]
-	public class DropTargetAnimationComponent : AnimationComponent<HitTargetData, DropTargetComponent>, IPackable
+	public class DropTargetAnimationComponent : AnimationComponent<bool>//, TODO IPackable
 	{
+		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
 		#region Data
 
-		[Tooltip("How fast the drop target moves down.")]
-		public float Speed =  0.5f;
+		[Range(-180f, 180f)]
+		[Tooltip("How far the drop target rotates back, when hit.")]
+		public float RotationAngle = 2f;
+
+		[Range(-180f, 180f)]
+		[Tooltip("Duration of the rotation, in seconds.")]
+		public float RotationDuration = 0.1f;
 
-		[Tooltip("Time in milliseconds how long it takes to start the raise animation after being triggered.")]
-		public int RaiseDelay = 100;
+		[Tooltip("Animation curve of the rotation. Must rotate back and forth.")]
+		public AnimationCurve RotationAnimationCurve = new(
+			new Keyframe(0f, 0),
+			new Keyframe(0.5f, 1),
+			new Keyframe(1f, 0)
+		);
 
 		[Tooltip("The length the target drops, in VPX units.")]
 		public float DropDistance = 52.0f;
 
-		[Tooltip("If set, the drop target is initially dropped.")]
-		public bool IsDropped;
+		[Tooltip("Time in seconds after the hit for the drop target to drop.")]
+		public float DropDelay = 0.1f;
 
-		#endregion
+		[Tooltip("Duration of the drop, in seconds.")]
+		public float DropDuration = 0.3f;
 
-		#region Packaging
+		[Tooltip("Animation curve of the drop animation.")]
+		public AnimationCurve DropAnimationCurve = AnimationCurve.EaseInOut(0, 0, 1f, 1);
 
-		public byte[] Pack() => DropTargetAnimationPackable.Pack(this);
+		[Tooltip("Duration of the pull-up, in seconds.")]
+		public float PullUpDuration = 0.5f;
 
-		public byte[] PackReferences(Transform root, PackagedRefs lookup, PackagedFiles files) => null;
+		[Tooltip("Animation curve of the drop animation.")]
+		public AnimationCurve PullUpAnimationCurve = AnimationCurve.EaseInOut(0, 0, 1f, 1);
 
-		public void Unpack(byte[] bytes) => DropTargetAnimationPackable.Unpack(bytes, this);
+		private float _startPos;
+		private bool _isAnimating;
 
-		public void UnpackReferences(byte[] data, Transform root, PackagedRefs lookup, PackagedFiles files) { }
+		private Keyboard _keyboard;
+		private IGamelogicEngine _gle;
 
 		#endregion
+
+		private void Start()
+		{
+			_startPos = transform.localPosition.y;
+		}
+
+		protected override void OnAnimationValueChanged(bool value)
+		{
+			if (value) {
+				OnHit();
+			} else {
+				OnReset();
+			}
+		}
+
+		private void OnHit()
+		{
+			if (_isAnimating) {
+				return;
+			}
+
+			_isAnimating = true;
+			StartCoroutine(AnimateRotation());
+			if (DropDelay == 0f) {
+				StartCoroutine(AnimateDrop());
+			}
+		}
+
+		private void OnReset()
+		{
+			if (_isAnimating) {
+				return;
+			}
+
+			_isAnimating = true;
+			StartCoroutine(AnimateReset());
+		}
+
+		private IEnumerator AnimateRotation()
+		{
+			var t = 0f;
+			while (t < RotationDuration) {
+				var f = RotationAnimationCurve.Evaluate(t / RotationDuration);
+				transform.SetLocalXRotation(math.radians(f * RotationAngle));
+				t += Time.deltaTime;
+				if (DropDelay != 0 && t >= DropDelay) {
+					StartCoroutine(AnimateDrop());
+				}
+				yield return null;                               // wait one frame
+			}
+
+			// snap back to the start
+			transform.SetLocalXRotation(0);
+		}
+
+		private IEnumerator AnimateDrop()
+		{
+			var t = 0f;
+			while (t < DropDuration) {
+				var f = DropAnimationCurve.Evaluate(t / DropDuration);
+				var pos = transform.localPosition;
+				pos.y = _startPos - f * Physics.ScaleToWorld(DropDistance);
+				transform.localPosition = pos;
+				t += Time.deltaTime;
+				yield return null;                               // wait one frame
+			}
+
+			// finally, snap to the curve's final value
+			var finalPos = transform.localPosition;
+			finalPos.y = _startPos - Physics.ScaleToWorld(DropDistance);
+			transform.localPosition = finalPos;
+			_isAnimating = false;
+		}
+
+		private IEnumerator AnimateReset()
+		{
+			var t = 0f;
+			while (t < PullUpDuration) {
+				var f = PullUpAnimationCurve.Evaluate(t / PullUpDuration);
+				var pos = transform.localPosition;
+				pos.y = _startPos - Physics.ScaleToWorld(DropDistance) + f * Physics.ScaleToWorld(DropDistance);
+				transform.localPosition = pos;
+				t += Time.deltaTime;
+				yield return null;                               // wait one frame
+			}
+
+			// finally, snap to the curve's final value
+			var finalPos = transform.localPosition;
+			finalPos.y = _startPos;
+			transform.localPosition = finalPos;
+			_isAnimating = false;
+		}
+
+		// #region Packaging
+		//
+		// public byte[] Pack() => TriggerAnimationPackable.Pack(this);
+		//
+		// public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files) => null;
+		//
+		// public void Unpack(byte[] bytes) => TriggerAnimationPackable.Unpack(bytes, this);
+		//
+		// public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files) { }
+		//
+		// #endregion
+
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs.meta
index 1910005cf..c0d4e5d00 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs.meta
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponent.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 39ede5c36a2f2a14ca7f17268f5d1e9f
+guid: 1bde8cef51124ae7872f61d7a0d902b8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponentLegacy.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponentLegacy.cs
new file mode 100644
index 000000000..83fbf937d
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponentLegacy.cs
@@ -0,0 +1,78 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	[PackAs("DropTargetAnimation")]
+	[AddComponentMenu("Pinball/Animation/Drop Target Animation (Legacy)")]
+	public class DropTargetAnimationComponentLegacy : AnimationComponent<float>, IPackable
+	{
+		#region Data
+
+		[Tooltip("How fast the drop target moves down.")]
+		public float Speed =  0.5f;
+
+		[Tooltip("Time in milliseconds how long it takes to start the raise animation after being triggered.")]
+		public int RaiseDelay = 100;
+
+		[Tooltip("The length the target drops, in VPX units.")]
+		public float DropDistance = 52.0f;
+
+		[Tooltip("If set, the drop target is initially dropped.")]
+		public bool IsDropped;
+
+		#endregion
+
+		#region Packaging
+
+		public byte[] Pack() => DropTargetAnimationPackable.Pack(this);
+
+		public byte[] PackReferences(Transform root, PackagedRefs lookup, PackagedFiles files) => null;
+
+		public void Unpack(byte[] bytes) => DropTargetAnimationPackable.Unpack(bytes, this);
+
+		public void UnpackReferences(byte[] data, Transform root, PackagedRefs lookup, PackagedFiles files) { }
+
+		#endregion
+
+		#region Runtime
+
+		private Vector3 _initialPosition;
+
+		private void Start()
+		{
+			_initialPosition = transform.localPosition;
+		}
+
+		protected override void OnAnimationValueChanged(float value)
+		{
+			var dropTargetTransform = transform;
+			var localYDirection = dropTargetTransform.up;
+
+			// Compute the new position by moving along the local Y-axis
+			var newPosition = _initialPosition + localYDirection * Physics.ScaleToWorld(value);
+
+			// Apply the new position
+			dropTargetTransform.localPosition = newPosition;
+		}
+
+		#endregion
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponentLegacy.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponentLegacy.cs.meta
new file mode 100644
index 000000000..1910005cf
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetAnimationComponentLegacy.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 39ede5c36a2f2a14ca7f17268f5d1e9f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {fileID: 2800000, guid: 8ce46987c732fa74f87c696253c710af, type: 3}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetApi.cs
index d7d86bec2..76c63ef60 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetApi.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetApi.cs
@@ -36,6 +36,11 @@ public class DropTargetApi : CollidableApi<TargetComponent, DropTargetColliderCo
 		/// </summary>
 		public event EventHandler<HitEventArgs> Hit;
 
+		/// <summary>
+		/// Event emitted drop target is reset.
+		/// </summary>
+		public event EventHandler Reset;
+
 		/// <summary>
 		/// Event emitted when the trigger is switched on or off.
 		/// </summary>
@@ -75,6 +80,10 @@ private void SetIsDropped(bool isDropped)
 		{
 			ref var state = ref PhysicsEngine.DropTargetState(ItemId);
 			if (state.Animation.IsDropped != isDropped) {
+				if (!isDropped) {
+					Reset?.Invoke(this, EventArgs.Empty);
+					MainComponent.UpdateAnimationValue(false);
+				}
 				state.Animation.MoveAnimation = true;
 				if (isDropped) {
 					state.Animation.MoveDown = true;
@@ -128,6 +137,7 @@ void IApi.OnDestroy()
 		void IApiHittable.OnHit(int ballId, bool _)
 		{
 			Hit?.Invoke(this, new HitEventArgs(ballId));
+			MainComponent.UpdateAnimationValue(true);
 		}
 
 		#endregion
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs
index 163d06189..289c4fd71 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs
@@ -32,7 +32,7 @@ public class DropTargetComponent : TargetComponent, IPackable
 	{
 		protected override float ZOffset {
 			get {
-				var animationComponent = GetComponentInChildren<DropTargetAnimationComponent>();
+				var animationComponent = GetComponentInChildren<DropTargetAnimationComponentLegacy>();
 				return animationComponent && animationComponent.IsDropped ? -animationComponent.DropDistance : 0f;
 			}
 		}
@@ -72,7 +72,7 @@ public override IEnumerable<MonoBehaviour> SetData(HitTargetData data)
 			}
 
 			// animation data
-			var animationComponent = GetComponent<DropTargetAnimationComponent>();
+			var animationComponent = GetComponent<DropTargetAnimationComponentLegacy>();
 			if (animationComponent) {
 				animationComponent.enabled = data.IsDropTarget;
 				animationComponent.Speed = data.DropSpeed;
@@ -122,7 +122,7 @@ public override HitTargetData CopyDataTo(HitTargetData data, string[] materialNa
 			}
 
 			// animation data
-			var dropTargetAnimationComponent = GetComponent<DropTargetAnimationComponent>();
+			var dropTargetAnimationComponent = GetComponent<DropTargetAnimationComponentLegacy>();
 			if (dropTargetAnimationComponent) {
 				data.DropSpeed = dropTargetAnimationComponent.Speed;
 				data.RaiseDelay = dropTargetAnimationComponent.RaiseDelay;
@@ -145,7 +145,7 @@ private void Awake()
 			DropTargetApi = new DropTargetApi(gameObject, player, physicsEngine);
 
 			player.Register(DropTargetApi, this);
-			if (GetComponentInChildren<DropTargetColliderComponent>() && GetComponentInChildren<DropTargetAnimationComponent>()) {
+			if (GetComponentInChildren<DropTargetColliderComponent>()) {
 				RegisterPhysics(physicsEngine);
 			}
 		}
@@ -157,14 +157,13 @@ private void Awake()
 		internal DropTargetState CreateState()
 		{
 			var colliderComponent = GetComponent<DropTargetColliderComponent>();
-			var animationComponent = GetComponentInChildren<DropTargetAnimationComponent>();
+			var animationComponent = GetComponentInChildren<DropTargetAnimationComponentLegacy>();
 
 			var staticData = colliderComponent && animationComponent
 				? new DropTargetStaticState {
 					Speed = animationComponent.Speed,
 					RaiseDelay = animationComponent.RaiseDelay,
 					UseHitEvent = colliderComponent.UseHitEvent,
-					InitialPosition = animationComponent.transform.localPosition
 				} : default;
 
 			var animationData = colliderComponent && animationComponent
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetPackable.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetPackable.cs
index e0d59fbf3..a42aafe9a 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetPackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetPackable.cs
@@ -95,7 +95,7 @@ public struct DropTargetAnimationPackable
 		public int RaiseDelay;
 		public bool IsDropped;
 
-		public static byte[] Pack(DropTargetAnimationComponent comp)
+		public static byte[] Pack(DropTargetAnimationComponentLegacy comp)
 		{
 			return PackageApi.Packer.Pack(new DropTargetAnimationPackable {
 				Speed = comp.Speed,
@@ -105,7 +105,7 @@ public static byte[] Pack(DropTargetAnimationComponent comp)
 			});
 		}
 
-		public static void Unpack(byte[] bytes, DropTargetAnimationComponent comp)
+		public static void Unpack(byte[] bytes, DropTargetAnimationComponentLegacy comp)
 		{
 			var data = PackageApi.Packer.Unpack<DropTargetAnimationPackable>(bytes);
 			comp.Speed = data.Speed;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetStaticState.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetStaticState.cs
index 5a27e8a19..5bdf7317d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetStaticState.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetStaticState.cs
@@ -23,6 +23,5 @@ internal struct DropTargetStaticState
 		public float Speed;
 		public float RaiseDelay;
 		public bool UseHitEvent;
-		public float3 InitialPosition;
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetAnimationComponent.cs
index 2c25cc1a4..513327ee4 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetAnimationComponent.cs
@@ -16,6 +16,8 @@
 
 // ReSharper disable InconsistentNaming
 
+using System;
+using Unity.Mathematics;
 using UnityEngine;
 using VisualPinball.Engine.VPT.HitTarget;
 
@@ -24,7 +26,7 @@ namespace VisualPinball.Unity
 	[PackAs("HitTargetAnimation")]
 	[AddComponentMenu("Pinball/Animation/Hit Target Animation")]
 	[RequireComponent(typeof(HitTargetColliderComponent))]
-	public class HitTargetAnimationComponent : AnimationComponent<HitTargetData, HitTargetComponent>, IPackable
+	public class HitTargetAnimationComponent : AnimationComponent<float>, IPackable
 	{
 		#region Data
 
@@ -49,5 +51,21 @@ public class HitTargetAnimationComponent : AnimationComponent<HitTargetData, Hit
 		public void UnpackReferences(byte[] data, Transform root, PackagedRefs lookup, PackagedFiles files) { }
 
 		#endregion
+
+		#region Runtime
+
+		private float _initialRotationDeg;
+
+		private void Start()
+		{
+			_initialRotationDeg = transform.localRotation.eulerAngles.x;
+		}
+
+		protected override void OnAnimationValueChanged(float value)
+		{
+			transform.SetLocalXRotation(math.radians(value + _initialRotationDeg));
+		}
+
+		#endregion
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetApi.cs
index fa69381ba..6fad3012c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetApi.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetApi.cs
@@ -85,6 +85,7 @@ void IApiHittable.OnHit(int ballId, bool _)
 		{
 			Hit?.Invoke(this, new HitEventArgs(ballId));
 			Switch?.Invoke(this, new SwitchEventArgs(true, ballId));
+			MainComponent.UpdateAnimationValue(true);
 			OnSwitch(true);
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetComponent.cs
index 8d3381571..a995c5c71 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetComponent.cs
@@ -149,8 +149,7 @@ internal HitTargetState CreateState()
 			var staticData = hitTargetColliderComponent && hitTargetAnimationComponent
 				? new HitTargetStaticData {
 					Speed = hitTargetAnimationComponent.Speed,
-					MaxAngle = hitTargetAnimationComponent.MaxAngle,
-					InitialXRotation = transform.localRotation.eulerAngles.x,
+					MaxAngle = hitTargetAnimationComponent.MaxAngle
 				} : default;
 
 			var animationData = hitTargetColliderComponent && hitTargetAnimationComponent
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetStaticData.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetStaticData.cs
index b8adb26ed..4e3e02271 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetStaticData.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetStaticData.cs
@@ -20,9 +20,5 @@ internal struct HitTargetStaticData
 	{
 		public float Speed;
 		public float MaxAngle;
-		/// <summary>
-		/// Initial X-rotation, in degrees.
-		/// </summary>
-		public float InitialXRotation;
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetComponent.cs
index 04bc5e193..62de67b20 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetComponent.cs
@@ -38,6 +38,7 @@
 namespace VisualPinball.Unity
 {
 	public abstract class TargetComponent : MainRenderableComponent<HitTargetData>,
+		IAnimationValueEmitter<bool>, IAnimationValueEmitter<float>,
 		ISwitchDeviceComponent, IMeshGenerator
 	{
 		#region Data
@@ -62,14 +63,6 @@ public float3 Size {
 
 		#endregion
 
-		#region IHitTargetData
-
-		public virtual bool IsLegacy => false;
-
-		public int TargetType => _targetType;
-
-		#endregion
-
 		#region IMeshGenerator
 
 		public Mesh GetMesh() => GetDefaultMesh();
@@ -159,8 +152,8 @@ public override void CopyFromObject(GameObject go)
 			}
 
 			// dt animation
-			var dtAnimComp = GetComponent<DropTargetAnimationComponent>();
-			var srcDtAnimComp = go.GetComponent<DropTargetAnimationComponent>();
+			var dtAnimComp = GetComponent<DropTargetAnimationComponentLegacy>();
+			var srcDtAnimComp = go.GetComponent<DropTargetAnimationComponentLegacy>();
 			if (dtAnimComp && srcDtAnimComp) {
 				dtAnimComp.IsDropped = srcDtAnimComp.IsDropped;
 				dtAnimComp.Speed = srcDtAnimComp.Speed;
@@ -212,5 +205,37 @@ public override void CopyFromObject(GameObject go)
 		}
 
 		#endregion
+
+		#region IAnimationValueEmitter
+
+		private float _lastFloatValue;
+
+		event Action<bool> IAnimationValueEmitter<bool>.OnAnimationValueChanged {
+			add => _onBoolAnimationValueChanged += value;
+			remove => _onBoolAnimationValueChanged -= value;
+		}
+
+		event Action<float> IAnimationValueEmitter<float>.OnAnimationValueChanged {
+			add => _onFloatAnimationValueChanged += value;
+			remove => _onFloatAnimationValueChanged -= value;
+		}
+
+		private event Action<bool> _onBoolAnimationValueChanged;
+		private event Action<float> _onFloatAnimationValueChanged;
+
+		public void UpdateAnimationValue(bool value)
+		{
+			_onBoolAnimationValueChanged?.Invoke(value);
+		}
+
+		public void UpdateAnimationValue(float value)
+		{
+			if (_lastFloatValue != value) {
+				_lastFloatValue = value;
+				_onFloatAnimationValueChanged?.Invoke(value);
+			}
+		}
+
+		#endregion
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/IAnimationValueEmitter.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/IAnimationValueEmitter.cs
new file mode 100644
index 000000000..6a46c55ba
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/IAnimationValueEmitter.cs
@@ -0,0 +1,43 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+
+namespace VisualPinball.Unity
+{
+	public interface IAnimationValueEmitter
+	{
+	}
+
+	/// <summary>
+	/// Components implementing this interface will get animation updates from the physics
+	/// engine, and can either relay them to their children or perform their own transformations.
+	/// </summary>
+	public interface IAnimationValueEmitter<T> : IAnimationValueEmitter
+	{
+		/// <summary>
+		/// Called by the physics engine to update the animation value of this component.
+		/// </summary>
+		/// <param name="value">Value passed to the component that animates.</param>
+		void UpdateAnimationValue(T value);
+
+		/// <summary>
+		/// Event to notify potential children about angle changes. Only triggers when
+		/// the angle actually changes, not on every update. The angle is in radians.
+		/// </summary>
+		public event Action<T> OnAnimationValueChanged;
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/IRotatableAnimationComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/IAnimationValueEmitter.cs.meta
similarity index 100%
rename from VisualPinball.Unity/VisualPinball.Unity/VPT/IRotatableAnimationComponent.cs.meta
rename to VisualPinball.Unity/VisualPinball.Unity/VPT/IAnimationValueEmitter.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/ICoilDeviceComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/ICoilDeviceComponent.cs
index f4ea7a15c..dceaa1293 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/ICoilDeviceComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/ICoilDeviceComponent.cs
@@ -28,6 +28,7 @@ public interface ICoilDeviceComponent : IWireableComponent, IDeviceComponent<Gam
 		/// A list of available coils supported by the coil device
 		/// </summary>
 		IEnumerable<GamelogicEngineCoil> AvailableCoils { get; }
-	}
 
+		public IApiCoil CoilDevice(string deviceId);
+	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/ItemComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/ItemComponent.cs
index 226a97856..ccfc1da77 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/ItemComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/ItemComponent.cs
@@ -16,9 +16,12 @@
 
 // ReSharper disable InconsistentNaming
 
+using System;
 using NLog;
+using Unity.Mathematics;
 using UnityEngine;
 using Logger = NLog.Logger;
+using Object = UnityEngine.Object;
 
 namespace VisualPinball.Unity
 {
@@ -31,6 +34,8 @@ public abstract class ItemComponent : MonoBehaviour
 
 		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
+		const float kAngleEps = 0.0005f; // radians ~0.03°
+
 		protected void RegisterPhysics(PhysicsEngine physicsEngine)
 		{
 			if (physicsEngine) {
@@ -82,5 +87,31 @@ protected bool GetEnabled<T>() where T : Object
 
 			return false;
 		}
+
+		/// <summary>
+		/// Checks whether two angles (in radian) are different enough so that the transform
+		/// of a rotating component should be updated.
+		/// </summary>
+		/// <param name="angleRad1"></param>
+		/// <param name="angleRad2"></param>
+		/// <returns></returns>
+		protected static bool HasAngleChanged(float angleRad1, float angleRad2)
+		{
+			return math.abs(DeltaAngleRad(angleRad1, angleRad2)) > kAngleEps;
+		}
+
+		/// <summary>
+		/// Smallest signed difference in radians. Used to check whether the transform
+		/// of a rotating component should be updated.
+		/// </summary>
+		/// <param name="a"></param>
+		/// <param name="b"></param>
+		/// <returns>Delta between the two angles</returns>
+		private static float DeltaAngleRad(float a, float b)
+		{
+			float d = math.fmod(a - b + math.PI, math.TAU);
+			if (d < 0f) d += math.TAU;
+			return d - math.PI;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerApi.cs
index e988e64f9..14833bd18 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerApi.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerApi.cs
@@ -52,12 +52,18 @@ public class KickerApi : CollidableApi<KickerComponent, KickerColliderComponent,
 		public KickerDeviceCoil KickerCoil => _coils.Values.FirstOrDefault();
 
 		private readonly Dictionary<string, KickerDeviceCoil> _coils = new Dictionary<string, KickerDeviceCoil>();
+		private readonly Transform _ballParent;
+		private readonly Matrix4x4 _worldToPlayfieldMatrix;
 
 		public KickerApi(GameObject go, Player player, PhysicsEngine physicsEngine) : base(go, player, physicsEngine)
 		{
 			foreach (var coil in MainComponent.Coils) {
 				_coils[coil.Id] = new KickerDeviceCoil(player, coil, this);
 			}
+
+			var pf = go.GetComponentInParent<PlayfieldComponent>();
+			_ballParent = pf ? pf.transform : go.transform;
+			_worldToPlayfieldMatrix = pf.transform.worldToLocalMatrix;
 		}
 
 		void IApi.OnInit(BallManager ballManager)
@@ -169,9 +175,9 @@ private void KickXYZ(float angle, float speed, float inclination, float x, float
 			if (ballId != 0) {
 				var angleRad = math.radians(angle); // yaw angle, zero is along -Y axis
 
-				if (math.abs(inclination) > (float) (System.Math.PI / 2.0)) {
-					// radians or degrees?  if greater PI/2 assume degrees
-					inclination *= (float) (System.Math.PI / 180.0); // convert to radians
+				// radians or degrees?  if greater PI/2 assume degrees
+				if (math.abs(inclination) > math.PIHALF) {
+					inclination = math.radians(inclination); // convert to radians
 				}
 
 				// if < 0 use global value
@@ -196,11 +202,24 @@ private void KickXYZ(float angle, float speed, float inclination, float x, float
 					ballData.Position.y + y,
 					ballData.Position.z + z
 				);
-				ballData.Velocity = new float3(
+				var velocity = new float3(
 					math.sin(angleRad) * speed,
 					-math.cos(angleRad) * speed,
 					speedZ
 				);
+
+				// rotate with kicker parent
+				var m = Physics.GetLocalToPlayfieldMatrixInVpx(MainComponent.transform.localToWorldMatrix, _worldToPlayfieldMatrix);
+				var rotMatrix = new float3x3(
+					math.normalize(m.c0.xyz),
+					math.normalize(m.c1.xyz),
+					math.normalize(m.c2.xyz)
+				);
+				var rotQuaternion = new quaternion(rotMatrix);
+				ballData.Velocity = math.mul(rotQuaternion, velocity);
+
+				Debug.Log($"Kick[{MainComponent.name}]: inclination {math.degrees(inclination)}, speedz = {speedZ}, velocity = {ballData.Velocity} ({velocity}) ({x}, {y}, {z}), pos = {ballData.Position}");
+
 				ballData.IsFrozen = false;
 				ballData.AngularMomentum = float3.zero;
 
@@ -239,12 +258,13 @@ protected override void CreateColliders(ref ColliderReference colliders, float4x
 
 		void IApiHittable.OnHit(int ballId, bool isUnHit)
 		{
-			var ballTransform = PhysicsEngine.GetTransform(ballId);
+			var ballComponent = PhysicsEngine.GetBall(ballId);
+			var ballTransform = ballComponent.transform;
 			if (isUnHit) {
 				UnHit?.Invoke(this, new HitEventArgs(ballId));
 				Switch?.Invoke(this, new SwitchEventArgs(false, ballId));
 				OnSwitch(false);
-				ballTransform.SetParent(MainComponent.GetComponentInParent<PlayfieldComponent>().transform, true);
+				ballTransform.SetParent(_ballParent, true);
 
 			} else {
 				Hit?.Invoke(this, new HitEventArgs(ballId));
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerColliderComponent.cs
index 2f585518e..77e4a5758 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerColliderComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerColliderComponent.cs
@@ -49,6 +49,9 @@ public class KickerColliderComponent : ColliderComponent<KickerData, KickerCompo
 		[Tooltip("Use a better collision model. Currently disabled.")]
 		public bool LegacyMode = true;
 
+		[Tooltip("Z-Position of the ball when locked in the kicker.")]
+		public float BallZOffset = -25f;
+
 		#endregion
 
 		#region Packaging
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerComponent.cs
index 78f66559a..b698ae973 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerComponent.cs
@@ -111,6 +111,7 @@ public float Radius {
 		public SwitchDefault SwitchDefault => SwitchDefault.Configurable;
 
 		public IEnumerable<GamelogicEngineCoil> AvailableCoils => Coils.Select(c => new GamelogicEngineCoil(c.Id) { Description = c.Name });
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)KickerApi).Coil(deviceId);
 
 		IEnumerable<GamelogicEngineCoil> IDeviceComponent<GamelogicEngineCoil>.AvailableDeviceItems => AvailableCoils;
 		IEnumerable<GamelogicEngineSwitch> IDeviceComponent<GamelogicEngineSwitch>.AvailableDeviceItems => AvailableSwitches;
@@ -285,7 +286,7 @@ public void OnBeforeSerialize()
 			#if UNITY_EDITOR
 
 			// don't generate ids for prefabs, otherwise they'll show up in the instances.
-			if (PrefabUtility.GetPrefabInstanceStatus(this) != PrefabInstanceStatus.Connected) {
+			if (EditorUtility.IsPersistent(this) && PrefabUtility.IsPartOfPrefabAsset(this)) {
 				return;
 			}
 			var coilIds = new HashSet<string>();
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerPackable.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerPackable.cs
index c8087a32f..d3dcdfb93 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerPackable.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerPackable.cs
@@ -65,6 +65,7 @@ public struct KickerColliderPackable
 		public float Scatter;
 		public float HitAccuracy;
 		public float HitHeight;
+		public float BallZOffset;
 		public bool FallThrough;
 		public bool FallIn;
 		public bool LegacyMode;
@@ -76,6 +77,7 @@ public static byte[] Pack(KickerColliderComponent comp)
 				Scatter = comp.Scatter,
 				HitAccuracy = comp.HitAccuracy,
 				HitHeight = comp.HitHeight,
+				BallZOffset = comp.BallZOffset,
 				FallThrough = comp.FallThrough,
 				FallIn = comp.FallIn,
 				LegacyMode = comp.LegacyMode
@@ -89,6 +91,7 @@ public static void Unpack(byte[] bytes, KickerColliderComponent comp)
 			comp.Scatter = data.Scatter;
 			comp.HitAccuracy = data.HitAccuracy;
 			comp.HitHeight = data.HitHeight;
+			comp.BallZOffset = data.BallZOffset;
 			comp.FallThrough = data.FallThrough;
 			comp.FallIn = data.FallIn;
 			comp.LegacyMode = data.LegacyMode;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/StepRotatorMechComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/StepRotatorMechComponent.cs
index 53e3ec652..96753148c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/StepRotatorMechComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Mech/StepRotatorMechComponent.cs
@@ -67,6 +67,8 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
 			}
 		};
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)StepRotatorMechApi).Coil(deviceId);
+
 		public IEnumerable<GamelogicEngineSwitch> AvailableSwitches => Marks.Select(m => m.Switch);
 
 		public SwitchDefault SwitchDefault => SwitchDefault.NormallyOpen;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/PhysicsMaterialAsset.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/PhysicsMaterialAsset.cs
index 633f4c056..c109329a2 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/PhysicsMaterialAsset.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/PhysicsMaterialAsset.cs
@@ -37,7 +37,7 @@ public class PhysicsMaterialAsset : ScriptableObject
 		public float Elasticity;
 		public float ElasticityFalloff;
 
-		public bool UseElasticityOverVelocity => ElasticityOverVelocity.keys.Length > 0;
+		public bool UseElasticityOverVelocity => ElasticityOverVelocity?.keys.Length > 0;
 		public AnimationCurve ElasticityOverVelocity;
 
 		public float Friction;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAnimationComponent.cs
new file mode 100644
index 000000000..84098185f
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAnimationComponent.cs
@@ -0,0 +1,54 @@
+// Visual Pinball Engine
+// Copyright (C) 2023 freezy and VPE Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// ReSharper disable InconsistentNaming
+
+using UnityEngine;
+
+namespace VisualPinball.Unity
+{
+	[PackAs("PlungerAnimation")]
+	[DisallowMultipleComponent]
+	public class PlungerAnimationComponent : AnimationComponent<float>, IPackable
+	{
+		private Quaternion _initialRotation;
+		private SkinnedMeshRenderer[] _skinnedMeshRenderer;
+
+		private void Start()
+		{
+			_skinnedMeshRenderer = GetComponentsInChildren<SkinnedMeshRenderer>();
+		}
+
+		protected override void OnAnimationValueChanged(float value)
+		{
+			foreach (var skinnedMeshRenderer in _skinnedMeshRenderer) {
+				skinnedMeshRenderer.SetBlendShapeWeight(0, value);
+			}
+		}
+
+		#region Packaging
+
+		public byte[] Pack() => PackageApi.Packer.Empty;
+
+		public byte[] PackReferences(Transform root, PackagedRefs refs, PackagedFiles files) => null;
+
+		public void Unpack(byte[] bytes) { }
+
+		public void UnpackReferences(byte[] bytes, Transform root, PackagedRefs refs, PackagedFiles files) { }
+
+		#endregion
+	}
+}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAnimationComponent.cs.meta b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAnimationComponent.cs.meta
new file mode 100644
index 000000000..cdf54b705
--- /dev/null
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerAnimationComponent.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c6b1de2c064d491a918191247fa07588
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {fileID: 2800000, guid: 1af95e9069c968748bca1eb7ab4ee6d3, type: 3}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerComponent.cs
index b189e36f1..33a74736f 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerComponent.cs
@@ -20,6 +20,7 @@
 
 using System;
 using System.Collections.Generic;
+using Unity.Mathematics;
 using UnityEngine;
 using UnityEngine.InputSystem;
 using VisualPinball.Engine.Game.Engines;
@@ -33,7 +34,7 @@ namespace VisualPinball.Unity
 	[SelectionBase]
 	[PackAs("Plunger")]
 	[AddComponentMenu("Pinball/Game Item/Plunger")]
-	public class PlungerComponent : MainRenderableComponent<PlungerData>, ICoilDeviceComponent, IPackable
+	public class PlungerComponent : MainRenderableComponent<PlungerData>, ICoilDeviceComponent, IAnimationValueEmitter<float>, IPackable
 	{
 		#region Data
 
@@ -101,6 +102,8 @@ private void Awake()
 			new GamelogicEngineCoil(FireCoilId) { Description = "Auto-fire" },
 		};
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)PlungerApi).Coil(deviceId);
+
 		IEnumerable<GamelogicEngineCoil> IDeviceComponent<GamelogicEngineCoil>.AvailableDeviceItems => AvailableCoils;
 		IEnumerable<IGamelogicEngineDeviceItem> IWireableComponent.AvailableWireDestinations => AvailableCoils;
 		IEnumerable<IGamelogicEngineDeviceItem> IDeviceComponent<IGamelogicEngineDeviceItem>.AvailableDeviceItems => AvailableCoils;
@@ -316,6 +319,21 @@ internal PlungerState CreateState()
 
 		#endregion
 
+		#region IAnimationValueEmitter
+
+		public event Action<float> OnAnimationValueChanged;
+		private float _lastPosition;
+
+		public void UpdateAnimationValue(float value)
+		{
+			if (math.abs(_lastPosition - value) > 0.0001f) {
+				_lastPosition = value;
+				OnAnimationValueChanged?.Invoke(value);
+			}
+		}
+
+		#endregion
+
 		public void UpdateParkPosition(float pos)
 		{
 			foreach (var skinnedMeshRenderer in GetComponentsInChildren<SkinnedMeshRenderer>()) {
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerCollider.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerCollider.cs
index 979e3ea63..1e852f913 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerCollider.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerCollider.cs
@@ -98,7 +98,7 @@ public static void Collide(in BallState ball, ref CollisionEventData collEvent,
 			// h -coll.m_radius will be moving a at linear rate of
 			// 'speed'. We can calculate the angular speed from that.
 
-			movement.AngleSpeed = math.abs(dot); // use this until a better value comes along
+			movement.AngleSpeed = math.abs(dot) * movement.InverseMass; // use this until a better value comes along
 
 			if (math.abs(h) > 1.0f) {
 				// avoid divide by zero
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerColliderComponent.cs
index a29684da4..d4278ef35 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerColliderComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerColliderComponent.cs
@@ -27,6 +27,10 @@ public class SpinnerColliderComponent : ColliderComponent<SpinnerData, SpinnerCo
 	{
 		#region Data
 
+		[Min(0.01f)]
+		[Tooltip("The mass of the spinner plate. Higher means slower spinning. Doesn't affect the ball.")]
+		public float Mass = 1;
+
 		[Min(0f)]
 		[Tooltip("Bounciness (coefficient of restitution) of the spinner bracket.")]
 		public float Elasticity = 0.3f;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerComponent.cs
index f47b78281..1c772fbb1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerComponent.cs
@@ -23,7 +23,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Unity.Mathematics;
 using UnityEngine;
 using VisualPinball.Engine.Common;
@@ -39,7 +38,7 @@ namespace VisualPinball.Unity
 	[PackAs("Spinner")]
 	[AddComponentMenu("Pinball/Game Item/Spinner")]
 	public class SpinnerComponent : MainRenderableComponent<SpinnerData>, ISwitchDeviceComponent,
-		IRotatableAnimationComponent, IPackable
+		IAnimationValueEmitter<float>, IPackable
 	{
 		#region Data
 
@@ -117,8 +116,6 @@ public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, Pac
 
 		#region Runtime
 
-		[NonSerialized]
-		private IRotatableAnimationComponent[] _animatedComponents;
 
 		public SpinnerApi SpinnerApi { get; private set; }
 
@@ -130,11 +127,11 @@ private void Awake()
 
 			Player.Register(SpinnerApi, this);
 			RegisterPhysics(physicsEngine);
+		}
 
-			_animatedComponents = GetComponentsInChildren<SpinnerPlateAnimationComponent>()
-				.Select(gwa => gwa as IRotatableAnimationComponent)
-				.Concat(GetComponentsInChildren<SpinnerLeverAnimationComponent>().Select(gwa => gwa as IRotatableAnimationComponent))
-				.ToArray();
+		private void Start()
+		{
+			OnAnimationValueChanged?.Invoke(0);
 		}
 
 		#endregion
@@ -247,7 +244,8 @@ internal SpinnerState CreateState()
 			var movementData = animComponent
 				? new SpinnerMovementState {
 					Angle = math.radians(math.clamp(0.0f, AngleMin, AngleMax)),
-					AngleSpeed = 0f
+					AngleSpeed = 0f,
+					InverseMass = 1 / collComponent.Mass
 				} : default;
 
 			return new SpinnerState(
@@ -259,12 +257,16 @@ internal SpinnerState CreateState()
 
 		#endregion
 
-		#region IRotatableAnimationComponent
+		#region IAnimationValueSource
+
+		public event Action<float> OnAnimationValueChanged;
+		private float _lastAngleRad;
 
-		public void OnRotationUpdated(float angleRad)
+		public void UpdateAnimationValue(float value)
 		{
-			foreach (var animatedComponent in _animatedComponents) {
-				animatedComponent.OnRotationUpdated(angleRad);
+			if (HasAngleChanged(_lastAngleRad, value)) {
+				_lastAngleRad = value;
+				OnAnimationValueChanged?.Invoke(value);
 			}
 		}
 
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerLeverAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerLeverAnimationComponent.cs
index ba1e883d9..b0ea81611 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerLeverAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerLeverAnimationComponent.cs
@@ -18,31 +18,51 @@
 
 using Unity.Mathematics;
 using UnityEngine;
-using VisualPinball.Engine.VPT.Spinner;
 
 namespace VisualPinball.Unity
 {
-	public class SpinnerLeverAnimationComponent : AnimationComponent<SpinnerData, SpinnerComponent>, IRotatableAnimationComponent
+	public class SpinnerLeverAnimationComponent : AnimationComponent<float>
 	{
-		[Tooltip("Shifts the lever angle by the given amount of degrees.")]
-		[Range(-90f, 90f)]
+		// todo make packable
+		[Tooltip("The axis of the rotation.")]
+		public Vector3 RotationAngle = Vector3.forward;
+
+		[Tooltip("Shifts the lever angle in relation to the input angle by the given amount of degrees.")]
+		[Range(0, 360f)]
 		public float Shift = 15f;
 
-		[Tooltip("Start angle of the movement")]
+		[Tooltip("Final offset of the lever angle in degrees.")]
 		[Range(-90f, 90f)]
+		public float Offset;
+
+		[Tooltip("Start angle of the movement")]
+		[Range(-180f, 180f)]
 		public float MinAngle = -1.56f;
 
 		[Tooltip("End angle of the movement")]
-		[Range(-90f, 90f)]
+		[Range(-180f, 180f)]
 		public float MaxAngle = 13.83f;
 
-		public void OnRotationUpdated(float angleRad)
+		private Quaternion _initialRotation;
+
+		private void Awake()
+		{
+			_initialRotation = transform.localRotation;
+			base.Awake();
+		}
+
+		protected override void OnAnimationValueChanged(float value)
 		{
-			angleRad = math.radians((math.degrees(angleRad) + Shift) % 360f);
+			// normalize input angle
+			var angleRad = math.radians((math.degrees(value) + Shift) % 360f);
+
 			var a = math.abs(angleRad - math.PI);
 			var pos = math.sin(math.smoothstep(0, math.PI, a));
 			var leverAngleDeg = math.lerp(MinAngle, MaxAngle, pos);
-			transform.localRotation = quaternion.RotateX(math.radians(leverAngleDeg));
+
+			var axis = RotationAngle.normalized;
+			var rotation = Quaternion.AngleAxis(math.degrees(math.radians(leverAngleDeg + Offset)), axis);
+			transform.localRotation = _initialRotation * rotation;
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerMovementState.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerMovementState.cs
index f759333ff..047e0f0b1 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerMovementState.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerMovementState.cs
@@ -20,5 +20,6 @@ internal struct SpinnerMovementState
 	{
 		public float Angle;
 		public float AngleSpeed;
+		public float InverseMass;
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerPlateAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerPlateAnimationComponent.cs
index 7182e3754..973c01133 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerPlateAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerPlateAnimationComponent.cs
@@ -14,16 +14,28 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+// ReSharper disable InconsistentNaming
+
 using Unity.Mathematics;
-using VisualPinball.Engine.VPT.Spinner;
+using UnityEngine;
 
 namespace VisualPinball.Unity
 {
-	public class SpinnerPlateAnimationComponent : AnimationComponent<SpinnerData, SpinnerComponent>, IRotatableAnimationComponent
+	public class SpinnerPlateAnimationComponent : AnimationComponent<float>
 	{
-		public void OnRotationUpdated(float angleRad)
+		public Vector3 RotationVector = Vector3.right;
+		private Quaternion _initialRotation;
+
+		private void Start()
+		{
+			_initialRotation = transform.localRotation;
+		}
+
+		protected override void OnAnimationValueChanged(float value)
 		{
-			transform.localRotation = quaternion.RotateX(-angleRad);
+			var axis = RotationVector.normalized;
+			var rotation = Quaternion.AngleAxis(math.degrees(value), axis);
+			transform.localRotation = _initialRotation * rotation;
 		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Teleporter/TeleporterComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Teleporter/TeleporterComponent.cs
index f377576c3..b27fe2207 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Teleporter/TeleporterComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Teleporter/TeleporterComponent.cs
@@ -67,6 +67,8 @@ public class TeleporterComponent : MonoBehaviour, ICoilDeviceComponent
 			}
 		};
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)TeleporterApi).Coil(deviceId);
+
 		#endregion
 
 		#region Runtime
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/SwitchAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/SwitchAnimationComponent.cs
index df769c3a1..6106a2a6d 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/SwitchAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/SwitchAnimationComponent.cs
@@ -26,12 +26,11 @@
 using VisualPinball.Engine.VPT.Trigger;
 using Logger = NLog.Logger;
 
-
 namespace VisualPinball.Unity
 {
 	//[PackAs("SwitchAnimation")]
 	[AddComponentMenu("Pinball/Animation/Switch Animation")]
-	public class SwitchAnimationComponent : AnimationComponent<TriggerData, TriggerComponent>//, IPackable
+	public class SwitchAnimationComponent : AnimationComponentLegacy<TriggerData, TriggerComponent>//, IPackable
 	{
 		private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -107,13 +106,16 @@ private void Update()
 				return;
 			}
 
-			var ballTransform = _physicsEngine.GetTransform(_ballId);
+			var ballComponent = _physicsEngine.GetBall(_ballId);
+			var ballTransform = ballComponent.transform;
 			var ballLocalToWorld = (float4x4)ballTransform.localToWorldMatrix;
 			var transformWithinParent = ballLocalToWorld.GetLocalToPlayfieldMatrixInVpx(_triggerComp.transform.worldToLocalMatrix);
 			var localVpxPos = transformWithinParent.MultiplyPoint(ballTransform.position);
 
 			var yPos = ForwardsAnimationCurve.Evaluate(math.unlerp(_yEnter, _yExit, localVpxPos.y)); // yPos is between 0 and 1, depending on where localVpxPos.y is
-			_currentAngle = math.clamp(math.lerp(_startAngle, EndAngle, yPos), _startAngle, EndAngle);
+			var clampFrom = math.min(_startAngle, EndAngle);
+			var clampTo = math.max(_startAngle, EndAngle);
+			_currentAngle = math.clamp(math.lerp(_startAngle, EndAngle, yPos), clampFrom, clampTo);
 
 			transform.SetLocalXRotation(math.radians(_currentAngle));
 		}
@@ -214,8 +216,8 @@ private void OnDrawGizmosSelected()
 			for (var i = 0; i < 4; i++) {
 				Handles2.DrawArrow(entryRect[i], exitRect[i], 3, 10);
 			}
-			Handles.DrawAAPolyLine(5, entryRect);
-			Handles.DrawAAPolyLine(5, exitRect);
+			Handles.DrawAAPolyLine(10, entryRect);
+			Handles.DrawAAPolyLine(10, exitRect);
 		}
 #endif
 	}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerAnimationComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerAnimationComponent.cs
index 7cb73f3f0..d70ed446c 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerAnimationComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerAnimationComponent.cs
@@ -23,7 +23,7 @@ namespace VisualPinball.Unity
 {
 	[PackAs("TriggerAnimation")]
 	[AddComponentMenu("Pinball/Animation/Trigger Animation")]
-	public class TriggerAnimationComponent : AnimationComponent<TriggerData, TriggerComponent>, IPackable
+	public class TriggerAnimationComponent : AnimationComponent<float>, IPackable
 	{
 		#region Data
 
@@ -31,6 +31,8 @@ public class TriggerAnimationComponent : AnimationComponent<TriggerData, Trigger
 		[Tooltip("How quick the trigger moves down when the ball rolls over it.")]
 		public float AnimSpeed = 1f;
 
+		private Vector3 _initialPosition;
+
 		#endregion
 
 		#region Packaging
@@ -44,5 +46,15 @@ public class TriggerAnimationComponent : AnimationComponent<TriggerData, Trigger
 		public void UnpackReferences(byte[] data, Transform root, PackagedRefs refs, PackagedFiles files) { }
 
 		#endregion
+
+		private void Start()
+		{
+			_initialPosition = transform.localPosition;
+		}
+
+		protected override void OnAnimationValueChanged(float value)
+		{
+			transform.localPosition = _initialPosition + transform.up * Physics.ScaleToWorld(value);
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderComponent.cs
index 262204637..6168cdabb 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderComponent.cs
@@ -31,7 +31,7 @@ public class TriggerColliderComponent : ColliderComponent<TriggerData, TriggerCo
 
 		[Min(0)]
 		[Tooltip("Height at which the trigger closes.")]
-		public float HitHeight = 50f;
+		public float HitHeight = 58f;
 
 		[Min(0)]
 		[Tooltip("Radius of the trigger.")]
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderGenerator.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderGenerator.cs
index 70420e773..37dd663c7 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderGenerator.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderGenerator.cs
@@ -60,27 +60,28 @@ private void GenerateRoundHitObjects(ref ColliderReference colliders)
 
 		private void GenerateCurvedHitObjects(ref ColliderReference colliders)
 		{
-			var height = _component.Position.z;
 			var vVertex = DragPoint.GetRgVertex<RenderVertex2D, CatmullCurve2DCatmullCurveFactory>(_component.DragPoints);
 
 			var count = vVertex.Length;
 			var rgv = new RenderVertex2D[count];
 			var rgv3D = new float3[count];
 
+			// top surface
 			for (var i = 0; i < count; i++) {
 				rgv[i] = vVertex[i];
-				rgv3D[i] = new float3(rgv[i].X, rgv[i].Y, height + (float)(PhysicsConstants.PhysSkin * 2.0));
+				rgv3D[i] = new float3(rgv[i].X, rgv[i].Y, _colliderComponent.HitHeight);
 			}
 			ColliderUtils.Generate3DPolyColliders(rgv3D, _api.GetColliderInfo(), ref colliders, _matrix);
 
+			// walls
 			for (var i = 0; i < count; i++) {
 				var pv2 = rgv[i < count - 1 ? i + 1 : 0];
 				var pv3 = rgv[i < count - 2 ? i + 2 : i + 2 - count];
 				colliders.Add(new LineCollider(
 					pv2.ToUnityFloat2(),
 					pv3.ToUnityFloat2(),
-					height,
-					height + math.max(_colliderComponent.HitHeight - 8.0f, 0f),
+					0,
+					_colliderComponent.HitHeight,
 					_api.GetColliderInfo()), _matrix);
 			}
 		}
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs
index d72e7e4ec..b216c9321 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs
@@ -39,7 +39,7 @@ namespace VisualPinball.Unity
 	[PackAs("Trigger")]
 	[AddComponentMenu("Pinball/Game Item/Trigger")]
 	public class TriggerComponent : MainRenderableComponent<TriggerData>,
-		ITriggerComponent, IPackable
+		ITriggerComponent, IAnimationValueEmitter<float>, IPackable
 	{
 		#region Data
 
@@ -288,5 +288,20 @@ internal TriggerState CreateState()
 		}
 
 		#endregion
+
+		#region IAnimationValueEmitter
+
+		public event Action<float> OnAnimationValueChanged;
+		private float _lastPosition;
+
+		public void UpdateAnimationValue(float value)
+		{
+			if (math.abs(_lastPosition - value) > 0.0001f) {
+				_lastPosition = value;
+				OnAnimationValueChanged?.Invoke(value);
+			}
+		}
+
+		#endregion
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughComponent.cs
index 36a1a1c81..455c5e4ce 100644
--- a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughComponent.cs
+++ b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trough/TroughComponent.cs
@@ -309,6 +309,8 @@ public IEnumerable<GamelogicEngineCoil> AvailableCoils {
 			}
 		}
 
+		IApiCoil ICoilDeviceComponent.CoilDevice(string deviceId) => ((IApiCoilDevice)TroughApi).Coil(deviceId);
+
 		IEnumerable<IGamelogicEngineDeviceItem> IWireableComponent.AvailableWireDestinations => AvailableCoils;
 		IEnumerable<IGamelogicEngineDeviceItem> IDeviceComponent<IGamelogicEngineDeviceItem>.AvailableDeviceItems => AvailableCoils;