diff --git a/packages/editor/src/lib/editor/types/event-types.ts b/packages/editor/src/lib/editor/types/event-types.ts
index fd317adf9..5fa41deb8 100644
--- a/packages/editor/src/lib/editor/types/event-types.ts
+++ b/packages/editor/src/lib/editor/types/event-types.ts
@@ -49,17 +49,6 @@ export interface TLBaseEventInfo {
 	ctrlKey: boolean
 }
 
-/** @public */
-export type TLBasePointerEventInfo = TLBaseEventInfo & {
-	type: 'pointer'
-	name: TLPointerEventName
-	// The pointer position in client space, i.e. clientX / clientY
-	point: VecLike
-	pointerId: number
-	button: number
-	isPen: boolean
-} & TLPointerEventTarget
-
 /** @public */
 export type TLPointerEventInfo = TLBaseEventInfo & {
 	type: 'pointer'
diff --git a/packages/tldraw/api-report.md b/packages/tldraw/api-report.md
index f2be50724..0fb49624f 100644
--- a/packages/tldraw/api-report.md
+++ b/packages/tldraw/api-report.md
@@ -411,7 +411,7 @@ export const DefaultQuickActions: NamedExoticComponent<TLUiQuickActionsProps>;
 export function DefaultQuickActionsContent(): JSX_2.Element | undefined;
 
 // @public (undocumented)
-export const defaultShapeTools: (typeof ArrowShapeTool | typeof DrawShapeTool | typeof FrameShapeTool | typeof GeoShapeTool | typeof LineShapeTool | typeof NoteShapeTool | typeof TextShapeTool)[];
+export const defaultShapeTools: (typeof ArrowShapeTool | typeof FrameShapeTool | typeof GeoShapeTool | typeof HighlightShapeTool | typeof LineShapeTool | typeof NoteShapeTool | typeof TextShapeTool)[];
 
 // @public (undocumented)
 export const defaultShapeUtils: TLAnyShapeUtilConstructor[];
@@ -457,7 +457,7 @@ export function downsizeImage(blob: Blob, width: number, height: number, opts?:
 // @public (undocumented)
 export class DrawShapeTool extends StateNode {
     // (undocumented)
-    static children: () => (typeof Drawing | typeof Idle_2)[];
+    static children: () => (typeof Drawing | typeof Idle_3)[];
     // (undocumented)
     static id: string;
     // (undocumented)
@@ -686,7 +686,7 @@ export function FrameToolbarItem(): JSX_2.Element;
 // @public (undocumented)
 export class GeoShapeTool extends StateNode {
     // (undocumented)
-    static children: () => (typeof Idle_3 | typeof Pointing_2)[];
+    static children: () => (typeof Idle_2 | typeof Pointing_2)[];
     // (undocumented)
     static id: string;
     // (undocumented)
@@ -880,7 +880,7 @@ export function HexagonToolbarItem(): JSX_2.Element;
 // @public (undocumented)
 export class HighlightShapeTool extends StateNode {
     // (undocumented)
-    static children: () => (typeof Drawing | typeof Idle_2)[];
+    static children: () => (typeof Drawing | typeof Idle_3)[];
     // (undocumented)
     static id: string;
     // (undocumented)
diff --git a/packages/tldraw/api/api.json b/packages/tldraw/api/api.json
index efaa70492..b01a02d86 100644
--- a/packages/tldraw/api/api.json
+++ b/packages/tldraw/api/api.json
@@ -3829,15 +3829,6 @@
               "kind": "Content",
               "text": " | typeof "
             },
-            {
-              "kind": "Reference",
-              "text": "DrawShapeTool",
-              "canonicalReference": "tldraw!DrawShapeTool:class"
-            },
-            {
-              "kind": "Content",
-              "text": " | typeof "
-            },
             {
               "kind": "Reference",
               "text": "FrameShapeTool",
@@ -3856,6 +3847,15 @@
               "kind": "Content",
               "text": " | typeof "
             },
+            {
+              "kind": "Reference",
+              "text": "HighlightShapeTool",
+              "canonicalReference": "tldraw!HighlightShapeTool:class"
+            },
+            {
+              "kind": "Content",
+              "text": " | typeof "
+            },
             {
               "kind": "Reference",
               "text": "LineShapeTool",
@@ -4490,7 +4490,7 @@
                 {
                   "kind": "Reference",
                   "text": "Idle",
-                  "canonicalReference": "tldraw!~Idle_2:class"
+                  "canonicalReference": "tldraw!~Idle_3:class"
                 },
                 {
                   "kind": "Content",
@@ -7979,7 +7979,7 @@
                 {
                   "kind": "Reference",
                   "text": "Idle",
-                  "canonicalReference": "tldraw!~Idle_3:class"
+                  "canonicalReference": "tldraw!~Idle_2:class"
                 },
                 {
                   "kind": "Content",
@@ -9741,7 +9741,7 @@
                 {
                   "kind": "Reference",
                   "text": "Idle",
-                  "canonicalReference": "tldraw!~Idle_2:class"
+                  "canonicalReference": "tldraw!~Idle_3:class"
                 },
                 {
                   "kind": "Content",