diff --git a/src/Constants.maccatalyst.cs.in b/src/Constants.maccatalyst.cs.in
index 2c36e3abb591..640e0662f91f 100644
--- a/src/Constants.maccatalyst.cs.in
+++ b/src/Constants.maccatalyst.cs.in
@@ -9,5 +9,8 @@ namespace ObjCRuntime {
 
 		// iOS 9.0
 		public const string libcompressionLibrary = "/usr/lib/libcompression.dylib";
+
+		// xcode 13
+		public const string ApplicationServicesCoreGraphicsLibrary = "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/CoreGraphics";
 	}
 }
diff --git a/src/CoreGraphics/CGColorSpace.cs b/src/CoreGraphics/CGColorSpace.cs
index 0406dfb64f5e..6152ac19d5d9 100644
--- a/src/CoreGraphics/CGColorSpace.cs
+++ b/src/CoreGraphics/CGColorSpace.cs
@@ -29,6 +29,7 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 
 using CoreFoundation;
 using ObjCRuntime;
@@ -655,6 +656,39 @@ public bool UsesExtendedRange {
 		[MacCatalyst (14,0)]
 		public CGColorSpace CreateExtendedLinearized () => Runtime.GetINativeObject<CGColorSpace> (CGColorSpaceCreateExtendedLinearized (handle), owns: true);
 
+#if !NET
+		[Mac (12,0), iOS (15,0), TV (15,0), MacCatalyst (15,0), Watch (8,0)]
+#else
+		[SupportedOSPlatform ("ios15.0"), SupportedOSPlatform ("tvos15.0"), SupportedOSPlatform ("macos12.0"), SupportedOSPlatform ("maccatalyst15.0")]
+#endif
+		[return: MarshalAs (UnmanagedType.I1)]
+		[DllImport (Constants.CoreGraphicsLibrary)]
+		static extern bool CGColorSpaceIsHLGBased (/* CGColorSpace */ IntPtr space);
+
+#if !NET
+		[Mac (12,0), iOS (15,0), TV (15,0), MacCatalyst (15,0), Watch (8,0)]
+#else
+		[SupportedOSPlatform ("ios15.0"), SupportedOSPlatform ("tvos15.0"), SupportedOSPlatform ("macos12.0"), SupportedOSPlatform ("maccatalyst15.0")]
+#endif
+		public bool IsHlgBased => CGColorSpaceIsHLGBased (handle); 
+
+#if !NET
+		[Mac (12,0), iOS (15,0), TV (15,0), MacCatalyst (15,0), Watch (8,0)]
+#else
+		[SupportedOSPlatform ("ios15.0"), SupportedOSPlatform ("tvos15.0"), SupportedOSPlatform ("macos12.0"), SupportedOSPlatform ("maccatalyst15.0")]
+#endif
+		[return: MarshalAs (UnmanagedType.I1)]
+		[DllImport (Constants.CoreGraphicsLibrary)]
+		static extern bool CGColorSpaceIsPQBased (/* CGColorSpace */ IntPtr space);
+
+#if !NET
+		[Mac (12,0), iOS (15,0), TV (15,0), MacCatalyst (15,0), Watch (8,0)]
+#else
+		[SupportedOSPlatform ("ios15.0"), SupportedOSPlatform ("tvos15.0"), SupportedOSPlatform ("macos12.0"), SupportedOSPlatform ("maccatalyst15.0")]
+#endif
+		public bool IsPQBased => CGColorSpaceIsPQBased (handle);
+
+
 #endif // !COREBUILD
 	}
 }
