diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b4f6643..327fed0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -35,7 +35,7 @@ jobs:
           shared-key: ci
           save-if: false
       - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
-      - run: cargo check --workspace --no-default-features
+      - run: cargo check --workspace --no-default-features --features libm
 
   clippy:
     runs-on: ubuntu-latest
diff --git a/Cargo.lock b/Cargo.lock
index fe0be48..8a74ab5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,7 +110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "libc",
 ]
@@ -127,23 +127,22 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cc",
- "cesu8",
- "jni",
- "jni-sys",
+ "jni 0.22.4",
  "libc",
  "log",
  "ndk 0.9.0",
  "ndk-context",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
- "thiserror 1.0.69",
+ "simd_cesu8",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -318,9 +317,9 @@ dependencies = [
 
 [[package]]
 name = "atomicow"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52e8890bb9844440d0c412fa74b67fd2f14e85248b6e00708059b6da9e5f8bf"
+checksum = "301801c08259e328a1c7da556608c0c22687708831b22024dbd3a57ea741e6de"
 dependencies = [
  "portable-atomic",
  "portable-atomic-util",
@@ -479,7 +478,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "blake3",
  "crossbeam-channel",
  "derive_more",
@@ -595,7 +594,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "nonmax",
  "radsort",
  "smallvec",
@@ -674,7 +673,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bumpalo",
  "concurrent-queue",
  "derive_more",
@@ -871,7 +870,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "futures-lite",
  "guillotiere",
@@ -1062,7 +1061,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_transform",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "hexasphere",
@@ -1121,7 +1120,7 @@ dependencies = [
  "bevy_shader",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "fixedbitset",
@@ -1199,7 +1198,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "nonmax",
  "radsort",
  "smallvec",
@@ -1283,7 +1282,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "downcast-rs 2.0.2",
@@ -1406,7 +1405,7 @@ dependencies = [
  "bevy_text",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "fixedbitset",
@@ -1674,14 +1673,14 @@ version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
  "shlex",
  "syn",
 ]
@@ -1709,9 +1708,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 dependencies = [
  "bytemuck",
  "serde_core",
@@ -1719,9 +1718,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.8.3"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d"
+checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1818,7 +1817,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -1840,9 +1839,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.56"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1899,6 +1898,15 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "color"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18ef4657441fb193b65f34dc39b3781f0dfec23d3bd94d0eeb4e88cde421edb"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -2030,7 +2038,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -2070,7 +2078,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4cadaea21e24c49c0c82116f2b465ae6a49d63c90e428b0f8d9ae1f638ac91f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
@@ -2098,7 +2106,7 @@ dependencies = [
  "core-foundation-sys",
  "coreaudio-rs",
  "dasp_sample",
- "jni",
+ "jni 0.21.1",
  "js-sys",
  "libc",
  "mach2",
@@ -2113,9 +2121,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.17"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
 dependencies = [
  "libc",
 ]
@@ -2190,9 +2198,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "data-encoding"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
 
 [[package]]
 name = "derive_more"
@@ -2229,7 +2237,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -2343,9 +2351,9 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.22.13"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
 dependencies = [
  "num-traits",
 ]
@@ -2373,9 +2381,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fdeflate"
@@ -2388,12 +2396,9 @@ dependencies = [
 
 [[package]]
 name = "field_path"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b15fe157f96af46037f9135145fd540de8a93cf4a32e8d7ba0037796878208a"
-dependencies = [
- "hashbrown 0.16.1",
-]
+checksum = "36ccac07e4c62197b44fd7161abc6bf6b006c8dc725aeca40fd438e62d0f2ada"
 
 [[package]]
 name = "find-msvc-tools"
@@ -2444,6 +2449,15 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "font-types"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "fontconfig-parser"
 version = "0.5.8"
@@ -2509,6 +2523,17 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.32"
@@ -2720,7 +2745,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "gpu-alloc-types",
 ]
 
@@ -2730,7 +2755,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -2751,7 +2776,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -2762,14 +2787,14 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
 name = "grid"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220"
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
 
 [[package]]
 name = "guillotiere"
@@ -2799,7 +2824,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "core_maths",
  "read-fonts 0.36.0",
@@ -2836,11 +2861,17 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
 [[package]]
 name = "heapless"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af2455f757db2b292a9b1768c4b70186d443bcb3b316252d6b540aec1cd89ed"
+checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4"
 dependencies = [
  "hash32",
  "portable-atomic",
@@ -2884,25 +2915,25 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "image"
-version = "0.25.9"
+version = "0.25.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
  "moxcms",
  "num-traits",
- "png",
+ "png 0.18.1",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "serde",
  "serde_core",
 ]
@@ -2919,7 +2950,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "inotify-sys",
  "libc",
 ]
@@ -2935,9 +2966,9 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ae045c87e7082cb72dab0ccd01ae075dd00141ddc108f43a0ea150a9e7227"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
 dependencies = [
  "rustversion",
 ]
@@ -2962,9 +2993,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jni"
@@ -2975,18 +3006,70 @@ dependencies = [
  "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
+]
+
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "jobserver"
@@ -3000,10 +3083,12 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
+ "cfg-if",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
@@ -3031,7 +3116,19 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
+]
+
+[[package]]
+name = "kurbo"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7564e90fe3c0d5771e1f0bc95322b21baaeaa0d9213fa6a0b61c99f8b17b3bfb"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "libm",
+ "smallvec",
 ]
 
 [[package]]
@@ -3059,9 +3156,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libloading"
@@ -3081,14 +3178,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "libc",
  "plain",
- "redox_syscall 0.7.3",
+ "redox_syscall 0.7.4",
 ]
 
 [[package]]
@@ -3188,7 +3285,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types",
@@ -3226,9 +3323,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.7.11"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -3242,7 +3339,7 @@ checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
@@ -3284,8 +3381,8 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.11.0",
- "jni-sys",
+ "bitflags 2.11.1",
+ "jni-sys 0.3.1",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
  "num_enum",
@@ -3298,8 +3395,8 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.0",
- "jni-sys",
+ "bitflags 2.11.1",
+ "jni-sys 0.3.1",
  "log",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
@@ -3319,7 +3416,7 @@ version = "0.5.0+25.2.9519653"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.1",
 ]
 
 [[package]]
@@ -3328,7 +3425,7 @@ version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.1",
 ]
 
 [[package]]
@@ -3337,7 +3434,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3349,7 +3446,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3418,9 +3515,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
 dependencies = [
  "num_enum_derive",
  "rustversion",
@@ -3428,9 +3525,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3478,7 +3575,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -3494,7 +3591,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -3518,7 +3615,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -3530,7 +3627,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -3569,7 +3666,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -3582,7 +3679,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "libc",
  "objc2-core-foundation",
 ]
