diff --git a/win32k-tracing.js b/win32k-tracing.js
index e56108d..4822f60 100644
--- a/win32k-tracing.js
+++ b/win32k-tracing.js
@@ -10,8 +10,12 @@ const EXCLUDED_WIN32K_SYSCALLS = [
 ];
 
 const WIN32K_SYSCALLS = [
-    "IsNtGdiFastPolyPolylineSupported",
-    "IsNtGdiFlushUserBatchSupported",
+    "NtBindCompositionSurface",
+    "NtCompositionInputThread",
+    "NtCompositionSetDropTarget",
+    "NtCreateCompositionInputSink",
+    "NtCreateCompositionSurfaceHandle",
+    "NtCreateImplicitCompositionInputSink",
     "NtDCompositionAddCrossDeviceVisualChild",
     "NtDCompositionBeginFrame",
     "NtDCompositionCommitChannel",
@@ -49,7 +53,6 @@ const WIN32K_SYSCALLS = [
     "NtDCompositionSetChildRootVisual",
     "NtDCompositionSetDebugCounter",
     "NtDCompositionSubmitDWMBatch",
-    "NtDCompositionSyncWait",
     "NtDCompositionSynchronize",
     "NtDCompositionTelemetryAnimationScenarioBegin",
     "NtDCompositionTelemetryAnimationScenarioReference",
@@ -60,6 +63,8 @@ const WIN32K_SYSCALLS = [
     "NtDCompositionTelemetryTouchInteractionUpdate",
     "NtDCompositionUpdatePointerCapture",
     "NtDCompositionWaitForChannel",
+    "NtDesktopCaptureBits",
+    "NtDuplicateCompositionInputSink",
     "NtGdiAbortDoc",
     "NtGdiAbortPath",
     "NtGdiAddEmbFontToDC",
@@ -120,32 +125,13 @@ const WIN32K_SYSCALLS = [
     "NtGdiCreateServerMetaFile",
     "NtGdiCreateSessionMappedDIBSection",
     "NtGdiCreateSolidBrush",
-    "NtGdiD3dContextCreate",
-    "NtGdiD3dContextDestroy",
-    "NtGdiD3dContextDestroyAll",
-    "NtGdiD3dDrawPrimitives2",
-    "NtGdiD3dValidateTextureStageState",
     "NtGdiDDCCIGetCapabilitiesString",
     "NtGdiDDCCIGetCapabilitiesStringLength",
     "NtGdiDDCCIGetTimingReport",
     "NtGdiDDCCIGetVCPFeature",
     "NtGdiDDCCISaveCurrentSettings",
     "NtGdiDDCCISetVCPFeature",
-    "NtGdiDdAddAttachedSurface",
-    "NtGdiDdAlphaBlt",
-    "NtGdiDdAttachSurface",
-    "NtGdiDdBeginMoCompFrame",
-    "NtGdiDdBlt",
-    "NtGdiDdCanCreateD3DBuffer",
-    "NtGdiDdCanCreateSurface",
-    "NtGdiDdColorControl",
-    "NtGdiDdCreateD3DBuffer",
-    "NtGdiDdCreateDirectDrawObject",
     "NtGdiDdCreateFullscreenSprite",
-    "NtGdiDdCreateMoComp",
-    "NtGdiDdCreateSurface",
-    "NtGdiDdCreateSurfaceEx",
-    "NtGdiDdCreateSurfaceObject",
     "NtGdiDdDDIAbandonSwapChain",
     "NtGdiDdDDIAcquireKeyedMutex",
     "NtGdiDdDDIAcquireKeyedMutex2",
@@ -209,9 +195,7 @@ const WIN32K_SYSCALLS = [
     "NtGdiDdDDIGetOverlayState",
     "NtGdiDdDDIGetPostCompositionCaps",
     "NtGdiDdDDIGetPresentHistory",
-    "NtGdiDdDDIGetPresentHistoryInternal",
     "NtGdiDdDDIGetPresentQueueEvent",
-    "NtGdiDdDDIGetPresentStatsInternal",
     "NtGdiDdDDIGetProcessSchedulingPriorityBand",
     "NtGdiDdDDIGetProcessSchedulingPriorityClass",
     "NtGdiDdDDIGetResourcePresentPrivateDriverData",
@@ -322,46 +306,9 @@ const WIN32K_SYSCALLS = [
     "NtGdiDdDDIWaitForSynchronizationObjectFromGpu",
     "NtGdiDdDDIWaitForVerticalBlankEvent",
     "NtGdiDdDDIWaitForVerticalBlankEvent2",
-    "NtGdiDdDeleteDirectDrawObject",
-    "NtGdiDdDeleteSurfaceObject",
-    "NtGdiDdDestroyD3DBuffer",
     "NtGdiDdDestroyFullscreenSprite",
-    "NtGdiDdDestroyMoComp",
-    "NtGdiDdDestroySurface",
-    "NtGdiDdEndMoCompFrame",
-    "NtGdiDdFlip",
-    "NtGdiDdFlipToGDISurface",
-    "NtGdiDdGetAvailDriverMemory",
-    "NtGdiDdGetBltStatus",
-    "NtGdiDdGetDC",
-    "NtGdiDdGetDriverInfo",
-    "NtGdiDdGetDriverState",
-    "NtGdiDdGetDxHandle",
-    "NtGdiDdGetFlipStatus",
-    "NtGdiDdGetInternalMoCompInfo",
-    "NtGdiDdGetMoCompBuffInfo",
-    "NtGdiDdGetMoCompFormats",
-    "NtGdiDdGetMoCompGuids",
-    "NtGdiDdGetScanLine",
-    "NtGdiDdLock",
-    "NtGdiDdLockD3D",
     "NtGdiDdNotifyFullscreenSpriteUpdate",
-    "NtGdiDdQueryDirectDrawObject",
-    "NtGdiDdQueryMoCompStatus",
     "NtGdiDdQueryVisRgnUniqueness",
-    "NtGdiDdReenableDirectDrawObject",
-    "NtGdiDdReleaseDC",
-    "NtGdiDdRenderMoComp",
-    "NtGdiDdResetVisrgn",
-    "NtGdiDdSetColorKey",
-    "NtGdiDdSetExclusiveMode",
-    "NtGdiDdSetGammaRamp",
-    "NtGdiDdSetOverlayPosition",
-    "NtGdiDdUnattachSurface",
-    "NtGdiDdUnlock",
-    "NtGdiDdUnlockD3D",
-    "NtGdiDdUpdateOverlay",
-    "NtGdiDdWaitForVerticalBlank",
     "NtGdiDeleteClientObj",
     "NtGdiDeleteColorSpace",
     "NtGdiDeleteColorTransform",
@@ -373,25 +320,7 @@ const WIN32K_SYSCALLS = [
     "NtGdiDoPalette",
     "NtGdiDrawEscape",
     "NtGdiDrawStream",
-    "NtGdiDvpAcquireNotification",
-    "NtGdiDvpCanCreateVideoPort",
-    "NtGdiDvpColorControl",
-    "NtGdiDvpCreateVideoPort",
-    "NtGdiDvpDestroyVideoPort",
-    "NtGdiDvpFlipVideoPort",
-    "NtGdiDvpGetVideoPortBandwidth",
-    "NtGdiDvpGetVideoPortConnectInfo",
-    "NtGdiDvpGetVideoPortField",
-    "NtGdiDvpGetVideoPortFlipStatus",
-    "NtGdiDvpGetVideoPortInputFormats",
-    "NtGdiDvpGetVideoPortLine",
-    "NtGdiDvpGetVideoPortOutputFormats",
-    "NtGdiDvpGetVideoSignalStatus",
-    "NtGdiDvpReleaseNotification",
-    "NtGdiDvpUpdateVideoPort",
-    "NtGdiDvpWaitForVideoPortSync",
     "NtGdiDwmCreatedBitmapRemotingOutput",
-    "NtGdiDxgGenericThunk",
     "NtGdiEllipse",
     "NtGdiEnableEudc",
     "NtGdiEndDoc",
@@ -448,12 +377,10 @@ const WIN32K_SYSCALLS = [
     "NtGdiFONTOBJ_pvTrueTypeFontFile",
     "NtGdiFONTOBJ_pxoGetXform",
     "NtGdiFONTOBJ_vGetInfo",
-    "NtGdiFastPolyPolyline",
     "NtGdiFillPath",
     "NtGdiFillRgn",
     "NtGdiFlattenPath",
     "NtGdiFlush",
-    "NtGdiFlushUserBatch",
     "NtGdiFontIsLinked",
     "NtGdiForceUFIMapping",
     "NtGdiFrameRgn",
@@ -656,6 +583,67 @@ const WIN32K_SYSCALLS = [
     "NtGdiXLATEOBJ_cGetPalette",
     "NtGdiXLATEOBJ_hGetColorTransform",
     "NtGdiXLATEOBJ_iXlate",
+    "NtHWCursorUpdatePointer",
+    "NtMITActivateInputProcessing",
+    "NtMITBindInputTypeToMonitors",
+    "NtMITCoreMsgKGetConnectionHandle",
+    "NtMITCoreMsgKOpenConnectionTo",
+    "NtMITCoreMsgKSend",
+    "NtMITDeactivateInputProcessing",
+    "NtMITDisableMouseIntercept",
+    "NtMITEnableMouseIntercept",
+    "NtMITSetInputCallbacks",
+    "NtMITSynthesizeMouseInput",
+    "NtMITSynthesizeMouseWheel",
+    "NtMITSynthesizeTouchInput",
+    "NtMITUpdateInputGlobals",
+    "NtMITWaitForMultipleObjectsEx",
+    "NtNotifyPresentToCompositionSurface",
+    "NtOpenCompositionSurfaceDirtyRegion",
+    "NtOpenCompositionSurfaceSectionInfo",
+    "NtOpenCompositionSurfaceSwapChainHandleInfo",
+    "NtQueryCompositionInputIsImplicit",
+    "NtQueryCompositionInputQueueAndTransform",
+    "NtQueryCompositionInputSink",
+    "NtQueryCompositionInputSinkLuid",
+    "NtQueryCompositionInputSinkViewId",
+    "NtQueryCompositionSurfaceBinding",
+    "NtQueryCompositionSurfaceHDRMetaData",
+    "NtQueryCompositionSurfaceRenderingRealization",
+    "NtQueryCompositionSurfaceStatistics",
+    "NtRIMAddInputObserver",
+    "NtRIMAreSiblingDevices",
+    "NtRIMDeviceIoControl",
+    "NtRIMFreeInputBuffer",
+    "NtRIMGetDevicePreparsedData",
+    "NtRIMGetDevicePreparsedDataLockfree",
+    "NtRIMGetDeviceProperties",
+    "NtRIMGetDevicePropertiesLockfree",
+    "NtRIMGetPhysicalDeviceRect",
+    "NtRIMGetSourceProcessId",
+    "NtRIMObserveNextInput",
+    "NtRIMOnPnpNotification",
+    "NtRIMOnTimerNotification",
+    "NtRIMReadInput",
+    "NtRIMRegisterForInput",
+    "NtRIMRemoveInputObserver",
+    "NtRIMSetTestModeStatus",
+    "NtRIMUnregisterForInput",
+    "NtRIMUpdateInputObserverRegistration",
+    "NtSetCompositionSurfaceAnalogExclusive",
+    "NtSetCompositionSurfaceBufferUsage",
+    "NtSetCompositionSurfaceDirectFlipState",
+    "NtSetCompositionSurfaceHDRMetaData",
+    "NtSetCompositionSurfaceIndependentFlipInfo",
+    "NtSetCompositionSurfaceStatistics",
+    "NtTokenManagerConfirmOutstandingAnalogToken",
+    "NtTokenManagerCreateCompositionTokenHandle",
+    "NtTokenManagerGetAnalogExclusiveSurfaceUpdates",
+    "NtTokenManagerGetAnalogExclusiveTokenEvent",
+    "NtTokenManagerOpenSectionAndEvents",
+    "NtTokenManagerThread",
+    "NtUnBindCompositionSurface",
+    "NtUpdateInputSinkTransforms",
     "NtUserAcquireIAMKey",
     "NtUserAcquireInteractiveControlBackgroundAccess",
     "NtUserActivateKeyboardLayout",
@@ -1029,7 +1017,8 @@ const WIN32K_SYSCALLS = [
     "NtUserSetCapture",
     "NtUserSetChildWindowNoActivate",
     "NtUserSetClassLong",
-    "NtUserSetClassLongPtr",
+    // TODO: Seems to cause an error when this is included.
+    // "NtUserSetClassLongPtr",
     "NtUserSetClassWord",
     "NtUserSetClipboardData",
     "NtUserSetClipboardViewer",
@@ -1091,7 +1080,8 @@ const WIN32K_SYSCALLS = [
     "NtUserSetWindowFNID",
     "NtUserSetWindowFeedbackSetting",
     "NtUserSetWindowLong",
-    "NtUserSetWindowLongPtr",
+    // TODO: Seems to cause an error when this is included.
+    // "NtUserSetWindowLongPtr",
     "NtUserSetWindowPlacement",
     "NtUserSetWindowPos",
     "NtUserSetWindowRgn",
@@ -1151,10 +1141,11 @@ const WIN32K_SYSCALLS = [
     "NtUserWaitForMsgAndEvent",
     "NtUserWaitForRedirectionStartComplete",
     "NtUserWaitMessage",
-    "NtUserWin32kSysCallFilterStub",
     "NtUserWindowFromPhysicalPoint",
     "NtUserWindowFromPoint",
-    "NtUserYieldTask"
+    "NtUserYieldTask",
+    "NtValidateCompositionSurfaceHandle",
+    "NtVisualCaptureBits",
 ];
 
 function _executeCommand(cmd) {