diff --git a/src/CoreGraphics/CGDisplay.cs b/src/CoreGraphics/CGDisplay.cs
index 6648e51241e0..ff9f736f8f62 100644
--- a/src/CoreGraphics/CGDisplay.cs
+++ b/src/CoreGraphics/CGDisplay.cs
@@ -1,17 +1,29 @@
-#if MONOMAC
+#if MONOMAC || __MACCATALYST__
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using ObjCRuntime;
 using Foundation;
 
 namespace CoreGraphics
 {
+
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGCaptureOptions : uint
 	{
 		None = 0,
 		NoFill = 1 << 0
 	}
 
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public static class CGDisplay
 	{
 #if !COREBUILD
diff --git a/src/CoreGraphics/CGEvent.cs b/src/CoreGraphics/CGEvent.cs
index 145ffb784823..b6e8377967d3 100644
--- a/src/CoreGraphics/CGEvent.cs
+++ b/src/CoreGraphics/CGEvent.cs
@@ -8,10 +8,11 @@
  *    Miguel de Icaza
  */
 
-#if MONOMAC
+#if MONOMAC || __MACCATALYST__
 
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 #if !NO_SYSTEM_DRAWING
 using System.Drawing;
 #endif
@@ -20,6 +21,12 @@
 using Foundation;
 
 namespace CoreGraphics {
+
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public sealed class CGEvent : IDisposable, INativeObject {
 		public delegate IntPtr CGEventTapCallback (IntPtr tapProxyEvent, CGEventType eventType, IntPtr eventRef, IntPtr userInfo);
 
diff --git a/src/CoreGraphics/CGEventSource.cs b/src/CoreGraphics/CGEventSource.cs
index 32ee1ffc2882..1bd24277362f 100644
--- a/src/CoreGraphics/CGEventSource.cs
+++ b/src/CoreGraphics/CGEventSource.cs
@@ -8,10 +8,11 @@
  *    Miguel de Icaza
  */
 
-#if MONOMAC
+#if MONOMAC || __MACCATALYST__
 
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 #if !NO_SYSTEM_DRAWING
 using System.Drawing;
 #endif
@@ -20,6 +21,11 @@
 using Foundation;
 
 namespace CoreGraphics {
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public sealed class CGEventSource : IDisposable, INativeObject {
 		IntPtr handle;
 
diff --git a/src/CoreGraphics/CGEventTypes.cs b/src/CoreGraphics/CGEventTypes.cs
index 90df43e7e7e3..f6893e6609f3 100644
--- a/src/CoreGraphics/CGEventTypes.cs
+++ b/src/CoreGraphics/CGEventTypes.cs
@@ -8,10 +8,11 @@
  *    Miguel de Icaza
  */
 
-#if MONOMAC
+#if MONOMAC || __MACCATALYST__
 
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 #if !NO_SYSTEM_DRAWING
 using System.Drawing;
 #endif
@@ -22,6 +23,11 @@
 namespace CoreGraphics {
 
 	// CGEventTypes.h:typedef uint32_t CGEventTapLocation;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventTapLocation : int {
 		HID,
 		Session,
@@ -29,28 +35,53 @@ public enum CGEventTapLocation : int {
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGEventTapPlacement;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventTapPlacement : uint {
 		HeadInsert,
 		TailAppend
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGEventTapOptions;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventTapOptions : uint {
 		Default, 
 		ListenOnly
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGMouseButton;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGMouseButton : uint {
 		Left, Right, Center
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGScrollEventUnit;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGScrollEventUnit : uint {
 		Pixel, Line
 	}
 
 	// CGEventTypes.h:typedef uint64_t CGEventMask;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	[Flags]
 	public enum CGEventMask : ulong {
 		Null              = 0x00000001,
@@ -73,6 +104,11 @@ public enum CGEventMask : ulong {
 	}
 
 	// CGEventTypes.h:typedef uint64_t CGEventFlags;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	[Flags]
 	public enum CGEventFlags : ulong {
 		NonCoalesced = 0x00000100,
@@ -87,6 +123,11 @@ public enum CGEventFlags : ulong {
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGEventField;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	internal enum CGEventField : int {
 		MouseEventNumber = 0,
 		MouseEventClickState = 1,
@@ -151,6 +192,11 @@ internal enum CGEventField : int {
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGEventType;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventType : uint {
 		Null = 0x0,
 		LeftMouseDown = 0x1,
@@ -174,16 +220,31 @@ public enum CGEventType : uint {
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGEventMouseSubtype;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventMouseSubtype : uint {
 		Default, TabletPoint, TabletProximity
 	}
 
 	// CGEventTypes.h:typedef uint32_t CGEventSourceStateID;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventSourceStateID : int {
 		Private = -1, CombinedSession = 0, HidSystem = 1
 	}
 
 	// CGRemoteOperation.h:typedef uint32_t CGEventFilterMask;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	[Flags]
 	public enum CGEventFilterMask : uint {
 		PermitLocalMouseEvents = 1,
@@ -192,6 +253,11 @@ public enum CGEventFilterMask : uint {
 	}
 
 	// CGRemoteOperation.h:typedef uint32_t CGEventSuppressionState;
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	public enum CGEventSuppressionState : int {
 		SuppressionInterval,
 		RemoteMouseDrag,
diff --git a/src/CoreGraphics/CGImage.cs b/src/CoreGraphics/CGImage.cs
index 913b45445299..12e3aa65814d 100644
--- a/src/CoreGraphics/CGImage.cs
+++ b/src/CoreGraphics/CGImage.cs
@@ -27,14 +27,20 @@
 //
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 
 using ObjCRuntime;
 using Foundation;
 
 namespace CoreGraphics {
 
-#if MONOMAC
+#if MONOMAC || __MACCATALYST__
 	// uint32_t -> CGWindow.h (OSX SDK only)
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	[Flags]	
 	public enum CGWindowImageOption : uint {
 		Default             = 0,
@@ -46,6 +52,11 @@ public enum CGWindowImageOption : uint {
 	}
 
 	// uint32_t -> CGWindow.h (OSX SDK only)
+#if !NET
+	[MacCatalyst (15,0)]
+#else
+	[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 	[Flags]
 	public enum CGWindowListOption : uint {
 		All                 = 0,
@@ -213,15 +224,30 @@ public CGImage (int width, int height, int bitsPerComponent, int bitsPerPixel, i
 						shouldInterpolate, intent);
 		}
 
-#if MONOMAC
+#if MONOMAC || __MACCATALYST__
+#if !NET
+		[MacCatalyst (15,0)]
+#else
+		[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 		[DllImport (Constants.CoreGraphicsLibrary)]
 		static extern IntPtr CGWindowListCreateImage(CGRect screenBounds, CGWindowListOption windowOption, uint windowID, CGWindowImageOption imageOption);
         
+#if !NET
+		[MacCatalyst (15,0)]
+#else
+		[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 		public static CGImage ScreenImage (int windownumber, CGRect bounds)
 		{
 			return ScreenImage (windownumber, bounds, CGWindowListOption.IncludingWindow, CGWindowImageOption.Default);
 		}
 
+#if !NET
+		[MacCatalyst (15,0)]
+#else
+		[SupportedOSPlatform ("maccatalyst15.0")]
+#endif
 		public static CGImage ScreenImage (int windownumber, CGRect bounds, CGWindowListOption windowOption,
 			CGWindowImageOption imageOption)
 		{
diff --git a/src/coregraphics.cs b/src/coregraphics.cs
index c5f83e787f80..5350873eb919 100644
--- a/src/coregraphics.cs
+++ b/src/coregraphics.cs
@@ -278,6 +278,18 @@ interface CGColorSpaceNames {
 		[MacCatalyst (14,0)]
 		[Field ("kCGColorSpaceITUR_2100_PQ")]
 		NSString Itur_2100_PQ { get; }
+
+		[Mac (12,0), iOS (15,0), TV (15,0), Watch (8,0), MacCatalyst (15,0)]
+		[Field ("kCGColorSpaceExtendedRange")]
+		NSString ExtendedRange { get; }
+
+		[Mac (12, 0), iOS (15, 0), TV (15,0), Watch (8,0), MacCatalyst (15,0)]
+		[Field ("kCGColorSpaceLinearDisplayP3")]
+		NSString LinearDisplayP3 { get; }
+
+		[Mac (12, 0), iOS (15, 0), TV (15,0), Watch (8,0), MacCatalyst (15,0)]
+		[Field ("kCGColorSpaceLinearITUR_2020")]
+		NSString LinearItur_2020 { get; }
 	}
 
 	[Partial]
diff --git a/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs b/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs
index 78d1a0d4a405..e7b402e398aa 100644
--- a/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs
+++ b/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs
@@ -445,5 +445,28 @@ public void CreateExtendedLinearizedTest ()
 				Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1));
 			}
 		}
+		
+		[Test]
+		public void IsHlgBasedTest ()
+		{
+			TestRuntime.AssertXcodeVersion (13,0);
+			using (var cs = CGColorSpace.CreateDeviceRGB ()) {
+				Assert.DoesNotThrow (() => {
+					var result = cs.IsHlgBased;
+				});
+			}
+		}
+		
+		[Test]
+		public void IsPQBasedTest ()
+		{
+			TestRuntime.AssertXcodeVersion (13,0);
+			using (var cs = CGColorSpace.CreateDeviceRGB ()) {
+				Assert.DoesNotThrow (() => {
+					var result = cs.IsPQBased;
+				});
+			}
+		}
 	}
+	
 }
diff --git a/tests/xtro-sharpie/MacCatalyst-CoreGraphics.todo b/tests/xtro-sharpie/MacCatalyst-CoreGraphics.ignore
similarity index 63%
rename from tests/xtro-sharpie/MacCatalyst-CoreGraphics.todo
rename to tests/xtro-sharpie/MacCatalyst-CoreGraphics.ignore
index 082c5ed105eb..7142678787a8 100644
--- a/tests/xtro-sharpie/MacCatalyst-CoreGraphics.todo
+++ b/tests/xtro-sharpie/MacCatalyst-CoreGraphics.ignore
@@ -1,30 +1,15 @@
-!missing-enum! CGCaptureOptions not bound
+# ignored in macOS too
 !missing-enum! CGConfigureOption not bound
 !missing-enum! CGDisplayChangeSummaryFlags not bound
 !missing-enum! CGDisplayStreamFrameStatus not bound
 !missing-enum! CGDisplayStreamUpdateRectType not bound
-!missing-enum! CGEventField not bound
-!missing-enum! CGEventFilterMask not bound
-!missing-enum! CGEventFlags not bound
-!missing-enum! CGEventMouseSubtype not bound
-!missing-enum! CGEventSourceStateID not bound
-!missing-enum! CGEventSuppressionState not bound
-!missing-enum! CGEventTapLocation not bound
-!missing-enum! CGEventTapOptions not bound
-!missing-enum! CGEventTapPlacement not bound
-!missing-enum! CGEventType not bound
 !missing-enum! CGGesturePhase not bound
 !missing-enum! CGMomentumScrollPhase not bound
-!missing-enum! CGMouseButton not bound
 !missing-enum! CGScreenUpdateOperation not bound
-!missing-enum! CGScrollEventUnit not bound
 !missing-enum! CGScrollPhase not bound
 !missing-enum! CGWindowBackingType not bound
-!missing-enum! CGWindowImageOption not bound
 !missing-enum! CGWindowLevelKey not bound
-!missing-enum! CGWindowListOption not bound
 !missing-enum! CGWindowSharingType not bound
-!missing-field! kCGColorSpaceExtendedRange not bound
 !missing-field! kCGDisplayShowDuplicateLowResolutionModes not bound
 !missing-field! kCGDisplayStreamColorSpace not bound
 !missing-field! kCGDisplayStreamDestinationRect not bound
@@ -54,11 +39,6 @@
 !missing-pinvoke! CGAssociateMouseAndMouseCursorPosition is not bound
 !missing-pinvoke! CGBeginDisplayConfiguration is not bound
 !missing-pinvoke! CGCancelDisplayConfiguration is not bound
-!missing-pinvoke! CGCaptureAllDisplays is not bound
-!missing-pinvoke! CGCaptureAllDisplaysWithOptions is not bound
-!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
-!missing-pinvoke! CGColorSpaceIsHLGBased is not bound
-!missing-pinvoke! CGColorSpaceIsPQBased is not bound
 !missing-pinvoke! CGCompleteDisplayConfiguration is not bound
 !missing-pinvoke! CGConfigureDisplayFadeEffect is not bound
 !missing-pinvoke! CGConfigureDisplayMirrorOfDisplay is not bound
@@ -67,16 +47,12 @@
 !missing-pinvoke! CGConfigureDisplayStereoOperation is not bound
 !missing-pinvoke! CGConfigureDisplayWithDisplayMode is not bound
 !missing-pinvoke! CGContextDrawPDFDocument is not bound
-!missing-pinvoke! CGConvertColorDataWithFormat is not bound
 !missing-pinvoke! CGCursorIsDrawnInFramebuffer is not bound
 !missing-pinvoke! CGCursorIsVisible is not bound
 !missing-pinvoke! CGDirectDisplayCopyCurrentMetalDevice is not bound
 !missing-pinvoke! CGDisplayAvailableModes is not bound
 !missing-pinvoke! CGDisplayBestModeForParameters is not bound
 !missing-pinvoke! CGDisplayBestModeForParametersAndRefreshRate is not bound
-!missing-pinvoke! CGDisplayBounds is not bound
-!missing-pinvoke! CGDisplayCapture is not bound
-!missing-pinvoke! CGDisplayCaptureWithOptions is not bound
 !missing-pinvoke! CGDisplayCopyAllDisplayModes is not bound
 !missing-pinvoke! CGDisplayCopyColorSpace is not bound
 !missing-pinvoke! CGDisplayCopyDisplayMode is not bound
@@ -85,16 +61,12 @@
 !missing-pinvoke! CGDisplayCurrentMode is not bound
 !missing-pinvoke! CGDisplayFade is not bound
 !missing-pinvoke! CGDisplayFadeOperationInProgress is not bound
-!missing-pinvoke! CGDisplayGammaTableCapacity is not bound
 !missing-pinvoke! CGDisplayGetDrawingContext is not bound
-!missing-pinvoke! CGDisplayHideCursor is not bound
-!missing-pinvoke! CGDisplayIDToOpenGLDisplayMask is not bound
 !missing-pinvoke! CGDisplayIOServicePort is not bound
 !missing-pinvoke! CGDisplayIsActive is not bound
 !missing-pinvoke! CGDisplayIsAlwaysInMirrorSet is not bound
 !missing-pinvoke! CGDisplayIsAsleep is not bound
 !missing-pinvoke! CGDisplayIsBuiltin is not bound
-!missing-pinvoke! CGDisplayIsCaptured is not bound
 !missing-pinvoke! CGDisplayIsInHWMirrorSet is not bound
 !missing-pinvoke! CGDisplayIsInMirrorSet is not bound
 !missing-pinvoke! CGDisplayIsMain is not bound
@@ -108,26 +80,19 @@
 !missing-pinvoke! CGDisplayModeGetPixelHeight is not bound
 !missing-pinvoke! CGDisplayModeGetPixelWidth is not bound
 !missing-pinvoke! CGDisplayModeGetRefreshRate is not bound
-!missing-pinvoke! CGDisplayModeGetTypeID is not bound
 !missing-pinvoke! CGDisplayModeGetWidth is not bound
 !missing-pinvoke! CGDisplayModeIsUsableForDesktopGUI is not bound
 !missing-pinvoke! CGDisplayModeRelease is not bound
 !missing-pinvoke! CGDisplayModeRetain is not bound
 !missing-pinvoke! CGDisplayModelNumber is not bound
-!missing-pinvoke! CGDisplayMoveCursorToPoint is not bound
-!missing-pinvoke! CGDisplayPixelsHigh is not bound
-!missing-pinvoke! CGDisplayPixelsWide is not bound
 !missing-pinvoke! CGDisplayPrimaryDisplay is not bound
 !missing-pinvoke! CGDisplayRegisterReconfigurationCallback is not bound
-!missing-pinvoke! CGDisplayRelease is not bound
 !missing-pinvoke! CGDisplayRemoveReconfigurationCallback is not bound
-!missing-pinvoke! CGDisplayRestoreColorSyncSettings is not bound
 !missing-pinvoke! CGDisplayRotation is not bound
 !missing-pinvoke! CGDisplayScreenSize is not bound
 !missing-pinvoke! CGDisplaySerialNumber is not bound
 !missing-pinvoke! CGDisplaySetDisplayMode is not bound
 !missing-pinvoke! CGDisplaySetStereoOperation is not bound
-!missing-pinvoke! CGDisplayShowCursor is not bound
 !missing-pinvoke! CGDisplayStreamCreate is not bound
 !missing-pinvoke! CGDisplayStreamCreateWithDispatchQueue is not bound
 !missing-pinvoke! CGDisplayStreamGetRunLoopSource is not bound
@@ -144,60 +109,13 @@
 !missing-pinvoke! CGDisplayUsesOpenGLAcceleration is not bound
 !missing-pinvoke! CGDisplayVendorNumber is not bound
 !missing-pinvoke! CGEnableEventStateCombining is not bound
-!missing-pinvoke! CGErrorSetCallback is not bound
-!missing-pinvoke! CGEventCreate is not bound
-!missing-pinvoke! CGEventCreateCopy is not bound
-!missing-pinvoke! CGEventCreateData is not bound
-!missing-pinvoke! CGEventCreateFromData is not bound
-!missing-pinvoke! CGEventCreateKeyboardEvent is not bound
-!missing-pinvoke! CGEventCreateMouseEvent is not bound
-!missing-pinvoke! CGEventCreateScrollWheelEvent is not bound
 !missing-pinvoke! CGEventCreateScrollWheelEvent2 is not bound
-!missing-pinvoke! CGEventCreateSourceFromEvent is not bound
-!missing-pinvoke! CGEventGetDoubleValueField is not bound
-!missing-pinvoke! CGEventGetFlags is not bound
-!missing-pinvoke! CGEventGetIntegerValueField is not bound
-!missing-pinvoke! CGEventGetLocation is not bound
-!missing-pinvoke! CGEventGetTimestamp is not bound
-!missing-pinvoke! CGEventGetType is not bound
 !missing-pinvoke! CGEventGetTypeID is not bound
-!missing-pinvoke! CGEventGetUnflippedLocation is not bound
-!missing-pinvoke! CGEventKeyboardGetUnicodeString is not bound
-!missing-pinvoke! CGEventKeyboardSetUnicodeString is not bound
-!missing-pinvoke! CGEventPost is not bound
-!missing-pinvoke! CGEventPostToPSN is not bound
 !missing-pinvoke! CGEventPostToPid is not bound
 !missing-pinvoke! CGEventSetDoubleValueField is not bound
-!missing-pinvoke! CGEventSetFlags is not bound
 !missing-pinvoke! CGEventSetIntegerValueField is not bound
-!missing-pinvoke! CGEventSetLocation is not bound
-!missing-pinvoke! CGEventSetSource is not bound
-!missing-pinvoke! CGEventSetTimestamp is not bound
-!missing-pinvoke! CGEventSetType is not bound
-!missing-pinvoke! CGEventSourceButtonState is not bound
-!missing-pinvoke! CGEventSourceCounterForEventType is not bound
-!missing-pinvoke! CGEventSourceCreate is not bound
-!missing-pinvoke! CGEventSourceFlagsState is not bound
-!missing-pinvoke! CGEventSourceGetKeyboardType is not bound
-!missing-pinvoke! CGEventSourceGetLocalEventsFilterDuringSuppressionState is not bound
-!missing-pinvoke! CGEventSourceGetLocalEventsSuppressionInterval is not bound
-!missing-pinvoke! CGEventSourceGetPixelsPerLine is not bound
-!missing-pinvoke! CGEventSourceGetSourceStateID is not bound
 !missing-pinvoke! CGEventSourceGetTypeID is not bound
-!missing-pinvoke! CGEventSourceGetUserData is not bound
-!missing-pinvoke! CGEventSourceKeyState is not bound
-!missing-pinvoke! CGEventSourceSecondsSinceLastEventType is not bound
-!missing-pinvoke! CGEventSourceSetKeyboardType is not bound
-!missing-pinvoke! CGEventSourceSetLocalEventsFilterDuringSuppressionState is not bound
-!missing-pinvoke! CGEventSourceSetLocalEventsSuppressionInterval is not bound
-!missing-pinvoke! CGEventSourceSetPixelsPerLine is not bound
-!missing-pinvoke! CGEventSourceSetUserData is not bound
-!missing-pinvoke! CGEventTapCreate is not bound
-!missing-pinvoke! CGEventTapCreateForPSN is not bound
 !missing-pinvoke! CGEventTapCreateForPid is not bound
-!missing-pinvoke! CGEventTapEnable is not bound
-!missing-pinvoke! CGEventTapIsEnabled is not bound
-!missing-pinvoke! CGEventTapPostEvent is not bound
 !missing-pinvoke! CGFontCreateWithPlatformFont is not bound
 !missing-pinvoke! CGGetActiveDisplayList is not bound
 !missing-pinvoke! CGGetDisplayTransferByFormula is not bound
@@ -205,12 +123,9 @@
 !missing-pinvoke! CGGetDisplaysWithOpenGLDisplayMask is not bound
 !missing-pinvoke! CGGetDisplaysWithPoint is not bound
 !missing-pinvoke! CGGetDisplaysWithRect is not bound
-!missing-pinvoke! CGGetEventTapList is not bound
 !missing-pinvoke! CGGetLastMouseDelta is not bound
 !missing-pinvoke! CGGetOnlineDisplayList is not bound
 !missing-pinvoke! CGInhibitLocalEvents is not bound
-!missing-pinvoke! CGMainDisplayID is not bound
-!missing-pinvoke! CGOpenGLDisplayMaskToDisplayID is not bound
 !missing-pinvoke! CGPDFDocumentGetArtBox is not bound
 !missing-pinvoke! CGPDFDocumentGetBleedBox is not bound
 !missing-pinvoke! CGPDFDocumentGetCropBox is not bound
@@ -225,27 +140,19 @@
 !missing-pinvoke! CGPostKeyboardEvent is not bound
 !missing-pinvoke! CGPostMouseEvent is not bound
 !missing-pinvoke! CGPostScrollWheelEvent is not bound
-!missing-pinvoke! CGPreflightListenEventAccess is not bound
-!missing-pinvoke! CGPreflightPostEventAccess is not bound
 !missing-pinvoke! CGPreflightScreenCaptureAccess is not bound
 !missing-pinvoke! CGRegisterScreenRefreshCallback is not bound
-!missing-pinvoke! CGReleaseAllDisplays is not bound
 !missing-pinvoke! CGReleaseDisplayFadeReservation is not bound
 !missing-pinvoke! CGReleaseScreenRefreshRects is not bound
-!missing-pinvoke! CGRequestListenEventAccess is not bound
-!missing-pinvoke! CGRequestPostEventAccess is not bound
 !missing-pinvoke! CGRequestScreenCaptureAccess is not bound
 !missing-pinvoke! CGRestorePermanentDisplayConfiguration is not bound
 !missing-pinvoke! CGScreenRegisterMoveCallback is not bound
 !missing-pinvoke! CGScreenUnregisterMoveCallback is not bound
 !missing-pinvoke! CGSessionCopyCurrentDictionary is not bound
 !missing-pinvoke! CGSetDisplayTransferByByteTable is not bound
-!missing-pinvoke! CGSetDisplayTransferByFormula is not bound
 !missing-pinvoke! CGSetDisplayTransferByTable is not bound
 !missing-pinvoke! CGSetLocalEventsFilterDuringSuppressionState is not bound
 !missing-pinvoke! CGSetLocalEventsSuppressionInterval is not bound
-!missing-pinvoke! CGShieldingWindowID is not bound
-!missing-pinvoke! CGShieldingWindowLevel is not bound
 !missing-pinvoke! CGUnregisterScreenRefreshCallback is not bound
 !missing-pinvoke! CGWaitForScreenRefreshRects is not bound
 !missing-pinvoke! CGWaitForScreenUpdateRects is not bound
@@ -254,10 +161,6 @@
 !missing-pinvoke! CGWindowListCopyWindowInfo is not bound
 !missing-pinvoke! CGWindowListCreate is not bound
 !missing-pinvoke! CGWindowListCreateDescriptionFromArray is not bound
-!missing-pinvoke! CGWindowListCreateImage is not bound
 !missing-pinvoke! CGWindowListCreateImageFromArray is not bound
 !missing-pinvoke! CGWindowServerCFMachPort is not bound
 !missing-pinvoke! CGWindowServerCreateServerPort is not bound
-## appended from unclassified file
-!missing-field! kCGColorSpaceLinearDisplayP3 not bound
-!missing-field! kCGColorSpaceLinearITUR_2020 not bound
diff --git a/tests/xtro-sharpie/common-CoreGraphics.ignore b/tests/xtro-sharpie/common-CoreGraphics.ignore
index 4a62e7a6200d..767b690bf4a0 100644
--- a/tests/xtro-sharpie/common-CoreGraphics.ignore
+++ b/tests/xtro-sharpie/common-CoreGraphics.ignore
@@ -7,6 +7,9 @@
 # There's an identical function that takes a C callback instead of a block, and which we've bound, which makes this function redundant since the managed API would be identical.
 !missing-pinvoke! CGPDFDictionaryApplyBlock is not bound
 
+# not yet sure how to bind this
+!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
+
 ## unsorted
 
 !missing-enum! CGBitmapInfo not bound
@@ -91,3 +94,5 @@
 !missing-pinvoke! CGRectOffset is not bound
 !missing-pinvoke! CGShadingGetTypeID is not bound
 !missing-pinvoke! CGSizeEqualToSize is not bound
+!missing-pinvoke! CGErrorSetCallback is not bound
+!missing-pinvoke! CGConvertColorDataWithFormat is not bound
diff --git a/tests/xtro-sharpie/iOS-CoreGraphics.todo b/tests/xtro-sharpie/iOS-CoreGraphics.todo
deleted file mode 100644
index 41628a6931f4..000000000000
--- a/tests/xtro-sharpie/iOS-CoreGraphics.todo
+++ /dev/null
@@ -1,8 +0,0 @@
-!missing-field! kCGColorSpaceExtendedRange not bound
-!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
-!missing-pinvoke! CGColorSpaceIsHLGBased is not bound
-!missing-pinvoke! CGColorSpaceIsPQBased is not bound
-!missing-pinvoke! CGConvertColorDataWithFormat is not bound
-!missing-pinvoke! CGErrorSetCallback is not bound
-!missing-field! kCGColorSpaceLinearDisplayP3 not bound
-!missing-field! kCGColorSpaceLinearITUR_2020 not bound
diff --git a/tests/xtro-sharpie/macOS-CoreGraphics.todo b/tests/xtro-sharpie/macOS-CoreGraphics.todo
deleted file mode 100644
index 41628a6931f4..000000000000
--- a/tests/xtro-sharpie/macOS-CoreGraphics.todo
+++ /dev/null
@@ -1,8 +0,0 @@
-!missing-field! kCGColorSpaceExtendedRange not bound
-!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
-!missing-pinvoke! CGColorSpaceIsHLGBased is not bound
-!missing-pinvoke! CGColorSpaceIsPQBased is not bound
-!missing-pinvoke! CGConvertColorDataWithFormat is not bound
-!missing-pinvoke! CGErrorSetCallback is not bound
-!missing-field! kCGColorSpaceLinearDisplayP3 not bound
-!missing-field! kCGColorSpaceLinearITUR_2020 not bound
diff --git a/tests/xtro-sharpie/tvOS-CoreGraphics.todo b/tests/xtro-sharpie/tvOS-CoreGraphics.todo
deleted file mode 100644
index 41628a6931f4..000000000000
--- a/tests/xtro-sharpie/tvOS-CoreGraphics.todo
+++ /dev/null
@@ -1,8 +0,0 @@
-!missing-field! kCGColorSpaceExtendedRange not bound
-!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
-!missing-pinvoke! CGColorSpaceIsHLGBased is not bound
-!missing-pinvoke! CGColorSpaceIsPQBased is not bound
-!missing-pinvoke! CGConvertColorDataWithFormat is not bound
-!missing-pinvoke! CGErrorSetCallback is not bound
-!missing-field! kCGColorSpaceLinearDisplayP3 not bound
-!missing-field! kCGColorSpaceLinearITUR_2020 not bound
diff --git a/tests/xtro-sharpie/watchOS-CoreGraphics.todo b/tests/xtro-sharpie/watchOS-CoreGraphics.todo
deleted file mode 100644
index 41628a6931f4..000000000000
--- a/tests/xtro-sharpie/watchOS-CoreGraphics.todo
+++ /dev/null
@@ -1,8 +0,0 @@
-!missing-field! kCGColorSpaceExtendedRange not bound
-!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
-!missing-pinvoke! CGColorSpaceIsHLGBased is not bound
-!missing-pinvoke! CGColorSpaceIsPQBased is not bound
-!missing-pinvoke! CGConvertColorDataWithFormat is not bound
-!missing-pinvoke! CGErrorSetCallback is not bound
-!missing-field! kCGColorSpaceLinearDisplayP3 not bound
-!missing-field! kCGColorSpaceLinearITUR_2020 not bound