@@ -3605,7 +3702,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -3617,7 +3714,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -3640,7 +3737,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -3672,7 +3769,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -3685,7 +3782,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
 dependencies = [
- "jni",
+ "jni 0.21.1",
  "ndk 0.8.0",
  "ndk-context",
  "num-derive",
@@ -3723,15 +3820,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "orbclient"
-version = "0.3.50"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
+checksum = "a570f6bca41d29acb2139229a7c873ec99bc9a313bd10804081d89bfac8ff329"
 dependencies = [
  "libc",
  "libredox",
@@ -3739,9 +3836,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "5.1.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d"
+checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
 dependencies = [
  "num-traits",
 ]
@@ -3790,6 +3887,26 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "peniko"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2b6aadb221872732e87d465213e9be5af2849b0e8cc5300a8ba98fffa2e00a"
+dependencies = [
+ "color",
+ "kurbo",
+ "linebender_resource_handle",
+ "smallvec",
+]
+
+[[package]]
+name = "peniko_motiongfx"
+version = "0.3.0"
+dependencies = [
+ "motiongfx",
+ "peniko",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -3848,9 +3965,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plain"
@@ -3858,13 +3975,26 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "png"
+version = "0.17.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "png"
 version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -3885,6 +4015,12 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "pollster"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
+
 [[package]]
 name = "portable-atomic"
 version = "1.13.1"
@@ -3893,9 +4029,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
  "portable-atomic",
 ]
@@ -3940,7 +4076,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.4+spec-1.1.0",
+ "toml_edit 0.25.11+spec-1.1.0",
 ]
 
 [[package]]
@@ -3954,15 +4090,15 @@ dependencies = [
 
 [[package]]
 name = "profiling"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
+checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 
 [[package]]
 name = "pxfm"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
 
 [[package]]
 name = "quick-xml"
@@ -4002,9 +4138,9 @@ checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -4059,23 +4195,23 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
 name = "read-fonts"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
+checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345"
 dependencies = [
  "bytemuck",
- "font-types",
+ "core_maths",
+ "font-types 0.10.1",
 ]
 
 [[package]]
 name = "read-fonts"
-version = "0.36.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345"
+checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
 dependencies = [
  "bytemuck",
- "core_maths",
- "font-types",
+ "font-types 0.11.3",
 ]
 
 [[package]]
@@ -4099,16 +4235,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
+checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -4158,11 +4294,11 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
+checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "once_cell",
  "serde",
  "serde_derive",
@@ -4184,9 +4320,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rustc_version"
@@ -4203,7 +4339,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -4216,7 +4352,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
@@ -4280,9 +4416,9 @@ checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "send_wrapper"
@@ -4350,20 +4486,26 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
 [[package]]
-name = "skrifa"
-version = "0.37.0"
+name = "simd_cesu8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
 dependencies = [
- "bytemuck",
- "read-fonts 0.35.0",
+ "rustc_version",
+ "simdutf8",
 ]
 
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
 [[package]]
 name = "skrifa"
 version = "0.39.0"
@@ -4374,6 +4516,16 @@ dependencies = [
  "read-fonts 0.36.0",
 ]
 
+[[package]]
+name = "skrifa"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.37.0",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -4401,7 +4553,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -4444,7 +4596,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -4482,11 +4634,11 @@ checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
 
 [[package]]
 name = "swash"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
+checksum = "842f3cd369c2ba38966204f983eaa5e54a8e84a7d7159ed36ade2b6c335aae64"
 dependencies = [
- "skrifa 0.37.0",
+ "skrifa 0.40.0",
  "yazi",
  "zeno",
 ]
@@ -4622,9 +4774,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4646,9 +4798,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.0.0+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
@@ -4662,28 +4814,28 @@ dependencies = [
  "indexmap",
  "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
- "winnow",
+ "winnow 0.7.15",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.25.4+spec-1.1.0"
+version = "0.25.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2"
+checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
 dependencies = [
  "indexmap",
- "toml_datetime 1.0.0+spec-1.1.0",
+ "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
- "winnow",
+ "winnow 1.0.2",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.9+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow",
+ "winnow 1.0.2",
 ]
 
 [[package]]
@@ -4743,9 +4895,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -4793,9 +4945,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typewit"
-version = "1.14.2"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c1ae7cc0fdb8b842d65d127cb981574b0d2b249b74d1c7a2986863dc134f71"
+checksum = "214ca0b2191785cbc06209b9ca1861e048e39b5ba33574b3cedd58363d5bb5f6"
 
 [[package]]
 name = "unicode-bidi"
@@ -4823,9 +4975,9 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-width"
@@ -4841,9 +4993,9 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "uuid"
-version = "1.22.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
  "getrandom 0.4.2",
  "js-sys",
@@ -4874,6 +5026,62 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
+[[package]]
+name = "vello"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72fef40773530322d5c2ffe3c1107e9874bd8239ac137d1c2b6c1edad695146e"
+dependencies = [
+ "bytemuck",
+ "futures-intrusive",
+ "log",
+ "peniko",
+ "png 0.17.16",
+ "skrifa 0.40.0",
+ "static_assertions",
+ "thiserror 2.0.18",
+ "vello_encoding",
+ "vello_shaders",
+ "wgpu",
+]
+
+[[package]]
+name = "vello_encoding"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24c91203ec4b483440614a9a5c7c2d991932af72c5349659a63ec49476f0b79c"
+dependencies = [
+ "bytemuck",
+ "guillotiere",
+ "peniko",
+ "skrifa 0.40.0",
+ "smallvec",
+]
+
+[[package]]
+name = "vello_shaders"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a765d44d4bd354146e44f9a860f4e92effd91a97302549be9e47f0a18d8128c"
+dependencies = [
+ "bytemuck",
+ "log",
+ "naga",
+ "thiserror 2.0.18",
+ "vello_encoding",
+]
+
+[[package]]
+name = "vello_winit_example"
+version = "0.3.0"
+dependencies = [
+ "motiongfx",
+ "peniko_motiongfx",
+ "pollster",
+ "vello",
+ "winit",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -4892,11 +5100,11 @@ dependencies = [
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -4905,14 +5113,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4923,23 +5131,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084"
 dependencies = [
- "cfg-if",
- "futures-util",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4947,9 +5151,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -4960,9 +5164,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
  "unicode-ident",
 ]
@@ -4995,7 +5199,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "hashbrown 0.15.5",
  "indexmap",
  "semver",
@@ -5003,9 +5207,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa75f400b7f719bcd68b3f47cd939ba654cedeef690f486db71331eec4c6a406"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
  "cc",
  "downcast-rs 1.2.1",
@@ -5017,11 +5221,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.13"
+version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab51d9f7c071abeee76007e2b742499e535148035bb835f97aaed1338cf516c3"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
@@ -5033,16 +5237,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.13"
+version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b3298683470fbdc6ca40151dfc48c8f2fd4c41a26e13042f801f85002384091"
+checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
 dependencies = [
  "rustix 1.1.4",
  "wayland-client",
@@ -5051,11 +5255,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.11"
+version = "0.32.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b23b5df31ceff1328f06ac607591d5ba360cf58f90c8fad4ac8d3a55a3c4aec7"
+checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -5063,11 +5267,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d392fc283a87774afc9beefcd6f931582bb97fe0e6ced0b306a62cb1d026527c"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5076,11 +5280,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78248e4cc0eff8163370ba5c158630dcae1f3497a586b826eca2ef5f348d6235"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5089,9 +5293,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.9"
+version = "0.31.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86287151a309799b821ca709b7345a048a2956af05957c89cb824ab919fa4e3"
+checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -5100,20 +5304,21 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.10"
+version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
 dependencies = [
  "dlib",
  "log",
+ "once_cell",
  "pkg-config",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.91"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5136,7 +5341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
 dependencies = [
  "arrayvec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "document-features",
@@ -5144,12 +5349,14 @@ dependencies = [
  "js-sys",
  "log",
  "naga",
+ "parking_lot",
  "portable-atomic",
  "profiling",
  "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
  "web-sys",
  "wgpu-core",
  "wgpu-hal",
@@ -5165,7 +5372,7 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "cfg_aliases",
  "document-features",
@@ -5182,6 +5389,7 @@ dependencies = [
  "smallvec",
  "thiserror 2.0.18",
  "wgpu-core-deps-apple",
+ "wgpu-core-deps-emscripten",
  "wgpu-core-deps-wasm",
  "wgpu-core-deps-windows-linux-android",
  "wgpu-hal",
@@ -5197,6 +5405,15 @@ dependencies = [
  "wgpu-hal",
 ]
 
+[[package]]
+name = "wgpu-core-deps-emscripten"
+version = "27.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5"
+dependencies = [
+ "wgpu-hal",
+]
+
 [[package]]
 name = "wgpu-core-deps-wasm"
 version = "27.0.0"
@@ -5225,7 +5442,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block",
  "bytemuck",
  "cfg-if",
@@ -5270,7 +5487,7 @@ version = "27.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "js-sys",
  "log",
@@ -5768,7 +5985,7 @@ dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
@@ -5820,6 +6037,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -5829,6 +6055,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -5878,7 +6110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "indexmap",
  "log",
  "serde",
@@ -5952,7 +6184,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "dlib",
  "log",
  "once_cell",
@@ -5985,18 +6217,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.40"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.40"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 0c0a181..dc745e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ repository = "https://github.com/voxell-tech/motiongfx"
 # motiongfx
 motiongfx = { version = "0.3.0", path = "crates/motiongfx" }
 bevy_motiongfx = { version = "0.3.0", path = "crates/bevy_motiongfx" }
+peniko_motiongfx = { version = "0.3.0", path = "crates/peniko_motiongfx" }
 
 # bevy
 bevy = { version = "0.18.1", default-features = false }
@@ -28,8 +29,12 @@ bevy_sprite = { version = "0.18.1", default-features = false }
 bevy_pbr = { version = "0.18.1", default-features = false }
 
 # other
-field_path = "0.3"
+field_path = "0.4.1"
 nonempty = { version = "0.12", default-features = false }
+peniko = { version = "0.6", default-features = false }
+vello = "0.7.0"
+winit = "0.30"
+pollster = "0.4"
 
 [workspace.lints.clippy]
 redundant_type_annotations = "warn"
diff --git a/crates/bevy_motiongfx/Cargo.toml b/crates/bevy_motiongfx/Cargo.toml
index 1abe34f..cd26a7a 100644
--- a/crates/bevy_motiongfx/Cargo.toml
+++ b/crates/bevy_motiongfx/Cargo.toml
@@ -34,7 +34,8 @@ bevy = { workspace = true, features = ["bevy_pbr"] }
 workspace = true
 
 [features]
-default = ["asset", "transform", "color", "sprite", "pbr"]
+default = ["std", "asset", "transform", "color", "sprite", "pbr"]
+std = ["motiongfx/std", "bevy_ecs/std", "bevy_app/std", "bevy_platform/std", "bevy_time/std"]
 asset = ["dep:bevy_asset"]
 transform = ["dep:bevy_transform"]
 color = ["dep:bevy_color"]
diff --git a/crates/bevy_motiongfx/README.md b/crates/bevy_motiongfx/README.md
index 0fb085d..56a373c 100644
--- a/crates/bevy_motiongfx/README.md
+++ b/crates/bevy_motiongfx/README.md
@@ -40,7 +40,7 @@ use bevy_motiongfx::prelude::*;
 
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
 ) {
     // Spawn the Entity.
     let entity = commands
@@ -48,9 +48,9 @@ fn build_timeline(
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     let track = b
-        .act_interp(entity, field!(<Transform>::translation::x), |x| {
+        .act(entity, path!(<Transform>::translation::x), |x| {
             x + 6.0
         })
         .play(1.0)
@@ -72,7 +72,7 @@ use bevy_motiongfx::prelude::*;
 
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut materials: ResMut<Assets<StandardMaterial>>
 ) {
     // Create the asset.
@@ -82,12 +82,12 @@ fn build_timeline(
     commands.spawn(MeshMaterial3d(material.clone()));
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     let track = b
-        .act_interp(
+        .act(
           // AssetIds must be type-erased.
           material.untyped().id(),
-          field!(<StandardMaterial>::base_color),
+          path!(<StandardMaterial>::base_color),
           |_| Srgba::RED.into(),
         )
         .play(1.0)
@@ -112,10 +112,10 @@ use bevy_motiongfx::prelude::*;
 
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
 ) {
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     // Add tracks here...
     let timeline = b.compile();
 
diff --git a/crates/bevy_motiongfx/src/controller.rs b/crates/bevy_motiongfx/src/controller.rs
index 8b09b3e..50fe4a0 100644
--- a/crates/bevy_motiongfx/src/controller.rs
+++ b/crates/bevy_motiongfx/src/controller.rs
@@ -3,7 +3,7 @@ use bevy_ecs::prelude::*;
 use bevy_time::prelude::*;
 
 use crate::MotionGfxSet;
-use crate::world::{MotionGfxWorld, TimelineId};
+use crate::manager::{MotionGfxManager, TimelineId};
 
 pub struct ControllerPlugin;
 
@@ -18,7 +18,7 @@ impl Plugin for ControllerPlugin {
 }
 
 fn realtime_player_timing(
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     q_timelines: Query<(&TimelineId, &RealtimePlayer)>,
     time: Res<Time>,
 ) {
@@ -35,7 +35,7 @@ fn realtime_player_timing(
 }
 
 fn fixed_rate_player_timing(
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut q_timelines: Query<(&TimelineId, &mut FixedRatePlayer)>,
 ) {
     for (id, mut player) in
diff --git a/crates/bevy_motiongfx/src/interpolation.rs b/crates/bevy_motiongfx/src/interpolation.rs
index 33daed3..8b2301c 100644
--- a/crates/bevy_motiongfx/src/interpolation.rs
+++ b/crates/bevy_motiongfx/src/interpolation.rs
@@ -1,60 +1,16 @@
 use bevy_math::*;
+use motiongfx::impl_float_interpolation;
 use motiongfx::prelude::*;
-use motiongfx::subject::SubjectId;
 
-pub trait ActionInterpTimelineExt {
-    fn act_interp<I, S, T>(
-        &mut self,
-        target: I,
-        field: Field<S, T>,
-        action: impl Action<T>,
-    ) -> InterpActionBuilder<'_, T>
-    where
-        I: SubjectId,
-        S: 'static,
-        T: Interpolation + ThreadSafe;
-}
-
-impl ActionInterpTimelineExt for TimelineBuilder {
-    /// Add an [`Action`] with interpolation using
-    /// [`Interpolation::interp`].
-    fn act_interp<I, S, T>(
-        &mut self,
-        target: I,
-        field: Field<S, T>,
-        action: impl Action<T>,
-    ) -> InterpActionBuilder<'_, T>
-    where
-        I: SubjectId,
-        S: 'static,
-        T: Interpolation + ThreadSafe,
-    {
-        self.act(target, field, action).with_interp(T::interp)
-    }
-}
-
-/// Trait for interpolating between 2 values based on a f32 `t` value.
-pub trait Interpolation<T = Self, U = Self> {
-    /// Linearly interpolate between 2 values based on a f32 `t` value.
-    fn interp(a: &Self, b: &T, t: f32) -> U;
-}
-
-#[macro_export]
-macro_rules! impl_float_interpolation {
-    ($ty:ty, $base:ty) => {
-        impl $crate::interpolation::Interpolation for $ty {
-            #[inline]
-            fn interp(a: &Self, b: &Self, t: f32) -> Self {
-                let t = <$base>::from(t);
-                (*a) * (1.0 - t) + (*b) * t
-            }
-        }
-    };
-}
+pub struct Bevy;
 
 macro_rules! impl_slerp_interpolation {
     ($ty: ty, $base: ty) => {
-        impl $crate::interpolation::Interpolation for $ty {
+        impl
+            ::motiongfx::interpolation::Interpolation<
+                $crate::interpolation::Bevy,
+            > for $ty
+        {
             #[inline]
             fn interp(a: &Self, b: &Self, t: f32) -> Self {
                 let t = <$base>::from(t);
@@ -64,16 +20,14 @@ macro_rules! impl_slerp_interpolation {
     };
 }
 
-impl_float_interpolation!(f32, f32);
-impl_float_interpolation!(Vec2, f32);
-impl_float_interpolation!(Vec3, f32);
-impl_float_interpolation!(Vec3A, f32);
-impl_float_interpolation!(Vec4, f32);
+impl_float_interpolation!(Vec2, f32, Bevy);
+impl_float_interpolation!(Vec3, f32, Bevy);
+impl_float_interpolation!(Vec3A, f32, Bevy);
+impl_float_interpolation!(Vec4, f32, Bevy);
 
-impl_float_interpolation!(f64, f64);
-impl_float_interpolation!(DVec2, f64);
-impl_float_interpolation!(DVec3, f64);
-impl_float_interpolation!(DVec4, f64);
+impl_float_interpolation!(DVec2, f64, Bevy);
+impl_float_interpolation!(DVec3, f64, Bevy);
+impl_float_interpolation!(DVec4, f64, Bevy);
 
 impl_slerp_interpolation!(Quat, f32);
 impl_slerp_interpolation!(DQuat, f64);
@@ -82,7 +36,7 @@ impl_slerp_interpolation!(Dir2, f32);
 impl_slerp_interpolation!(Dir3, f32);
 impl_slerp_interpolation!(Dir3A, f32);
 
-impl Interpolation for u8 {
+impl Interpolation<Bevy> for u8 {
     fn interp(a: &Self, b: &Self, t: f32) -> Self {
         let a = *a as f32;
         let b = *b as f32;
@@ -95,11 +49,11 @@ impl Interpolation for u8 {
 pub mod color {
     use bevy_color::prelude::*;
 
-    use super::Interpolation;
+    use super::*;
 
     macro_rules! impl_color_interpolation {
         ($ty:ty) => {
-            impl $crate::interpolation::Interpolation for $ty {
+            impl Interpolation<$crate::interpolation::Bevy> for $ty {
                 #[inline]
                 fn interp(a: &Self, b: &Self, t: f32) -> Self {
                     (*a) * (1.0 - t) + (*b) * t
@@ -114,7 +68,7 @@ pub mod color {
     impl_color_interpolation!(Srgba);
     impl_color_interpolation!(Xyza);
 
-    impl Interpolation for Color {
+    impl Interpolation<Bevy> for Color {
         #[inline]
         fn interp(a: &Self, b: &Self, t: f32) -> Self {
             Color::mix(a, b, t)
@@ -126,9 +80,9 @@ pub mod color {
 pub mod transform {
     use bevy_transform::components::Transform;
 
-    use super::Interpolation;
+    use super::*;
 
-    impl Interpolation for Transform {
+    impl Interpolation<Bevy> for Transform {
         fn interp(a: &Self, b: &Self, t: f32) -> Self {
             Self {
                 translation: Interpolation::interp(
diff --git a/crates/bevy_motiongfx/src/lib.rs b/crates/bevy_motiongfx/src/lib.rs
index ae319f8..388ec39 100644
--- a/crates/bevy_motiongfx/src/lib.rs
+++ b/crates/bevy_motiongfx/src/lib.rs
@@ -5,27 +5,19 @@ use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 
 use crate::controller::ControllerPlugin;
-use crate::world::MotionGfxWorldPlugin;
+use crate::manager::MotionGfxManagerPlugin;
 
 pub mod controller;
 pub mod interpolation;
-pub mod pipeline;
-pub mod registry;
+pub mod manager;
 pub mod world;
 
 pub mod prelude {
     pub use motiongfx::prelude::*;
 
     pub use crate::controller::{FixedRatePlayer, RealtimePlayer};
-    pub use crate::interpolation::{
-        ActionInterpTimelineExt, Interpolation,
-    };
-    pub use crate::pipeline::{
-        PipelineRegistryExt, WorldPipeline, WorldPipelineRegistry,
-    };
-    pub use crate::register_fields;
-    pub use crate::registry::FieldPathRegisterAppExt;
-    pub use crate::world::{MotionGfxWorld, TimelineId};
+    pub use crate::manager::{MotionGfxManager, TimelineId};
+    pub use crate::world::{BevyTimeline, BevyTimelineBuilder};
 }
 
 pub use motiongfx;
@@ -47,66 +39,7 @@ impl Plugin for BevyMotionGfxPlugin {
             )
                 .chain(),
         );
-        app.add_plugins((MotionGfxWorldPlugin, ControllerPlugin));
-
-        #[cfg(feature = "transform")]
-        {
-            use bevy_transform::components::Transform;
-
-            register_fields!(
-                app.register_component_field(),
-                Transform,
-                (
-                    translation(x, y, z),
-                    scale(x, y, z),
-                    rotation(x, y, z, w),
-                )
-            );
-        }
-
-        #[cfg(feature = "sprite")]
-        {
-            use bevy_sprite::prelude::*;
-
-            register_fields!(
-                app.register_component_field(),
-                Sprite,
-                (
-                    image,
-                    texture_atlas,
-                    color,
-                    flip_x,
-                    flip_y,
-                    custom_size,
-                    rect,
-                    image_mode,
-                )
-            );
-        }
-
-        #[cfg(feature = "pbr")]
-        {
-            use bevy_pbr::prelude::*;
-
-            register_fields!(
-                app.register_asset_field(),
-                StandardMaterial,
-                (
-                    base_color,
-                    emissive,
-                    perceptual_roughness,
-                    metallic,
-                    reflectance,
-                    specular_tint,
-                    diffuse_transmission,
-                    specular_transmission,
-                    thickness,
-                    ior,
-                    attenuation_distance,
-                    attenuation_color,
-                )
-            );
-        }
+        app.add_plugins((MotionGfxManagerPlugin, ControllerPlugin));
     }
 }
 
diff --git a/crates/bevy_motiongfx/src/manager.rs b/crates/bevy_motiongfx/src/manager.rs
new file mode 100644
index 0000000..aee0f02
--- /dev/null
+++ b/crates/bevy_motiongfx/src/manager.rs
@@ -0,0 +1,206 @@
+use core::ops::{Deref, DerefMut};
+
+use bevy_app::prelude::*;
+use bevy_ecs::prelude::*;
+use bevy_platform::collections::HashMap;
+use motiongfx::prelude::*;
+
+use crate::MotionGfxSet;
+use crate::controller::FixedRatePlayer;
+use crate::controller::RealtimePlayer;
+use crate::prelude::BevyTimelineBuilder;
+use crate::world::{BevyTimeline, BevyWorld};
+
+pub struct MotionGfxManagerPlugin;
+
+impl Plugin for MotionGfxManagerPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<MotionGfxManager>().add_systems(
+            PostUpdate,
+            (
+                sample_timelines.in_set(MotionGfxSet::Sample),
+                (
+                    complete_timelines::<RealtimePlayer>,
+                    complete_timelines::<FixedRatePlayer>,
+                )
+                    .after(MotionGfxSet::Sample),
+            ),
+        );
+    }
+}
+
+// TODO: Optimize samplers into parallel operations.
+// This could be deferred into motiongfx::pipeline?
+// See also https://github.com/voxell-tech/motiongfx/issues/72
+
+/// # Panics
+///
+/// Panics if the [`Timeline`] component is sampling itself.
+fn sample_timelines(world: &mut World) {
+    world.try_resource_scope::<MotionGfxManager, _>(
+        |world, mut motiongfx| {
+            motiongfx.load_pending_timelines(world);
+            motiongfx.sample_timelines(world);
+        },
+    );
+}
+
+/// A unique Id for a [`Timeline`].
+#[derive(Component, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct TimelineId(u64);
+
+/// Signal for complete timelines
+#[derive(Component)]
+pub struct TimelineComplete;
+
+#[allow(clippy::type_complexity)]
+fn complete_timelines<T>(
+    mut commands: Commands,
+    motiongfx: Res<MotionGfxManager>,
+    timelines: Query<
+        (Entity, &TimelineId),
+        (With<T>, Without<TimelineComplete>),
+    >,
+) where
+    T: Component,
+{
+    for (entity, timeline) in timelines.iter() {
+        if motiongfx
+            .get_timeline(timeline)
+            .is_some_and(|t| t.is_complete())
+        {
+            commands.entity(entity).insert(TimelineComplete);
+        }
+    }
+}
+
+/// Resources that the [`motiongfx`] framework operates on.
+#[derive(Resource)]
+pub struct MotionGfxManager {
+    id: TimelineId,
+    pending_timelines: HashMap<TimelineId, MutDetect<BevyTimeline>>,
+    timelines: HashMap<TimelineId, MutDetect<BevyTimeline>>,
+    registry: Registry,
+}
+
+impl Default for MotionGfxManager {
+    fn default() -> Self {
+        Self {
+            id: TimelineId(0),
+            pending_timelines: Default::default(),
+            timelines: Default::default(),
+            registry: Default::default(),
+        }
+    }
+}
+
+impl MotionGfxManager {
+    pub fn create_builder(&mut self) -> BevyTimelineBuilder<'_> {
+        TimelineBuilder::new(&mut self.registry)
+    }
+
+    pub fn add_timeline(
+        &mut self,
+        timeline: BevyTimeline,
+    ) -> TimelineId {
+        let id = self.id;
+        self.pending_timelines.insert(id, MutDetect::new(timeline));
+
+        self.id.0 = self.id.0.wrapping_add(1);
+        id
+    }
+
+    pub fn remove_timeline(
+        &mut self,
+        id: &TimelineId,
+    ) -> Option<BevyTimeline> {
+        self.timelines
+            .remove(id)
+            .or_else(|| self.pending_timelines.remove(id))
+            .map(|t| t.take())
+    }
+
+    pub fn get_timeline(
+        &self,
+        id: &TimelineId,
+    ) -> Option<&BevyTimeline> {
+        self.timelines
+            .get(id)
+            .or_else(|| self.pending_timelines.get(id))
+            .map(|t| &**t)
+    }
+
+    pub fn get_timeline_mut(
+        &mut self,
+        id: &TimelineId,
+    ) -> Option<&mut MutDetect<BevyTimeline>> {
+        self.timelines
+            .get_mut(id)
+            .or_else(|| self.pending_timelines.get_mut(id))
+    }
+
+    pub fn load_pending_timelines(&mut self, world: &World) {
+        for (id, mut timeline) in self.pending_timelines.drain() {
+            timeline.bake_actions(
+                &self.registry,
+                BevyWorld::from_ref(world),
+            );
+            self.timelines.insert(id, timeline);
+        }
+    }
+
+    pub fn sample_timelines(&mut self, world: &mut World) {
+        for timeline in
+            self.timelines.values_mut().filter(|t| t.mutated())
+        {
+            timeline.queue_actions();
+            timeline.sample_queued_actions(
+                &self.registry,
+                BevyWorld::from_mut(world),
+            );
+            timeline.reset();
+        }
+    }
+}
+
+pub struct MutDetect<T> {
+    inner: T,
+    mutated: bool,
+}
+
+impl<T> MutDetect<T> {
+    pub fn new(inner: T) -> Self {
+        Self {
+            inner,
+            mutated: false,
+        }
+    }
+
+    pub fn mutated(&self) -> bool {
+        self.mutated
+    }
+
+    /// Reset mutation detection flag to `false`.
+    pub fn reset(&mut self) {
+        self.mutated = false
+    }
+
+    pub fn take(self) -> T {
+        self.inner
+    }
+}
+
+impl<T> Deref for MutDetect<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<T> DerefMut for MutDetect<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.mutated = true;
+        &mut self.inner
+    }
+}
diff --git a/crates/bevy_motiongfx/src/pipeline.rs b/crates/bevy_motiongfx/src/pipeline.rs
deleted file mode 100644
index 2fb1b7f..0000000
--- a/crates/bevy_motiongfx/src/pipeline.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use bevy_ecs::component::Mutable;
-use bevy_ecs::prelude::*;
-use motiongfx::prelude::*;
-
-pub type WorldPipelineRegistry = PipelineRegistry<World>;
-pub type WorldPipeline = Pipeline<World>;
-
-pub fn bake_component_actions<S, T>(world: &World, ctx: BakeCtx)
-where
-    S: Component,
-    T: Clone + ThreadSafe,
-{
-    ctx.bake::<Entity, S, T>(|entity| world.get::<S>(entity));
-}
-
-pub fn sample_component_actions<S, T>(
-    world: &mut World,
-    ctx: SampleCtx,
-) where
-    S: Component<Mutability = Mutable>,
-    T: Clone + ThreadSafe,
-{
-    ctx.sample::<Entity, S, T>(|entity, target, accessor| {
-        if let Some(mut source) = world.get_mut::<S>(entity) {
-            *accessor.get_mut(&mut source) = target;
-        }
-    });
-}
-
-#[cfg(feature = "asset")]
-pub fn bake_asset_actions<S, T>(world: &World, ctx: BakeCtx)
-where
-    S: bevy_asset::Asset,
-    T: Clone + ThreadSafe,
-{
-    use bevy_asset::Assets;
-    use bevy_asset::UntypedAssetId;
-
-    let Some(assets) = world.get_resource::<Assets<S>>() else {
-        return;
-    };
-
-    ctx.bake::<UntypedAssetId, S, T>(|asset_id| {
-        assets.get(asset_id.typed::<S>())
-    });
-}
-
-#[cfg(feature = "asset")]
-pub fn sample_asset_actions<S, T>(world: &mut World, ctx: SampleCtx)
-where
-    S: bevy_asset::Asset,
-    T: Clone + ThreadSafe,
-{
-    use bevy_asset::Assets;
-    use bevy_asset::UntypedAssetId;
-
-    let Some(mut assets) = world.get_resource_mut::<Assets<S>>()
-    else {
-        return;
-    };
-
-    ctx.sample::<UntypedAssetId, S, T>(
-        |asset_id, target, accessor| {
-            if let Some(source) =
-                assets.get_mut(asset_id.typed::<S>())
-            {
-                *accessor.get_mut(source) = target;
-            }
-        },
-    );
-}
-
-pub trait PipelineRegistryExt {
-    fn register_component<S, T>(&mut self) -> PipelineKey
-    where
-        S: Component<Mutability = Mutable>,
-        T: Clone + ThreadSafe;
-
-    #[cfg(feature = "asset")]
-    fn register_asset<S, T>(&mut self) -> PipelineKey
-    where
-        S: bevy_asset::Asset,
-        T: Clone + ThreadSafe;
-}
-
-impl PipelineRegistryExt for WorldPipelineRegistry {
-    fn register_component<S, T>(&mut self) -> PipelineKey
-    where
-        S: Component<Mutability = Mutable>,
-        T: Clone + ThreadSafe,
-    {
-        let key = PipelineKey::new::<Entity, S, T>();
-
-        self.register_unchecked(
-            key,
-            WorldPipeline::new(
-                bake_component_actions::<S, T>,
-                sample_component_actions::<S, T>,
-            ),
-        );
-
-        key
-    }
-
-    #[cfg(feature = "asset")]
-    fn register_asset<S, T>(&mut self) -> PipelineKey
-    where
-        S: bevy_asset::Asset,
-        T: Clone + ThreadSafe,
-    {
-        use bevy_asset::UntypedAssetId;
-
-        let key = PipelineKey::new::<UntypedAssetId, S, T>();
-
-        self.register_unchecked(
-            key,
-            WorldPipeline::new(
-                bake_asset_actions::<S, T>,
-                sample_asset_actions::<S, T>,
-            ),
-        );
-
-        key
-    }
-}
diff --git a/crates/bevy_motiongfx/src/registry.rs b/crates/bevy_motiongfx/src/registry.rs
deleted file mode 100644
index 156bdbc..0000000
--- a/crates/bevy_motiongfx/src/registry.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use bevy_app::prelude::*;
-use bevy_ecs::component::Mutable;
-use bevy_ecs::prelude::*;
-use motiongfx::prelude::*;
-
-use crate::pipeline::PipelineRegistryExt;
-use crate::world::MotionGfxWorld;
-
-// TODO: Move purely the recursive logic back to motiongfx and keep
-// the registration logic here.
-
-/// Recursively register fields.
-///
-/// # Example
-///
-/// ```
-/// use bevy_ecs::entity::Entity;
-/// use bevy_app::App;
-/// use bevy_ecs::component::Component;
-/// use bevy_motiongfx::BevyMotionGfxPlugin;
-/// use bevy_motiongfx::prelude::*;
-///
-/// #[derive(Component, Default, Clone)]
-/// struct Foo {
-///     bar_x: Bar,
-///     bar_y: Bar,
-/// }
-///
-/// #[derive(Clone, Default)]
-/// struct Bar {
-///     cho_a: Cho,
-///     cho_b: Cho,
-/// }
-///
-/// #[derive(Clone, Default)]
-/// struct Cho {
-///     bo_c: Bo,
-///     bo_d: Bo,
-/// }
-///
-/// #[derive(Clone, Default)]
-/// struct Bo(f32, u32);
-///
-/// let mut app = App::new();
-/// app.add_plugins(BevyMotionGfxPlugin);
-///
-/// let a = &mut app;
-/// register_fields!(
-///     a.register_component_field(),
-///     Foo,
-///     (
-///         bar_x(cho_a(bo_c(0, 1), bo_d(0, 1))),
-///         bar_y(cho_b(bo_c(0, 1), bo_d(0, 1))),
-///     )
-/// );
-///
-/// let motiongfx = app.world().resource::<MotionGfxWorld>();
-///
-/// // Get accessor from the registry.
-/// let key = field!(<Foo>::bar_x::cho_a::bo_c::0).untyped();
-/// let accessor =
-///     motiongfx.accessor_registry.get::<Foo, f32>(&key).unwrap();
-///
-/// let mut foo = Foo::default();
-///
-/// assert_eq!(accessor.get_ref(&foo), &foo.bar_x.cho_a.bo_c.0,);
-///
-/// *accessor.get_mut(&mut foo) = 2.0;
-/// assert_eq!(accessor.get_ref(&foo), &2.0);
-///
-/// // Get pipeline from the registry.
-/// let key = PipelineKey::new::<Entity, Foo, f32>();
-/// let pipeline = motiongfx.pipeline_registry.get(&key).unwrap();
-/// ```
-#[macro_export]
-macro_rules! register_fields {
-    (
-        $app:ident.$reg_func:ident(),
-        $root:ty $(, $($rest:tt)*)?
-    ) => {
-        register_fields!(
-            $app.$reg_func::<$root>(),
-            $root $(, $($rest)*)?
-        )
-    };
-
-    (
-        $app:ident.$reg_func:ident::<$source:ty>(),
-        $root:ty $(, $($rest:tt)*)?
-    ) => {
-        $crate::registry::FieldPathRegisterAppExt
-        ::$reg_func::<$source, _>(
-            $app,
-            ::motiongfx::field_path::field!(<$root>),
-            ::motiongfx::field_path::accessor!(<$root>),
-        );
-
-        register_fields!(
-            @fields $app.$reg_func::<$source>, $root, []
-            $(, $($rest)*)?
-        );
-    };
-
-    // Recursively register all the nested fields!
-    (
-        @fields $app:ident.$reg_func:ident::<$source:ty>,
-        $root:ty, [$(::$path:tt)*],
-        (
-            $field:tt $(( $($sub_field:tt)+ ))?
-            $(,$($rest:tt)*)?
-        )
-    ) => {
-        // Register the current field.
-        // (translation(x, y, z), rotation, scale) => translation
-        $crate::registry::FieldPathRegisterAppExt
-        ::$reg_func::<$source, _>(
-            $app,
-            motiongfx::field_path::field!(<$root>$(::$path)*::$field),
-            ::motiongfx::field_path::accessor!(<$root>$(::$path)*::$field),
-        );
-
-        // Register sub fields.
-        // (translation(x, y, z), rotation, scale) => (x, y, z)
-        register_fields!(
-            @fields $app.$reg_func::<$source>,
-            $root, [$(::$path)*::$field],
-            $(( $($sub_field)+ ))?
-        );
-
-        // Register the rest of the fields.
-        // (translation(x, y, z), rotation, scale) => (rotation, scale)
-        register_fields!(
-            @fields $app.$reg_func::<$source>,
-            $root, [$(::$path)*],
-            $(( $($rest)* ))?
-        );
-    };
-
-    // There are no fields left!
-    (
-        @fields $app:ident.$reg_func:ident::<$source:ty>,
-        $root:ty, [$(::$path:tt)*]
-        $(,)? $(,())?
-    ) => {};
-}
-
-pub trait FieldPathRegisterAppExt {
-    fn register_component_field<S, T>(
-        &mut self,
-        field: Field<S, T>,
-        accessor: Accessor<S, T>,
-    ) -> &mut Self
-    where
-        S: Component<Mutability = Mutable>,
-        T: Clone + ThreadSafe;
-
-    #[cfg(feature = "asset")]
-    fn register_asset_field<S, T>(
-        &mut self,
-        field: Field<S, T>,
-        accessor: Accessor<S, T>,
-    ) -> &mut Self
-    where
-        S: bevy_asset::Asset,
-        T: Clone + ThreadSafe;
-}
-
-impl FieldPathRegisterAppExt for App {
-    fn register_component_field<S, T>(
-        &mut self,
-        field: Field<S, T>,
-        accessor: Accessor<S, T>,
-    ) -> &mut Self
-    where
-        S: Component<Mutability = Mutable>,
-        T: Clone + ThreadSafe,
-    {
-        let mut motiongfx =
-            self.world_mut().resource_mut::<MotionGfxWorld>();
-
-        motiongfx
-            .accessor_registry
-            .register(field.untyped(), accessor);
-        motiongfx.pipeline_registry.register_component::<S, T>();
-
-        self
-    }
-
-    #[cfg(feature = "asset")]
-    fn register_asset_field<S, T>(
-        &mut self,
-        field: Field<S, T>,
-        accessor: Accessor<S, T>,
-    ) -> &mut Self
-    where
-        S: bevy_asset::Asset,
-        T: Clone + ThreadSafe,
-    {
-        let mut motiongfx =
-            self.world_mut().resource_mut::<MotionGfxWorld>();
-
-        motiongfx
-            .accessor_registry
-            .register(field.untyped(), accessor);
-        motiongfx.pipeline_registry.register_asset::<S, T>();
-
-        self
-    }
-}
diff --git a/crates/bevy_motiongfx/src/world.rs b/crates/bevy_motiongfx/src/world.rs
index cbec5a7..30888f4 100644
--- a/crates/bevy_motiongfx/src/world.rs
+++ b/crates/bevy_motiongfx/src/world.rs
@@ -1,199 +1,65 @@
-use core::ops::{Deref, DerefMut};
-
-use bevy_app::prelude::*;
+use bevy_ecs::component::Mutable;
 use bevy_ecs::prelude::*;
-use bevy_platform::collections::HashMap;
-use motiongfx::prelude::{FieldAccessorRegistry, Timeline};
-
-use crate::MotionGfxSet;
-use crate::controller::FixedRatePlayer;
-use crate::pipeline::WorldPipelineRegistry;
-use crate::prelude::RealtimePlayer;
-
-pub struct MotionGfxWorldPlugin;
-
-impl Plugin for MotionGfxWorldPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<MotionGfxWorld>().add_systems(
-            PostUpdate,
-            (
-                sample_timelines.in_set(MotionGfxSet::Sample),
-                (
-                    complete_timelines::<RealtimePlayer>,
-                    complete_timelines::<FixedRatePlayer>,
-                )
-                    .after(MotionGfxSet::Sample),
-            ),
-        );
-    }
-}
-
-// TODO: Optimize samplers into parallel operations.
-// This could be deferred into motiongfx::pipeline?
-// See also https://github.com/voxell-tech/motiongfx/issues/72
-
-/// # Panics
-///
-/// Panics if the [`Timeline`] component is sampling itself.
-fn sample_timelines(world: &mut World) {
-    world.try_resource_scope::<MotionGfxWorld, _>(
-        |world, mut motiongfx| {
-            motiongfx.load_pending_timelines(world);
-            motiongfx.sample_timelines(world);
-        },
-    );
-}
-
-/// A unique Id for a [`Timeline`].
-#[derive(Component, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct TimelineId(u64);
+use motiongfx::prelude::*;
 
-/// Signal for complete timelines
-#[derive(Component)]
-pub struct TimelineComplete;
+/// Newtype wrapper around [`World`] that is local to this crate,
+/// allowing [`SubjectSource`] impls without violating the orphan rule.
+#[repr(transparent)]
+pub struct BevyWorld(pub World);
 
-#[allow(clippy::type_complexity)]
-fn complete_timelines<T>(
-    mut commands: Commands,
-    motiongfx: Res<MotionGfxWorld>,
-    timelines: Query<
-        (Entity, &TimelineId),
-        (With<T>, Without<TimelineComplete>),
-    >,
-) where
-    T: Component,
-{
-    for (entity, timeline) in timelines.iter() {
-        if motiongfx
-            .get_timeline(timeline)
-            .is_some_and(|t| t.is_complete())
-        {
-            commands.entity(entity).insert(TimelineComplete);
-        }
+impl BevyWorld {
+    pub fn from_ref(world: &World) -> &Self {
+        // SAFETY: `BevyWorld` is repr(transparent) over `World`.
+        unsafe { &*(world as *const World as *const Self) }
     }
-}
 
-/// Resources that the [`motiongfx`] framework operates on.
-#[derive(Resource)]
-pub struct MotionGfxWorld {
-    id: TimelineId,
-    pending_timelines: HashMap<TimelineId, MutDetect<Timeline>>,
-    timelines: HashMap<TimelineId, MutDetect<Timeline>>,
-    pub pipeline_registry: WorldPipelineRegistry,
-    pub accessor_registry: FieldAccessorRegistry,
-}
-
-impl Default for MotionGfxWorld {
-    fn default() -> Self {
-        Self {
-            id: TimelineId(0),
-            pending_timelines: Default::default(),
-            timelines: Default::default(),
-            pipeline_registry: Default::default(),
-            accessor_registry: Default::default(),
-        }
+    pub fn from_mut(world: &mut World) -> &mut Self {
+        // SAFETY: `BevyWorld` is repr(transparent) over `World`.
+        unsafe { &mut *(world as *mut World as *mut Self) }
     }
 }
 
-impl MotionGfxWorld {
-    pub fn add_timeline(&mut self, timeline: Timeline) -> TimelineId {
-        let id = self.id;
-        self.pending_timelines.insert(id, MutDetect::new(timeline));
-
-        self.id.0 = self.id.0.wrapping_add(1);
-        id
-    }
-
-    pub fn remove_timeline(
-        &mut self,
-        id: &TimelineId,
-    ) -> Option<Timeline> {
-        self.timelines
-            .remove(id)
-            .or_else(|| self.pending_timelines.remove(id))
-            .map(|t| t.take())
-    }
-
-    pub fn get_timeline(&self, id: &TimelineId) -> Option<&Timeline> {
-        self.timelines
-            .get(id)
-            .or_else(|| self.pending_timelines.get(id))
-            .map(|t| &**t)
+impl<S: Component<Mutability = Mutable>> SubjectSource<Entity, S>
+    for BevyWorld
+{
+    fn get_source(&self, id: Entity) -> Option<&S> {
+        self.0.get::<S>(id)
     }
 
-    pub fn get_timeline_mut(
+    fn apply_source<R>(
         &mut self,
-        id: &TimelineId,
-    ) -> Option<&mut MutDetect<Timeline>> {
-        self.timelines
-            .get_mut(id)
-            .or_else(|| self.pending_timelines.get_mut(id))
-    }
-
-    pub fn load_pending_timelines(&mut self, world: &mut World) {
-        for (id, mut timeline) in self.pending_timelines.drain() {
-            timeline.bake_actions(
-                &self.accessor_registry,
-                &self.pipeline_registry,
-                world,
-            );
-            self.timelines.insert(id, timeline);
-        }
-    }
-
-    pub fn sample_timelines(&mut self, world: &mut World) {
-        for timeline in
-            self.timelines.values_mut().filter(|t| t.mutated())
-        {
-            timeline.queue_actions();
-            timeline.sample_queued_actions(
-                &self.accessor_registry,
-                &self.pipeline_registry,
-                world,
-            );
-            timeline.reset();
-        }
+        id: Entity,
+        f: impl FnOnce(&mut S) -> R,
+    ) -> Option<R> {
+        self.0.get_mut::<S>(id).map(|mut m| f(m.as_mut()))
     }
 }
 
-pub struct MutDetect<T> {
-    inner: T,
-    mutated: bool,
-}
-
-impl<T> MutDetect<T> {
-    pub fn new(inner: T) -> Self {
-        Self {
-            inner,
-            mutated: false,
-        }
-    }
-
-    pub fn mutated(&self) -> bool {
-        self.mutated
-    }
-
-    /// Reset mutation detection flag to `false`.
-    pub fn reset(&mut self) {
-        self.mutated = false
-    }
-
-    pub fn take(self) -> T {
-        self.inner
+#[cfg(feature = "asset")]
+impl<S: bevy_asset::Asset>
+    SubjectSource<bevy_asset::UntypedAssetId, S> for BevyWorld
+{
+    fn get_source(
+        &self,
+        id: bevy_asset::UntypedAssetId,
+    ) -> Option<&S> {
+        self.0
+            .get_resource::<bevy_asset::Assets<S>>()?
+            .get(id.typed::<S>())
     }
-}
 
-impl<T> Deref for MutDetect<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
+    fn apply_source<R>(
+        &mut self,
+        id: bevy_asset::UntypedAssetId,
+        f: impl FnOnce(&mut S) -> R,
+    ) -> Option<R> {
+        self.0
+            .get_resource_mut::<bevy_asset::Assets<S>>()?
+            .into_inner()
+            .get_mut(id.typed::<S>())
+            .map(f)
     }
 }
 
-impl<T> DerefMut for MutDetect<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.mutated = true;
-        &mut self.inner
-    }
-}
+pub type BevyTimeline = Timeline<BevyWorld>;
+pub type BevyTimelineBuilder<'a> = TimelineBuilder<'a, BevyWorld>;
diff --git a/crates/motiongfx/Cargo.toml b/crates/motiongfx/Cargo.toml
index df37f75..51cea18 100644
--- a/crates/motiongfx/Cargo.toml
+++ b/crates/motiongfx/Cargo.toml
@@ -22,3 +22,7 @@ nonempty = { workspace = true }
 
 [lints]
 workspace = true
+
+[features]
+default = ["std"]
+std = ["bevy_ecs/std", "bevy_platform/std", "bevy_math/std"]
diff --git a/crates/motiongfx/README.md b/crates/motiongfx/README.md
index 63b88e5..2af8b40 100644
--- a/crates/motiongfx/README.md
+++ b/crates/motiongfx/README.md
@@ -1,382 +1,298 @@
-# MotionGfx
-
-[![License](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](https://github.com/voxell-tech/motiongfx#license)
-[![Crates.io](https://img.shields.io/crates/v/motiongfx.svg)](https://crates.io/crates/motiongfx)
-[![Downloads](https://img.shields.io/crates/d/motiongfx.svg)](https://crates.io/crates/motiongfx)
-[![Docs](https://docs.rs/motiongfx/badge.svg)](https://docs.rs/motiongfx/latest/motiongfx/)
-[![CI](https://github.com/voxell-tech/motiongfx/workflows/CI/badge.svg)](https://github.com/voxell-tech/motiongfx/actions)
-[![Discord](https://img.shields.io/discord/442334985471655946.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/Mhnyp6VYEQ)
-
-**MotionGfx** is a backend-agnostic motion graphics framework
-built on top of [Bevy](https://bevyengine.org) ECS. It provides a
-modular foundation for procedural animations.
-
-## Key Features
-
-- **Backend agnostic**: Works with any rendering backend.
-- **Procedural**: Write animations with code - loops, functions,
-  logic.
-- **Type-erased**: Powered by
-  [Field Path](https://github.com/voxell-tech/field_path), allowing
-  runtime-flexible animation of arbitrary data.
-- **Two-way playback**: Play animations both forward and backward with
-  no extra computation.
-- **Batteries included**: Packed with common easing and interpolation
-  functions.
-
-## Core Concepts
-
-### Timeline
-
-`Timeline` is a top-level structure that coordinates a sequence of
-tracks and their associated actions. Each track acts like a
-checkpoint, allowing animations to be grouped into discrete blocks
-(especially useful for creating slides).
-
-A `Track` represents sequences of actions in chronological order, each
-with a defined start time and duration. Tracks ensure that actions
-within them are played in the correct temporal order.
-
-```rust
-use motiongfx::prelude::*;
-
-// `Timeline` can only be created via a `TimelineBuilder`.
-let mut b = TimelineBuilder::new();
-// To create a track, you first have to create the actions.
-let action = b
-    // Create an action with:
-    //   id   field path     action fn
-    .act("x", field!(<f32>), |x| x + 1.0)
-    // Every action needs an interpolation function.
-    .with_interp(|&a, &b, t| a + (b - a) * t)
-    // An optional easing function can be added.
-    .with_ease(ease::cubic::ease_in_out);
-
-// Once an action is created, it can be "played" into a
-// `TrackFragment` with a given duration.
-let frag = action.play(1.0);
-
-// Which can then be compiled into a `Track`.
-let track = frag.compile();
-
-// 1 or more tracks can be added to the builder to create a timeline.
-b.add_tracks(track);
-let timeline = b.compile();
-```
-
-#### Bake and Sample Timeline
-
-Once a timeline is created, it is ready for baking and sampling. Bake
-must happen before sample. Otherwise, sampling it will be a no-op.
-
-Registries must be created to perform baking/sampling. For more info
-about registries, see below.
-
-```rust
-use std::collections::HashMap;
-use motiongfx::prelude::*;
-
-type SubjectWorld = HashMap<&'static str, f32>;
-
-let mut world: SubjectWorld = HashMap::new();
-world.insert("x", 0.0);
-let accessor_registry = FieldAccessorRegistry::new();
-let pipeline_registry = PipelineRegistry::<SubjectWorld>::new();
-
-let mut b = TimelineBuilder::new();
-let action = b
-    .act("x", field!(<f32>), |x| x + 1.0)
-    .with_interp(|&a, &b, t| a + (b - a) * t);
-
-let track = action.play(1.0).compile();
-b.add_tracks(track);
-
-let mut timeline = b.compile();
-
-// Bake actions into segments.
-timeline.bake_actions(
-    &accessor_registry,
-    &pipeline_registry,
-    &world,
-);
-
-// Actions needs to be queued before it can be sampled.
-timeline.queue_actions();
-timeline.sample_queued_actions(
-    &accessor_registry,
-    &pipeline_registry,
-    &mut world,
-);
-```
-
-### Track Ordering
-
-`TrackFragment`s can be ordered using track ordering trait or
-functions. There are 4 ways to order track fragments:
-
-#### 1. Chain
-
-```rust
-use motiongfx::prelude::*;
-
-// Using empty fragments as an example only.
-let f0 = TrackFragment::new();
-let f1 = TrackFragment::new();
-
-let f = [f0, f1].ord_chain();
-// Or...
-// use motiongfx::track::chain;
-// let f = chain([f0, f1]);
-```
-
-Chaining runs `f1` after `f0` finishes.
-
-#### 2. All
-
-```rust
-use motiongfx::prelude::*;
-
-let f0 = TrackFragment::new();
-let f1 = TrackFragment::new();
-
-let f = [f0, f1].ord_all();
-```
-
-All runs `f0` and `f1` concurrently and waits for all of them to
-finish.
-
-#### 3. Any
-
-```rust
-use motiongfx::prelude::*;
-
-let f0 = TrackFragment::new();
-let f1 = TrackFragment::new();
-
-let f = [f0, f1].ord_any();
-```
-
-Any runs `f0` and `f1` concurrenly and wait for any of them to finish.
-
-#### 4. Flow
-
-```rust
-use motiongfx::prelude::*;
-
-let f0 = TrackFragment::new();
-let f1 = TrackFragment::new();
-
-let f = [f0, f1].ord_flow(0.5);
-```
-
-Flow runs `f1` after `f0` with a fixed delay time rather than waiting
-for `f0` to finish.
-
-### Registries
-
-Registries are used to perform reflection and safely erase types.
-
-#### Field Accessor Regisry
-
-The `FieldAccessorRegistry` maintains a mapping between animatable
-fields and their corresponding accessors, enabling MotionGfx to read
-and write values on arbitrary data structures in a type-safe yet
-dynamic way.
-
-```rust
-use motiongfx::prelude::*;
-
-#[derive(Debug, Clone, Copy)]
-struct Subject(f32);
-
-let mut accessor_registry = FieldAccessorRegistry::new();
-accessor_registry.register_typed(
-    field!(<Subject>::0),
-    accessor!(<Subject>::0)
-);
-```
-
-#### Pipeline Registry
-
-Pipelines handle the baking of actions and the sampling of animation
-segments for playback or preview.
-
-```rust
-use std::collections::HashMap;
-
-use motiongfx::prelude::*;
-
-#[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
-struct Id(u32);
-#[derive(Debug, Clone, Copy)]
-struct Subject(f32);
-type SubjectWorld = HashMap<Id, Subject>;
-
-let mut pipeline_registry = PipelineRegistry::<SubjectWorld>::new();
-pipeline_registry.register_unchecked(
-    PipelineKey::new::<Id, Subject, f32>(),
-    Pipeline::new(
-        |world, ctx| {
-            ctx.bake::<Id, Subject, f32>(|id| world.get(&id));
-        },
-        |world, ctx| {
-            ctx.sample::<Id, Subject, f32>(
-                |id, target, accessor| {
-                    if let Some(x) = world.get_mut(&id) {
-                        *accessor.get_mut(x) = target;
-                    }
-                },
-            );
-        },
-    ),
-);
-```
-
-### Subject World
-
-Because MotionGfx is backend agnostic, it can be used to animate
-subjects in any world. A typical subject world would hold unique Ids
-that maps subject entities to their associated animatable components.
-
-A simple example of such would be a `HashMap`.
-
-```rust
-use std::collections::HashMap;
-
-#[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
-struct Id(u32);
-#[derive(Debug, Clone, Copy)]
-struct Subject(f32);
-type SubjectWorld = HashMap<Id, Subject>;
-```
-
-Below is a comprehensive example on how MotionGfx can be used with a
-custom world!
-
-```rust
-use std::collections::HashMap;
-
-use motiongfx::prelude::*;
-
-// First, we have to initialize a subject world and the
-// registries.
-#[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
-struct Id(u32);
-#[derive(Debug, Clone, Copy)]
-struct Subject(f32);
-type SubjectWorld = HashMap<Id, Subject>;
-
-let mut subject_world = SubjectWorld::new();
-let mut accessor_registry = FieldAccessorRegistry::new();
-let mut pipeline_registry =
-    PipelineRegistry::<SubjectWorld>::new();
-
-// The accessor registry should contain accessors to the fields in
-// the subjects. In our case, it's just the first field in
-// the tuple struct: `Subject::0`.
-
-accessor_registry.register_typed(
-    field!(<Subject>::0),
-    accessor!(<Subject>::0),
-);
-
-// Similarly, the pipeline registry shoiud contain pipelines to
-// bake and sample the fields in the subjects.
-
-pipeline_registry.register_unchecked(
-    PipelineKey::new::<Id, Subject, f32>(),
-    Pipeline::new(
-        |world, ctx| {
-            ctx.bake::<Id, Subject, f32>(|id| world.get(&id));
-        },
-        |world, ctx| {
-            ctx.sample::<Id, Subject, f32>(
-                |id, target, accessor| {
-                    if let Some(x) = world.get_mut(&id) {
-                        *accessor.get_mut(x) = target;
-                    }
-                },
-            );
-        },
-    ),
-);
-
-// Now that the registries are complete, we can start adding
-// subjects into the subject world.
-
-subject_world.insert(Id(1), Subject(0.0));
-
-// A timeline can only be created via the `TimelineBuilder`.
-
-let mut builder = TimelineBuilder::new();
-
-let track = builder
-    // Creates the action.
-    .act(Id(1), field!(<Subject>::0), |x| x + 10.0)
-    // Adds an interpolation method.
-    .with_interp(|&a, &b, t| a + (b - a) * t)
-    // Specifies the duration of the action.
-    .play(1.0)
-    // Compiles into a track.
-    .compile();
-
-// Adds the track to the builder.
-builder.add_tracks(track);
-// And compile it into a timeline.
-let mut timeline = builder.compile();
-// The timeline needs to be baked once before sampling can happen.
-timeline.bake_actions(
-    &accessor_registry,
-    &pipeline_registry,
-    &subject_world,
-);
-
-// Let's visualize the current state of the subject world before
-// the sampling happens.
-println!("Before: {:?}", subject_world);
-
-// We fast forward the timeline.
-timeline.set_target_time(0.5);
-// Actions need to be queued before it can be sampled.
-// The queued actions are stored internally.
-timeline.queue_actions();
-timeline.sample_queued_actions(
-    &accessor_registry,
-    &pipeline_registry,
-    &mut subject_world,
-);
-
-// Visualize the state of the subject world after the sampling.
-println!("After:  {:?}", subject_world);
-```
-
-## Officially Supported Backends
-
-- [Bevy MotionGfx](https://crates.io/crates/bevy_motiongfx)
-
-## Join the community!
-
-You can join us on the [Voxell discord server](https://discord.gg/Mhnyp6VYEQ).
-
-## Inspirations and Similar Projects
-
-- [Motion Canvas](https://motioncanvas.io/)
-- [Manim](https://www.manim.community/)
-
-## Version Matrix
-
-| Bevy    | MotionGfx  |
-| ------- | ---------- |
-| 0.18    | 0.2        |
-| 0.17    | 0.1        |
-
-## License
-
-`motiongfx` is dual-licensed under either:
-
-- MIT License ([LICENSE-MIT](/LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT))
-- Apache License, Version 2.0 ([LICENSE-APACHE](/LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
-
-This means you can select the license you prefer!
-This dual-licensing approach is the de-facto standard in the Rust ecosystem and there are [very good reasons](https://github.com/bevyengine/bevy/issues/2373) to include both.
-
+# MotionGfx
+
+[![License](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](https://github.com/voxell-tech/motiongfx#license)
+[![Crates.io](https://img.shields.io/crates/v/motiongfx.svg)](https://crates.io/crates/motiongfx)
+[![Downloads](https://img.shields.io/crates/d/motiongfx.svg)](https://crates.io/crates/motiongfx)
+[![Docs](https://docs.rs/motiongfx/badge.svg)](https://docs.rs/motiongfx/latest/motiongfx/)
+[![CI](https://github.com/voxell-tech/motiongfx/workflows/CI/badge.svg)](https://github.com/voxell-tech/motiongfx/actions)
+[![Discord](https://img.shields.io/discord/442334985471655946.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/Mhnyp6VYEQ)
+
+**MotionGfx** is a backend-agnostic motion graphics framework
+built on top of [Bevy](https://bevyengine.org) ECS. It provides a
+modular foundation for procedural animations.
+
+## Key Features
+
+- **Backend agnostic**: Works with any rendering backend.
+- **Procedural**: Write animations with code - loops, functions,
+  logic.
+- **Type-erased**: Powered by
+  [Field Path](https://github.com/voxell-tech/field_path), allowing
+  runtime-flexible animation of arbitrary data.
+- **Two-way playback**: Play animations both forward and backward with
+  no extra computation.
+- **Batteries included**: Packed with common easing and interpolation
+  functions.
+
+## Quick Start
+
+```rust
+use motiongfx::prelude::*;
+
+// A world is where you hold all your animatable subjects.
+struct World(Vec<f32>);
+
+// Teach `motiongfx` how to read and write `f32` subjects from `World`.
+impl SubjectSource<usize, f32> for World {
+    fn get_source(&self, id: usize) -> Option<&f32> {
+        self.0.get(id)
+    }
+
+    fn apply_source<R>(
+        &mut self,
+        id: usize,
+        f: impl FnOnce(&mut f32) -> R,
+    ) -> Option<R> {
+        self.0.get_mut(id).map(f)
+    }
+}
+
+let mut world = World(vec![0.0]);
+
+// The registry tracks which types are animated.
+let mut registry = Registry::new();
+// The builder is typed on the world.
+let mut b = registry.create_builder::<World>();
+
+let id = 0;
+// Create an action with: id, field path, action fn.
+// Animate subject 0 from its current value to +10.0.
+let action = b.act(id, path!(<f32>), |x| x + 10.0);
+
+// "Play" the action into a `TrackFragment` with a duration.
+let frag = action.play(1.0);
+
+// Compile into a `Track`
+// See "Track Ordering" section for composing fragments.
+let track = frag.compile();
+
+b.add_tracks(track);
+let mut timeline = b.compile();
+
+// Bake must run once before sampling.
+timeline.bake_actions(&registry, &world);
+
+// Sample at t = 0.5, world.0[0] should now be 5.0.
+timeline.set_target_time(0.5);
+timeline.queue_actions();
+timeline.sample_queued_actions(&registry, &mut world);
+
+assert!((world.0[0] - 5.0).abs() < f32::EPSILON);
+```
+
+## Creating your first animation
+
+### The World
+
+Think of a **world** as a container for everything you want to
+animate. Each item inside it (called a **subject**) has an ID so
+`motiongfx` can find it. To connect your world to `motiongfx`,
+implement `SubjectSource` with two methods: one to read a subject by
+ID, and one to write to it.
+
+Because of Rust's orphan rule, `SubjectSource` must be implemented on
+a type local to your crate. If you cannot own the type directly, wrap
+it in a newtype.
+
+```rust
+# use motiongfx::prelude::*;
+// Own your world so you can impl SubjectSource on it.
+// Each f32 value is a subject, accessed by its index.
+struct World(Vec<f32>);
+
+impl SubjectSource<usize, f32> for World {
+    fn get_source(&self, id: usize) -> Option<&f32> {
+        self.0.get(id)
+    }
+
+    fn apply_source<R>(
+        &mut self,
+        id: usize,
+        f: impl FnOnce(&mut f32) -> R,
+    ) -> Option<R> {
+        self.0.get_mut(id).map(f)
+    }
+}
+```
+
+
+### The Registry
+
+The `Registry` keeps track of how to animate your types behind the
+scenes. `motiongfx` is type-erased at runtime, so it needs the
+registry to know how to read and write each field. You don't need to
+set it up manually, just create one and pass it to the builder.
+Registration happens automatically the first time you add an
+animation.
+
+```rust
+# use motiongfx::prelude::*;
+let mut registry = Registry::new();
+```
+
+### The Timeline Builder
+
+The `TimelineBuilder` is where you describe your animations. Create
+one from the registry, typed to your data holder:
+
+```rust
+# use motiongfx::prelude::*;
+# let mut registry = Registry::new();
+# type World = Vec<f32>;
+let mut b = registry.create_builder::<World>();
+```
+
+### Building the Timeline
+
+Animations are built up in layers:
+
+1. An **action** says what to animate and how to transform it.
+2. A **track fragment** gives the action a duration by calling `.play(seconds)`.
+3. A **track** is one or more fragments compiled together. You can
+   order fragments before compiling (see [Track Ordering](#track-ordering)).
+4. A **timeline** combines all your tracks into one playable sequence.
+
+```rust
+# #[path = "docs/world.rs"] mod _doc; use _doc::*;
+# let mut registry = Registry::new();
+# let mut b = registry.create_builder::<World>();
+# let mut world = World(vec![0.0]);
+let id = 0;
+// Act: animate subject 0 from its current value to +10.0.
+let action = b
+    .act(id, path!(<f32>), |x| x + 10.0)
+    // An optional easing function can be added.
+    .with_ease(ease::cubic::ease_in_out);
+
+// Play: turn the action into a fragment with a 1-second duration.
+let frag = action.play(1.0);
+
+// Compile the fragment into a Track.
+let track = frag.compile();
+
+// Add the track and compile into a Timeline.
+b.add_tracks(track);
+let timeline = b.compile();
+```
+
+### Bake and Sample
+
+Before playing an animation, you need to **bake** it. Baking reads
+the starting values from your world and prepares the animation data.
+This only needs to happen once, right after building the timeline.
+
+To advance the animation, set a target time, then **queue** and
+**sample**. Queuing figures out which actions are active at that
+time, and sampling writes the new values back into your world.
+
+A timeline can also have multiple tracks, each acting as a chapter.
+Use `set_target_track` to jump between them.
+
+```rust
+# #[path = "docs/world.rs"] mod _doc; use _doc::*;
+# let mut subjects = World(vec![0.0]);
+# let (registry, mut timeline) = timeline();
+// Bake once after building the timeline.
+timeline.bake_actions(&registry, &subjects);
+
+// Set target time, queue, then sample.
+timeline.set_target_time(0.5);
+timeline.queue_actions();
+timeline.sample_queued_actions(&registry, &mut subjects);
+
+assert!((subjects.0[0] - 5.0).abs() < f32::EPSILON);
+```
+
+### Track Ordering
+
+You can control how fragments play relative to each other. There are
+4 ordering combinators:
+
+#### 1. Chain
+
+```rust
+use motiongfx::prelude::*;
+
+// Using empty fragments as an example only.
+let f0 = TrackFragment::new();
+let f1 = TrackFragment::new();
+
+let f = [f0, f1].ord_chain();
+// Or...
+// use motiongfx::track::chain;
+// let f = chain([f0, f1]);
+```
+
+`f1` plays after `f0` finishes.
+
+#### 2. All
+
+```rust
+use motiongfx::prelude::*;
+
+let f0 = TrackFragment::new();
+let f1 = TrackFragment::new();
+
+let f = [f0, f1].ord_all();
+```
+
+`f0` and `f1` play at the same time, and the result finishes when
+both are done.
+
+#### 3. Any
+
+```rust
+use motiongfx::prelude::*;
+
+let f0 = TrackFragment::new();
+let f1 = TrackFragment::new();
+
+let f = [f0, f1].ord_any();
+```
+
+`f0` and `f1` play at the same time, and the result finishes when
+either one is done.
+
+#### 4. Flow
+
+```rust
+use motiongfx::prelude::*;
+
+let f0 = TrackFragment::new();
+let f1 = TrackFragment::new();
+
+let f = [f0, f1].ord_flow(0.5);
+```
+
+`f1` starts 0.5 seconds after `f0` begins, regardless of how long
+`f0` takes.
+
+## Officially Supported Backends
+
+- [Bevy MotionGfx](https://crates.io/crates/bevy_motiongfx)
+
+## Join the community!
+
+You can join us on the [Voxell discord server](https://discord.gg/Mhnyp6VYEQ).
+
+## Inspirations and Similar Projects
+
+- [Motion Canvas](https://motioncanvas.io/)
+- [Manim](https://www.manim.community/)
+
+## Version Matrix
+
+| Bevy    | MotionGfx  |
+| ------- | ---------- |
+| 0.18    | 0.2        |
+| 0.17    | 0.1        |
+
+## License
+
+`motiongfx` is dual-licensed under either:
+
+- MIT License ([LICENSE-MIT](/LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT))
+- Apache License, Version 2.0 ([LICENSE-APACHE](/LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
+
+This means you can select the license you prefer!
+This dual-licensing approach is the de-facto standard in the Rust ecosystem and there are [very good reasons](https://github.com/bevyengine/bevy/issues/2373) to include both.
diff --git a/crates/motiongfx/docs/world.rs b/crates/motiongfx/docs/world.rs
new file mode 100644
index 0000000..e97fb0e
--- /dev/null
+++ b/crates/motiongfx/docs/world.rs
@@ -0,0 +1,30 @@
+pub use motiongfx::prelude::*;
+
+pub struct World(pub Vec<f32>);
+
+impl SubjectSource<usize, f32> for World {
+    fn get_source(&self, id: usize) -> Option<&f32> {
+        self.0.get(id)
+    }
+
+    fn apply_source<R>(
+        &mut self,
+        id: usize,
+        f: impl FnOnce(&mut f32) -> R,
+    ) -> Option<R> {
+        self.0.get_mut(id).map(f)
+    }
+}
+
+pub fn timeline() -> (Registry, Timeline<World>) {
+    let mut registry = Registry::new();
+    let mut b = registry.create_builder::<World>();
+    let track = b
+        .act_builder(0usize, path!(<f32>), |x| x + 10.0)
+        .with_interp(|a: &f32, b: &f32, t| a + (b - a) * t)
+        .play(1.0)
+        .compile();
+    b.add_tracks(track);
+    let timeline = b.compile();
+    (registry, timeline)
+}
diff --git a/crates/motiongfx/examples/custom_world.rs b/crates/motiongfx/examples/custom_world.rs
index 7ed2c01..fec2eb2 100644
--- a/crates/motiongfx/examples/custom_world.rs
+++ b/crates/motiongfx/examples/custom_world.rs
@@ -3,16 +3,14 @@ use std::collections::HashMap;
 use motiongfx::prelude::*;
 
 struct World {
-    accessor_registry: FieldAccessorRegistry,
-    pipeline_registry: PipelineRegistry<SubjectWorld>,
+    registry: Registry,
     subject_world: SubjectWorld,
 }
 
 impl World {
     pub fn new() -> Self {
         Self {
-            accessor_registry: FieldAccessorRegistry::new(),
-            pipeline_registry: PipelineRegistry::new(),
+            registry: Registry::new(),
             subject_world: SubjectWorld {
                 world: HashMap::new(),
             },
@@ -53,11 +51,6 @@ struct Line {
 fn main() {
     let mut world = World::new();
 
-    // Register the accessors.
-    register_accessors(&mut world.accessor_registry);
-    // Regsitre the pipelines.
-    register_pipelines(&mut world.pipeline_registry);
-
     // Spawn in some subjects.
     world
         .subject_world
@@ -68,21 +61,23 @@ fn main() {
         .world
         .insert(Id(1), Subject::Line(Line::default()));
 
-    let mut builder = TimelineBuilder::new();
+    let mut builder = world.registry.create_builder();
 
     // Create the track.
     let track = [
         builder
-            .act(Id(0), field!(<Point>::x), |x| x + 72.0)
+            .act_builder(Id(0), path!(<Point>::x), |x| x + 72.0)
             .with_interp(linear_f32)
             .play(1.0),
         [
             builder
-                .act(Id(1), field!(<Line>::p0::y), |y| y + 42.0)
+                .act_builder(Id(1), path!(<Line>::p0::y), |y| {
+                    y + 42.0
+                })
                 .with_interp(linear_f32)
                 .play(2.0),
             builder
-                .act(Id(1), field!(<Line>::p1), |_| Point {
+                .act_builder(Id(1), path!(<Line>::p1), |_| Point {
                     x: 6.0,
                     y: 6.0,
                 })
@@ -98,11 +93,7 @@ fn main() {
     let mut timeline = builder.compile();
 
     // Bake actions into segments.
-    timeline.bake_actions(
-        &world.accessor_registry,
-        &world.pipeline_registry,
-        &world.subject_world,
-    );
+    timeline.bake_actions(&world.registry, &world.subject_world);
 
     // Change the target time.
     timeline.set_target_time(1.5);
@@ -113,8 +104,7 @@ fn main() {
     // Queue and sample the actions.
     timeline.queue_actions();
     timeline.sample_queued_actions(
-        &world.accessor_registry,
-        &world.pipeline_registry,
+        &world.registry,
         &mut world.subject_world,
     );
 
@@ -138,8 +128,7 @@ fn main() {
     // Queue and sample the actions.
     timeline.queue_actions();
     timeline.sample_queued_actions(
-        &world.accessor_registry,
-        &world.pipeline_registry,
+        &world.registry,
         &mut world.subject_world,
     );
 
@@ -150,130 +139,44 @@ fn main() {
     );
 }
 
-fn register_pipelines(
-    pipeline_registry: &mut PipelineRegistry<SubjectWorld>,
-) {
-    pipeline_registry.register_unchecked(
-        PipelineKey::new::<Id, Point, f32>(),
-        Pipeline::new(
-            |world, ctx| {
-                ctx.bake::<Id, Point, f32>(|id| {
-                    let subject = world.world.get(&id)?;
-                    match subject {
-                        Subject::Point(point) => Some(point),
-                        Subject::Line(_) => None,
-                    }
-                });
-            },
-            |world, ctx| {
-                ctx.sample::<Id, Point, f32>(
-                    |id, target, accessor| {
-                        let Some(subject) = world.world.get_mut(&id)
-                        else {
-                            return;
-                        };
-
-                        if let Subject::Point(point) = subject {
-                            *accessor.get_mut(point) = target;
-                        }
-                    },
-                );
-            },
-        ),
-    );
-
-    pipeline_registry.register_unchecked(
-        PipelineKey::new::<Id, Line, Point>(),
-        Pipeline::new(
-            |world, ctx| {
-                ctx.bake::<Id, Line, Point>(|id| {
-                    let subject = world.world.get(&id)?;
-                    match subject {
-                        Subject::Line(line) => Some(line),
-                        Subject::Point(_) => None,
-                    }
-                });
-            },
-            |world, ctx| {
-                ctx.sample::<Id, Line, Point>(
-                    |id, target, accessor| {
-                        let Some(subject) = world.world.get_mut(&id)
-                        else {
-                            return;
-                        };
-
-                        if let Subject::Line(line) = subject {
-                            *accessor.get_mut(line) = target;
-                        }
-                    },
-                );
-            },
-        ),
-    );
-
-    // TODO: This looks almost exactly the same as above, could
-    // pipeline be simplified enough to ignore the target field?
-    pipeline_registry.register_unchecked(
-        PipelineKey::new::<Id, Line, f32>(),
-        Pipeline::new(
-            |world, ctx| {
-                ctx.bake::<Id, Line, f32>(|id| {
-                    let subject = world.world.get(&id)?;
-                    match subject {
-                        Subject::Line(line) => Some(line),
-                        Subject::Point(_) => None,
-                    }
-                });
-            },
-            |world, ctx| {
-                ctx.sample::<Id, Line, f32>(
-                    |id, target, accessor| {
-                        let Some(subject) = world.world.get_mut(&id)
-                        else {
-                            return;
-                        };
+impl SubjectSource<Id, Point> for SubjectWorld {
+    fn get_source(&self, id: Id) -> Option<&Point> {
+        match self.world.get(&id)? {
+            Subject::Point(point) => Some(point),
+            Subject::Line(_) => None,
+        }
+    }
 
-                        if let Subject::Line(line) = subject {
-                            *accessor.get_mut(line) = target;
-                        }
-                    },
-                );
-            },
-        ),
-    );
+    fn apply_source<R>(
+        &mut self,
+        id: Id,
+        f: impl FnOnce(&mut Point) -> R,
+    ) -> Option<R> {
+        match self.world.get_mut(&id)? {
+            Subject::Point(point) => Some(f(point)),
+            Subject::Line(_) => None,
+        }
+    }
 }
 
-fn register_accessors(accessor_registry: &mut FieldAccessorRegistry) {
-    // In real use cases, a macro should be used!
-    // Refer to `bevy_motiongfx` for now...
+impl SubjectSource<Id, Line> for SubjectWorld {
+    fn get_source(&self, id: Id) -> Option<&Line> {
+        match self.world.get(&id)? {
+            Subject::Line(line) => Some(line),
+            Subject::Point(_) => None,
+        }
+    }
 
-    // Point -> f32.
-    accessor_registry
-        .register_typed(field!(<Point>::x), accessor!(<Point>::x));
-    accessor_registry
-        .register_typed(field!(<Point>::y), accessor!(<Point>::y));
-    // Line -> Point.
-    accessor_registry
-        .register_typed(field!(<Line>::p0), accessor!(<Line>::p0));
-    accessor_registry
-        .register_typed(field!(<Line>::p1), accessor!(<Line>::p1));
-    // Line -> Point -> f32.
-    accessor_registry.register_typed(
-        field!(<Line>::p0::x),
-        accessor!(<Line>::p0::x),
-    );
-    accessor_registry.register_typed(
-        field!(<Line>::p0::y),
-        accessor!(<Line>::p0::y),
-    );
-    accessor_registry.register_typed(
-        field!(<Line>::p1::x),
-        accessor!(<Line>::p1::x),
-    );
-    accessor_registry.register_typed(
-        field!(<Line>::p1::y),
-        accessor!(<Line>::p1::y),
-    );
+    fn apply_source<R>(
+        &mut self,
+        id: Id,
+        f: impl FnOnce(&mut Line) -> R,
+    ) -> Option<R> {
+        match self.world.get_mut(&id)? {
+            Subject::Line(line) => Some(f(line)),
+            Subject::Point(_) => None,
+        }
+    }
 }
 
 fn linear_f32(a: &f32, b: &f32, t: f32) -> f32 {
diff --git a/crates/motiongfx/src/action.rs b/crates/motiongfx/src/action.rs
index 8bb06fc..c596ac4 100644
--- a/crates/motiongfx/src/action.rs
+++ b/crates/motiongfx/src/action.rs
@@ -118,29 +118,28 @@ pub struct UntypedSubjectId {
 }
 
 impl UntypedSubjectId {
-    pub fn new<I: SubjectId>(uid: UId) -> Self {
+    pub const PLACEHOLDER: Self =
+        Self::placeholder_with_u64(u64::MAX);
+
+    pub const fn new<I: SubjectId>(uid: UId) -> Self {
         Self {
             type_id: TypeId::of::<I>(),
             uid,
         }
     }
 
-    pub fn placeholder() -> Self {
-        Self::placeholder_with_u64(0)
-    }
-
-    pub fn placeholder_with_u64(id: u64) -> Self {
+    pub const fn placeholder_with_u64(id: u64) -> Self {
         Self {
             type_id: TypeId::of::<()>(),
             uid: UId(id),
         }
     }
 
-    pub fn type_id(&self) -> TypeId {
+    pub const fn type_id(&self) -> TypeId {
         self.type_id
     }
 
-    pub fn uid(&self) -> UId {
+    pub const fn uid(&self) -> UId {
         self.uid
     }
 }
@@ -252,10 +251,8 @@ impl ActionWorld {
             .get_resource_or_insert_with(|| IdRegistry::new())
             .register_instance(target);
 
-        let key = ActionKey {
-            subject_id: UntypedSubjectId::new::<I>(uid),
-            field,
-        };
+        let key =
+            ActionKey::new(UntypedSubjectId::new::<I>(uid), field);
         let world = self.world.spawn((
             key,
             IdType::<I>::new(),
diff --git a/crates/motiongfx/src/interpolation.rs b/crates/motiongfx/src/interpolation.rs
new file mode 100644
index 0000000..4c36e37
--- /dev/null
+++ b/crates/motiongfx/src/interpolation.rs
@@ -0,0 +1,28 @@
+/// Trait for interpolating between two values.
+///
+/// The `M` marker parameter exists solely to satisfy the orphan rule:
+/// downstream crates can provide a local marker type to implement
+/// this trait for foreign `Self` types.
+pub trait Interpolation<M> {
+    fn interp(a: &Self, b: &Self, t: f32) -> Self;
+}
+
+#[macro_export]
+macro_rules! impl_float_interpolation {
+    ($ty:ty, $base:ty) => {
+        $crate::impl_float_interpolation!($ty, $base, ());
+    };
+
+    ($ty:ty, $base:ty, $marker:ty) => {
+        impl $crate::interpolation::Interpolation<$marker> for $ty {
+            #[inline]
+            fn interp(a: &Self, b: &Self, t: f32) -> Self {
+                let t = <$base>::from(t);
+                (*a) * (1.0 - t) + (*b) * t
+            }
+        }
+    };
+}
+
+impl_float_interpolation!(f32, f32);
+impl_float_interpolation!(f64, f64);
diff --git a/crates/motiongfx/src/lib.rs b/crates/motiongfx/src/lib.rs
index 7a8c281..56e19aa 100644
--- a/crates/motiongfx/src/lib.rs
+++ b/crates/motiongfx/src/lib.rs
@@ -5,21 +5,20 @@ extern crate alloc;
 
 pub mod action;
 pub mod ease;
+pub mod interpolation;
 pub mod pipeline;
+pub mod registry;
 pub mod sequence;
 pub mod subject;
 pub mod timeline;
 pub mod track;
+pub mod world;
 
 // Re-exports field_path as it is essential for motiongfx to work!
 pub use field_path;
 
 pub mod prelude {
-    pub use field_path::accessor;
-    pub use field_path::accessor::{Accessor, UntypedAccessor};
-    pub use field_path::field;
-    pub use field_path::field::{Field, UntypedField};
-    pub use field_path::registry::FieldAccessorRegistry;
+    pub use field_path::field_accessor::FieldAccessor;
 
     pub use crate::ThreadSafe;
     pub use crate::action::{
@@ -27,11 +26,35 @@ pub mod prelude {
         InterpFn,
     };
     pub use crate::ease;
-    pub use crate::pipeline::{
-        BakeCtx, Pipeline, PipelineKey, PipelineRegistry, SampleCtx,
+    pub use crate::interpolation::Interpolation;
+    pub use crate::path;
+    pub use crate::pipeline::PipelineKey;
+    pub use crate::registry::{
+        AccessorRegistry, PipelineRegistry, Registry,
     };
     pub use crate::timeline::{Timeline, TimelineBuilder};
     pub use crate::track::{Track, TrackFragment, TrackOrdering};
+    pub use crate::world::SubjectSource;
+}
+
+/// See [`field_path::field_accessor!`].
+///
+/// This macro just forwards the tokens to the mentioned macro.
+///
+/// ## Example
+///
+/// ```
+/// use motiongfx::path;
+///
+/// struct Foo(u32);
+///
+/// let path = path!(<Foo>::0);
+/// ```
+#[macro_export]
+macro_rules! path {
+    ($($t:tt)*) => {
+        $crate::field_path::field_accessor!($($t)*)
+    };
 }
 
 /// Auto trait for types that implements [`Send`] + [`Sync`] +
diff --git a/crates/motiongfx/src/pipeline.rs b/crates/motiongfx/src/pipeline.rs
index be7a352..bc3eb1c 100644
--- a/crates/motiongfx/src/pipeline.rs
+++ b/crates/motiongfx/src/pipeline.rs
@@ -1,229 +1,278 @@
+pub mod func_pointers;
+
 use core::any::TypeId;
+use core::marker::PhantomData;
 
-use bevy_ecs::prelude::*;
-use bevy_platform::collections::HashMap;
-use field_path::accessor::Accessor;
-use field_path::registry::FieldAccessorRegistry;
+use func_pointers::{BakeFnPtr, SampleFnPtr};
 
 use crate::ThreadSafe;
 use crate::action::{
     ActionClip, ActionKey, ActionWorld, EaseStorage, InterpStorage,
     SampleMode, Segment,
 };
+use crate::pipeline::func_pointers::{BakeFn, SampleFn};
+use crate::registry::AccessorRegistry;
 use crate::subject::SubjectId;
 use crate::track::Track;
+use crate::world::SubjectSource;
+
+pub struct PipelineHandle<W, I, S, T> {
+    #[expect(clippy::complexity)]
+    _marker: PhantomData<fn() -> (W, I, S, T)>,
+}
+
+impl<W, I, S, T> PipelineHandle<W, I, S, T>
+where
+    W: 'static,
+    I: SubjectId,
+    S: 'static,
+    T: 'static,
+{
+    pub fn new() -> Self {
+        Self {
+            _marker: PhantomData,
+        }
+    }
+
+    pub fn as_key(&self) -> PipelineKey {
+        PipelineKey::new::<W, I, S, T>()
+    }
+}
 
-/// Uniquely identifies a [`Pipeline`] to bake and sample a target
-/// field from a subject's source data structure.
+impl<W, I, S, T> Copy for PipelineHandle<W, I, S, T> {}
+
+impl<W, I, S, T> Clone for PipelineHandle<W, I, S, T> {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<W, I, S, T> Default for PipelineHandle<W, I, S, T>
+where
+    W: 'static,
+    I: SubjectId,
+    S: 'static,
+    T: 'static,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Uniquely identifies a [`Pipeline`] by its world, subject, source,
+/// and target types.
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord,
 )]
 pub struct PipelineKey {
-    /// The [`TypeId`] of the [`SubjectId`].
+    world_id: TypeId,
     subject_id: TypeId,
-    /// The [`TypeId`] of the source type.
     source_id: TypeId,
-    /// The [`TypeId`] of the target type.
     target_id: TypeId,
 }
 
 impl PipelineKey {
-    pub fn new<I, S, T>() -> Self
+    pub fn new<W, I, S, T>() -> Self
     where
+        W: 'static,
         I: SubjectId,
         S: 'static,
         T: 'static,
     {
         Self {
+            world_id: TypeId::of::<W>(),
             subject_id: TypeId::of::<I>(),
             source_id: TypeId::of::<S>(),
             target_id: TypeId::of::<T>(),
         }
     }
 
-    pub fn from_action_key(key: ActionKey) -> Self {
+    pub fn from_action_key<W: 'static>(key: ActionKey) -> Self {
         Self {
+            world_id: TypeId::of::<W>(),
             subject_id: key.subject_id().type_id(),
             source_id: key.field().source_id(),
             target_id: key.field().target_id(),
         }
     }
-}
 
-pub type BakeFn<W> = fn(&W, BakeCtx);
-pub type SampleFn<W> = fn(&mut W, SampleCtx);
+    pub(crate) fn world_id(&self) -> TypeId {
+        self.world_id
+    }
+}
 
+/// A pipeline for baking and sampling actions of type `(I, S, T)`.
+/// The world type `W` is erased at storage; it must match at call sites.
 #[derive(Debug, Clone, Copy)]
-pub struct Pipeline<W> {
+pub struct Pipeline<W, I, S, T> {
     bake: BakeFn<W>,
     sample: SampleFn<W>,
+    #[expect(clippy::complexity)]
+    _marker: PhantomData<fn() -> (I, S, T)>,
 }
 
-impl<W> Pipeline<W> {
-    pub fn new(bake: BakeFn<W>, sample: SampleFn<W>) -> Self {
-        Self { bake, sample }
+impl<W, I, S, T> Pipeline<W, I, S, T> {
+    pub fn new() -> Self
+    where
+        W: SubjectSource<I, S>,
+        I: SubjectId,
+        S: 'static,
+        T: Clone + ThreadSafe,
+    {
+        Self {
+            bake: bake::<W, I, S, T>,
+            sample: sample::<W, I, S, T>,
+            _marker: PhantomData,
+        }
     }
 
-    pub fn bake(&self, world: &W, ctx: BakeCtx) {
-        (self.bake)(world, ctx)
+    pub fn untyped(&self) -> PipelineUntyped {
+        PipelineUntyped {
+            bake: BakeFnPtr::new(self.bake),
+            sample: SampleFnPtr::new(self.sample),
+        }
     }
+}
 
-    pub fn sample(&self, world: &mut W, ctx: SampleCtx) {
-        (self.sample)(world, ctx)
+impl<W, I, S, T> Default for Pipeline<W, I, S, T>
+where
+    W: SubjectSource<I, S>,
+    I: SubjectId,
+    S: 'static,
+    T: Clone + ThreadSafe,
+{
+    fn default() -> Self {
+        Self::new()
     }
 }
 
-#[derive(Resource)]
-pub struct PipelineRegistry<W> {
-    pipelines: HashMap<PipelineKey, Pipeline<W>>,
+#[derive(Debug, Clone, Copy)]
+pub struct PipelineUntyped {
+    bake: BakeFnPtr,
+    sample: SampleFnPtr,
 }
 
-impl<W> PipelineRegistry<W> {
-    pub fn new() -> Self {
-        Self {
-            pipelines: HashMap::new(),
-        }
-    }
-
-    pub fn get(&self, key: &PipelineKey) -> Option<&Pipeline<W>> {
-        self.pipelines.get(key)
-    }
-
-    /// Register a pipeline function.
+impl PipelineUntyped {
+    /// # Safety
     ///
-    /// Registering the same key twice will result in a replacement.
-    ///
-    /// # Note
-    ///
-    /// This function assumes that the baker function matches
-    /// the field that it points towards. Failure to do so will
-    /// result in a useless baker registry.
-    pub fn register_unchecked(
-        &mut self,
-        key: PipelineKey,
-        pipeline: Pipeline<W>,
-    ) -> &mut Self {
-        self.pipelines.insert(key, pipeline);
-        self
+    /// `W` must match the type used when registering this pipeline.
+    pub(crate) unsafe fn bake<W>(&self, ctx: BakeCtx<W>) {
+        let f = unsafe { self.bake.typed_unchecked::<W>() };
+        f(ctx)
     }
-}
 
-impl<W> Default for PipelineRegistry<W> {
-    fn default() -> Self {
-        Self::new()
+    /// # Safety
+    ///
+    /// `W` must match the type used when registering this pipeline.
+    pub(crate) unsafe fn sample<W>(&self, ctx: SampleCtx<W>) {
+        let f = unsafe { self.sample.typed_unchecked::<W>() };
+        f(ctx)
     }
 }
 
-pub struct BakeCtx<'a> {
+pub struct BakeCtx<'a, W> {
+    pub world: &'a W,
     pub track: &'a Track,
     pub action_world: &'a mut ActionWorld,
-    pub accessor_registry: &'a FieldAccessorRegistry,
+    pub accessor_registry: &'a AccessorRegistry,
 }
 
-impl<'a> BakeCtx<'a> {
-    pub fn bake<I, S, T>(
-        self,
-        get_source: impl Fn(I) -> Option<&'a S>,
-    ) where
-        I: SubjectId,
-        S: 'static,
-        T: Clone + ThreadSafe,
-    {
-        for (key, span) in self.track.sequences_spans() {
-            let Ok(accessor) =
-                self.accessor_registry.get::<S, T>(key.field())
-            else {
-                continue;
-            };
+pub fn bake<W, I, S, T>(ctx: BakeCtx<W>)
+where
+    W: SubjectSource<I, S>,
+    I: SubjectId,
+    S: 'static,
+    T: Clone + ThreadSafe,
+{
+    for (key, span) in ctx.track.sequences_spans() {
+        let Some(accessor) =
+            ctx.accessor_registry.get::<S, T>(key.field())
+        else {
+            continue;
+        };
 
-            let Some(&id) =
-                self.action_world.get_id(&key.subject_id().uid())
-            else {
-                continue;
-            };
+        let Some(&id) =
+            ctx.action_world.get_id(&key.subject_id().uid())
+        else {
+            continue;
+        };
 
-            // Get the source from the target world.
-            let Some(source) = get_source(id) else {
-                continue;
-            };
+        let Some(source) = ctx.world.get_source(id) else {
+            continue;
+        };
 
-            let mut start = accessor.get_ref(source).clone();
+        let mut start = accessor.get_ref(source).clone();
 
-            for ActionClip { id, .. } in self.track.clips(*span) {
-                let Some(action) =
-                    self.action_world.get_action::<T>(*id)
-                else {
-                    continue;
-                };
+        for ActionClip { id, .. } in ctx.track.clips(*span) {
+            let Some(action) = ctx.action_world.get_action::<T>(*id)
+            else {
+                continue;
+            };
 
-                let end = action(&start);
-                let segment =
-                    Segment::new(start.clone(), end.clone());
+            let end = action(&start);
+            let segment = Segment::new(start.clone(), end.clone());
 
-                self.action_world
-                    .edit_action(*id)
-                    .set_segment(segment);
+            ctx.action_world.edit_action(*id).set_segment(segment);
 
-                start = end;
-            }
+            start = end;
         }
     }
 }
 
-pub struct SampleCtx<'a> {
+pub struct SampleCtx<'a, W> {
+    pub world: &'a mut W,
     pub action_world: &'a ActionWorld,
-    pub accessor_registry: &'a FieldAccessorRegistry,
+    pub accessor_registry: &'a AccessorRegistry,
 }
 
-impl<'a> SampleCtx<'a> {
-    pub fn sample<I, S, T>(
-        self,
-        mut set_target: impl FnMut(I, T, Accessor<S, T>),
-    ) where
-        I: SubjectId,
-        S: 'static,
-        T: Clone + ThreadSafe,
+pub fn sample<W, I, S, T>(ctx: SampleCtx<W>)
+where
+    W: SubjectSource<I, S>,
+    I: SubjectId,
+    S: 'static,
+    T: Clone + ThreadSafe,
+{
+    let Some(mut q) = ctx.action_world.world().try_query::<(
+        &ActionKey,
+        &SampleMode,
+        &Segment<T>,
+        &InterpStorage<T>,
+        Option<&EaseStorage>,
+    )>() else {
+        return;
+    };
+
+    for (key, sample_mode, segment, interp, ease) in
+        q.iter(ctx.action_world.world())
     {
-        let Some(mut q) = self.action_world.world().try_query::<(
-            &ActionKey,
-            &SampleMode,
-            &Segment<T>,
-            &InterpStorage<T>,
-            Option<&EaseStorage>,
-        )>() else {
-            return;
+        let Some(accessor) =
+            ctx.accessor_registry.get::<S, T>(key.field())
+        else {
+            continue;
         };
 
-        for (key, sample_mode, segment, interp, ease) in
-            q.iter(self.action_world.world())
-        {
-            let Ok(accessor) =
-                self.accessor_registry.get::<S, T>(key.field())
-            else {
-                continue;
-            };
+        let Some(&id) =
+            ctx.action_world.get_id(&key.subject_id().uid())
+        else {
+            continue;
+        };
 
-            let Some(&id) =
-                self.action_world.get_id(&key.subject_id().uid())
-            else {
-                continue;
-            };
+        let target = match sample_mode {
+            SampleMode::Start => segment.start.clone(),
+            SampleMode::End => segment.end.clone(),
+            SampleMode::Interp(t) => {
+                let t = match ease {
+                    Some(ease) => ease.0(*t),
+                    None => *t,
+                };
 
-            let target = match sample_mode {
-                SampleMode::Start => segment.start.clone(),
-                SampleMode::End => segment.end.clone(),
-                SampleMode::Interp(t) => {
-                    let t = match ease {
-                        Some(ease) => ease.0(*t),
-                        None => *t,
-                    };
-
-                    interp.0(&segment.start, &segment.end, t)
-                }
-            };
+                interp.0(&segment.start, &segment.end, t)
+            }
+        };
 
-            set_target(id, target, accessor);
-        }
+        ctx.world.apply_source(id, |source| {
+            *accessor.get_mut(source) = target;
+        });
     }
 }
 
diff --git a/crates/motiongfx/src/pipeline/func_pointers.rs b/crates/motiongfx/src/pipeline/func_pointers.rs
new file mode 100644
index 0000000..8ea1853
--- /dev/null
+++ b/crates/motiongfx/src/pipeline/func_pointers.rs
@@ -0,0 +1,48 @@
+use super::{BakeCtx, SampleCtx};
+
+/// A type-erased bake function pointer.
+#[derive(Debug, Clone, Copy)]
+pub struct BakeFnPtr(*const ());
+
+unsafe impl Send for BakeFnPtr {}
+unsafe impl Sync for BakeFnPtr {}
+
+impl BakeFnPtr {
+    pub const fn new<W>(f: BakeFn<W>) -> Self {
+        Self(f as *const ())
+    }
+
+    /// # Safety
+    ///
+    /// `W` must match the type used when constructing this pointer.
+    pub const unsafe fn typed_unchecked<W>(&self) -> BakeFn<W> {
+        unsafe {
+            core::mem::transmute::<*const (), BakeFn<W>>(self.0)
+        }
+    }
+}
+
+/// A type-erased sample function pointer.
+#[derive(Debug, Clone, Copy)]
+pub struct SampleFnPtr(*const ());
+
+unsafe impl Send for SampleFnPtr {}
+unsafe impl Sync for SampleFnPtr {}
+
+impl SampleFnPtr {
+    pub const fn new<W>(f: SampleFn<W>) -> Self {
+        Self(f as *const ())
+    }
+
+    /// # Safety
+    ///
+    /// `W` must match the type used when constructing this pointer.
+    pub const unsafe fn typed_unchecked<W>(&self) -> SampleFn<W> {
+        unsafe {
+            core::mem::transmute::<*const (), SampleFn<W>>(self.0)
+        }
+    }
+}
+
+pub type BakeFn<W> = fn(BakeCtx<'_, W>);
+pub type SampleFn<W> = fn(SampleCtx<'_, W>);
diff --git a/crates/motiongfx/src/registry.rs b/crates/motiongfx/src/registry.rs
new file mode 100644
index 0000000..ad1dea7
--- /dev/null
+++ b/crates/motiongfx/src/registry.rs
@@ -0,0 +1,169 @@
+use core::any::TypeId;
+
+use bevy_platform::collections::HashMap;
+use field_path::accessor::{Accessor, UntypedAccessor};
+use field_path::field::UntypedField;
+use field_path::field_accessor::FieldAccessor;
+
+use crate::ThreadSafe;
+use crate::pipeline::{
+    BakeCtx, Pipeline, PipelineHandle, PipelineKey, PipelineUntyped,
+    SampleCtx,
+};
+use crate::prelude::{SubjectSource, TimelineBuilder};
+use crate::subject::SubjectId;
+
+pub struct Registry {
+    pub accessor: AccessorRegistry,
+    pub pipeline: PipelineRegistry,
+}
+
+impl Registry {
+    pub fn new() -> Self {
+        Self {
+            accessor: AccessorRegistry::new(),
+            pipeline: PipelineRegistry::new(),
+        }
+    }
+
+    pub fn register<W, I, S, T>(
+        &mut self,
+        field_acc: FieldAccessor<S, T>,
+    ) where
+        W: SubjectSource<I, S> + 'static,
+        I: SubjectId,
+        S: 'static,
+        T: Clone + ThreadSafe,
+    {
+        self.accessor.register(field_acc);
+        self.pipeline.register::<W, I, S, T>();
+    }
+
+    /// Create a [`TimelineBuilder`] for a specific `W` world.
+    pub fn create_builder<W: 'static>(
+        &mut self,
+    ) -> TimelineBuilder<'_, W> {
+        TimelineBuilder::new(self)
+    }
+}
+
+impl Default for Registry {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+pub struct AccessorRegistry {
+    accessors: HashMap<UntypedField, UntypedAccessor>,
+}
+
+impl AccessorRegistry {
+    pub fn new() -> Self {
+        Self {
+            accessors: HashMap::new(),
+        }
+    }
+
+    /// Registers a [`FieldAccessor`] pair.
+    /// Skips fields already registered.
+    #[inline]
+    pub fn register<S: 'static, T: 'static>(
+        &mut self,
+        field_acc: FieldAccessor<S, T>,
+    ) {
+        let untyped_field = field_acc.field.untyped();
+        if self.accessors.contains_key(&untyped_field) {
+            return;
+        }
+
+        self.accessors
+            .insert(untyped_field, field_acc.accessor.untyped());
+    }
+
+    /// Retrieve a typed [`Accessor`] from the registry.
+    pub fn get<S: 'static, T: 'static>(
+        &self,
+        field: &UntypedField,
+    ) -> Option<Accessor<S, T>> {
+        self.accessors.get(field)?.typed()
+    }
+}
+
+impl Default for AccessorRegistry {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+pub struct PipelineRegistry {
+    pipelines: HashMap<PipelineKey, PipelineUntyped>,
+}
+
+impl PipelineRegistry {
+    pub fn new() -> Self {
+        Self {
+            pipelines: HashMap::new(),
+        }
+    }
+
+    pub(crate) fn bake<W: 'static>(
+        &self,
+        key: &PipelineKey,
+        ctx: BakeCtx<W>,
+    ) -> bool {
+        if key.world_id() != TypeId::of::<W>() {
+            return false;
+        }
+
+        if let Some(pipeline) = self.pipelines.get(key) {
+            // SAFETY: verified above that key.world_id == TypeId::of::<W>().
+            unsafe { pipeline.bake(ctx) };
+            return true;
+        }
+
+        false
+    }
+
+    pub(crate) fn sample<W: 'static>(
+        &self,
+        key: &PipelineKey,
+        ctx: SampleCtx<W>,
+    ) -> bool {
+        if key.world_id() != TypeId::of::<W>() {
+            return false;
+        }
+
+        if let Some(pipeline) = self.pipelines.get(key) {
+            // SAFETY: verified above that key.world_id == TypeId::of::<W>().
+            unsafe { pipeline.sample(ctx) };
+            return true;
+        }
+
+        false
+    }
+
+    /// Register a [`Pipeline`].
+    /// Skips pipelines already registered.
+    pub fn register<W, I, S, T>(&mut self) -> &mut Self
+    where
+        W: SubjectSource<I, S> + 'static,
+        I: SubjectId,
+        S: 'static,
+        T: Clone + ThreadSafe,
+    {
+        let key = PipelineHandle::<W, I, S, T>::new().as_key();
+        if self.pipelines.contains_key(&key) {
+            return self;
+        }
+
+        self.pipelines
+            .insert(key, Pipeline::<W, I, S, T>::new().untyped());
+        self
+    }
+}
+
+impl Default for PipelineRegistry {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/crates/motiongfx/src/timeline.rs b/crates/motiongfx/src/timeline.rs
index 35353ee..a08cf56 100644
--- a/crates/motiongfx/src/timeline.rs
+++ b/crates/motiongfx/src/timeline.rs
@@ -1,24 +1,24 @@
 use core::cmp::Ordering;
+use core::marker::PhantomData;
 
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use bevy_platform::collections::HashMap;
-use field_path::field::Field;
-use field_path::registry::FieldAccessorRegistry;
+use field_path::field_accessor::FieldAccessor;
 
 use crate::ThreadSafe;
 use crate::action::{
     Action, ActionBuilder, ActionId, ActionKey, ActionWorld,
     InterpActionBuilder, SampleMode,
 };
-use crate::pipeline::Range;
-use crate::pipeline::{
-    BakeCtx, PipelineKey, PipelineRegistry, SampleCtx,
-};
+use crate::interpolation::Interpolation;
+use crate::pipeline::{BakeCtx, PipelineKey, Range, SampleCtx};
+use crate::registry::Registry;
 use crate::subject::SubjectId;
 use crate::track::Track;
+use crate::world::SubjectSource;
 
-pub struct Timeline {
+pub struct Timeline<W> {
     action_world: ActionWorld,
     pipeline_counts: Box<[(PipelineKey, u32)]>,
     /// Track length is guaranteed to be at least 1 by construction.
@@ -37,33 +37,42 @@ pub struct Timeline {
     curr_index: usize,
     /// The index of the target track.
     target_index: usize,
+    _marker: PhantomData<fn() -> W>,
 }
 
-impl Timeline {
-    pub fn bake_actions<W>(
+impl<W: 'static> Timeline<W> {
+    pub fn bake_actions(
         &mut self,
-        accessor_registry: &FieldAccessorRegistry,
-        pipeline_registry: &PipelineRegistry<W>,
+        registry: &Registry,
         subject_world: &W,
     ) {
         for key in self.pipeline_counts.iter().map(|(key, _)| key) {
-            let Some(pipeline) = pipeline_registry.get(key) else {
-                continue;
-            };
-
             for track in self.tracks.iter() {
-                pipeline.bake(
-                    subject_world,
+                let ok = registry.pipeline.bake(
+                    key,
                     BakeCtx {
+                        world: subject_world,
                         track,
                         action_world: &mut self.action_world,
-                        accessor_registry,
+                        accessor_registry: &registry.accessor,
                     },
-                )
+                );
+                debug_assert!(
+                    ok,
+                    "pipeline not found for key {key:?}"
+                );
             }
         }
     }
 
+    /// Determines which actions are active at the current target time
+    /// and marks them for sampling.
+    ///
+    /// This step is intentionally separate from
+    /// [`Self::sample_queued_actions`] so that multiple timelines can
+    /// queue concurrently. Queuing only requires `&mut self`, whereas
+    /// sampling requires `&mut W`, which would prevent parallel
+    /// execution across timelines sharing the same world.
     pub fn queue_actions(&mut self) {
         if self.tracks.is_empty() {
             return;
@@ -220,24 +229,21 @@ impl Timeline {
         self.curr_time = self.target_time;
     }
 
-    pub fn sample_queued_actions<W>(
+    pub fn sample_queued_actions(
         &self,
-        accessor_registry: &FieldAccessorRegistry,
-        pipeline_registry: &PipelineRegistry<W>,
+        registry: &Registry,
         subject_world: &mut W,
     ) {
         for key in self.pipeline_counts.iter().map(|(key, _)| key) {
-            let Some(pipeline) = pipeline_registry.get(key) else {
-                continue;
-            };
-
-            pipeline.sample(
-                subject_world,
+            let ok = registry.pipeline.sample(
+                key,
                 SampleCtx {
+                    world: subject_world,
                     action_world: &self.action_world,
-                    accessor_registry,
+                    accessor_registry: &registry.accessor,
                 },
             );
+            debug_assert!(ok, "pipeline not found for key {key:?}");
         }
     }
 
@@ -248,7 +254,7 @@ impl Timeline {
 }
 
 // Getter methods.
-impl Timeline {
+impl<W> Timeline<W> {
     /// Returns the current queue cache.
     #[inline]
     pub fn queue_cache(&self) -> &QueueCache {
@@ -322,7 +328,7 @@ impl Timeline {
 }
 
 // Setter methods.
-impl Timeline {
+impl<W> Timeline<W> {
     /// Set the target time of the current track, clamping the value
     /// within \[0.0..=track.duration\]
     pub fn set_target_time(&mut self, target_time: f32) -> &mut Self {
@@ -406,67 +412,96 @@ impl Default for QueueCache {
     }
 }
 
-pub struct TimelineBuilder {
+pub struct TimelineBuilder<'a, W> {
+    registry: &'a mut Registry,
     action_world: ActionWorld,
     pipeline_counts: HashMap<PipelineKey, u32>,
     tracks: Vec<Track>,
+    _marker: PhantomData<fn() -> W>,
 }
 
-impl TimelineBuilder {
+impl<'a, W: 'static> TimelineBuilder<'a, W> {
     /// Creates an empty timeline builder.
-    pub fn new() -> Self {
+    pub fn new(registry: &'a mut Registry) -> Self {
         Self {
+            registry,
             action_world: ActionWorld::new(),
             pipeline_counts: HashMap::new(),
             tracks: Vec::new(),
+            _marker: PhantomData,
         }
     }
 
-    /// Add an [`Action`] without interpolation.
-    pub fn act<I, S, T>(
+    /// Add an [`Action`] with interpolation using
+    /// [`Interpolation::interp`].
+    pub fn act<I, S, T, M>(
         &mut self,
         target: I,
-        field: Field<S, T>,
+        field_acc: FieldAccessor<S, T>,
         action: impl Action<T>,
-    ) -> ActionBuilder<'_, T>
+    ) -> InterpActionBuilder<'_, T>
     where
+        W: SubjectSource<I, S> + 'static,
         I: SubjectId,
         S: 'static,
-        T: ThreadSafe,
+        T: Interpolation<M> + Clone + ThreadSafe,
     {
-        let key = PipelineKey::new::<I, S, T>();
-
-        match self.pipeline_counts.get_mut(&key) {
-            Some(count) => *count += 1,
-            None => {
-                self.pipeline_counts.insert(key, 1);
-            }
-        }
-
-        self.action_world.add(target, field, action)
+        self.act_builder(target, field_acc, action)
+            .with_interp(T::interp)
     }
 
     /// Add an [`Action`] using step interpolation.
     pub fn act_step<I, S, T>(
         &mut self,
         target: I,
-        field: Field<S, T>,
+        field_acc: FieldAccessor<S, T>,
         action: impl Action<T>,
     ) -> InterpActionBuilder<'_, T>
     where
+        W: SubjectSource<I, S> + 'static,
+        I: SubjectId,
+        S: 'static,
+        T: Clone + ThreadSafe,
+    {
+        self.act_builder(target, field_acc, action).with_interp(
+            |a, b, t| {
+                if t < 1.0 { a.clone() } else { b.clone() }
+            },
+        )
+    }
+
+    /// Add an [`Action`] without interpolation, returning an
+    /// [`ActionBuilder`] for manual configuration.
+    pub fn act_builder<I, S, T>(
+        &mut self,
+        target: I,
+        field_acc: FieldAccessor<S, T>,
+        action: impl Action<T>,
+    ) -> ActionBuilder<'_, T>
+    where
+        W: SubjectSource<I, S> + 'static,
         I: SubjectId,
         S: 'static,
         T: Clone + ThreadSafe,
     {
-        self.act(target, field, action).with_interp(|a, b, t| {
-            if t < 1.0 { a.clone() } else { b.clone() }
-        })
+        let field = field_acc.field;
+        self.registry.register::<W, I, S, T>(field_acc);
+        let key = PipelineKey::new::<W, I, S, T>();
+
+        match self.pipeline_counts.get_mut(&key) {
+            Some(count) => *count += 1,
+            None => {
+                self.pipeline_counts.insert(key, 1);
+            }
+        }
+
+        self.action_world.add(target, field, action)
     }
 
     /// Remove an [`Action`].
     pub fn unact(&mut self, id: ActionId) -> bool {
         if let Some(key) = self.action_world.remove(id) {
-            let pipeline_key = PipelineKey::from_action_key(key);
+            let pipeline_key = PipelineKey::from_action_key::<W>(key);
 
             let count = self
                 .pipeline_counts
@@ -502,7 +537,10 @@ impl TimelineBuilder {
     /// ## Panic
     ///
     /// Panics if the track is empty.
-    pub fn compile(self) -> Timeline {
+    /// Use [`Self::try_compile`] to explicitly handle the case where
+    /// the track may be empty.
+    pub fn compile(self) -> Timeline<W> {
+        // TODO(nixon): What happens when track is empty?
         debug_assert!(
             !self.tracks.is_empty(),
             "Track cannot be empty!"
@@ -520,19 +558,14 @@ impl TimelineBuilder {
             target_time: 0.0,
             curr_index: 0,
             target_index: 0,
+            _marker: PhantomData,
         }
     }
 
-    /// Similar to [`Self::compile()`] but return `None` instead of
+    /// Similar to [`Self::compile`] but return `None` instead of
     /// panicking.
-    pub fn try_compile(self) -> Option<Timeline> {
-        (!self.tracks.is_empty()).then_some(self.compile())
-    }
-}
-
-impl Default for TimelineBuilder {
-    fn default() -> Self {
-        Self::new()
+    pub fn try_compile(self) -> Option<Timeline<W>> {
+        (!self.tracks.is_empty()).then(|| self.compile())
     }
 }
 
diff --git a/crates/motiongfx/src/track.rs b/crates/motiongfx/src/track.rs
index aa157ca..1f3c145 100644
--- a/crates/motiongfx/src/track.rs
+++ b/crates/motiongfx/src/track.rs
@@ -352,7 +352,7 @@ mod tests {
 
     fn key(path: &'static str) -> ActionKey {
         ActionKey::new(
-            UntypedSubjectId::placeholder(),
+            UntypedSubjectId::PLACEHOLDER,
             UntypedField::placeholder_with_path(path),
         )
     }
diff --git a/crates/motiongfx/src/world.rs b/crates/motiongfx/src/world.rs
new file mode 100644
index 0000000..f2efd61
--- /dev/null
+++ b/crates/motiongfx/src/world.rs
@@ -0,0 +1,12 @@
+use crate::subject::SubjectId;
+
+/// Provides read and write access to a source type `S` by subject id `I`.
+pub trait SubjectSource<I: SubjectId, S: 'static> {
+    fn get_source(&self, id: I) -> Option<&S>;
+
+    fn apply_source<R>(
+        &mut self,
+        id: I,
+        f: impl FnOnce(&mut S) -> R,
+    ) -> Option<R>;
+}
diff --git a/crates/peniko_motiongfx/Cargo.toml b/crates/peniko_motiongfx/Cargo.toml
new file mode 100644
index 0000000..a89c81e
--- /dev/null
+++ b/crates/peniko_motiongfx/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "peniko_motiongfx"
+description = "Peniko 2d graphics support for the MotionGfx framework."
+keywords = ["motion", "animation", "procedural", "kurbo"]
+categories = ["no-std", "multimedia", "graphics", "visualization"]
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[dependencies]
+motiongfx = { workspace = true }
+peniko = { workspace = true }
+
+[lints]
+workspace = true
+
+[features]
+default = ["std"]
+std = ["motiongfx/std", "peniko/std"]
+libm = ["peniko/libm"]
diff --git a/crates/peniko_motiongfx/src/interpolation.rs b/crates/peniko_motiongfx/src/interpolation.rs
new file mode 100644
index 0000000..56bcaee
--- /dev/null
+++ b/crates/peniko_motiongfx/src/interpolation.rs
@@ -0,0 +1,146 @@
+use motiongfx::prelude::Interpolation;
+use peniko::Color;
+use peniko::kurbo::{
+    Circle, CubicBez, Line, Point, QuadBez, Rect, RoundedRect,
+    RoundedRectRadii, Size, Vec2,
+};
+
+use crate::Peniko;
+
+/// Linearly interpolates between two `f64` values.
+#[inline]
+pub(crate) const fn lerp_f64(a: f64, b: f64, t: f32) -> f64 {
+    let t = t as f64;
+    a * (1.0 - t) + b * t
+}
+
+/// Linearly interpolates between two [`Point`]s.
+#[inline]
+pub(crate) const fn interp_point(
+    a: &Point,
+    b: &Point,
+    t: f32,
+) -> Point {
+    Point::new(lerp_f64(a.x, b.x, t), lerp_f64(a.y, b.y, t))
+}
+
+impl Interpolation<Peniko> for Point {
+    /// Linearly interpolates between two [`Point`]s.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        interp_point(a, b, t)
+    }
+}
+
+impl Interpolation<Peniko> for Vec2 {
+    /// Linearly interpolates between two [`Vec2`]s.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        Vec2::new(lerp_f64(a.x, b.x, t), lerp_f64(a.y, b.y, t))
+    }
+}
+
+impl Interpolation<Peniko> for Size {
+    /// Linearly interpolates between two [`Size`]s.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        Size::new(
+            lerp_f64(a.width, b.width, t),
+            lerp_f64(a.height, b.height, t),
+        )
+    }
+}
+
+impl Interpolation<Peniko> for Rect {
+    /// Linearly interpolates between two [`Rect`]s.
+    ///
+    /// Each corner coordinate is interpolated independently.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        Rect {
+            x0: lerp_f64(a.x0, b.x0, t),
+            y0: lerp_f64(a.y0, b.y0, t),
+            x1: lerp_f64(a.x1, b.x1, t),
+            y1: lerp_f64(a.y1, b.y1, t),
+        }
+    }
+}
+
+impl Interpolation<Peniko> for Circle {
+    /// Linearly interpolates between two [`Circle`]s.
+    ///
+    /// Both the center position and radius are interpolated.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        Circle {
+            center: interp_point(&a.center, &b.center, t),
+            radius: lerp_f64(a.radius, b.radius, t),
+        }
+    }
+}
+
+impl Interpolation<Peniko> for Line {
+    /// Linearly interpolates between two [`Line`]s.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        Line {
+            p0: interp_point(&a.p0, &b.p0, t),
+            p1: interp_point(&a.p1, &b.p1, t),
+        }
+    }
+}
+
+impl Interpolation<Peniko> for CubicBez {
+    /// Linearly interpolates between two [`CubicBez`] curves.
+    ///
+    /// Each of the four control points is interpolated independently.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        CubicBez::new(
+            interp_point(&a.p0, &b.p0, t),
+            interp_point(&a.p1, &b.p1, t),
+            interp_point(&a.p2, &b.p2, t),
+            interp_point(&a.p3, &b.p3, t),
+        )
+    }
+}
+
+impl Interpolation<Peniko> for QuadBez {
+    /// Linearly interpolates between two [`QuadBez`] curves.
+    ///
+    /// Each of the three control points is interpolated independently.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        QuadBez::new(
+            interp_point(&a.p0, &b.p0, t),
+            interp_point(&a.p1, &b.p1, t),
+            interp_point(&a.p2, &b.p2, t),
+        )
+    }
+}
+
+impl Interpolation<Peniko> for RoundedRect {
+    /// Linearly interpolates between two [`RoundedRect`]s.
+    ///
+    /// Both the bounding rect and each of the four corner radii are
+    /// interpolated independently.
+    #[inline]
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        let rect = Rect::interp(&a.rect(), &b.rect(), t);
+        let ra = a.radii();
+        let rb = b.radii();
+        let radii = RoundedRectRadii::new(
+            lerp_f64(ra.top_left, rb.top_left, t),
+            lerp_f64(ra.top_right, rb.top_right, t),
+            lerp_f64(ra.bottom_right, rb.bottom_right, t),
+            lerp_f64(ra.bottom_left, rb.bottom_left, t),
+        );
+        RoundedRect::from_rect(rect, radii)
+    }
+}
+
+impl Interpolation<Peniko> for Color {
+    fn interp(a: &Self, b: &Self, t: f32) -> Self {
+        a.lerp_rect(*b, t)
+    }
+}
diff --git a/crates/peniko_motiongfx/src/lib.rs b/crates/peniko_motiongfx/src/lib.rs
new file mode 100644
index 0000000..3404e90
--- /dev/null
+++ b/crates/peniko_motiongfx/src/lib.rs
@@ -0,0 +1,19 @@
+#![no_std]
+
+pub mod interpolation;
+pub mod trace;
+
+pub mod prelude {
+    pub use peniko;
+    pub use peniko::kurbo;
+
+    pub use crate::Peniko;
+    pub use crate::trace::{
+        CubicTracer, LineTracer, PathTracer, QuadTracer, Trace,
+    };
+}
+
+/// Marker for [`Interpolation<Peniko>`] impls on [`peniko`] types.
+///
+/// [`Interpolation<Peniko>`]: motiongfx::interpolation::Interpolation
+pub struct Peniko;
diff --git a/crates/peniko_motiongfx/src/trace.rs b/crates/peniko_motiongfx/src/trace.rs
new file mode 100644
index 0000000..d9d4f8e
--- /dev/null
+++ b/crates/peniko_motiongfx/src/trace.rs
@@ -0,0 +1,99 @@
+use peniko::kurbo::{BezPath, CubicBez, Line, ParamCurve, QuadBez};
+
+pub type LineTracer = Tracer<Line>;
+pub type QuadTracer = Tracer<QuadBez>;
+pub type CubicTracer = Tracer<CubicBez>;
+pub type PathTracer = Tracer<BezPath>;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct Tracer<T: Trace> {
+    /// The original full path.
+    pub path: T,
+    /// The `t` value to trace `path`.
+    pub t: f32,
+}
+
+impl<T: Trace> Tracer<T> {
+    pub fn trace(&self) -> T {
+        self.path.trace(self.t)
+    }
+}
+
+pub trait Trace {
+    fn trace(&self, t: f32) -> Self;
+}
+
+impl Trace for Line {
+    /// Returns the prefix of a [`Line`] traced from start to `t`.
+    #[inline]
+    fn trace(&self, t: f32) -> Self {
+        let t = t.clamp(0.0, 1.0) as f64;
+        self.subsegment(0.0..t)
+    }
+}
+
+impl Trace for QuadBez {
+    /// Returns the prefix of a [`QuadBez`] traced from start to `t`.
+    #[inline]
+    fn trace(&self, t: f32) -> Self {
+        let t = t.clamp(0.0, 1.0) as f64;
+        self.subsegment(0.0..t)
+    }
+}
+
+impl Trace for CubicBez {
+    /// Returns the prefix of a [`CubicBez`] traced from start to `t`.
+    #[inline]
+    fn trace(&self, t: f32) -> Self {
+        let t = t.clamp(0.0, 1.0) as f64;
+        self.subsegment(0.0..t)
+    }
+}
+
+impl Trace for BezPath {
+    /// See [`trace_bez_path`].
+    #[inline]
+    fn trace(&self, t: f32) -> Self {
+        trace_bez_path(self, t)
+    }
+}
+
+/// Returns the prefix of `path` traced from the start to `t`.
+///
+/// Progress is distributed uniformly across segments (not
+/// arc-length parameterised).
+///
+/// Trace multiple paths as if they were a single continuous stroke.
+pub fn trace_bez_path(path: &BezPath, t: f32) -> BezPath {
+    if t <= 0.0 {
+        return BezPath::new();
+    }
+    if t >= 1.0 {
+        return path.clone();
+    }
+
+    let n = path.segments().count();
+    if n == 0 {
+        return BezPath::new();
+    }
+
+    let t = f64::from(t);
+    let scaled = t * n as f64;
+    let complete = scaled.floor() as usize;
+    let partial_t = scaled - complete as f64;
+
+    let mut result = BezPath::new();
+    result.move_to(
+        path.get_seg(0).map(|s| s.start()).unwrap_or_default(),
+    );
+    for seg in path.segments().take(complete) {
+        result.push(seg.as_path_el());
+    }
+    if partial_t > 0.0
+        && let Some(seg) = path.segments().nth(complete)
+    {
+        result.push(seg.subsegment(0.0..partial_t).as_path_el());
+    }
+
+    result
+}
diff --git a/examples/bevy_examples/examples/custom_ease.rs b/examples/bevy_examples/examples/custom_ease.rs
index 2b034a8..3d2c97b 100644
--- a/examples/bevy_examples/examples/custom_ease.rs
+++ b/examples/bevy_examples/examples/custom_ease.rs
@@ -14,27 +14,28 @@ fn main() {
 
 fn spawn_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Spawn cube.
-    let cube = commands
+    let cube_id = commands
         .spawn((
             Mesh3d(meshes.add(Cuboid::default())),
-            MeshMaterial3d(materials.add(StandardMaterial {
-                base_color: palettes::tailwind::LIME_200.into(),
-                ..default()
-            })),
+            MeshMaterial3d(materials.add(
+                StandardMaterial::from_color(
+                    palettes::tailwind::LIME_200,
+                ),
+            )),
             Transform::from_xyz(-5.0, 0.0, 0.0),
         ))
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
 
     let track = b
-        .act_interp(cube, field!(<Transform>::translation::x), |x| {
+        .act(cube_id, path!(<Transform>::translation::x), |x| {
             x + 10.0
         })
         // A custom 10 step easing.
@@ -44,8 +45,9 @@ fn spawn_timeline(
 
     b.add_tracks(track);
 
+    let timeline = b.compile();
     commands.spawn((
-        motiongfx.add_timeline(b.compile()),
+        motiongfx.add_timeline(timeline),
         RealtimePlayer::new().with_playing(true),
     ));
 }
diff --git a/examples/bevy_examples/examples/custom_interp.rs b/examples/bevy_examples/examples/custom_interp.rs
index 6130c98..57bddca 100644
--- a/examples/bevy_examples/examples/custom_interp.rs
+++ b/examples/bevy_examples/examples/custom_interp.rs
@@ -16,27 +16,28 @@ fn main() {
 
 fn spawn_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Spawn cube.
-    let cube = commands
+    let cube_id = commands
         .spawn((
             Mesh3d(meshes.add(Cuboid::default())),
-            MeshMaterial3d(materials.add(StandardMaterial {
-                base_color: palettes::tailwind::LIME_200.into(),
-                ..default()
-            })),
+            MeshMaterial3d(materials.add(
+                StandardMaterial::from_color(
+                    palettes::tailwind::LIME_200,
+                ),
+            )),
             Transform::from_xyz(-5.0, 0.0, 0.0),
         ))
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
 
     let track = b
-        .act(cube, field!(<Transform>::translation), |x| {
+        .act_builder(cube_id, path!(<Transform>::translation), |x| {
             x + Vec3::ZERO.with_x(10.0).with_z(1.0)
         })
         .with_interp(|start, end, t| arc_lerp_3d(*start, *end, t))
@@ -46,9 +47,10 @@ fn spawn_timeline(
 
     b.add_tracks(track);
 
+    let timeline = b.compile();
     commands.spawn((
-        motiongfx.add_timeline(b.compile()),
-        RealtimePlayer::new(),
+        motiongfx.add_timeline(timeline),
+        RealtimePlayer::new().with_playing(true),
     ));
 }
 
@@ -71,7 +73,7 @@ fn setup(mut commands: Commands) {
     ));
 }
 
-// TODO: Optimize this.
+// TODO(nixon): Optimize this.
 pub fn arc_lerp_3d(start: Vec3, end: Vec3, t: f32) -> Vec3 {
     let center = (start + end) * 0.5;
 
diff --git a/examples/bevy_examples/examples/easings.rs b/examples/bevy_examples/examples/easings.rs
index 61a7bc6..c4dfd14 100644
--- a/examples/bevy_examples/examples/easings.rs
+++ b/examples/bevy_examples/examples/easings.rs
@@ -17,7 +17,7 @@ fn main() {
 
 fn spawn_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
@@ -41,8 +41,8 @@ fn spawn_timeline(
     let red = LinearRgba::from(palettes::tailwind::ROSE_400) * 100.0;
 
     // Spawn spheres.
-    let mut spheres = Vec::with_capacity(capacity);
-    let mut sphere_mats = Vec::with_capacity(capacity);
+    let mut sphere_ids = Vec::with_capacity(capacity);
+    let mut sphere_mat_ids = Vec::with_capacity(capacity);
     let mesh_handle = meshes.add(Sphere::default());
     let material = StandardMaterial {
         base_color: Color::WHITE,
@@ -51,11 +51,12 @@ fn spawn_timeline(
     };
 
     for i in 0..capacity {
-        let sphere_mat = materials.add(material.clone());
+        let sphere_mat_handle = materials.add(material.clone());
+        let sphere_mat_id = sphere_mat_handle.id().untyped();
         let sphere = commands
             .spawn((
                 Mesh3d(mesh_handle.clone()),
-                MeshMaterial3d(sphere_mat.clone()),
+                MeshMaterial3d(sphere_mat_handle),
                 Transform::from_translation(Vec3::new(
                     -5.0,
                     (i as f32) - (capacity as f32) * 0.5,
@@ -66,29 +67,28 @@ fn spawn_timeline(
             ))
             .id();
 
-        spheres.push(sphere);
-        sphere_mats.push(sphere_mat.untyped().id());
+        sphere_ids.push(sphere);
+        sphere_mat_ids.push(sphere_mat_id);
     }
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
 
     let track = easings
         .into_iter()
         .enumerate()
-        // .zip(easings)
         .map(|(i, ease_fn)| {
             [
-                b.act_interp(
-                    spheres[i],
-                    field!(<Transform>::translation::x),
+                b.act(
+                    sphere_ids[i],
+                    path!(<Transform>::translation::x),
                     |x| x + 10.0,
                 )
                 .with_ease(ease_fn)
                 .play(1.0),
-                b.act_interp(
-                    sphere_mats[i],
-                    field!(<StandardMaterial>::emissive),
+                b.act(
+                    sphere_mat_ids[i],
+                    path!(<StandardMaterial>::emissive),
                     move |_| red,
                 )
                 .with_ease(ease_fn)
@@ -100,8 +100,9 @@ fn spawn_timeline(
 
     b.add_tracks(track.compile());
 
+    let timeline = b.compile();
     commands.spawn((
-        motiongfx.add_timeline(b.compile()),
+        motiongfx.add_timeline(timeline),
         RealtimePlayer::new().with_playing(true),
     ));
 }
diff --git a/examples/bevy_examples/examples/hello_world.rs b/examples/bevy_examples/examples/hello_world.rs
index 45807e3..3d8dd62 100644
--- a/examples/bevy_examples/examples/hello_world.rs
+++ b/examples/bevy_examples/examples/hello_world.rs
@@ -15,7 +15,7 @@ fn main() {
 
 fn spawn_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     mut meshes: ResMut<Assets<Mesh>>,
 ) {
@@ -25,12 +25,11 @@ fn spawn_timeline(
     const CAPACITY: usize = WIDTH * HEIGHT;
 
     // Spawn cubes.
-    let mut cubes = Vec::with_capacity(CAPACITY);
+    let mut cube_ids = Vec::with_capacity(CAPACITY);
     let mesh_handle = meshes.add(Cuboid::default());
-    let material_handle = materials.add(StandardMaterial {
-        base_color: palettes::tailwind::LIME_200.into(),
-        ..default()
-    });
+    let material_handle = materials.add(
+        StandardMaterial::from_color(palettes::tailwind::LIME_200),
+    );
 
     for w in 0..WIDTH {
         for h in 0..HEIGHT {
@@ -48,48 +47,42 @@ fn spawn_timeline(
                     MeshMaterial3d(material_handle.clone()),
                 ))
                 .id();
-            cubes.push(id);
+            cube_ids.push(id);
         }
     }
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     let mut cube_tracks = Vec::with_capacity(CAPACITY);
 
     for w in 0..WIDTH {
         for h in 0..HEIGHT {
             let c = w * WIDTH + h;
-            let cube = cubes[c];
+            let cube_id = cube_ids[c];
 
             let circ_ease = ease::circ::ease_in_out;
 
             let track = [
-                b.act_interp(
-                    cube,
-                    field!(<Transform>::scale),
-                    |_| Vec3::splat(0.9),
-                )
+                b.act(cube_id, path!(<Transform>::scale), |_| {
+                    Vec3::splat(0.9)
+                })
                 .with_ease(circ_ease)
                 .play(1.0),
-                b.act_interp(
-                    cube,
-                    field!(<Transform>::translation::x),
+                b.act(
+                    cube_id,
+                    path!(<Transform>::translation::x),
                     |x| x + 1.0,
                 )
                 .with_ease(circ_ease)
                 .play(1.0),
-                b.act_interp(
-                    cube,
-                    field!(<Transform>::rotation),
-                    |_| {
-                        Quat::from_euler(
-                            EulerRot::XYZ,
-                            0.0,
-                            f32::to_radians(90.0),
-                            0.0,
-                        )
-                    },
-                )
+                b.act(cube_id, path!(<Transform>::rotation), |_| {
+                    Quat::from_euler(
+                        EulerRot::XYZ,
+                        0.0,
+                        f32::to_radians(90.0),
+                        0.0,
+                    )
+                })
                 .with_ease(circ_ease)
                 .play(1.0),
             ]
diff --git a/examples/bevy_examples/examples/minimal.rs b/examples/bevy_examples/examples/minimal.rs
index 4dcca8f..e0ccb2e 100644
--- a/examples/bevy_examples/examples/minimal.rs
+++ b/examples/bevy_examples/examples/minimal.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use bevy_motiongfx::BevyMotionGfxPlugin;
+use bevy_motiongfx::manager::TimelineComplete;
 use bevy_motiongfx::prelude::*;
-use bevy_motiongfx::world::TimelineComplete;
 
 fn main() {
     App::new()
@@ -32,33 +32,32 @@ fn log_complete(_: On<Add, TimelineComplete>) {
 /// Creates the timeline and plays it.
 fn build_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    let material =
+    let cube_mat_handle =
         materials.add(StandardMaterial::from_color(Srgba::BLUE));
+    let cube_mat_id = cube_mat_handle.id().untyped();
     // Spawns the cube.
-    let cube = commands
+    let cube_id = commands
         .spawn((
             Mesh3d(meshes.add(Cuboid::default())),
-            MeshMaterial3d(material.clone()),
+            MeshMaterial3d(cube_mat_handle),
             Transform::from_xyz(-3.0, 0.0, 0.0),
         ))
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
     let track = [
-        b.act_interp(
-            cube,
-            field!(<Transform>::translation::x),
-            |x| x + 6.0,
-        )
+        b.act(cube_id, path!(<Transform>::translation::x), |x| {
+            x + 6.0
+        })
         .play(1.0),
-        b.act_interp(
-            material.untyped().id(),
-            field!(<StandardMaterial>::base_color),
+        b.act(
+            cube_mat_id,
+            path!(<StandardMaterial>::base_color),
             |_| Srgba::RED.into(),
         )
         .play(1.0),
diff --git a/examples/bevy_examples/examples/recording.rs b/examples/bevy_examples/examples/recording.rs
index 10d2eab..d3c7e77 100644
--- a/examples/bevy_examples/examples/recording.rs
+++ b/examples/bevy_examples/examples/recording.rs
@@ -4,8 +4,8 @@ use bevy::color::palettes;
 use bevy::prelude::*;
 use bevy::render::view::screenshot::{Screenshot, save_to_disk};
 use bevy_motiongfx::BevyMotionGfxPlugin;
+use bevy_motiongfx::manager::TimelineComplete;
 use bevy_motiongfx::prelude::*;
-use bevy_motiongfx::world::TimelineComplete;
 
 use crate::pipelines_ready::*;
 
@@ -87,30 +87,28 @@ fn check_final_frame(
 
 fn spawn_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // Spawn cube.
-    let mesh = meshes.add(Cuboid::default());
-    let mat = materials.add(StandardMaterial {
-        base_color: palettes::tailwind::LIME_200.into(),
-        ..default()
-    });
-
-    let cube = commands
+    let cube_id = commands
         .spawn((
-            Mesh3d(mesh),
-            MeshMaterial3d(mat),
+            Mesh3d(meshes.add(Cuboid::default())),
+            MeshMaterial3d(materials.add(
+                StandardMaterial::from_color(
+                    palettes::tailwind::LIME_200,
+                ),
+            )),
             Transform::from_xyz(-5.0, 0.0, 0.0),
         ))
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
 
     let track = b
-        .act(cube, field!(<Transform>::translation), |x| {
+        .act_builder(cube_id, path!(<Transform>::translation), |x| {
             x + Vec3::ZERO.with_x(10.0).with_z(1.0)
         })
         .with_interp(|start, end, t| arc_lerp_3d(*start, *end, t))
@@ -119,8 +117,9 @@ fn spawn_timeline(
 
     b.add_tracks(track);
 
+    let timeline = b.compile();
     commands.spawn((
-        motiongfx.add_timeline(b.compile()),
+        motiongfx.add_timeline(timeline),
         FixedRatePlayer::new(144),
     ));
 }
diff --git a/examples/bevy_examples/examples/slide_basic.rs b/examples/bevy_examples/examples/slide_basic.rs
index 9d6e000..18108a6 100644
--- a/examples/bevy_examples/examples/slide_basic.rs
+++ b/examples/bevy_examples/examples/slide_basic.rs
@@ -14,21 +14,22 @@ fn main() {
 
 fn spawn_timeline(
     mut commands: Commands,
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     const X_OFFSET: f32 = 2.0;
 
     // Spawn 3d models.
+    let cube_mat_handle = materials.add(
+        StandardMaterial::from_color(palettes::tailwind::LIME_200),
+    );
+    let cube_mat_id = cube_mat_handle.id().untyped();
     let cube = commands
         .spawn((
             Mesh3d(meshes.add(Cuboid::default())),
             Transform::default().with_scale(Vec3::splat(0.0)),
-            MeshMaterial3d(materials.add(StandardMaterial {
-                base_color: palettes::tailwind::LIME_200.into(),
-                ..default()
-            })),
+            MeshMaterial3d(cube_mat_handle),
         ))
         .id();
 
@@ -46,46 +47,45 @@ fn spawn_timeline(
         .id();
 
     // Build the timeline.
-    let mut b = TimelineBuilder::new();
+    let mut b = motiongfx.create_builder();
 
     // Generate slide sequences.
     let slide0 = b
-        .act_interp(cube, field!(<Transform>::scale), |_| Vec3::ONE)
+        .act(cube, path!(<Transform>::scale), |_| Vec3::ONE)
         .with_ease(ease::cubic::ease_out)
         .play(1.0)
         .compile();
 
     let slide1 = [
         [
-            b.act_interp(
+            b.act(
                 cube,
-                field!(<Transform>::translation::x),
+                path!(<Transform>::translation::x),
                 move |_| -X_OFFSET,
             )
             .with_ease(ease::cubic::ease_out)
             .play(1.0),
-            b.act_interp(
-                cube,
-                field!(<StandardMaterial>::base_color),
+            b.act(
+                cube_mat_id,
+                path!(<StandardMaterial>::base_color),
                 move |_| palettes::tailwind::ZINC_700.into(),
             )
             .with_ease(ease::cubic::ease_out)
             .play(1.0),
         ]
         .ord_all(),
-        b.act_interp(sphere, field!(<Transform>::scale), |_| {
-            Vec3::ONE
-        })
-        .with_ease(ease::cubic::ease_out)
-        .play(1.0),
+        b.act(sphere, path!(<Transform>::scale), |_| Vec3::ONE)
+            .with_ease(ease::cubic::ease_out)
+            .play(1.0),
     ]
     .ord_flow(0.1)
     .compile();
 
     b.add_tracks([slide0, slide1]);
 
+    let timeline = b.compile();
     commands.spawn((
-        motiongfx.add_timeline(b.compile()),
+        motiongfx.add_timeline(timeline),
         RealtimePlayer::new().with_playing(true),
     ));
 }
@@ -109,7 +109,7 @@ fn setup(mut commands: Commands) {
 }
 
 fn slide_movement(
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut q_timelines: Query<(&TimelineId, &mut RealtimePlayer)>,
     keys: Res<ButtonInput<KeyCode>>,
 ) {
diff --git a/examples/bevy_examples/src/lib.rs b/examples/bevy_examples/src/lib.rs
index 88324dc..191c33f 100644
--- a/examples/bevy_examples/src/lib.rs
+++ b/examples/bevy_examples/src/lib.rs
@@ -2,7 +2,7 @@ use bevy::prelude::*;
 use bevy_motiongfx::prelude::*;
 
 pub fn timeline_movement(
-    mut motiongfx: ResMut<MotionGfxWorld>,
+    mut motiongfx: ResMut<MotionGfxManager>,
     mut q_timelines: Query<(&TimelineId, &mut RealtimePlayer)>,
     keys: Res<ButtonInput<KeyCode>>,
     time: Res<Time>,