diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..c8f6633
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,28 @@
+name: Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-ios:
+    name: Build for iOS
+    runs-on: macos-15
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Select Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
+      - name: Build CarPlayDemo for iOS Simulator
+        run: |
+          xcodebuild build \
+            -project Xcode/CarPlayDemo.xcodeproj \
+            -scheme CarPlayDemo \
+            -destination 'generic/platform=iOS Simulator'
diff --git a/Package.swift b/Package.swift
index b667907..02ff4e9 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,9 +1,9 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 import PackageDescription
 
 let package = Package(
     name: "CarPlayUI",
-    platforms: [.iOS(.v13)],
+    platforms: [.iOS(.v17)],
     products: [
         .library(
             name: "CarPlayUI",
@@ -14,14 +14,18 @@ let package = Package(
         .target(
             name: "CarPlayUI",
             swiftSettings: [
-                .swiftLanguageMode(.v6)
+                .swiftLanguageMode(.v6),
+                .enableUpcomingFeature("InferIsolatedConformances"),
+                .enableUpcomingFeature("NonisolatedNonsendingByDefault")
             ]
         ),
         .testTarget(
             name: "CarPlayUITests",
             dependencies: ["CarPlayUI"],
             swiftSettings: [
-                .swiftLanguageMode(.v6)
+                .swiftLanguageMode(.v6),
+                .enableUpcomingFeature("InferIsolatedConformances"),
+                .enableUpcomingFeature("NonisolatedNonsendingByDefault")
             ]
         )
     ]
diff --git a/Sources/CarPlayUI/Extensions/CPGridButton.swift b/Sources/CarPlayUI/Extensions/CPGridButton.swift
index 10b930b..581dbf8 100644
--- a/Sources/CarPlayUI/Extensions/CPGridButton.swift
+++ b/Sources/CarPlayUI/Extensions/CPGridButton.swift
@@ -10,6 +10,7 @@ import CarPlay
 
 internal extension CPGridButton {
     
+    @MainActor
     convenience init(label: ParentView, action: @escaping (CPGridButton) -> ()) {
         // extract labels
         var labels = label.children.compactMap {
diff --git a/Sources/CarPlayUI/Extensions/CPPointOfInterest.swift b/Sources/CarPlayUI/Extensions/CPPointOfInterest.swift
index 6a4a559..b05118d 100644
--- a/Sources/CarPlayUI/Extensions/CPPointOfInterest.swift
+++ b/Sources/CarPlayUI/Extensions/CPPointOfInterest.swift
@@ -11,6 +11,7 @@ import CarPlay
 @available(iOS 14.0, *)
 internal extension CPPointOfInterest {
     
+    @MainActor
     convenience init(_ view: ViewObject) {
         if #available(iOS 16.0, *) {
             self.init(
diff --git a/Sources/CarPlayUI/Extensions/CPTextButton.swift b/Sources/CarPlayUI/Extensions/CPTextButton.swift
index 13fc0cf..b8e6102 100644
--- a/Sources/CarPlayUI/Extensions/CPTextButton.swift
+++ b/Sources/CarPlayUI/Extensions/CPTextButton.swift
@@ -11,6 +11,7 @@ import CarPlay
 @available(iOS 14.0, *)
 internal extension CPTextButton {
     
+    @MainActor
     convenience init(button: Button<Text>) {
         let title = _TextProxy(button.label).rawText
         let textStyle = CPTextButtonStyle(role: button.role)
diff --git a/Sources/CarPlayUI/Extensions/UIImage.swift b/Sources/CarPlayUI/Extensions/UIImage.swift
index bc7d4a0..5cf43a2 100644
--- a/Sources/CarPlayUI/Extensions/UIImage.swift
+++ b/Sources/CarPlayUI/Extensions/UIImage.swift
@@ -11,6 +11,7 @@ import CarPlay
 
 internal extension UIImage {
     
+    @MainActor
     convenience init?(
         _ image: _ImageProxy,
         environment: EnvironmentValues = .defaultEnvironment
@@ -38,6 +39,7 @@ internal extension UIImage {
         }
     }
     
+    @MainActor
     static func unsafe(
         _ image: Image,
         environment: EnvironmentValues = .defaultEnvironment,
@@ -46,7 +48,8 @@ internal extension UIImage {
     ) -> UIImage {
         unsafe(_ImageProxy(image), environment: environment, file: file, line: line)
     }
-    
+
+    @MainActor
     static func unsafe(
         _ image: _ImageProxy,
         environment: EnvironmentValues = .defaultEnvironment,
diff --git a/Sources/CarPlayUI/TokamakCore/Animation/Animatable.swift b/Sources/CarPlayUI/TokamakCore/Animation/Animatable.swift
index ca75dca..46a7d30 100644
--- a/Sources/CarPlayUI/TokamakCore/Animation/Animatable.swift
+++ b/Sources/CarPlayUI/TokamakCore/Animation/Animatable.swift
@@ -18,8 +18,8 @@
 import Foundation
 
 public protocol Animatable {
-  associatedtype AnimatableData: VectorArithmetic
-  var animatableData: Self.AnimatableData { get set }
+  associatedtype _AnimatableData: VectorArithmetic
+  var animatableData: Self._AnimatableData { get set }
 }
 
 public protocol _PrimitiveAnimatable {}
@@ -32,7 +32,7 @@ public extension Animatable where Self: VectorArithmetic {
   }
 }
 
-public extension Animatable where Self.AnimatableData == EmptyAnimatableData {
+public extension Animatable where Self._AnimatableData == EmptyAnimatableData {
   var animatableData: EmptyAnimatableData {
     @inlinable get { EmptyAnimatableData() }
     // swiftlint:disable:next unused_setter_value
@@ -140,26 +140,34 @@ public struct AnimatablePair<First, Second>: VectorArithmetic
 }
 
 extension CGPoint: Animatable {
-  public var animatableData: AnimatablePair<CGFloat, CGFloat> {
+  public typealias _AnimatableData = AnimatablePair<CGFloat, CGFloat>
+  public var animatableData: _AnimatableData {
     @inlinable get { .init(x, y) }
     @inlinable set { (x, y) = newValue[] }
   }
 }
 
 extension CGSize: Animatable {
-  public var animatableData: AnimatablePair<CGFloat, CGFloat> {
+  public typealias _AnimatableData = AnimatablePair<CGFloat, CGFloat>
+  public var animatableData: _AnimatableData {
     @inlinable get { .init(width, height) }
     @inlinable set { (width, height) = newValue[] }
   }
 }
 
 extension CGRect: Animatable {
-  public var animatableData: AnimatablePair<CGPoint.AnimatableData, CGSize.AnimatableData> {
+  public typealias _AnimatableData = AnimatablePair<AnimatablePair<CGFloat, CGFloat>, AnimatablePair<CGFloat, CGFloat>>
+  public var animatableData: _AnimatableData {
     @inlinable get {
-      .init(origin.animatableData, size.animatableData)
+      .init(
+        AnimatablePair(origin.x, origin.y),
+        AnimatablePair(size.width, size.height)
+      )
     }
     @inlinable set {
-      (origin.animatableData, size.animatableData) = newValue[]
+      let value = newValue[]
+      origin = .init(x: value.0[].0, y: value.0[].1)
+      size = .init(width: value.1[].0, height: value.1[].1)
     }
   }
 }
diff --git a/Sources/CarPlayUI/TokamakCore/Animation/Animation.swift b/Sources/CarPlayUI/TokamakCore/Animation/Animation.swift
index 589b5e5..69550b5 100644
--- a/Sources/CarPlayUI/TokamakCore/Animation/Animation.swift
+++ b/Sources/CarPlayUI/TokamakCore/Animation/Animation.swift
@@ -143,8 +143,8 @@ public struct _AnimationProxy {
 public struct _AnimationModifier<Value>: ViewModifier, Equatable
   where Value: Equatable
 {
-  public var animation: Animation?
-  public var value: Value
+  public nonisolated(unsafe) var animation: Animation?
+  public nonisolated(unsafe) var value: Value
 
   @inlinable
   public init(animation: Animation?, value: Value) {
@@ -155,10 +155,9 @@ public struct _AnimationModifier<Value>: ViewModifier, Equatable
   private struct ContentWrapper: View, Equatable {
     let content: Content
     let animation: Animation?
-    let value: Value
+    nonisolated(unsafe) let value: Value
 
-    @State
-    private var lastValue: Value?
+    @State private nonisolated(unsafe) var lastValue: Value?
 
     var body: some View {
       content.transaction {
@@ -168,7 +167,7 @@ public struct _AnimationModifier<Value>: ViewModifier, Equatable
       }
     }
 
-    static func == (lhs: Self, rhs: Self) -> Bool {
+    nonisolated static func == (lhs: Self, rhs: Self) -> Bool {
       lhs.value == rhs.value
     }
   }
@@ -177,7 +176,7 @@ public struct _AnimationModifier<Value>: ViewModifier, Equatable
     ContentWrapper(content: content, animation: animation, value: value)
   }
 
-  public static func == (lhs: Self, rhs: Self) -> Bool {
+  public nonisolated static func == (lhs: Self, rhs: Self) -> Bool {
     lhs.value == rhs.value
       && lhs.animation == rhs.animation
   }
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+Content.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+Content.swift
index 68886f1..2fca8aa 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+Content.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+Content.swift
@@ -20,11 +20,11 @@ import Foundation
 public extension FiberReconciler.Fiber {
   enum Content {
     /// The underlying `App` instance and a function to visit it generically.
-    case app(Any, visit: (AppVisitor) -> ())
+    case app(Any, visit: @MainActor (AppVisitor) -> ())
     /// The underlying `Scene` instance and a function to visit it generically.
-    case scene(Any, visit: (SceneVisitor) -> ())
+    case scene(Any, visit: @MainActor (SceneVisitor) -> ())
     /// The underlying `View` instance and a function to visit it generically.
-    case view(Any, visit: (ViewVisitor) -> ())
+    case view(Any, visit: @MainActor (ViewVisitor) -> ())
   }
 
   /// Create a `Content` value for a given `App`.
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+CustomDebugStringConvertible.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+CustomDebugStringConvertible.swift
index 49f98bb..b8cf756 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+CustomDebugStringConvertible.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Fiber+CustomDebugStringConvertible.swift
@@ -16,14 +16,16 @@
 //
 
 extension FiberReconciler.Fiber: CustomDebugStringConvertible {
-  public var debugDescription: String {
-    let memoryAddress = String(format: "%010p", unsafeBitCast(self, to: Int.self))
-    if case let .view(view, _) = content,
-       let text = view as? Text
-    {
-      return "Text(\"\(text.storage.rawText)\") (\(memoryAddress))"
+  public nonisolated var debugDescription: String {
+    MainActor.assumeIsolated {
+      let memoryAddress = String(format: "%010p", unsafeBitCast(self, to: Int.self))
+      if case let .view(view, _) = content,
+         let text = view as? Text
+      {
+        return "Text(\"\(text.storage.rawText)\") (\(memoryAddress))"
+      }
+      return "\(typeInfo?.name ?? "Unknown") (\(memoryAddress))"
     }
-    return "\(typeInfo?.name ?? "Unknown") (\(memoryAddress))"
   }
 
   private func flush(level: Int = 0) -> String {
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Fiber.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Fiber.swift
index a50171e..67ff4dd 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Fiber.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Fiber.swift
@@ -39,6 +39,7 @@ public extension FiberReconciler {
   /// After the entire tree has been traversed, the current and work in progress trees are swapped,
   /// making the updated tree the current one,
   /// and leaving the previous current tree available to apply future changes on.
+  @MainActor
   final class Fiber {
     weak var reconciler: FiberReconciler<Renderer>?
 
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/FiberReconciler.swift b/Sources/CarPlayUI/TokamakCore/Fiber/FiberReconciler.swift
index 37c5f1c..1e38c5b 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/FiberReconciler.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/FiberReconciler.swift
@@ -20,6 +20,7 @@ import Combine
 
 /// A reconciler modeled after React's
 /// [Fiber reconciler](https://reactjs.org/docs/faq-internals.html#what-is-react-fiber)
+@MainActor
 public final class FiberReconciler<Renderer: FiberRenderer> {
   /// The root node in the `Fiber` tree that represents the `View`s currently rendered on screen.
   
@@ -283,6 +284,7 @@ public extension EnvironmentValues {
     static let defaultValue: (@escaping () -> ()) -> () = { _ in }
   }
 
+  @MainActor
   var afterReconcile: (@escaping () -> ()) -> () {
     get { self[AfterReconcileKey.self] }
     set { self[AfterReconcileKey.self] = newValue }
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/FiberRenderer.swift b/Sources/CarPlayUI/TokamakCore/Fiber/FiberRenderer.swift
index 2057e1d..e60991c 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/FiberRenderer.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/FiberRenderer.swift
@@ -128,6 +128,7 @@ extension EnvironmentValues {
     }
   }
 
+  @MainActor
   var measureText: (Text, ProposedViewSize, EnvironmentValues) -> CGSize {
     get { self[MeasureTextKey.self] }
     set { self[MeasureTextKey.self] = newValue }
@@ -139,6 +140,7 @@ extension EnvironmentValues {
     }
   }
 
+  @MainActor
   var measureImage: (Image, ProposedViewSize, EnvironmentValues) -> CGSize {
     get { self[MeasureImageKey.self] }
     set { self[MeasureImageKey.self] = newValue }
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Layout/Layout.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Layout/Layout.swift
index d52da8f..3e36d6f 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Layout/Layout.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Layout/Layout.swift
@@ -286,11 +286,11 @@ protocol AnyLayoutBox: AnyObject {
     cache: inout Self.Cache
   ) -> CGFloat?
 
-  var animatableData: _AnyAnimatableData { get set }
+  nonisolated var animatableData: _AnyAnimatableData { get set }
 }
 
 final class ConcreteLayoutBox<L: Layout>: AnyLayoutBox {
-  var base: L
+  nonisolated(unsafe) var base: L
 
   init(_ base: L) {
     self.base = base
@@ -381,12 +381,12 @@ final class ConcreteLayoutBox<L: Layout>: AnyLayoutBox {
     }
   }
 
-  var animatableData: _AnyAnimatableData {
+  nonisolated var animatableData: _AnyAnimatableData {
     get {
       .init(base.animatableData)
     }
     set {
-      guard let newData = newValue.value as? L.AnimatableData else { return }
+      guard let newData = newValue.value as? L._AnimatableData else { return }
       base.animatableData = newData
     }
   }
@@ -394,7 +394,7 @@ final class ConcreteLayoutBox<L: Layout>: AnyLayoutBox {
 
 @frozen
 public struct AnyLayout: Layout {
-  var storage: AnyLayoutBox
+  nonisolated(unsafe) var storage: AnyLayoutBox
 
   public init<L>(_ layout: L) where L: Layout {
     storage = ConcreteLayoutBox(layout)
@@ -469,7 +469,7 @@ public struct AnyLayout: Layout {
     )
   }
 
-  public var animatableData: _AnyAnimatableData {
+  public nonisolated var animatableData: _AnyAnimatableData {
     get {
       _AnyAnimatableData(storage.animatableData)
     }
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Layout/LayoutSubviews.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Layout/LayoutSubviews.swift
index 2f12987..5786c8e 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Layout/LayoutSubviews.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Layout/LayoutSubviews.swift
@@ -27,6 +27,7 @@ public struct LayoutSubviews: Equatable, RandomAccessCollection {
     self.storage = storage
   }
 
+  @MainActor
   init<R: FiberRenderer>(_ node: FiberReconciler<R>.Fiber) {
     self.init(
       layoutDirection: node.outputs.environment.environment.layoutDirection,
@@ -78,6 +79,7 @@ public struct LayoutSubview: Equatable {
   private let storage: AnyStorage
 
   /// A protocol used to erase `Storage<R>`.
+  @MainActor
   private class AnyStorage {
     let traits: _ViewTraitStore?
 
@@ -193,6 +195,7 @@ public struct LayoutSubview: Equatable {
     }
   }
 
+  @MainActor
   init<R: FiberRenderer>(
     id: ObjectIdentifier,
     traits: _ViewTraitStore?,
@@ -209,30 +212,37 @@ public struct LayoutSubview: Equatable {
     )
   }
 
+  @MainActor
   public func _trait<K>(key: K.Type) -> K.Value where K: _ViewTraitKey {
     storage.traits?.value(forKey: key) ?? K.defaultValue
   }
 
+  @MainActor
   public subscript<K>(key: K.Type) -> K.Value where K: LayoutValueKey {
     _trait(key: _LayoutTrait<K>.self)
   }
 
+  @MainActor
   public var priority: Double {
     _trait(key: LayoutPriorityTraitKey.self)
   }
 
+  @MainActor
   public func sizeThatFits(_ proposal: ProposedViewSize) -> CGSize {
     storage.sizeThatFits(proposal)
   }
 
+  @MainActor
   public func dimensions(in proposal: ProposedViewSize) -> ViewDimensions {
     storage.dimensions(sizeThatFits(proposal))
   }
 
+  @MainActor
   public var spacing: ViewSpacing {
     storage.spacing()
   }
 
+  @MainActor
   public func place(
     at position: CGPoint,
     anchor: UnitPoint = .topLeading,
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Layout/StackLayout.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Layout/StackLayout.swift
index 4442acb..689d6b0 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Layout/StackLayout.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Layout/StackLayout.swift
@@ -19,6 +19,7 @@ import Foundation
 
 private extension ViewDimensions {
   /// Access the guide value of an `Alignment` for a particular `Axis`.
+  @MainActor
   subscript(alignment alignment: Alignment, in axis: Axis) -> CGFloat {
     switch axis {
     case .horizontal: return self[alignment.vertical]
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/Passes/FiberReconcilerPass.swift b/Sources/CarPlayUI/TokamakCore/Fiber/Passes/FiberReconcilerPass.swift
index 75ddb9d..1d2649f 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/Passes/FiberReconcilerPass.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/Passes/FiberReconcilerPass.swift
@@ -18,6 +18,7 @@
 import Foundation
 
 extension FiberReconciler {
+  @MainActor
   final class Caches {
     var elementIndices = [ObjectIdentifier: Int]()
     var layoutCaches = [ObjectIdentifier: LayoutCache]()
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/ViewArguments.swift b/Sources/CarPlayUI/TokamakCore/Fiber/ViewArguments.swift
index 8e81ec5..29eea2a 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/ViewArguments.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/ViewArguments.swift
@@ -85,6 +85,7 @@ public extension View {
 }
 
 public extension ModifiedContent where Content: View, Modifier: ViewModifier {
+  @MainActor
   static func _makeView(_ inputs: ViewInputs<Self>) -> ViewOutputs {
     Modifier._makeView(.init(
       content: inputs.content.modifier,
@@ -95,6 +96,7 @@ public extension ModifiedContent where Content: View, Modifier: ViewModifier {
     ))
   }
 
+  @MainActor
   func _visitChildren<V>(_ visitor: V) where V: ViewVisitor {
     modifier._visitChildren(visitor, content: .init(modifier: modifier, view: content))
   }
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/ViewGeometry.swift b/Sources/CarPlayUI/TokamakCore/Fiber/ViewGeometry.swift
index b9ce867..6fce750 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/ViewGeometry.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/ViewGeometry.swift
@@ -48,10 +48,12 @@ public struct ViewDimensions: Equatable {
   public var width: CGFloat { size.width }
   public var height: CGFloat { size.height }
 
+  @MainActor
   public subscript(guide: HorizontalAlignment) -> CGFloat {
     self[explicit: guide] ?? guide.id.defaultValue(in: self)
   }
 
+  @MainActor
   public subscript(guide: VerticalAlignment) -> CGFloat {
     self[explicit: guide] ?? guide.id.defaultValue(in: self)
   }
diff --git a/Sources/CarPlayUI/TokamakCore/Fiber/walk.swift b/Sources/CarPlayUI/TokamakCore/Fiber/walk.swift
index d21c984..8673213 100644
--- a/Sources/CarPlayUI/TokamakCore/Fiber/walk.swift
+++ b/Sources/CarPlayUI/TokamakCore/Fiber/walk.swift
@@ -33,6 +33,7 @@ public enum WalkResult<Renderer: FiberRenderer, Success> {
 /// Walk a fiber tree from `root` until the `work` predicate returns `false`.
 
 @discardableResult
+@MainActor
 public func walk<Renderer: FiberRenderer>(
   _ root: FiberReconciler<Renderer>.Fiber,
   _ work: @escaping (FiberReconciler<Renderer>.Fiber) throws -> Bool
@@ -53,6 +54,7 @@ public func walk<Renderer: FiberRenderer>(
 ///
 /// When the `root` is reached, the loop exits.
 
+@MainActor
 public func walk<Renderer: FiberRenderer, Success>(
   _ root: FiberReconciler<Renderer>.Fiber,
   _ work: @escaping (FiberReconciler<Renderer>.Fiber) throws -> WalkWorkResult<Success>
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/ClipEffect.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/ClipEffect.swift
index 2222726..5d27e28 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/ClipEffect.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/ClipEffect.swift
@@ -30,7 +30,7 @@ public struct _ClipEffect<ClipShape>: ViewModifier where ClipShape: Shape {
     content
   }
 
-  public var animatableData: ClipShape.AnimatableData {
+  public var animatableData: ClipShape._AnimatableData {
     get { shape.animatableData }
     set { shape.animatableData = newValue }
   }
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OffsetEffect.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OffsetEffect.swift
index 1b63278..6ca8758 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OffsetEffect.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OffsetEffect.swift
@@ -19,7 +19,7 @@ import Foundation
 
 @frozen
 public struct _OffsetEffect: GeometryEffect, Equatable {
-  public var offset: CGSize
+  public nonisolated(unsafe) var offset: CGSize
 
   @inlinable
   public init(offset: CGSize) {
@@ -30,7 +30,7 @@ public struct _OffsetEffect: GeometryEffect, Equatable {
     .init(.init(translationX: offset.width, y: offset.height))
   }
 
-  public var animatableData: CGSize.AnimatableData {
+  public nonisolated var animatableData: AnimatablePair<CGFloat, CGFloat> {
     get {
       offset.animatableData
     }
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OpacityEffect.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OpacityEffect.swift
index 382ae05..b083f21 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OpacityEffect.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/OpacityEffect.swift
@@ -16,7 +16,7 @@
 //
 
 public struct _OpacityEffect: Animatable, ViewModifier, Equatable {
-  public var opacity: Double
+  public nonisolated var opacity: Double
 
   public init(opacity: Double) {
     self.opacity = opacity
@@ -26,7 +26,7 @@ public struct _OpacityEffect: Animatable, ViewModifier, Equatable {
     content
   }
 
-  public var animatableData: Double {
+  public nonisolated var animatableData: Double {
     get { opacity }
     set { opacity = newValue }
   }
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/RotationEffect.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/RotationEffect.swift
index e9e4c4f..47787f3 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/RotationEffect.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/Effects/RotationEffect.swift
@@ -18,8 +18,8 @@
 import Foundation
 
 public struct _RotationEffect: GeometryEffect {
-  public var angle: Angle
-  public var anchor: UnitPoint
+  public nonisolated(unsafe) var angle: Angle
+  public nonisolated(unsafe) var anchor: UnitPoint
 
   public init(angle: Angle, anchor: UnitPoint = .center) {
     self.angle = angle
@@ -34,7 +34,7 @@ public struct _RotationEffect: GeometryEffect {
     content
   }
 
-  public var animatableData: AnimatablePair<Angle.AnimatableData, UnitPoint.AnimatableData> {
+  public nonisolated var animatableData: AnimatablePair<Angle._AnimatableData, UnitPoint._AnimatableData> {
     get {
       .init(angle.animatableData, anchor.animatableData)
     }
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/FlexFrameLayout.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/FlexFrameLayout.swift
index ab5efe8..afaef8a 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/FlexFrameLayout.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/FlexFrameLayout.swift
@@ -57,7 +57,7 @@ public struct _FlexFrameLayout: ViewModifier {
 }
 
 extension _FlexFrameLayout: Animatable {
-  public typealias AnimatableData = EmptyAnimatableData
+  public typealias _AnimatableData = EmptyAnimatableData
 }
 
 public extension View {
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/FrameLayout.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/FrameLayout.swift
index 0f7d99b..470489d 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/FrameLayout.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/FrameLayout.swift
@@ -31,7 +31,7 @@ public struct _FrameLayout: ViewModifier {
 }
 
 extension _FrameLayout: Animatable {
-  public typealias AnimatableData = EmptyAnimatableData
+  public typealias _AnimatableData = EmptyAnimatableData
 }
 
 public extension View {
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/HoverActionModifier.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/HoverActionModifier.swift
index 190d3f7..1336a24 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/HoverActionModifier.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/HoverActionModifier.swift
@@ -21,6 +21,7 @@ public struct _HoverActionModifier: ViewModifier {
 extension ModifiedContent
   where Content: View, Modifier == _HoverActionModifier
 {
+  @MainActor
   var hover: ((Bool) -> ())? { modifier.hover }
 }
 
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/ModifiedContent.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/ModifiedContent.swift
index 45156be..7efe6f3 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/ModifiedContent.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/ModifiedContent.swift
@@ -27,6 +27,7 @@ public struct ModifiedContent<Content, Modifier>: ModifiedContentProtocol {
   public private(set) var content: Content
   public private(set) var modifier: Modifier
 
+  @MainActor
   public init(content: Content, modifier: Modifier) {
     self.content = content
     self.modifier = modifier
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/PaddingLayout.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/PaddingLayout.swift
index bc747c5..3045de6 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/PaddingLayout.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/PaddingLayout.swift
@@ -29,7 +29,7 @@ public struct _PaddingLayout: ViewModifier {
 }
 
 extension _PaddingLayout: Animatable {
-  public typealias AnimatableData = EmptyAnimatableData
+  public typealias _AnimatableData = EmptyAnimatableData
 }
 
 public extension View {
@@ -51,6 +51,7 @@ public extension View {
 }
 
 public extension ModifiedContent where Modifier == _PaddingLayout, Content: View {
+  @MainActor
   func padding(_ length: CGFloat) -> ModifiedContent<Content, _PaddingLayout> {
     var layout = modifier
     layout.insets?.top += length
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/ShadowLayout.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/ShadowLayout.swift
index 30e1fd0..08cd7b8 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/ShadowLayout.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/ShadowLayout.swift
@@ -39,15 +39,15 @@ public struct _ShadowEffect: EnvironmentalModifier, Equatable {
   }
 
   public struct _Resolved: ViewModifier, Animatable {
-    public var color: AnyColorBox.ResolvedValue
-    public var radius: CGFloat
-    public var offset: CGSize
+    public nonisolated(unsafe) var color: AnyColorBox.ResolvedValue
+    public nonisolated var radius: CGFloat
+    public nonisolated(unsafe) var offset: CGSize
 
     public func body(content: Content) -> some View {
       content
     }
 
-    public typealias AnimatableData = AnimatablePair<
+    public typealias _AnimatableData = AnimatablePair<
       AnimatablePair<
         Float,
         AnimatablePair<
@@ -55,9 +55,9 @@ public struct _ShadowEffect: EnvironmentalModifier, Equatable {
           AnimatablePair<Float, Float>
         >
       >,
-      AnimatablePair<CGFloat, CGSize.AnimatableData>
+      AnimatablePair<CGFloat, AnimatablePair<CGFloat, CGFloat>>
     >
-    public var animatableData: _Resolved.AnimatableData {
+    public nonisolated var animatableData: _Resolved._AnimatableData {
       get {
         .init(
           .init(
diff --git a/Sources/CarPlayUI/TokamakCore/Modifiers/TaskModifier.swift b/Sources/CarPlayUI/TokamakCore/Modifiers/TaskModifier.swift
index 5d9848a..548273a 100644
--- a/Sources/CarPlayUI/TokamakCore/Modifiers/TaskModifier.swift
+++ b/Sources/CarPlayUI/TokamakCore/Modifiers/TaskModifier.swift
@@ -20,14 +20,13 @@ internal struct _TaskModifierView<Content>: View where Content: View {
 
   let priority: TaskPriority
 
-  let action: @Sendable () async -> ()
+  let action: @isolated(any) @Sendable () async -> ()
 
   let content: Content
 
-  @State
-  nonisolated(unsafe) private var task: Task<(), Never>?
+  @State private nonisolated(unsafe) var task: Task<(), Never>?
 
-  init(priority: TaskPriority, action: @escaping @Sendable () async -> (), content: Content) {
+  init(priority: TaskPriority, action: @escaping @isolated(any) @Sendable () async -> (), content: Content) {
     self.priority = priority
     self.action = action
     self.content = content
@@ -48,7 +47,7 @@ internal struct _TaskModifierView<Content>: View where Content: View {
 public extension View {
   func task(
     priority: TaskPriority = .userInitiated,
-    _ action: @escaping @Sendable () async -> ()
+    _ action: @escaping @isolated(any) @Sendable () async -> ()
   ) -> some View {
     _TaskModifierView(priority: priority, action: action, content: self)
   }
diff --git a/Sources/CarPlayUI/TokamakCore/Preferences/_PreferenceReadingView.swift b/Sources/CarPlayUI/TokamakCore/Preferences/_PreferenceReadingView.swift
index 8a795ed..84558b3 100644
--- a/Sources/CarPlayUI/TokamakCore/Preferences/_PreferenceReadingView.swift
+++ b/Sources/CarPlayUI/TokamakCore/Preferences/_PreferenceReadingView.swift
@@ -20,8 +20,7 @@
 public struct _DelayedPreferenceView<Key, Content>: View, _PreferenceReadingViewProtocol
   where Key: PreferenceKey, Content: View
 {
-  @State
-  nonisolated(unsafe) private var resolvedValue: _PreferenceValue<Key> = _PreferenceValue(storage: .init(Key.self))
+  @State private nonisolated(unsafe) var resolvedValue: _PreferenceValue<Key> = _PreferenceValue(storage: .init(Key.self))
   public let transform: (_PreferenceValue<Key>) -> Content
 
   private var valueReference: _PreferenceValue<Key>?
diff --git a/Sources/CarPlayUI/TokamakCore/Shapes/AnyShape.swift b/Sources/CarPlayUI/TokamakCore/Shapes/AnyShape.swift
index 78fa0b8..16755e8 100644
--- a/Sources/CarPlayUI/TokamakCore/Shapes/AnyShape.swift
+++ b/Sources/CarPlayUI/TokamakCore/Shapes/AnyShape.swift
@@ -30,7 +30,7 @@ private struct ConcreteAnyShapeBox<Base: Shape>: AnyShapeBox {
       _AnyAnimatableData(base.animatableData)
     }
     set {
-      guard let newData = newValue.value as? Base.AnimatableData else {
+      guard let newData = newValue.value as? Base._AnimatableData else {
         // TODO: Should this crash?
         return
       }
diff --git a/Sources/CarPlayUI/TokamakCore/Shapes/ModifiedShapes.swift b/Sources/CarPlayUI/TokamakCore/Shapes/ModifiedShapes.swift
index b870bc5..689aac9 100644
--- a/Sources/CarPlayUI/TokamakCore/Shapes/ModifiedShapes.swift
+++ b/Sources/CarPlayUI/TokamakCore/Shapes/ModifiedShapes.swift
@@ -37,8 +37,8 @@ public struct _StrokedShape<S>: Shape, DynamicProperty where S: Shape {
 
   public static var role: ShapeRole { .stroke }
 
-  public typealias AnimatableData = AnimatablePair<S.AnimatableData, StrokeStyle.AnimatableData>
-  public nonisolated var animatableData: AnimatableData {
+  public typealias _AnimatableData = AnimatablePair<S._AnimatableData, StrokeStyle._AnimatableData>
+  public nonisolated var animatableData: _AnimatableData {
     get {
       .init(shape.animatableData, style.animatableData)
     }
@@ -65,11 +65,11 @@ public struct _TrimmedShape<S>: Shape where S: Shape {
       .trimmedPath(from: startFraction, to: endFraction)
   }
 
-  public typealias AnimatableData = AnimatablePair<
-    S.AnimatableData,
+  public typealias _AnimatableData = AnimatablePair<
+    S._AnimatableData,
     AnimatablePair<CGFloat, CGFloat>
   >
-  public nonisolated var animatableData: AnimatableData {
+  public nonisolated var animatableData: _AnimatableData {
     get {
       .init(shape.animatableData, .init(startFraction, endFraction))
     }
@@ -81,8 +81,8 @@ public struct _TrimmedShape<S>: Shape where S: Shape {
 }
 
 public struct OffsetShape<Content>: Shape where Content: Shape {
-  public var shape: Content
-  public var offset: CGSize
+  public nonisolated(unsafe) var shape: Content
+  public nonisolated(unsafe) var offset: CGSize
 
   public init(shape: Content, offset: CGSize) {
     self.shape = shape
@@ -95,8 +95,8 @@ public struct OffsetShape<Content>: Shape where Content: Shape {
       .offsetBy(dx: offset.width, dy: offset.height)
   }
 
-  public typealias AnimatableData = AnimatablePair<Content.AnimatableData, CGSize.AnimatableData>
-  public var animatableData: AnimatableData {
+  public typealias _AnimatableData = AnimatablePair<Content._AnimatableData, AnimatablePair<CGFloat, CGFloat>>
+  public nonisolated var animatableData: _AnimatableData {
     get {
       .init(shape.animatableData, offset.animatableData)
     }
@@ -115,9 +115,9 @@ extension OffsetShape: InsettableShape where Content: InsettableShape {
 }
 
 public struct ScaledShape<Content>: Shape where Content: Shape {
-  public var shape: Content
-  public var scale: CGSize
-  public var anchor: UnitPoint
+  public nonisolated(unsafe) var shape: Content
+  public nonisolated(unsafe) var scale: CGSize
+  public nonisolated(unsafe) var anchor: UnitPoint
 
   public init(shape: Content, scale: CGSize, anchor: UnitPoint = .center) {
     self.shape = shape
@@ -131,11 +131,11 @@ public struct ScaledShape<Content>: Shape where Content: Shape {
       .applying(.init(scaleX: scale.width, y: scale.height))
   }
 
-  public typealias AnimatableData = AnimatablePair<
-    Content.AnimatableData,
-    AnimatablePair<CGSize.AnimatableData, UnitPoint.AnimatableData>
+  public typealias _AnimatableData = AnimatablePair<
+    Content._AnimatableData,
+    AnimatablePair<AnimatablePair<CGFloat, CGFloat>, UnitPoint._AnimatableData>
   >
-  public var animatableData: AnimatableData {
+  public nonisolated var animatableData: _AnimatableData {
     get {
       .init(shape.animatableData, .init(scale.animatableData, anchor.animatableData))
     }
@@ -163,11 +163,11 @@ public struct RotatedShape<Content>: Shape where Content: Shape {
       .applying(.init(rotationAngle: CGFloat(angle.radians)))
   }
 
-  public typealias AnimatableData = AnimatablePair<
-    Content.AnimatableData,
-    AnimatablePair<Angle.AnimatableData, UnitPoint.AnimatableData>
+  public typealias _AnimatableData = AnimatablePair<
+    Content._AnimatableData,
+    AnimatablePair<Angle._AnimatableData, UnitPoint._AnimatableData>
   >
-  public nonisolated var animatableData: AnimatableData {
+  public nonisolated var animatableData: _AnimatableData {
     get {
       .init(shape.animatableData, .init(angle.animatableData, anchor.animatableData))
     }
@@ -199,15 +199,15 @@ public struct TransformedShape<Content>: Shape where Content: Shape {
       .applying(transform)
   }
 
-  public nonisolated var animatableData: Content.AnimatableData {
+  public nonisolated var animatableData: Content._AnimatableData {
     get { shape.animatableData }
     set { shape.animatableData = newValue }
   }
 }
 
 public struct _SizedShape<S>: Shape where S: Shape {
-  public var shape: S
-  public var size: CGSize
+  public nonisolated(unsafe) var shape: S
+  public nonisolated(unsafe) var size: CGSize
 
   public init(shape: S, size: CGSize) {
     self.shape = shape
@@ -220,8 +220,8 @@ public struct _SizedShape<S>: Shape where S: Shape {
       .path(in: rect)
   }
 
-  public typealias AnimatableData = AnimatablePair<S.AnimatableData, CGSize.AnimatableData>
-  public var animatableData: AnimatableData {
+  public typealias _AnimatableData = AnimatablePair<S._AnimatableData, AnimatablePair<CGFloat, CGFloat>>
+  public nonisolated var animatableData: _AnimatableData {
     get {
       .init(shape.animatableData, size.animatableData)
     }
diff --git a/Sources/CarPlayUI/TokamakCore/StackReconciler.swift b/Sources/CarPlayUI/TokamakCore/StackReconciler.swift
index 71bfc48..db315a7 100644
--- a/Sources/CarPlayUI/TokamakCore/StackReconciler.swift
+++ b/Sources/CarPlayUI/TokamakCore/StackReconciler.swift
@@ -16,6 +16,7 @@
 //
 
 import Combine
+import Observation
 
 /** A class that reconciles a "raw" tree of element values (such as `App`, `Scene` and `View`,
  all coming from `body` or `renderedBody` properties) with a tree of mounted element instances
@@ -38,6 +39,7 @@ public final class StackReconciler<R: Renderer> {
    */
   private var queuedRerenders = Set<Rerender>()
 
+  @MainActor
   struct Rerender: Hashable {
     let element: MountedCompositeElement<R>
     let transaction: Transaction
@@ -155,6 +157,10 @@ public final class StackReconciler<R: Renderer> {
     queuedRerenders.removeAll()
 
     for mountedView in queued {
+      // Skip elements that have already been unmounted. This can happen when an Observable
+      // `onChange` Task is in-flight while the element is removed from the tree (e.g., a
+      // navigation pop), leaving a stale entry in `queuedRerenders`.
+      guard mountedView.element.transitionPhase != .willUnmount else { continue }
       mountedView.element.update(in: self, with: mountedView.transaction)
     }
 
@@ -262,7 +268,20 @@ public final class StackReconciler<R: Renderer> {
     let view = body(of: compositeView, keyPath: \.view.view)
 
     guard let renderedBody = renderer.primitiveBody(for: view) else {
-      return compositeView.view.bodyClosure(view)
+      // Track any `@Observable` properties read during `body`, so mutating them later
+      // schedules a re-render the same way a `@State` setter or `ObservableObject`
+      // `objectWillChange` emission does. `render(compositeView:)` re-runs on every
+      // mount and re-render, which naturally re-establishes tracking each time.
+      let reconcilerBox = WeakBox(value: self)
+      let elementBox = WeakBox(value: compositeView)
+      return withObservationTracking {
+        compositeView.view.bodyClosure(view)
+      } onChange: {
+        Task { @MainActor in
+          guard let reconciler = reconcilerBox.value, let element = elementBox.value else { return }
+          reconciler.queueUpdate(for: element, transaction: .init(animation: nil))
+        }
+      }
     }
 
     return renderedBody
@@ -328,3 +347,10 @@ public final class StackReconciler<R: Renderer> {
     queuedPostrenderCallbacks.removeAll()
   }
 }
+
+/// Smuggles a weak reference to a MainActor-isolated, non-`Sendable` object across the
+/// non-isolated `@Sendable` `onChange` closure of `withObservationTracking`. Safe because
+/// `.value` is only read after hopping back onto the main actor via `Task { @MainActor in }`.
+private struct WeakBox<T: AnyObject>: @unchecked Sendable {
+  weak var value: T?
+}
diff --git a/Sources/CarPlayUI/TokamakCore/Styles/ToggleStyle.swift b/Sources/CarPlayUI/TokamakCore/Styles/ToggleStyle.swift
index 72b2a2c..16ff8f1 100644
--- a/Sources/CarPlayUI/TokamakCore/Styles/ToggleStyle.swift
+++ b/Sources/CarPlayUI/TokamakCore/Styles/ToggleStyle.swift
@@ -23,7 +23,7 @@
 // It seems like during the rendering process it’s dynamically replaced with the actual label.
 // That’s complicated so instead we’re providing the label view directly.
 
-public struct ToggleStyleConfiguration {
+public nonisolated struct ToggleStyleConfiguration {
   public let label: AnyView
   @Binding
   public var isOn: Swift.Bool
diff --git a/Sources/CarPlayUI/TokamakCore/Tokens/Color/Color.swift b/Sources/CarPlayUI/TokamakCore/Tokens/Color/Color.swift
index f6a9ebc..d9d14a9 100644
--- a/Sources/CarPlayUI/TokamakCore/Tokens/Color/Color.swift
+++ b/Sources/CarPlayUI/TokamakCore/Tokens/Color/Color.swift
@@ -59,9 +59,9 @@ public struct Color: Hashable, Equatable, Sendable {
 
   /// Create a `Color` dependent on the current `ColorScheme`.
   
-  public static func _withScheme(_ resolver: @escaping (ColorScheme) -> Self) -> Self {
+  public static func _withScheme(_ resolver: @escaping @MainActor (ColorScheme) -> Self) -> Self {
     .init(_EnvironmentDependentColorBox { environment in
-      MainActor.assumeIsolated { resolver(environment.colorScheme) }
+      resolver(environment.colorScheme)
     })
   }
 }
@@ -76,7 +76,7 @@ public struct _ColorProxy {
   let subject: Color
   public init(_ subject: Color) { self.subject = subject }
   @MainActor
-  public func resolve(in environment: EnvironmentValues) -> AnyColorBox.ResolvedValue {
+  public func resolve(in environment: sending EnvironmentValues) -> AnyColorBox.ResolvedValue {
     if let deferred = subject.provider as? AnyColorBoxDeferredToRenderer {
       return deferred.deferredResolve(in: environment)
     } else {
@@ -123,7 +123,7 @@ public extension Color {
 
   nonisolated(unsafe) static let secondary: Self = .init(systemColor: .secondary)
   nonisolated(unsafe) static let accentColor: Self = .init(_EnvironmentDependentColorBox { environment in
-    MainActor.assumeIsolated { environment.accentColor ?? Self.blue }
+    environment.accentColor ?? Self.blue
   })
 
   init(_ color: UIColor) {
diff --git a/Sources/CarPlayUI/TokamakCore/Tokens/Color/ColorBoxes.swift b/Sources/CarPlayUI/TokamakCore/Tokens/Color/ColorBoxes.swift
index 3d0e5a2..c830551 100644
--- a/Sources/CarPlayUI/TokamakCore/Tokens/Color/ColorBoxes.swift
+++ b/Sources/CarPlayUI/TokamakCore/Tokens/Color/ColorBoxes.swift
@@ -37,7 +37,7 @@
 ///
 @MainActor
 public protocol AnyColorBoxDeferredToRenderer: AnyColorBox {
-  func deferredResolve(in environment: EnvironmentValues) -> AnyColorBox.ResolvedValue
+  func deferredResolve(in environment: sending EnvironmentValues) -> AnyColorBox.ResolvedValue
 }
 
 public class AnyColorBox: AnyTokenBox, Hashable, @unchecked Sendable {
@@ -103,7 +103,7 @@ public final class _ConcreteColorBox: AnyColorBox {
 }
 
 public final class _EnvironmentDependentColorBox: AnyColorBox {
-  public let resolver: (EnvironmentValues) -> Color
+  public let resolver: @MainActor (EnvironmentValues) -> Color
 
   override public func equals(_ other: AnyColorBox) -> Bool {
     guard let other = other as? _EnvironmentDependentColorBox
@@ -117,11 +117,11 @@ public final class _EnvironmentDependentColorBox: AnyColorBox {
     hasher.combine(MainActor.assumeIsolated { resolver(EnvironmentValues()) })
   }
 
-  init(_ resolver: @escaping (EnvironmentValues) -> Color) {
+  init(_ resolver: @escaping @MainActor (EnvironmentValues) -> Color) {
     self.resolver = resolver
   }
 
-  override public func resolve(in environment: EnvironmentValues) -> ResolvedValue {
+  override public func resolve(in environment: sending EnvironmentValues) -> ResolvedValue {
     MainActor.assumeIsolated {
       resolver(environment).provider.resolve(in: environment)
     }
@@ -197,7 +197,7 @@ public final class _SystemColorBox: AnyColorBox, CustomStringConvertible {
     self.value = value
   }
 
-  override public func resolve(in environment: EnvironmentValues) -> ResolvedValue {
+  override public func resolve(in environment: sending EnvironmentValues) -> ResolvedValue {
     switch MainActor.assumeIsolated({ environment.colorScheme }) {
     case .light:
       switch value {
diff --git a/Sources/CarPlayUI/TokamakCore/Tokens/Edge.swift b/Sources/CarPlayUI/TokamakCore/Tokens/Edge.swift
index 67238c1..b646e0e 100644
--- a/Sources/CarPlayUI/TokamakCore/Tokens/Edge.swift
+++ b/Sources/CarPlayUI/TokamakCore/Tokens/Edge.swift
@@ -67,7 +67,7 @@ public struct EdgeInsets: Equatable {
 }
 
 extension EdgeInsets: Animatable, _VectorMath {
-  public typealias AnimatableData = AnimatablePair<
+  public typealias _AnimatableData = AnimatablePair<
     CGFloat,
     AnimatablePair<
       CGFloat,
@@ -75,7 +75,7 @@ extension EdgeInsets: Animatable, _VectorMath {
     >
   >
 
-  public var animatableData: AnimatableData {
+  public var animatableData: _AnimatableData {
     @inlinable get {
       .init(top, .init(leading, .init(bottom, trailing)))
     }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Containers/DisclosureGroup.swift b/Sources/CarPlayUI/TokamakCore/Views/Containers/DisclosureGroup.swift
index 70f1996..d8789bf 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Containers/DisclosureGroup.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Containers/DisclosureGroup.swift
@@ -16,8 +16,7 @@
 //
 
 public struct DisclosureGroup<Label, Content>: _PrimitiveView where Label: View, Content: View {
-  @State
-  nonisolated(unsafe) var isExpanded: Bool = false
+  @State nonisolated(unsafe) var isExpanded: Bool = false
   let isExpandedBinding: Binding<Bool>?
 
   @Environment(\._outlineGroupStyle)
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Containers/List/List.swift b/Sources/CarPlayUI/TokamakCore/Views/Containers/List/List.swift
index 67585d8..5d6745c 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Containers/List/List.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Containers/List/List.swift
@@ -29,11 +29,13 @@ public struct List<SelectionValue, Content>
   @Environment(\.listStyle)
   var style
 
+  @MainActor
   public init(selection: Binding<Set<SelectionValue>>?, @ViewBuilder content: () -> Content) {
     self.selection = .many(selection)
     self.content = content()
   }
 
+  @MainActor
   public init(selection: Binding<SelectionValue?>?, @ViewBuilder content: () -> Content) {
     self.selection = .one(selection)
     self.content = content()
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Containers/Section.swift b/Sources/CarPlayUI/TokamakCore/Views/Containers/Section.swift
index 11a470f..f526cec 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Containers/Section.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Containers/Section.swift
@@ -44,6 +44,7 @@ extension Section: View, SectionView where Parent: View, Content: View, Footer:
     footer
   }
 
+  @MainActor
   func sectionContent(_ style: ListStyle) -> AnyView {
     if let contentContainer = content as? ParentView {
       let rows = _ListRow.buildItems(contentContainer.children) { view, isLast in
@@ -61,6 +62,7 @@ extension Section: View, SectionView where Parent: View, Content: View, Footer:
     }
   }
 
+  @MainActor
   func footerView(_ style: ListStyle) -> AnyView {
     if footer is EmptyView {
       return AnyView(EmptyView())
@@ -71,6 +73,7 @@ extension Section: View, SectionView where Parent: View, Content: View, Footer:
     }
   }
 
+  @MainActor
   func headerView(_ style: ListStyle) -> AnyView {
     if header is EmptyView {
       return AnyView(EmptyView())
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Containers/VariadicView.swift b/Sources/CarPlayUI/TokamakCore/Views/Containers/VariadicView.swift
index 542511a..6cd339d 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Containers/VariadicView.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Containers/VariadicView.swift
@@ -66,7 +66,7 @@ public struct _VariadicView_Children {
 extension _VariadicView_Children: RandomAccessCollection {
   public struct Element: View, Identifiable {
     let view: AnyView
-    public var id: AnyHashable
+    public nonisolated(unsafe) var id: AnyHashable
     let viewTraits: _ViewTraitStore
     let onTraitsUpdated: (_ViewTraitStore) -> ()
 
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Controls/ButtonBase.swift b/Sources/CarPlayUI/TokamakCore/Views/Controls/ButtonBase.swift
index 5314873..7894e8a 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Controls/ButtonBase.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Controls/ButtonBase.swift
@@ -103,8 +103,7 @@ public struct _Button<Label>: View where Label: View {
   public let role: ButtonRole?
   public let action: () -> ()
 
-  @State
-  public var isPressed = false
+  @State public nonisolated(unsafe) var isPressed = false
 
   let anyStyle: AnyButtonStyle
   public var style: Any.Type { anyStyle.type }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Controls/Link.swift b/Sources/CarPlayUI/TokamakCore/Views/Controls/Link.swift
index a3f731f..988326b 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Controls/Link.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Controls/Link.swift
@@ -37,6 +37,7 @@ public struct _LinkProxy<Label> where Label: View {
 
   public init(_ subject: Link<Label>) { self.subject = subject }
 
+  @MainActor
   public var label: Label { subject.label }
   public var destination: URL {
     subject.destination
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/DatePicker.swift b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/DatePicker.swift
index 09fd797..792c771 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/DatePicker.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/DatePicker.swift
@@ -169,8 +169,11 @@ public struct _DatePickerProxy<Label> where Label: View {
 
   public init(_ subject: DatePicker<Label>) { self.subject = subject }
 
+  @MainActor
   public var label: Label { subject.label }
+  @MainActor
   public var valueBinding: Binding<Date> { subject.valueBinding }
+  @MainActor
   public var displayedComponents: DatePickerComponents { subject.displayedComponents }
   public var min: Date? { subject.min }
   public var max: Date? { subject.max }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Picker.swift b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Picker.swift
index 80f1e14..9969337 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Picker.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Picker.swift
@@ -24,8 +24,7 @@ public struct _PickerContainer<
 >: _PrimitiveView,
   _PickerContainerProtocol
 {
-  @Binding
-  public var selection: SelectionValue
+  @Binding public nonisolated(unsafe) var selection: SelectionValue
 
   public let label: Label
   public let content: Content
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Slider.swift b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Slider.swift
index f585284..c194200 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Slider.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Slider.swift
@@ -154,11 +154,17 @@ public struct _SliderProxy<Label, ValueLabel> where Label: View, ValueLabel: Vie
 
   public init(_ subject: Slider<Label, ValueLabel>) { self.subject = subject }
 
+  @MainActor
   public var label: Label { subject.label }
+  @MainActor
   public var minValueLabel: ValueLabel { subject.minValueLabel }
+  @MainActor
   public var maxValueLabel: ValueLabel { subject.maxValueLabel }
+  @MainActor
   public var valueBinding: Binding<Double> { subject.valueBinding }
   public var bounds: ClosedRange<Double> { subject.bounds }
+  @MainActor
   public var step: _SliderStep { subject.step }
+  @MainActor
   public var onEditingChanged: (Bool) -> () { subject.onEditingChanged }
 }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Toggle.swift b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Toggle.swift
index c20765a..8cd7cb6 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Toggle.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Controls/Selectors/Toggle.swift
@@ -16,8 +16,7 @@
 //
 
 public struct Toggle<Label>: View where Label: View {
-  @Binding
-  var isOn: Bool
+  @Binding nonisolated(unsafe) var isOn: Bool
 
   var label: Label
 
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Image.swift b/Sources/CarPlayUI/TokamakCore/Views/Image.swift
index a3b24ec..6c0d94e 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Image.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Image.swift
@@ -121,42 +121,47 @@ private class SystemImageProvider: _AnyImageProviderBox {
     }
 }
 
-public struct Image: _PrimitiveView, Equatable {
-  
+public nonisolated struct Image: _PrimitiveView, Equatable {
+
   public let provider: _AnyImageProviderBox
 
   @Environment(\.self)
   var environment
 
-  
+
   @State
   public var _intrinsicSize: CGSize?
 
-  public static func == (lhs: Self, rhs: Self) -> Bool {
+  public nonisolated static func == (lhs: Self, rhs: Self) -> Bool {
     lhs.provider == rhs.provider
   }
 
+  @MainActor
   init(_ provider: _AnyImageProviderBox) {
     self.provider = provider
   }
 }
 
 public extension Image {
+  @MainActor
   init(_ name: String, bundle: Bundle? = nil) {
     self.init(name, bundle: bundle, label: Text(name))
   }
 
+  @MainActor
   init(_ name: String, bundle: Bundle? = nil, label: Text) {
     self.init(NamedImageProvider(name: name, bundle: bundle, label: label))
   }
 
+  @MainActor
   init(decorative name: String, bundle: Bundle? = nil) {
     self.init(NamedImageProvider(name: name, bundle: bundle, label: nil))
   }
 }
 
 public extension Image {
-    
+
+    @MainActor
     init(systemName imageName: String, label: Text? = nil) {
         self.init(SystemImageProvider(systemName: imageName, label: label))
     }
@@ -168,6 +173,7 @@ public extension Image {
     case stretch
   }
 
+  @MainActor
   func resizable(
     capInsets: EdgeInsets = EdgeInsets(),
     resizingMode: ResizingMode = .stretch
@@ -183,10 +189,12 @@ internal struct _ImageProxy {
   public init(_ subject: Image) { self.subject = subject }
 
   public var provider: _AnyImageProviderBox { subject.provider }
+  @MainActor
   public var environment: EnvironmentValues { subject.environment }
 }
 
 extension Image: Layout {
+  @MainActor
   public func sizeThatFits(
     proposal: ProposedViewSize,
     subviews: Subviews,
@@ -195,6 +203,7 @@ extension Image: Layout {
     environment.measureImage(self, proposal, environment)
   }
 
+  @MainActor
   public func placeSubviews(
     in bounds: CGRect,
     proposal: ProposedViewSize,
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyHGrid.swift b/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyHGrid.swift
index 5291c05..142d0c3 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyHGrid.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyHGrid.swift
@@ -44,7 +44,9 @@ public struct _LazyHGridProxy<Content> where Content: View {
 
   public init(_ subject: LazyHGrid<Content>) { self.subject = subject }
 
+  @MainActor
   public var rows: [GridItem] { subject.rows }
+  @MainActor
   public var content: Content { subject.content }
   public var spacing: CGFloat { subject.spacing }
 }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyVGrid.swift b/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyVGrid.swift
index 2f9555a..67694c6 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyVGrid.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Layout/LazyVGrid.swift
@@ -44,7 +44,9 @@ public struct _LazyVGridProxy<Content> where Content: View {
 
   public init(_ subject: LazyVGrid<Content>) { self.subject = subject }
 
+  @MainActor
   public var columns: [GridItem] { subject.columns }
+  @MainActor
   public var content: Content { subject.content }
   public var spacing: CGFloat { subject.spacing }
 }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Progress/ProgressView.swift b/Sources/CarPlayUI/TokamakCore/Views/Progress/ProgressView.swift
index 71e4a0f..6adb8c5 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Progress/ProgressView.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Progress/ProgressView.swift
@@ -76,8 +76,7 @@ public struct _FoundationProgressView: View {
 public struct _FoundationProgressView: View {
   let progress: Progress
 
-  @State
-  private var state: ProgressState?
+  @State private nonisolated(unsafe) var state: ProgressState?
 
   struct ProgressState {
     var progress: Double
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Text/SecureField.swift b/Sources/CarPlayUI/TokamakCore/Views/Text/SecureField.swift
index d03ab49..d629d96 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Text/SecureField.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Text/SecureField.swift
@@ -65,7 +65,10 @@ public struct _SecureFieldProxy {
 
   public init(_ subject: SecureField<Text>) { self.subject = subject }
 
+  @MainActor
   public var label: _TextProxy { _TextProxy(subject.label) }
+  @MainActor
   public var textBinding: Binding<String> { subject.textBinding }
+  @MainActor
   public var onCommit: () -> () { subject.onCommit }
 }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Text/Text.swift b/Sources/CarPlayUI/TokamakCore/Views/Text/Text.swift
index 70945b7..12d91df 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Text/Text.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Text/Text.swift
@@ -76,6 +76,7 @@ public nonisolated struct Text: _PrimitiveView, Equatable {
     case underline(Bool, Color?) // Note: Not in SwiftUI
   }
 
+  @MainActor
   init(storage: _Storage, modifiers: [_Modifier] = []) {
     if case let .segmentedText(segments) = storage {
       self.storage = .segmentedText(segments.map {
@@ -87,10 +88,12 @@ public nonisolated struct Text: _PrimitiveView, Equatable {
     self.modifiers = modifiers
   }
 
+  @MainActor
   public init(verbatim content: String) {
     self.init(storage: .verbatim(content))
   }
 
+  @MainActor
   public init<S>(_ content: S) where S: StringProtocol {
     self.init(storage: .verbatim(String(content)))
   }
@@ -146,6 +149,7 @@ public struct _TextProxy {
   public var environment: EnvironmentValues { subject.environment }
 }
 
+@MainActor
 public extension Text {
   func font(_ font: Font?) -> Text {
     .init(storage: storage, modifiers: modifiers + [.font(font)])
@@ -189,6 +193,7 @@ public extension Text {
 }
 
 public extension Text {
+  @MainActor
   static func _concatenating(lhs: Self, rhs: Self) -> Self {
     .init(storage: .segmentedText([
       (lhs.storage, lhs.modifiers),
@@ -207,6 +212,7 @@ extension Text: Layout {
     environment.measureText(self, proposal, environment)
   }
 
+  @MainActor
   public func placeSubviews(
     in bounds: CGRect,
     proposal: ProposedViewSize,
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Text/TextEditor.swift b/Sources/CarPlayUI/TokamakCore/Views/Text/TextEditor.swift
index 465fdfa..423b766 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Text/TextEditor.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Text/TextEditor.swift
@@ -25,5 +25,6 @@ public struct _TextEditorProxy {
 
   public init(_ subject: TextEditor) { self.subject = subject }
 
+  @MainActor
   public var textBinding: Binding<String> { subject.textBinding }
 }
diff --git a/Sources/CarPlayUI/TokamakCore/Views/Text/TextField.swift b/Sources/CarPlayUI/TokamakCore/Views/Text/TextField.swift
index 4f04cd0..e645a62 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/Text/TextField.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/Text/TextField.swift
@@ -78,11 +78,17 @@ public struct _TextFieldProxy<Label: View> {
 
   public init(_ subject: TextField<Label>) { self.subject = subject }
 
+  @MainActor
   public var label: Label { subject.label }
+  @MainActor
   public var textBinding: Binding<String> { subject.textBinding }
+  @MainActor
   public var onCommit: () -> () { subject.onCommit }
+  @MainActor
   public var onEditingChanged: (Bool) -> () { subject.onEditingChanged }
+  @MainActor
   public var textFieldStyle: _AnyTextFieldStyle { subject.environment.textFieldStyle }
+  @MainActor
   public var foregroundColor: AnyColorBox.ResolvedValue? {
     guard let foregroundColor = subject.environment.foregroundColor else {
       return nil
diff --git a/Sources/CarPlayUI/TokamakCore/Views/ViewBuilder.swift b/Sources/CarPlayUI/TokamakCore/Views/ViewBuilder.swift
index 36332d3..bc1f9e5 100644
--- a/Sources/CarPlayUI/TokamakCore/Views/ViewBuilder.swift
+++ b/Sources/CarPlayUI/TokamakCore/Views/ViewBuilder.swift
@@ -89,6 +89,7 @@ extension Optional: AnyOptional {
 }
 
 @resultBuilder
+@MainActor
 public enum ViewBuilder {
   public static func buildBlock() -> EmptyView { EmptyView() }
 
diff --git a/Sources/CarPlayUI/Views/Form.swift b/Sources/CarPlayUI/Views/Form.swift
index 1514bdc..bbf37a8 100644
--- a/Sources/CarPlayUI/Views/Form.swift
+++ b/Sources/CarPlayUI/Views/Form.swift
@@ -152,7 +152,9 @@ internal extension CPInformationTemplate {
     
     func update(oldValue: CPInformationItem, newValue: CPInformationItem) {
         guard let index = _items.firstIndex(where: { $0 === oldValue }) else {
-            assertionFailure("Unable to find item in graph")
+            // Item was removed before this update arrived (e.g., a stale re-render after
+            // a navigation pop). Append so target.storage and _coordinator.items stay in sync.
+            _items.append(newValue)
             return
         }
         // update with new instance at
@@ -191,16 +193,16 @@ internal extension CPInformationTemplate {
             _actions.append(action)
         }
     }
-    
+
     func update(oldValue: CPTextButton, newValue: CPTextButton) {
         guard let index = _actions.firstIndex(where: { $0 === oldValue }) else {
-            assertionFailure("Unable to find item in graph")
+            _actions.append(newValue)
             return
         }
         // update with new instance at
         _actions[index] = newValue
     }
-    
+
     func remove(action: CPTextButton) {
         guard let index = _actions.firstIndex(where: { $0 === action }) else {
             return
@@ -275,7 +277,8 @@ extension FormItem: AnyComponent {
 
 @available(iOS 14.0, *)
 internal extension Text {
-    
+
+    @MainActor
     func build(template: CPInformationTemplate, before sibling: CPInformationItem?) -> CPInformationItem {
         let title = _TextProxy(self).rawText
         let formItem = FormItem(title: title)
diff --git a/Sources/CarPlayUI/Views/Grid.swift b/Sources/CarPlayUI/Views/Grid.swift
index 754ef7b..f218204 100644
--- a/Sources/CarPlayUI/Views/Grid.swift
+++ b/Sources/CarPlayUI/Views/Grid.swift
@@ -78,6 +78,7 @@ extension Grid.Storage {
         }
     }
     
+    @MainActor
     var view: AnyView {
         switch self {
         case .static:
diff --git a/Sources/CarPlayUI/Views/ListSection.swift b/Sources/CarPlayUI/Views/ListSection.swift
index f824805..fa20b7e 100644
--- a/Sources/CarPlayUI/Views/ListSection.swift
+++ b/Sources/CarPlayUI/Views/ListSection.swift
@@ -37,6 +37,7 @@ public struct ListSection: View, _PrimitiveView {
 
 public extension Section where Parent == EmptyView, Footer == EmptyView, Content == ListSection {
     
+    @MainActor
     init(header: String? = nil,
          sectionIndexTitle: String? = nil,
          data: [ListItem]
diff --git a/Sources/CarPlayUI/Views/Navigation/NavigationLink.swift b/Sources/CarPlayUI/Views/Navigation/NavigationLink.swift
index 1520598..e2b7c12 100644
--- a/Sources/CarPlayUI/Views/Navigation/NavigationLink.swift
+++ b/Sources/CarPlayUI/Views/Navigation/NavigationLink.swift
@@ -60,6 +60,7 @@ final class NavigationDestination {
     
     let _id: AnyHashable?
     
+    @MainActor
     init<V: View>(
         _ destination: V,
         id: AnyHashable? = nil
diff --git a/Sources/CarPlayUI/Views/Navigation/NavigationView.swift b/Sources/CarPlayUI/Views/Navigation/NavigationView.swift
index 24071d2..ca1680a 100644
--- a/Sources/CarPlayUI/Views/Navigation/NavigationView.swift
+++ b/Sources/CarPlayUI/Views/Navigation/NavigationView.swift
@@ -9,8 +9,7 @@ public struct NavigationView<Content>: View where Content: View {
     
     let content: Content
 
-    @StateObject
-    var context = NavigationContext()
+    @StateObject nonisolated(unsafe) var context = NavigationContext()
 
     public init(@ViewBuilder content: () -> Content) {
         self.content = content()
diff --git a/Sources/CarPlayUI/Views/Navigation/ToolbarContentBuilder.swift b/Sources/CarPlayUI/Views/Navigation/ToolbarContentBuilder.swift
index 5babfec..634474f 100644
--- a/Sources/CarPlayUI/Views/Navigation/ToolbarContentBuilder.swift
+++ b/Sources/CarPlayUI/Views/Navigation/ToolbarContentBuilder.swift
@@ -16,6 +16,7 @@
 //
 
 @resultBuilder
+@MainActor
 public enum ToolbarContentBuilder<ID> {
   public static func buildBlock<V>(_ content: ToolbarItem<ID, V>)
     -> ToolbarItemGroup<ID, ToolbarItem<ID, V>> where V: View
@@ -28,6 +29,7 @@ public enum ToolbarContentBuilder<ID> {
 // swiftlint:disable large_tuple
 // swiftlint:disable function_parameter_count
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1>(
     _ c0: ToolbarItem<ID, C0>,
@@ -42,6 +44,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2>(
     _ c0: ToolbarItem<ID, C0>,
@@ -55,6 +58,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3>(
     _ c0: ToolbarItem<ID, C0>,
@@ -72,6 +76,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3, C4>(
     _ c0: ToolbarItem<ID, C0>,
@@ -90,6 +95,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3, C4, C5>(
     _ c0: ToolbarItem<ID, C0>,
@@ -110,6 +116,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3, C4, C5, C6>(
     _ c0: ToolbarItem<ID, C0>,
@@ -132,6 +139,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3, C4, C5, C6, C7>(
     _ c0: ToolbarItem<ID, C0>,
@@ -156,6 +164,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3, C4, C5, C6, C7, C8>(
     _ c0: ToolbarItem<ID, C0>,
@@ -184,6 +193,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 public extension ToolbarContentBuilder {
   static func buildBlock<C0, C1, C2, C3, C4, C5, C6, C7, C8, C9>(
     _ c0: ToolbarItem<ID, C0>,
@@ -214,6 +224,7 @@ public extension ToolbarContentBuilder {
   }
 }
 
+@MainActor
 extension ToolbarItemGroup: View {
   public var body: some View {
     let items = _items.sorted { a, b in
diff --git a/Sources/CarPlayUI/Views/Navigation/ToolbarItem.swift b/Sources/CarPlayUI/Views/Navigation/ToolbarItem.swift
index 72f0ce6..05a111b 100644
--- a/Sources/CarPlayUI/Views/Navigation/ToolbarItem.swift
+++ b/Sources/CarPlayUI/Views/Navigation/ToolbarItem.swift
@@ -52,7 +52,7 @@ public protocol AnyToolbarItem {
 }
 
 public struct ToolbarItem<ID, Content>: View, AnyToolbarItem where Content: View {
-  public let id: ID
+  public nonisolated(unsafe) let id: ID
   public let placement: ToolbarItemPlacement
   public let showsByDefault: Bool
   let content: Content
@@ -91,7 +91,9 @@ public struct _ToolbarItemProxy<ID, Content> where Content: View {
 
   public init(_ subject: ToolbarItem<ID, Content>) { self.subject = subject }
 
+  @MainActor
   public var placement: ToolbarItemPlacement { subject.placement }
   public var showsByDefault: Bool { subject.showsByDefault }
+  @MainActor
   public var content: Content { subject.content }
 }
diff --git a/Sources/CarPlayUI/Views/PointOfInterest.swift b/Sources/CarPlayUI/Views/PointOfInterest.swift
index 6d4805a..845889c 100644
--- a/Sources/CarPlayUI/Views/PointOfInterest.swift
+++ b/Sources/CarPlayUI/Views/PointOfInterest.swift
@@ -340,6 +340,7 @@ internal extension CPPointOfInterest {
         
         private var _view: CPPointOfInterest!
         
+        @MainActor
         var view: CPPointOfInterest {
             guard viewDidChange else {
                 return _view
@@ -348,10 +349,11 @@ internal extension CPPointOfInterest {
             _view = CPPointOfInterest(self)
             return _view
         }
-        
+
         var viewDidChange = false
-        
-        init(title: String, 
+
+        @MainActor
+        init(title: String,
              location: MKMapItem,
              subtitle: String?,
              summary: String?,
@@ -376,6 +378,7 @@ internal extension CPPointOfInterest {
             self._view = CPPointOfInterest(self)
         }
         
+        @MainActor
         func updateTemplate() {
             let oldValue = _view!
             let newValue = view
diff --git a/Sources/CarPlayUI/Views/TextComponent.swift b/Sources/CarPlayUI/Views/TextComponent.swift
index 0e76d9e..7558c16 100644
--- a/Sources/CarPlayUI/Views/TextComponent.swift
+++ b/Sources/CarPlayUI/Views/TextComponent.swift
@@ -10,6 +10,7 @@ import CarPlay
 
 extension Text: AnyComponent {
         
+    @MainActor
     func build(parent: NSObject, before sibling: NSObject?) -> NSObject? {
         if #available(iOS 14.0, *), let template = parent as? CPInformationTemplate {
             return build(template: template, before: sibling as? CPInformationItem)
@@ -17,7 +18,8 @@ extension Text: AnyComponent {
             return nil
         }
     }
-    
+
+    @MainActor
     func update(component: inout NSObject, parent: NSObject) {
         if #available(iOS 14, *),
            let item = component as? CPInformationItem,
@@ -26,7 +28,8 @@ extension Text: AnyComponent {
             component = view.update(item, template: template)
         }
     }
-    
+
+    @MainActor
     func remove(component: NSObject, parent: NSObject) {
         if #available(iOS 14, *),
            let item = component as? CPInformationItem,
@@ -36,6 +39,7 @@ extension Text: AnyComponent {
     }
     
     @available(iOS 14.0, *)
+    @MainActor
     func remove(_ item: CPInformationItem, template: CPInformationTemplate) {
         template.remove(item: item)
     }
diff --git a/Xcode/CarPlayDemo.xcodeproj/project.pbxproj b/Xcode/CarPlayDemo.xcodeproj/project.pbxproj
index 307006a..016f59a 100644
--- a/Xcode/CarPlayDemo.xcodeproj/project.pbxproj
+++ b/Xcode/CarPlayDemo.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		6E0EF99E2B27BF0900402A9F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6E0EF99D2B27BF0900402A9F /* Assets.xcassets */; };
 		6E0EF9A12B27BF0900402A9F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6E0EF9A02B27BF0900402A9F /* Preview Assets.xcassets */; };
 		6E0EF9AA2B27BF4B00402A9F /* CarPlayUI in Frameworks */ = {isa = PBXBuildFile; productRef = 6E0EF9A92B27BF4B00402A9F /* CarPlayUI */; };
-		6E79D8EE2B30B054009082A7 /* CarPointsOfInterestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E79D8ED2B30B054009082A7 /* CarPointsOfInterestView.swift */; };
+		6EAE334C3006C55700C91D2E /* CarPointsOfInterestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EAE334B3006C55700C91D2E /* CarPointsOfInterestView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -34,7 +34,7 @@
 		6E0EF99D2B27BF0900402A9F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		6E0EF9A02B27BF0900402A9F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		6E0EF9A72B27BF2600402A9F /* CarPlayUI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = CarPlayUI; path = ..; sourceTree = "<group>"; };
-		6E79D8ED2B30B054009082A7 /* CarPointsOfInterestView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CarPointsOfInterestView.swift; path = "../../../../../Downloads/CarPlaySample-master/CarPlaySample/Car/CarPointsOfInterestView.swift"; sourceTree = "<group>"; };
+		6EAE334B3006C55700C91D2E /* CarPointsOfInterestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPointsOfInterestView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -55,8 +55,8 @@
 				6E01D6BC2B2B3F1A001B7F97 /* CarPlayApp.swift */,
 				6E01D6BF2B2B3F7F001B7F97 /* CarGridView.swift */,
 				6E01D6C02B2B3F7F001B7F97 /* CarInformationView.swift */,
-				6E79D8ED2B30B054009082A7 /* CarPointsOfInterestView.swift */,
 				6E01D6C12B2B3F7F001B7F97 /* CarListView.swift */,
+				6EAE334B3006C55700C91D2E /* CarPointsOfInterestView.swift */,
 				6E01D6BE2B2B3F7F001B7F97 /* CarTabView.swift */,
 			);
 			path = CarPlay;
@@ -183,7 +183,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				6E01D6BD2B2B3F1A001B7F97 /* CarPlayApp.swift in Sources */,
-				6E79D8EE2B30B054009082A7 /* CarPointsOfInterestView.swift in Sources */,
+				6EAE334C3006C55700C91D2E /* CarPointsOfInterestView.swift in Sources */,
 				6E01D6C32B2B3F7F001B7F97 /* CarGridView.swift in Sources */,
 				6E0EF99C2B27BF0800402A9F /* ContentView.swift in Sources */,
 				6E0EF99A2B27BF0800402A9F /* App.swift in Sources */,
@@ -333,7 +333,7 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -368,7 +368,7 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/Xcode/CarPlayDemo/CarPlay/CarInformationView.swift b/Xcode/CarPlayDemo/CarPlay/CarInformationView.swift
index e1f3c67..a0ee2a1 100644
--- a/Xcode/CarPlayDemo/CarPlay/CarInformationView.swift
+++ b/Xcode/CarPlayDemo/CarPlay/CarInformationView.swift
@@ -7,55 +7,70 @@
 //
 
 import Foundation
+import Observation
 import CarPlayUI
 
+/// Demonstrates that CarPlayUI auto-tracks `@Observable` view models: mutating `counter`
+/// from a button action re-renders `CarInformationView` without any property wrapper.
+@Observable
+final class InformationViewModel {
+    var counter = 0
+}
+
 struct CarInformationView: CarPlayUI.View {
-    
+
     @State
     var date = Date()
-    
+
     @State
     var showButton = false
-    
+
     @State
     var counter = 0
-    
+
     @State
     var rating = 0.5
-    
+
+    @State
+    private var viewModel = InformationViewModel()
+
     var body: some CarPlayUI.View {
         Form {
             // Items
             if counter == 0 {
                 Text("Use the increment button to increase the counter")
             }
-            
+
             CounterView(counter: counter)
-            
+
+            FormItem(title: "Observable Counter", detail: "\(viewModel.counter)")
+
             if #available(iOS 15.0, *) {
                 DateView(date: date)
             }
-            
+
             Rating(
                 title: Text("Rating"),
                 rating: rating,
                 maximum: 5.0
             )
-            
+
             if counter == 0 {
                 FormItem(title: nil, detail: "Detail Text")
                 Rating()
             }
-            
+
             // Buttons
             Button("Increment") { increment() }
-            
+
+            Button("Increment (Observable)") { viewModel.counter += 1 }
+
             Button(role: .confirm) {
                 reset()
             } label: {
                 Text("Reset")
             }
-            
+
             NavigationLink("Next", destination: CarInformationView())
         }
         .navigationTitle("Information")