diff --git a/kotlin-browser/src/jsMain/generated/web/animations/Animation.kt b/kotlin-browser/src/jsMain/generated/web/animations/Animation.kt
index a6402d35d244c..3047b46c6c29e 100644
--- a/kotlin-browser/src/jsMain/generated/web/animations/Animation.kt
+++ b/kotlin-browser/src/jsMain/generated/web/animations/Animation.kt
@@ -36,17 +36,17 @@ open external class Animation(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Animation/cancel_event)
      */
-    var oncancel: EventHandler<AnimationPlaybackEvent>?
+    var oncancel: EventHandler<AnimationPlaybackEvent<Animation>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Animation/finish_event)
      */
-    var onfinish: EventHandler<AnimationPlaybackEvent>?
+    var onfinish: EventHandler<AnimationPlaybackEvent<Animation>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Animation/remove_event)
      */
-    var onremove: EventHandler<AnimationPlaybackEvent>?
+    var onremove: EventHandler<AnimationPlaybackEvent<Animation>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Animation/pending)
diff --git a/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.kt b/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.kt
index 694198c470515..5d982bd49ce87 100644
--- a/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.kt
@@ -7,6 +7,7 @@
 package web.animations
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AnimationEvent)
  */
-open external class AnimationEvent(
-    override val type: EventType<AnimationEvent>,
+open external class AnimationEvent<out C : EventTarget?>(
+    override val type: EventType<AnimationEvent<C>>,
     init: AnimationEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     AnimationEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AnimationEvent/animationName)
diff --git a/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.types.kt
index 19bf309c5f4bd..5b40e37a589a0 100644
--- a/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/animations/AnimationEvent.types.kt
@@ -11,18 +11,18 @@ import web.events.EventType
 
 sealed external interface AnimationEventTypes {
     @JsValue("animationcancel")
-    val ANIMATION_CANCEL: EventType<AnimationEvent>
+    val ANIMATION_CANCEL: EventType<AnimationEvent<*>>
         get() = definedExternally
 
     @JsValue("animationend")
-    val ANIMATION_END: EventType<AnimationEvent>
+    val ANIMATION_END: EventType<AnimationEvent<*>>
         get() = definedExternally
 
     @JsValue("animationiteration")
-    val ANIMATION_ITERATION: EventType<AnimationEvent>
+    val ANIMATION_ITERATION: EventType<AnimationEvent<*>>
         get() = definedExternally
 
     @JsValue("animationstart")
-    val ANIMATION_START: EventType<AnimationEvent>
+    val ANIMATION_START: EventType<AnimationEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.kt b/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.kt
index 8aad50b3710d3..c56b8a057aa29 100644
--- a/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.kt
@@ -7,15 +7,16 @@
 package web.animations
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AnimationPlaybackEvent)
  */
-open external class AnimationPlaybackEvent(
-    override val type: EventType<AnimationPlaybackEvent>,
+open external class AnimationPlaybackEvent<out C : EventTarget?>(
+    override val type: EventType<AnimationPlaybackEvent<C>>,
     init: AnimationPlaybackEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     AnimationPlaybackEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AnimationPlaybackEvent/currentTime)
diff --git a/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.types.kt
index ed363ef39e11a..1421697787a5f 100644
--- a/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/animations/AnimationPlaybackEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface AnimationPlaybackEventTypes {
     @JsValue("cancel")
-    val CANCEL: EventType<AnimationPlaybackEvent>
+    val CANCEL: EventType<AnimationPlaybackEvent<*>>
         get() = definedExternally
 
     @JsValue("finish")
-    val FINISH: EventType<AnimationPlaybackEvent>
+    val FINISH: EventType<AnimationPlaybackEvent<*>>
         get() = definedExternally
 
     @JsValue("remove")
-    val REMOVE: EventType<AnimationPlaybackEvent>
+    val REMOVE: EventType<AnimationPlaybackEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/AudioScheduledSourceNode.kt b/kotlin-browser/src/jsMain/generated/web/audio/AudioScheduledSourceNode.kt
index 5adc3f3666748..c900630d44fa5 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/AudioScheduledSourceNode.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/AudioScheduledSourceNode.kt
@@ -13,7 +13,7 @@ sealed external class AudioScheduledSourceNode :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AudioScheduledSourceNode/ended_event)
      */
-    var onended: EventHandler<Event>?
+    var onended: EventHandler<Event<AudioScheduledSourceNode>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AudioScheduledSourceNode/start)
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/AudioWorkletNode.kt b/kotlin-browser/src/jsMain/generated/web/audio/AudioWorkletNode.kt
index b057692d02017..2bf438ef663fe 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/AudioWorkletNode.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/AudioWorkletNode.kt
@@ -19,7 +19,7 @@ external class AudioWorkletNode(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AudioWorkletNode/processorerror_event)
      */
-    var onprocessorerror: EventHandler<ErrorEvent>?
+    var onprocessorerror: EventHandler<ErrorEvent<AudioWorkletNode>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AudioWorkletNode/parameters)
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/BaseAudioContext.kt b/kotlin-browser/src/jsMain/generated/web/audio/BaseAudioContext.kt
index c361eae202464..165cc8744a8fb 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/BaseAudioContext.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/BaseAudioContext.kt
@@ -40,7 +40,7 @@ sealed external class BaseAudioContext :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BaseAudioContext/statechange_event)
      */
-    var onstatechange: EventHandler<Event>?
+    var onstatechange: EventHandler<Event<BaseAudioContext>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BaseAudioContext/sampleRate)
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/audio/Event.types.kt
index dc79475187985..63174c2f74a31 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/Event.types.kt
@@ -5,8 +5,8 @@ package web.audio
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.ENDED: EventType<Event>
+inline val Event.Companion.ENDED: EventType<Event<*>>
     get() = EventType("ended")
 
-inline val Event.Companion.STATE_CHANGE: EventType<Event>
+inline val Event.Companion.STATE_CHANGE: EventType<Event<*>>
     get() = EventType("statechange")
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.kt b/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.kt
index 9597e01babd6c..bc826dc5ed497 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.kt
@@ -7,6 +7,7 @@
 package web.audio
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/OfflineAudioCompletionEvent)
  */
-open external class OfflineAudioCompletionEvent(
-    override val type: EventType<OfflineAudioCompletionEvent>,
+open external class OfflineAudioCompletionEvent<out C : EventTarget?>(
+    override val type: EventType<OfflineAudioCompletionEvent<C>>,
     init: OfflineAudioCompletionEventInit,
-) : Event,
+) : Event<C>,
     OfflineAudioCompletionEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/OfflineAudioCompletionEvent/renderedBuffer)
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.types.kt
index 2a378b6f3db92..2cb6a5c385cc3 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioCompletionEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface OfflineAudioCompletionEventTypes {
     @JsValue("complete")
-    val COMPLETE: EventType<OfflineAudioCompletionEvent>
+    val COMPLETE: EventType<OfflineAudioCompletionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioContext.kt b/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioContext.kt
index df1bcf43c4164..c1872177e9b35 100644
--- a/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioContext.kt
+++ b/kotlin-browser/src/jsMain/generated/web/audio/OfflineAudioContext.kt
@@ -28,7 +28,7 @@ external class OfflineAudioContext(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/OfflineAudioContext/complete_event)
      */
-    var oncomplete: EventHandler<OfflineAudioCompletionEvent>?
+    var oncomplete: EventHandler<OfflineAudioCompletionEvent<OfflineAudioContext>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/OfflineAudioContext/resume)
diff --git a/kotlin-browser/src/jsMain/generated/web/canvas/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/canvas/Event.types.kt
index 72346009f832e..e2ab653e1954f 100644
--- a/kotlin-browser/src/jsMain/generated/web/canvas/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/canvas/Event.types.kt
@@ -5,8 +5,8 @@ package web.canvas
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.CONTEXT_LOST: EventType<Event>
+inline val Event.Companion.CONTEXT_LOST: EventType<Event<*>>
     get() = EventType("contextlost")
 
-inline val Event.Companion.CONTEXT_RESTORED: EventType<Event>
+inline val Event.Companion.CONTEXT_RESTORED: EventType<Event<*>>
     get() = EventType("contextrestored")
diff --git a/kotlin-browser/src/jsMain/generated/web/canvas/OffscreenCanvas.kt b/kotlin-browser/src/jsMain/generated/web/canvas/OffscreenCanvas.kt
index 29fa0e9ab5a70..90c68ba9aff06 100644
--- a/kotlin-browser/src/jsMain/generated/web/canvas/OffscreenCanvas.kt
+++ b/kotlin-browser/src/jsMain/generated/web/canvas/OffscreenCanvas.kt
@@ -31,8 +31,8 @@ external class OffscreenCanvas(
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/OffscreenCanvas/height)
      */
     var height: JsLong
-    var oncontextlost: EventHandler<Event>?
-    var oncontextrestored: EventHandler<Event>?
+    var oncontextlost: EventHandler<Event<OffscreenCanvas>>?
+    var oncontextrestored: EventHandler<Event<OffscreenCanvas>>?
 
     /**
      * These attributes return the dimensions of the OffscreenCanvas object's bitmap.
diff --git a/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.kt b/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.kt
index ac37b2dba6d4e..a5ebbaf0dd235 100644
--- a/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.kt
@@ -8,6 +8,7 @@ package web.clipboard
 
 import web.data.DataTransfer
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ClipboardEvent)
  */
-open external class ClipboardEvent(
-    override val type: EventType<ClipboardEvent>,
+open external class ClipboardEvent<out C : EventTarget?>(
+    override val type: EventType<ClipboardEvent<C>>,
     init: ClipboardEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     ClipboardEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ClipboardEvent/clipboardData)
diff --git a/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.types.kt
index ec94e616a4db9..b67f1e5e77a88 100644
--- a/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/clipboard/ClipboardEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface ClipboardEventTypes {
     @JsValue("copy")
-    val COPY: EventType<ClipboardEvent>
+    val COPY: EventType<ClipboardEvent<*>>
         get() = definedExternally
 
     @JsValue("cut")
-    val CUT: EventType<ClipboardEvent>
+    val CUT: EventType<ClipboardEvent<*>>
         get() = definedExternally
 
     @JsValue("paste")
-    val PASTE: EventType<ClipboardEvent>
+    val PASTE: EventType<ClipboardEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/codecs/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/codecs/Event.types.kt
index 5d750f0cdf1ff..16cb8fc2bd1fb 100644
--- a/kotlin-browser/src/jsMain/generated/web/codecs/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/codecs/Event.types.kt
@@ -5,5 +5,5 @@ package web.codecs
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.DEQUEUE: EventType<Event>
+inline val Event.Companion.DEQUEUE: EventType<Event<*>>
     get() = EventType("dequeue")
diff --git a/kotlin-browser/src/jsMain/generated/web/codecs/VideoDecoder.kt b/kotlin-browser/src/jsMain/generated/web/codecs/VideoDecoder.kt
index 77a45c869bd44..b5ea4f4113607 100644
--- a/kotlin-browser/src/jsMain/generated/web/codecs/VideoDecoder.kt
+++ b/kotlin-browser/src/jsMain/generated/web/codecs/VideoDecoder.kt
@@ -20,7 +20,7 @@ external class VideoDecoder(
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VideoDecoder/decodeQueueSize)
      */
     val decodeQueueSize: Int
-    var ondequeue: EventHandler<Event>?
+    var ondequeue: EventHandler<Event<VideoDecoder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VideoDecoder/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/codecs/VideoEncoder.kt b/kotlin-browser/src/jsMain/generated/web/codecs/VideoEncoder.kt
index 9c25d1a84ea88..82c2757ded2d5 100644
--- a/kotlin-browser/src/jsMain/generated/web/codecs/VideoEncoder.kt
+++ b/kotlin-browser/src/jsMain/generated/web/codecs/VideoEncoder.kt
@@ -20,7 +20,7 @@ external class VideoEncoder(
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VideoEncoder/encodeQueueSize)
      */
     val encodeQueueSize: Int
-    var ondequeue: EventHandler<Event>?
+    var ondequeue: EventHandler<Event<VideoEncoder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VideoEncoder/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/components/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/components/Event.types.kt
index 8e4446fa21984..fbf89d812f815 100644
--- a/kotlin-browser/src/jsMain/generated/web/components/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/components/Event.types.kt
@@ -5,5 +5,5 @@ package web.components
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.SLOT_CHANGE: EventType<Event>
+inline val Event.Companion.SLOT_CHANGE: EventType<Event<*>>
     get() = EventType("slotchange")
diff --git a/kotlin-browser/src/jsMain/generated/web/components/ShadowRoot.kt b/kotlin-browser/src/jsMain/generated/web/components/ShadowRoot.kt
index 478d6769674aa..86fdb646d79f7 100644
--- a/kotlin-browser/src/jsMain/generated/web/components/ShadowRoot.kt
+++ b/kotlin-browser/src/jsMain/generated/web/components/ShadowRoot.kt
@@ -30,7 +30,7 @@ sealed external class ShadowRoot :
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ShadowRoot/mode)
      */
     val mode: ShadowRootMode
-    var onslotchange: EventHandler<Event>?
+    var onslotchange: EventHandler<Event<ShadowRoot>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ShadowRoot/slotAssignment)
diff --git a/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.kt b/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.kt
index d33f0d0c35c8e..23832b2a76dca 100644
--- a/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.kt
@@ -7,6 +7,7 @@
 package web.csp
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SecurityPolicyViolationEvent)
  */
-open external class SecurityPolicyViolationEvent(
-    override val type: EventType<SecurityPolicyViolationEvent>,
+open external class SecurityPolicyViolationEvent<out C : EventTarget?>(
+    override val type: EventType<SecurityPolicyViolationEvent<C>>,
     init: SecurityPolicyViolationEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     SecurityPolicyViolationEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SecurityPolicyViolationEvent/blockedURI)
diff --git a/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.types.kt
index 649850cd6447b..44bf395212505 100644
--- a/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/csp/SecurityPolicyViolationEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface SecurityPolicyViolationEventTypes {
     @JsValue("securitypolicyviolation")
-    val SECURITY_POLICY_VIOLATION: EventType<SecurityPolicyViolationEvent>
+    val SECURITY_POLICY_VIOLATION: EventType<SecurityPolicyViolationEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryList.kt b/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryList.kt
index 569e35c06dd43..ddd2ab535cd28 100644
--- a/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryList.kt
+++ b/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryList.kt
@@ -25,5 +25,5 @@ sealed external class MediaQueryList :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaQueryList/change_event)
      */
-    var onchange: EventHandler<MediaQueryListEvent>?
+    var onchange: EventHandler<MediaQueryListEvent<MediaQueryList>>?
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.kt b/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.kt
index e34878788429c..d15ca46069b0c 100644
--- a/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.kt
@@ -7,15 +7,16 @@
 package web.cssom
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaQueryListEvent)
  */
-open external class MediaQueryListEvent(
-    override val type: EventType<MediaQueryListEvent>,
+open external class MediaQueryListEvent<out C : EventTarget?>(
+    override val type: EventType<MediaQueryListEvent<C>>,
     init: MediaQueryListEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     MediaQueryListEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaQueryListEvent/matches)
diff --git a/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.types.kt
index 270a12794302c..08ed3b5da75f7 100644
--- a/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/cssom/MediaQueryListEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface MediaQueryListEventTypes {
     @JsValue("change")
-    val CHANGE: EventType<MediaQueryListEvent>
+    val CHANGE: EventType<MediaQueryListEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.kt b/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.kt
index d65c5d677d253..ad16b8ab9031b 100644
--- a/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.kt
@@ -7,6 +7,7 @@
 package web.cssom
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransitionEvent)
  */
-open external class TransitionEvent(
-    override val type: EventType<TransitionEvent>,
+open external class TransitionEvent<out C : EventTarget?>(
+    override val type: EventType<TransitionEvent<C>>,
     init: TransitionEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     TransitionEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransitionEvent/elapsedTime)
diff --git a/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.types.kt
index 27ae8e8d3df4e..76b5c17a38552 100644
--- a/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/cssom/TransitionEvent.types.kt
@@ -11,18 +11,18 @@ import web.events.EventType
 
 sealed external interface TransitionEventTypes {
     @JsValue("transitioncancel")
-    val TRANSITION_CANCEL: EventType<TransitionEvent>
+    val TRANSITION_CANCEL: EventType<TransitionEvent<*>>
         get() = definedExternally
 
     @JsValue("transitionend")
-    val TRANSITION_END: EventType<TransitionEvent>
+    val TRANSITION_END: EventType<TransitionEvent<*>>
         get() = definedExternally
 
     @JsValue("transitionrun")
-    val TRANSITION_RUN: EventType<TransitionEvent>
+    val TRANSITION_RUN: EventType<TransitionEvent<*>>
         get() = definedExternally
 
     @JsValue("transitionstart")
-    val TRANSITION_START: EventType<TransitionEvent>
+    val TRANSITION_START: EventType<TransitionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.kt b/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.kt
index 02c051960fdf9..41814898184f4 100644
--- a/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.kt
@@ -7,6 +7,7 @@
 package web.device
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DeviceMotionEvent)
  */
-open external class DeviceMotionEvent(
-    override val type: EventType<DeviceMotionEvent>,
+open external class DeviceMotionEvent<out C : EventTarget?>(
+    override val type: EventType<DeviceMotionEvent<C>>,
     init: DeviceMotionEventInit = definedExternally,
-) : Event {
+) : Event<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DeviceMotionEvent/acceleration)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.types.kt
index 74f6ae540d238..efbaca5701048 100644
--- a/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/device/DeviceMotionEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface DeviceMotionEventTypes {
     @JsValue("devicemotion")
-    val DEVICE_MOTION: EventType<DeviceMotionEvent>
+    val DEVICE_MOTION: EventType<DeviceMotionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.kt b/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.kt
index 6ed2ad49f929f..0ce8704710fd9 100644
--- a/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.kt
@@ -7,6 +7,7 @@
 package web.device
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DeviceOrientationEvent)
  */
-open external class DeviceOrientationEvent(
-    override val type: EventType<DeviceOrientationEvent>,
+open external class DeviceOrientationEvent<out C : EventTarget?>(
+    override val type: EventType<DeviceOrientationEvent<C>>,
     init: DeviceOrientationEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     DeviceOrientationEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DeviceOrientationEvent/absolute)
diff --git a/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.types.kt
index ebe28dbffc4df..6730f9ddf67d5 100644
--- a/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/device/DeviceOrientationEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface DeviceOrientationEventTypes {
     @JsValue("deviceorientation")
-    val DEVICE_ORIENTATION: EventType<DeviceOrientationEvent>
+    val DEVICE_ORIENTATION: EventType<DeviceOrientationEvent<*>>
         get() = definedExternally
 
     @JsValue("deviceorientationabsolute")
-    val DEVICE_ORIENTATION_ABSOLUTE: EventType<DeviceOrientationEvent>
+    val DEVICE_ORIENTATION_ABSOLUTE: EventType<DeviceOrientationEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/dom/Document.kt b/kotlin-browser/src/jsMain/generated/web/dom/Document.kt
index ec2ca17e52b1a..de7d4b146efbe 100644
--- a/kotlin-browser/src/jsMain/generated/web/dom/Document.kt
+++ b/kotlin-browser/src/jsMain/generated/web/dom/Document.kt
@@ -195,22 +195,22 @@ open external class Document :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/fullscreenchange_event)
      */
-    var onfullscreenchange: EventHandler<Event>?
+    var onfullscreenchange: EventHandler<Event<Document>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/fullscreenerror_event)
      */
-    var onfullscreenerror: EventHandler<Event>?
+    var onfullscreenerror: EventHandler<Event<Document>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/pointerlockchange_event)
      */
-    var onpointerlockchange: EventHandler<Event>?
+    var onpointerlockchange: EventHandler<Event<Document>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/pointerlockerror_event)
      */
-    var onpointerlockerror: EventHandler<Event>?
+    var onpointerlockerror: EventHandler<Event<Document>>?
 
     /**
      * Fires when the state of the object has changed.
@@ -218,12 +218,12 @@ open external class Document :
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/readystatechange_event)
      */
-    var onreadystatechange: EventHandler<Event>?
+    var onreadystatechange: EventHandler<Event<Document>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/visibilitychange_event)
      */
-    var onvisibilitychange: EventHandler<Event>?
+    var onvisibilitychange: EventHandler<Event<Document>>?
     override val ownerDocument: Void
 
     /**
diff --git a/kotlin-browser/src/jsMain/generated/web/dom/Element.kt b/kotlin-browser/src/jsMain/generated/web/dom/Element.kt
index f49b392420f2a..8969d9ccafb73 100644
--- a/kotlin-browser/src/jsMain/generated/web/dom/Element.kt
+++ b/kotlin-browser/src/jsMain/generated/web/dom/Element.kt
@@ -104,12 +104,12 @@ abstract external class Element :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/fullscreenchange_event)
      */
-    var onfullscreenchange: EventHandler<Event>?
+    var onfullscreenchange: EventHandler<Event<Element>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/fullscreenerror_event)
      */
-    var onfullscreenerror: EventHandler<Event>?
+    var onfullscreenerror: EventHandler<Event<Element>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/outerHTML)
diff --git a/kotlin-browser/src/jsMain/generated/web/dom/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/dom/Event.types.kt
index 582a88b997d2e..6f9d97f587a77 100644
--- a/kotlin-browser/src/jsMain/generated/web/dom/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/dom/Event.types.kt
@@ -5,134 +5,134 @@ package web.dom
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.DOM_CONTENT_LOADED: EventType<Event>
+inline val Event.Companion.DOM_CONTENT_LOADED: EventType<Event<*>>
     get() = EventType("DOMContentLoaded")
 
-inline val Event.Companion.BEFORE_TOGGLE: EventType<Event>
+inline val Event.Companion.BEFORE_TOGGLE: EventType<Event<*>>
     get() = EventType("beforetoggle")
 
-inline val Event.Companion.CAN_PLAY: EventType<Event>
+inline val Event.Companion.CAN_PLAY: EventType<Event<*>>
     get() = EventType("canplay")
 
-inline val Event.Companion.CAN_PLAY_THROUGH: EventType<Event>
+inline val Event.Companion.CAN_PLAY_THROUGH: EventType<Event<*>>
     get() = EventType("canplaythrough")
 
-inline val Event.Companion.CUE_CHANGE: EventType<Event>
+inline val Event.Companion.CUE_CHANGE: EventType<Event<*>>
     get() = EventType("cuechange")
 
-inline val Event.Companion.DURATION_CHANGE: EventType<Event>
+inline val Event.Companion.DURATION_CHANGE: EventType<Event<*>>
     get() = EventType("durationchange")
 
-inline val Event.Companion.EMPTIED: EventType<Event>
+inline val Event.Companion.EMPTIED: EventType<Event<*>>
     get() = EventType("emptied")
 
-inline val Event.Companion.ENDED: EventType<Event>
+inline val Event.Companion.ENDED: EventType<Event<*>>
     get() = EventType("ended")
 
-inline val Event.Companion.FULLSCREEN_CHANGE: EventType<Event>
+inline val Event.Companion.FULLSCREEN_CHANGE: EventType<Event<*>>
     get() = EventType("fullscreenchange")
 
-inline val Event.Companion.FULLSCREEN_ERROR: EventType<Event>
+inline val Event.Companion.FULLSCREEN_ERROR: EventType<Event<*>>
     get() = EventType("fullscreenerror")
 
-inline val Event.Companion.INPUT: EventType<Event>
+inline val Event.Companion.INPUT: EventType<Event<*>>
     get() = EventType("input")
 
-inline val Event.Companion.INVALID: EventType<Event>
+inline val Event.Companion.INVALID: EventType<Event<*>>
     get() = EventType("invalid")
 
-inline val Event.Companion.LOAD: EventType<Event>
+inline val Event.Companion.LOAD: EventType<Event<*>>
     get() = EventType("load")
 
-inline val Event.Companion.LOADED_DATA: EventType<Event>
+inline val Event.Companion.LOADED_DATA: EventType<Event<*>>
     get() = EventType("loadeddata")
 
-inline val Event.Companion.LOADED_METADATA: EventType<Event>
+inline val Event.Companion.LOADED_METADATA: EventType<Event<*>>
     get() = EventType("loadedmetadata")
 
-inline val Event.Companion.LOAD_START: EventType<Event>
+inline val Event.Companion.LOAD_START: EventType<Event<*>>
     get() = EventType("loadstart")
 
-inline val Event.Companion.PAUSE: EventType<Event>
+inline val Event.Companion.PAUSE: EventType<Event<*>>
     get() = EventType("pause")
 
-inline val Event.Companion.PLAY: EventType<Event>
+inline val Event.Companion.PLAY: EventType<Event<*>>
     get() = EventType("play")
 
-inline val Event.Companion.PLAYING: EventType<Event>
+inline val Event.Companion.PLAYING: EventType<Event<*>>
     get() = EventType("playing")
 
-inline val Event.Companion.POINTER_LOCK_CHANGE: EventType<Event>
+inline val Event.Companion.POINTER_LOCK_CHANGE: EventType<Event<*>>
     get() = EventType("pointerlockchange")
 
-inline val Event.Companion.POINTER_LOCK_ERROR: EventType<Event>
+inline val Event.Companion.POINTER_LOCK_ERROR: EventType<Event<*>>
     get() = EventType("pointerlockerror")
 
-inline val Event.Companion.RATE_CHANGE: EventType<Event>
+inline val Event.Companion.RATE_CHANGE: EventType<Event<*>>
     get() = EventType("ratechange")
 
-inline val Event.Companion.READY_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.READY_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("readystatechange")
 
-inline val Event.Companion.RESET: EventType<Event>
+inline val Event.Companion.RESET: EventType<Event<*>>
     get() = EventType("reset")
 
-inline val Event.Companion.SCROLL: EventType<Event>
+inline val Event.Companion.SCROLL: EventType<Event<*>>
     get() = EventType("scroll")
 
-inline val Event.Companion.SCROLL_END: EventType<Event>
+inline val Event.Companion.SCROLL_END: EventType<Event<*>>
     get() = EventType("scrollend")
 
-inline val Event.Companion.SEEKED: EventType<Event>
+inline val Event.Companion.SEEKED: EventType<Event<*>>
     get() = EventType("seeked")
 
-inline val Event.Companion.SEEKING: EventType<Event>
+inline val Event.Companion.SEEKING: EventType<Event<*>>
     get() = EventType("seeking")
 
-inline val Event.Companion.SELECT: EventType<Event>
+inline val Event.Companion.SELECT: EventType<Event<*>>
     get() = EventType("select")
 
-inline val Event.Companion.SELECTION_CHANGE: EventType<Event>
+inline val Event.Companion.SELECTION_CHANGE: EventType<Event<*>>
     get() = EventType("selectionchange")
 
-inline val Event.Companion.SELECT_START: EventType<Event>
+inline val Event.Companion.SELECT_START: EventType<Event<*>>
     get() = EventType("selectstart")
 
-inline val Event.Companion.SLOT_CHANGE: EventType<Event>
+inline val Event.Companion.SLOT_CHANGE: EventType<Event<*>>
     get() = EventType("slotchange")
 
-inline val Event.Companion.STALLED: EventType<Event>
+inline val Event.Companion.STALLED: EventType<Event<*>>
     get() = EventType("stalled")
 
-inline val Event.Companion.SUSPEND: EventType<Event>
+inline val Event.Companion.SUSPEND: EventType<Event<*>>
     get() = EventType("suspend")
 
-inline val Event.Companion.TIME_UPDATE: EventType<Event>
+inline val Event.Companion.TIME_UPDATE: EventType<Event<*>>
     get() = EventType("timeupdate")
 
-inline val Event.Companion.TOGGLE: EventType<Event>
+inline val Event.Companion.TOGGLE: EventType<Event<*>>
     get() = EventType("toggle")
 
-inline val Event.Companion.VISIBILITY_CHANGE: EventType<Event>
+inline val Event.Companion.VISIBILITY_CHANGE: EventType<Event<*>>
     get() = EventType("visibilitychange")
 
-inline val Event.Companion.VOLUME_CHANGE: EventType<Event>
+inline val Event.Companion.VOLUME_CHANGE: EventType<Event<*>>
     get() = EventType("volumechange")
 
-inline val Event.Companion.WAITING: EventType<Event>
+inline val Event.Companion.WAITING: EventType<Event<*>>
     get() = EventType("waiting")
 
-inline val Event.Companion.WEBKIT_ANIMATION_END: EventType<Event>
+inline val Event.Companion.WEBKIT_ANIMATION_END: EventType<Event<*>>
     get() = EventType("webkitanimationend")
 
-inline val Event.Companion.WEBKIT_ANIMATION_ITERATION: EventType<Event>
+inline val Event.Companion.WEBKIT_ANIMATION_ITERATION: EventType<Event<*>>
     get() = EventType("webkitanimationiteration")
 
-inline val Event.Companion.WEBKIT_ANIMATION_START: EventType<Event>
+inline val Event.Companion.WEBKIT_ANIMATION_START: EventType<Event<*>>
     get() = EventType("webkitanimationstart")
 
-inline val Event.Companion.WEBKIT_FULLSCREEN_CHANGE: EventType<Event>
+inline val Event.Companion.WEBKIT_FULLSCREEN_CHANGE: EventType<Event<*>>
     get() = EventType("webkitfullscreenchange")
 
-inline val Event.Companion.WEBKIT_TRANSITION_END: EventType<Event>
+inline val Event.Companion.WEBKIT_TRANSITION_END: EventType<Event<*>>
     get() = EventType("webkittransitionend")
diff --git a/kotlin-browser/src/jsMain/generated/web/dom/GlobalEventHandlers.kt b/kotlin-browser/src/jsMain/generated/web/dom/GlobalEventHandlers.kt
index 98e28e3087fd7..18071f0c7a855 100644
--- a/kotlin-browser/src/jsMain/generated/web/dom/GlobalEventHandlers.kt
+++ b/kotlin-browser/src/jsMain/generated/web/dom/GlobalEventHandlers.kt
@@ -20,56 +20,56 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/abort_event)
      */
-    var onabort: EventHandler<UIEvent>?
+    var onabort: EventHandler<UIEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/animationcancel_event)
      */
-    var onanimationcancel: EventHandler<AnimationEvent>?
+    var onanimationcancel: EventHandler<AnimationEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/animationend_event)
      */
-    var onanimationend: EventHandler<AnimationEvent>?
+    var onanimationend: EventHandler<AnimationEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/animationiteration_event)
      */
-    var onanimationiteration: EventHandler<AnimationEvent>?
+    var onanimationiteration: EventHandler<AnimationEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/animationstart_event)
      */
-    var onanimationstart: EventHandler<AnimationEvent>?
+    var onanimationstart: EventHandler<AnimationEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/auxclick_event)
      */
-    var onauxclick: EventHandler<MouseEvent>?
+    var onauxclick: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/beforeinput_event)
      */
-    var onbeforeinput: EventHandler<InputEvent>?
+    var onbeforeinput: EventHandler<InputEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/beforetoggle_event)
      */
-    var onbeforetoggle: EventHandler<Event>?
+    var onbeforetoggle: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -79,14 +79,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/blur_event)
      */
-    var onblur: EventHandler<FocusEvent>?
+    var onblur: EventHandler<FocusEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLDialogElement/cancel_event)
      */
-    var oncancel: EventHandler<Event>?
+    var oncancel: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -96,14 +96,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/canplay_event)
      */
-    var oncanplay: EventHandler<Event>?
+    var oncanplay: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/canplaythrough_event)
      */
-    var oncanplaythrough: EventHandler<Event>?
+    var oncanplaythrough: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -113,7 +113,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/change_event)
      */
-    var onchange: EventHandler<Event>?
+    var onchange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -123,14 +123,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/click_event)
      */
-    var onclick: EventHandler<MouseEvent>?
+    var onclick: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLDialogElement/close_event)
      */
-    var onclose: EventHandler<Event>?
+    var onclose: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -140,28 +140,28 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/contextmenu_event)
      */
-    var oncontextmenu: EventHandler<MouseEvent>?
+    var oncontextmenu: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/copy_event)
      */
-    var oncopy: EventHandler<ClipboardEvent>?
+    var oncopy: EventHandler<ClipboardEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLTrackElement/cuechange_event)
      */
-    var oncuechange: EventHandler<Event>?
+    var oncuechange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/cut_event)
      */
-    var oncut: EventHandler<ClipboardEvent>?
+    var oncut: EventHandler<ClipboardEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -171,7 +171,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/dblclick_event)
      */
-    var ondblclick: EventHandler<MouseEvent>?
+    var ondblclick: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -181,7 +181,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/drag_event)
      */
-    var ondrag: EventHandler<DragEvent>?
+    var ondrag: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -191,7 +191,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/dragend_event)
      */
-    var ondragend: EventHandler<DragEvent>?
+    var ondragend: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -201,7 +201,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/dragenter_event)
      */
-    var ondragenter: EventHandler<DragEvent>?
+    var ondragenter: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -211,7 +211,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/dragleave_event)
      */
-    var ondragleave: EventHandler<DragEvent>?
+    var ondragleave: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -221,7 +221,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/dragover_event)
      */
-    var ondragover: EventHandler<DragEvent>?
+    var ondragover: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -231,14 +231,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/dragstart_event)
      */
-    var ondragstart: EventHandler<DragEvent>?
+    var ondragstart: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/drop_event)
      */
-    var ondrop: EventHandler<DragEvent>?
+    var ondrop: EventHandler<DragEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -248,7 +248,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/durationchange_event)
      */
-    var ondurationchange: EventHandler<Event>?
+    var ondurationchange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -258,7 +258,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/emptied_event)
      */
-    var onemptied: EventHandler<Event>?
+    var onemptied: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -268,7 +268,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/ended_event)
      */
-    var onended: EventHandler<Event>?
+    var onended: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -288,35 +288,35 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/focus_event)
      */
-    var onfocus: EventHandler<FocusEvent>?
+    var onfocus: EventHandler<FocusEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLFormElement/formdata_event)
      */
-    var onformdata: EventHandler<FormDataEvent>?
+    var onformdata: EventHandler<FormDataEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/gotpointercapture_event)
      */
-    var ongotpointercapture: EventHandler<PointerEvent>?
+    var ongotpointercapture: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/input_event)
      */
-    var oninput: EventHandler<Event>?
+    var oninput: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLInputElement/invalid_event)
      */
-    var oninvalid: EventHandler<Event>?
+    var oninvalid: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -326,7 +326,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/keydown_event)
      */
-    var onkeydown: EventHandler<KeyboardEvent>?
+    var onkeydown: EventHandler<KeyboardEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -336,7 +336,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/keyup_event)
      */
-    var onkeyup: EventHandler<KeyboardEvent>?
+    var onkeyup: EventHandler<KeyboardEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -346,7 +346,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SVGElement/load_event)
      */
-    var onload: EventHandler<Event>?
+    var onload: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -356,7 +356,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/loadeddata_event)
      */
-    var onloadeddata: EventHandler<Event>?
+    var onloadeddata: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -366,7 +366,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/loadedmetadata_event)
      */
-    var onloadedmetadata: EventHandler<Event>?
+    var onloadedmetadata: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -376,14 +376,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/loadstart_event)
      */
-    var onloadstart: EventHandler<Event>?
+    var onloadstart: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLElement/lostpointercapture_event)
      */
-    var onlostpointercapture: EventHandler<PointerEvent>?
+    var onlostpointercapture: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -393,21 +393,21 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mousedown_event)
      */
-    var onmousedown: EventHandler<MouseEvent>?
+    var onmousedown: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mouseenter_event)
      */
-    var onmouseenter: EventHandler<MouseEvent>?
+    var onmouseenter: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mouseleave_event)
      */
-    var onmouseleave: EventHandler<MouseEvent>?
+    var onmouseleave: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -417,7 +417,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mousemove_event)
      */
-    var onmousemove: EventHandler<MouseEvent>?
+    var onmousemove: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -427,7 +427,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mouseout_event)
      */
-    var onmouseout: EventHandler<MouseEvent>?
+    var onmouseout: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -437,7 +437,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mouseover_event)
      */
-    var onmouseover: EventHandler<MouseEvent>?
+    var onmouseover: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -447,14 +447,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/mouseup_event)
      */
-    var onmouseup: EventHandler<MouseEvent>?
+    var onmouseup: EventHandler<MouseEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/paste_event)
      */
-    var onpaste: EventHandler<ClipboardEvent>?
+    var onpaste: EventHandler<ClipboardEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -464,7 +464,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/pause_event)
      */
-    var onpause: EventHandler<Event>?
+    var onpause: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -474,7 +474,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/play_event)
      */
-    var onplay: EventHandler<Event>?
+    var onplay: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -484,63 +484,63 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/playing_event)
      */
-    var onplaying: EventHandler<Event>?
+    var onplaying: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointercancel_event)
      */
-    var onpointercancel: EventHandler<PointerEvent>?
+    var onpointercancel: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointerdown_event)
      */
-    var onpointerdown: EventHandler<PointerEvent>?
+    var onpointerdown: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointerenter_event)
      */
-    var onpointerenter: EventHandler<PointerEvent>?
+    var onpointerenter: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointerleave_event)
      */
-    var onpointerleave: EventHandler<PointerEvent>?
+    var onpointerleave: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointermove_event)
      */
-    var onpointermove: EventHandler<PointerEvent>?
+    var onpointermove: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointerout_event)
      */
-    var onpointerout: EventHandler<PointerEvent>?
+    var onpointerout: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointerover_event)
      */
-    var onpointerover: EventHandler<PointerEvent>?
+    var onpointerover: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/pointerup_event)
      */
-    var onpointerup: EventHandler<PointerEvent>?
+    var onpointerup: EventHandler<PointerEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -550,7 +550,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/progress_event)
      */
-    var onprogress: EventHandler<ProgressEvent>?
+    var onprogress: EventHandler<ProgressEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -560,7 +560,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/ratechange_event)
      */
-    var onratechange: EventHandler<Event>?
+    var onratechange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -570,14 +570,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLFormElement/reset_event)
      */
-    var onreset: EventHandler<Event>?
+    var onreset: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/resize_event)
      */
-    var onresize: EventHandler<UIEvent>?
+    var onresize: EventHandler<UIEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -587,21 +587,21 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/scroll_event)
      */
-    var onscroll: EventHandler<Event>?
+    var onscroll: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/scrollend_event)
      */
-    var onscrollend: EventHandler<Event>?
+    var onscrollend: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/securitypolicyviolation_event)
      */
-    var onsecuritypolicyviolation: EventHandler<SecurityPolicyViolationEvent>?
+    var onsecuritypolicyviolation: EventHandler<SecurityPolicyViolationEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -611,7 +611,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/seeked_event)
      */
-    var onseeked: EventHandler<Event>?
+    var onseeked: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -621,7 +621,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/seeking_event)
      */
-    var onseeking: EventHandler<Event>?
+    var onseeking: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -631,28 +631,28 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLInputElement/select_event)
      */
-    var onselect: EventHandler<Event>?
+    var onselect: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Document/selectionchange_event)
      */
-    var onselectionchange: EventHandler<Event>?
+    var onselectionchange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Node/selectstart_event)
      */
-    var onselectstart: EventHandler<Event>?
+    var onselectstart: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLSlotElement/slotchange_event)
      */
-    var onslotchange: EventHandler<Event>?
+    var onslotchange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -662,14 +662,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/stalled_event)
      */
-    var onstalled: EventHandler<Event>?
+    var onstalled: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLFormElement/submit_event)
      */
-    var onsubmit: EventHandler<SubmitEvent>?
+    var onsubmit: EventHandler<SubmitEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -679,7 +679,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/suspend_event)
      */
-    var onsuspend: EventHandler<Event>?
+    var onsuspend: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -689,70 +689,70 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/timeupdate_event)
      */
-    var ontimeupdate: EventHandler<Event>?
+    var ontimeupdate: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLDetailsElement/toggle_event)
      */
-    var ontoggle: EventHandler<Event>?
+    var ontoggle: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/touchcancel_event)
      */
-    var ontouchcancel: EventHandler<TouchEvent>?
+    var ontouchcancel: EventHandler<TouchEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/touchend_event)
      */
-    var ontouchend: EventHandler<TouchEvent>?
+    var ontouchend: EventHandler<TouchEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/touchmove_event)
      */
-    var ontouchmove: EventHandler<TouchEvent>?
+    var ontouchmove: EventHandler<TouchEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/touchstart_event)
      */
-    var ontouchstart: EventHandler<TouchEvent>?
+    var ontouchstart: EventHandler<TouchEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/transitioncancel_event)
      */
-    var ontransitioncancel: EventHandler<TransitionEvent>?
+    var ontransitioncancel: EventHandler<TransitionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/transitionend_event)
      */
-    var ontransitionend: EventHandler<TransitionEvent>?
+    var ontransitionend: EventHandler<TransitionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/transitionrun_event)
      */
-    var ontransitionrun: EventHandler<TransitionEvent>?
+    var ontransitionrun: EventHandler<TransitionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/transitionstart_event)
      */
-    var ontransitionstart: EventHandler<TransitionEvent>?
+    var ontransitionstart: EventHandler<TransitionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -762,7 +762,7 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/volumechange_event)
      */
-    var onvolumechange: EventHandler<Event>?
+    var onvolumechange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
@@ -772,14 +772,14 @@ external interface GlobalEventHandlers {
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/waiting_event)
      */
-    var onwaiting: EventHandler<Event>?
+    var onwaiting: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Element/wheel_event)
      */
-    var onwheel: EventHandler<WheelEvent>?
+    var onwheel: EventHandler<WheelEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.kt b/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.kt
index a8e0db4879bd5..642ea43f95c21 100644
--- a/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.kt
@@ -7,6 +7,7 @@
 package web.errors
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent)
  */
-open external class ErrorEvent(
-    override val type: EventType<ErrorEvent>,
+open external class ErrorEvent<out C : EventTarget?>(
+    override val type: EventType<ErrorEvent<C>>,
     init: ErrorEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     ErrorEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent/colno)
diff --git a/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.types.kt
index 65ccf30669215..2b214d6a6c61b 100644
--- a/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/errors/ErrorEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface ErrorEventTypes {
     @JsValue("error")
-    val ERROR: EventType<ErrorEvent>
+    val ERROR: EventType<ErrorEvent<*>>
         get() = definedExternally
 
     @JsValue("processorerror")
-    val PROCESSOR_ERROR: EventType<ErrorEvent>
+    val PROCESSOR_ERROR: EventType<ErrorEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/file/FileReader.kt b/kotlin-browser/src/jsMain/generated/web/file/FileReader.kt
index f04a7c52c16da..e016d76b395bd 100644
--- a/kotlin-browser/src/jsMain/generated/web/file/FileReader.kt
+++ b/kotlin-browser/src/jsMain/generated/web/file/FileReader.kt
@@ -23,32 +23,32 @@ open external class FileReader :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/abort_event)
      */
-    var onabort: EventHandler<ProgressEvent>?
+    var onabort: EventHandler<ProgressEvent<FileReader>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/error_event)
      */
-    var onerror: EventHandler<ProgressEvent>?
+    var onerror: EventHandler<ProgressEvent<FileReader>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/load_event)
      */
-    var onload: EventHandler<ProgressEvent>?
+    var onload: EventHandler<ProgressEvent<FileReader>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/loadend_event)
      */
-    var onloadend: EventHandler<ProgressEvent>?
+    var onloadend: EventHandler<ProgressEvent<FileReader>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/loadstart_event)
      */
-    var onloadstart: EventHandler<ProgressEvent>?
+    var onloadstart: EventHandler<ProgressEvent<FileReader>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/progress_event)
      */
-    var onprogress: EventHandler<ProgressEvent>?
+    var onprogress: EventHandler<ProgressEvent<FileReader>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FileReader/readyState)
diff --git a/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSet.kt b/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSet.kt
index 96a74f282eac4..9a719c37ceef5 100644
--- a/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSet.kt
+++ b/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSet.kt
@@ -21,17 +21,17 @@ sealed external interface FontFaceSet :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FontFaceSet/loading_event)
      */
-    var onloading: EventHandler<FontFaceSetLoadEvent>?
+    var onloading: EventHandler<FontFaceSetLoadEvent<FontFaceSet>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FontFaceSet/loadingdone_event)
      */
-    var onloadingdone: EventHandler<FontFaceSetLoadEvent>?
+    var onloadingdone: EventHandler<FontFaceSetLoadEvent<FontFaceSet>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FontFaceSet/loadingerror_event)
      */
-    var onloadingerror: EventHandler<FontFaceSetLoadEvent>?
+    var onloadingerror: EventHandler<FontFaceSetLoadEvent<FontFaceSet>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FontFaceSet/ready)
diff --git a/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.kt b/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.kt
index 489d3f0286045..f133ab3e559e3 100644
--- a/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.kt
@@ -8,15 +8,16 @@ package web.fonts
 
 import js.array.ReadonlyArray
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FontFaceSetLoadEvent)
  */
-open external class FontFaceSetLoadEvent(
-    override val type: EventType<FontFaceSetLoadEvent>,
+open external class FontFaceSetLoadEvent<out C : EventTarget?>(
+    override val type: EventType<FontFaceSetLoadEvent<C>>,
     init: FontFaceSetLoadEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     FontFaceSetLoadEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FontFaceSetLoadEvent/fontfaces)
diff --git a/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.types.kt
index 71d1106b568c1..34e196d38ae14 100644
--- a/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/fonts/FontFaceSetLoadEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface FontFaceSetLoadEventTypes {
     @JsValue("loading")
-    val LOADING: EventType<FontFaceSetLoadEvent>
+    val LOADING: EventType<FontFaceSetLoadEvent<*>>
         get() = definedExternally
 
     @JsValue("loadingdone")
-    val LOADING_DONE: EventType<FontFaceSetLoadEvent>
+    val LOADING_DONE: EventType<FontFaceSetLoadEvent<*>>
         get() = definedExternally
 
     @JsValue("loadingerror")
-    val LOADING_ERROR: EventType<FontFaceSetLoadEvent>
+    val LOADING_ERROR: EventType<FontFaceSetLoadEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.kt b/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.kt
index 7e87b5dce302a..1ae6a9ce40c11 100644
--- a/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.kt
@@ -7,15 +7,16 @@
 package web.form
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormDataEvent)
  */
-open external class FormDataEvent(
-    override val type: EventType<FormDataEvent>,
+open external class FormDataEvent<out C : EventTarget?>(
+    override val type: EventType<FormDataEvent<C>>,
     init: FormDataEventInit,
-) : Event,
+) : Event<C>,
     FormDataEventInit {
     /**
      * Returns a FormData object representing names and values of elements associated to the target form. Operations on the FormData object will affect form data to be submitted.
diff --git a/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.types.kt
index dd88af3726877..c0670f8d5f636 100644
--- a/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/form/FormDataEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface FormDataEventTypes {
     @JsValue("formdata")
-    val FORM_DATA: EventType<FormDataEvent>
+    val FORM_DATA: EventType<FormDataEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.kt b/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.kt
index e6d59acb3f66f..14cda8fdb0207 100644
--- a/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.kt
@@ -7,16 +7,17 @@
 package web.form
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 import web.html.HTMLElement
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubmitEvent)
  */
-open external class SubmitEvent(
-    override val type: EventType<SubmitEvent>,
+open external class SubmitEvent<out C : EventTarget?>(
+    override val type: EventType<SubmitEvent<C>>,
     init: SubmitEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     SubmitEventInit {
     /**
      * Returns the element representing the submit button that triggered the form submission, or null if the submission was not triggered by a button.
diff --git a/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.types.kt
index 914fe8531990f..94212a0a59fce 100644
--- a/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/form/SubmitEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface SubmitEventTypes {
     @JsValue("submit")
-    val SUBMIT: EventType<SubmitEvent>
+    val SUBMIT: EventType<SubmitEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.kt b/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.kt
index 88a22b59495ec..6faabb33a432a 100644
--- a/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.kt
@@ -7,6 +7,7 @@
 package web.gamepad
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/GamepadEvent)
  */
-open external class GamepadEvent(
-    override val type: EventType<GamepadEvent>,
+open external class GamepadEvent<out C : EventTarget?>(
+    override val type: EventType<GamepadEvent<C>>,
     init: GamepadEventInit,
-) : Event,
+) : Event<C>,
     GamepadEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/GamepadEvent/gamepad)
diff --git a/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.types.kt
index f9f8855e68546..5234cb091b17b 100644
--- a/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/gamepad/GamepadEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface GamepadEventTypes {
     @JsValue("gamepadconnected")
-    val GAMEPAD_CONNECTED: EventType<GamepadEvent>
+    val GAMEPAD_CONNECTED: EventType<GamepadEvent<*>>
         get() = definedExternally
 
     @JsValue("gamepaddisconnected")
-    val GAMEPAD_DISCONNECTED: EventType<GamepadEvent>
+    val GAMEPAD_DISCONNECTED: EventType<GamepadEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/gl/WebGLContextEvent.kt b/kotlin-browser/src/jsMain/generated/web/gl/WebGLContextEvent.kt
index 629bafc4559fe..6fac69c10d9ce 100644
--- a/kotlin-browser/src/jsMain/generated/web/gl/WebGLContextEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/gl/WebGLContextEvent.kt
@@ -7,6 +7,7 @@
 package web.gl
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLContextEvent)
  */
-open external class WebGLContextEvent(
-    override val type: EventType<WebGLContextEvent>,
+open external class WebGLContextEvent<out C : EventTarget?>(
+    override val type: EventType<WebGLContextEvent<C>>,
     init: WebGLContextEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     WebGLContextEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLContextEvent/statusMessage)
diff --git a/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.kt b/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.kt
index 0acdac0cfc336..abfd3787e1de0 100644
--- a/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.kt
@@ -7,6 +7,7 @@
 package web.history
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HashChangeEvent)
  */
-open external class HashChangeEvent(
-    override val type: EventType<HashChangeEvent>,
+open external class HashChangeEvent<out C : EventTarget?>(
+    override val type: EventType<HashChangeEvent<C>>,
     init: HashChangeEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     HashChangeEventInit {
     /**
      * Returns the URL of the session history entry that is now current.
diff --git a/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.types.kt
index 2a6429f7ed6e4..1dafcdb86b94c 100644
--- a/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/history/HashChangeEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface HashChangeEventTypes {
     @JsValue("hashchange")
-    val HASH_CHANGE: EventType<HashChangeEvent>
+    val HASH_CHANGE: EventType<HashChangeEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.kt b/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.kt
index 5d08fea74b0a9..56fea03ea7db2 100644
--- a/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.kt
@@ -7,6 +7,7 @@
 package web.history
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PageTransitionEvent)
  */
-open external class PageTransitionEvent(
-    override val type: EventType<PageTransitionEvent>,
+open external class PageTransitionEvent<out C : EventTarget?>(
+    override val type: EventType<PageTransitionEvent<C>>,
     init: PageTransitionEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     PageTransitionEventInit {
     /**
      * For the pageshow event, returns false if the page is newly being loaded (and the load event will fire). Otherwise, returns true.
diff --git a/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.types.kt
index f1643387eec8c..c177877d1bcac 100644
--- a/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/history/PageTransitionEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface PageTransitionEventTypes {
     @JsValue("pagehide")
-    val PAGE_HIDE: EventType<PageTransitionEvent>
+    val PAGE_HIDE: EventType<PageTransitionEvent<*>>
         get() = definedExternally
 
     @JsValue("pageshow")
-    val PAGE_SHOW: EventType<PageTransitionEvent>
+    val PAGE_SHOW: EventType<PageTransitionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.kt b/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.kt
index 6999c09e447fb..c22bd631d78a1 100644
--- a/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.kt
@@ -7,6 +7,7 @@
 package web.history
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PopStateEvent)
  */
-open external class PopStateEvent(
-    override val type: EventType<PopStateEvent>,
+open external class PopStateEvent<out C : EventTarget?>(
+    override val type: EventType<PopStateEvent<C>>,
     init: PopStateEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     PopStateEventInit {
     /**
      * Returns a copy of the information that was provided to pushState() or replaceState().
diff --git a/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.types.kt
index daf96b8cee85e..393b4b0bf31dc 100644
--- a/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/history/PopStateEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface PopStateEventTypes {
     @JsValue("popstate")
-    val POP_STATE: EventType<PopStateEvent>
+    val POP_STATE: EventType<PopStateEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/html/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/html/Event.types.kt
index e817ffa7eccb6..b59f0d8ec3e76 100644
--- a/kotlin-browser/src/jsMain/generated/web/html/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/html/Event.types.kt
@@ -5,5 +5,5 @@ package web.html
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.WAITING_FOR_KEY: EventType<Event>
+inline val Event.Companion.WAITING_FOR_KEY: EventType<Event<*>>
     get() = EventType("waitingforkey")
diff --git a/kotlin-browser/src/jsMain/generated/web/html/HTMLMediaElement.kt b/kotlin-browser/src/jsMain/generated/web/html/HTMLMediaElement.kt
index 31021bf7fbff5..021e248e63299 100644
--- a/kotlin-browser/src/jsMain/generated/web/html/HTMLMediaElement.kt
+++ b/kotlin-browser/src/jsMain/generated/web/html/HTMLMediaElement.kt
@@ -130,12 +130,12 @@ sealed external class HTMLMediaElement :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/encrypted_event)
      */
-    var onencrypted: EventHandler<MediaEncryptedEvent>?
+    var onencrypted: EventHandler<MediaEncryptedEvent<HTMLMediaElement>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLMediaElement/waitingforkey_event)
      */
-    var onwaitingforkey: EventHandler<Event>?
+    var onwaitingforkey: EventHandler<Event<HTMLMediaElement>>?
 
     /**
      * Gets a flag that specifies whether playback is paused.
diff --git a/kotlin-browser/src/jsMain/generated/web/html/HTMLVideoElement.kt b/kotlin-browser/src/jsMain/generated/web/html/HTMLVideoElement.kt
index 47087e2cafa39..699232ec1a1fb 100644
--- a/kotlin-browser/src/jsMain/generated/web/html/HTMLVideoElement.kt
+++ b/kotlin-browser/src/jsMain/generated/web/html/HTMLVideoElement.kt
@@ -34,12 +34,12 @@ protected constructor() :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/enterpictureinpicture_event)
      */
-    var onenterpictureinpicture: EventHandler<PictureInPictureEvent>?
+    var onenterpictureinpicture: EventHandler<PictureInPictureEvent<HTMLVideoElement>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/HTMLVideoElement/leavepictureinpicture_event)
      */
-    var onleavepictureinpicture: EventHandler<PictureInPictureEvent>?
+    var onleavepictureinpicture: EventHandler<PictureInPictureEvent<HTMLVideoElement>>?
 
     /**
      * Gets or sets the playsinline of the video element. for example, On iPhone, video elements will now be allowed to play inline, and will not automatically enter fullscreen mode when playback begins.
diff --git a/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.kt b/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.kt
index c1b7e38806482..8266fb4371a2d 100644
--- a/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.kt
@@ -8,15 +8,16 @@ package web.html
 
 import js.buffer.ArrayBuffer
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaEncryptedEvent)
  */
-open external class MediaEncryptedEvent(
-    override val type: EventType<MediaEncryptedEvent>,
+open external class MediaEncryptedEvent<out C : EventTarget?>(
+    override val type: EventType<MediaEncryptedEvent<C>>,
     init: MediaEncryptedEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     MediaEncryptedEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaEncryptedEvent/initData)
diff --git a/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.types.kt
index fc01705d2e5c4..2cdc1df66b1e8 100644
--- a/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/html/MediaEncryptedEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface MediaEncryptedEventTypes {
     @JsValue("encrypted")
-    val ENCRYPTED: EventType<MediaEncryptedEvent>
+    val ENCRYPTED: EventType<MediaEncryptedEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/idb/IDBDatabase.kt b/kotlin-browser/src/jsMain/generated/web/idb/IDBDatabase.kt
index 52c65957bc814..5357d9ed16904 100644
--- a/kotlin-browser/src/jsMain/generated/web/idb/IDBDatabase.kt
+++ b/kotlin-browser/src/jsMain/generated/web/idb/IDBDatabase.kt
@@ -29,18 +29,18 @@ sealed external class IDBDatabase :
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBDatabase/objectStoreNames)
      */
     val objectStoreNames: DOMStringList
-    var onabort: EventHandler<Event>?
+    var onabort: EventHandler<Event<IDBDatabase>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBDatabase/close_event)
      */
-    var onclose: EventHandler<Event>?
-    var onerror: EventHandler<Event>?
+    var onclose: EventHandler<Event<IDBDatabase>>?
+    var onerror: EventHandler<Event<IDBDatabase>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBDatabase/versionchange_event)
      */
-    var onversionchange: EventHandler<IDBVersionChangeEvent>?
+    var onversionchange: EventHandler<IDBVersionChangeEvent<IDBDatabase>>?
 
     /**
      * Returns the version of the database.
diff --git a/kotlin-browser/src/jsMain/generated/web/idb/IDBOpenDBRequest.kt b/kotlin-browser/src/jsMain/generated/web/idb/IDBOpenDBRequest.kt
index 90848b074b202..8e7f2664218d9 100644
--- a/kotlin-browser/src/jsMain/generated/web/idb/IDBOpenDBRequest.kt
+++ b/kotlin-browser/src/jsMain/generated/web/idb/IDBOpenDBRequest.kt
@@ -14,10 +14,10 @@ sealed external class IDBOpenDBRequest :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBOpenDBRequest/blocked_event)
      */
-    var onblocked: EventHandler<IDBVersionChangeEvent>?
+    var onblocked: EventHandler<IDBVersionChangeEvent<IDBOpenDBRequest>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBOpenDBRequest/upgradeneeded_event)
      */
-    var onupgradeneeded: EventHandler<IDBVersionChangeEvent>?
+    var onupgradeneeded: EventHandler<IDBVersionChangeEvent<IDBOpenDBRequest>>?
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/idb/IDBRequest.kt b/kotlin-browser/src/jsMain/generated/web/idb/IDBRequest.kt
index 5c042897c2f4e..6d54e46578d0f 100644
--- a/kotlin-browser/src/jsMain/generated/web/idb/IDBRequest.kt
+++ b/kotlin-browser/src/jsMain/generated/web/idb/IDBRequest.kt
@@ -24,12 +24,12 @@ sealed external class IDBRequest<T> :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBRequest/error_event)
      */
-    var onerror: EventHandler<Event>?
+    var onerror: EventHandler<Event<IDBRequest<T>>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBRequest/success_event)
      */
-    var onsuccess: EventHandler<Event>?
+    var onsuccess: EventHandler<Event<IDBRequest<T>>>?
 
     /**
      * Returns "pending" until a request is complete, then returns "done".
diff --git a/kotlin-browser/src/jsMain/generated/web/idb/IDBTransaction.kt b/kotlin-browser/src/jsMain/generated/web/idb/IDBTransaction.kt
index 6195585fa3b62..4b36cfa41a381 100644
--- a/kotlin-browser/src/jsMain/generated/web/idb/IDBTransaction.kt
+++ b/kotlin-browser/src/jsMain/generated/web/idb/IDBTransaction.kt
@@ -49,17 +49,17 @@ sealed external class IDBTransaction :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBTransaction/abort_event)
      */
-    var onabort: EventHandler<Event>?
+    var onabort: EventHandler<Event<IDBTransaction>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBTransaction/complete_event)
      */
-    var oncomplete: EventHandler<Event>?
+    var oncomplete: EventHandler<Event<IDBTransaction>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBTransaction/error_event)
      */
-    var onerror: EventHandler<Event>?
+    var onerror: EventHandler<Event<IDBTransaction>>?
 
     /**
      * Aborts the transaction. All pending requests will fail with a "AbortError" DOMException and all changes made to the database will be reverted.
diff --git a/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.kt b/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.kt
index 470d44bae4593..796c48b50ec9d 100644
--- a/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.kt
@@ -8,6 +8,7 @@ package web.idb
 
 import js.core.JsLong
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBVersionChangeEvent)
  */
-open external class IDBVersionChangeEvent(
-    override val type: EventType<IDBVersionChangeEvent>,
+open external class IDBVersionChangeEvent<out C : EventTarget?>(
+    override val type: EventType<IDBVersionChangeEvent<C>>,
     init: IDBVersionChangeEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     IDBVersionChangeEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBVersionChangeEvent/newVersion)
diff --git a/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.types.kt
index cef4355ae519e..f77e6637c8af2 100644
--- a/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/idb/IDBVersionChangeEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface IDBVersionChangeEventTypes {
     @JsValue("blocked")
-    val BLOCKED: EventType<IDBVersionChangeEvent>
+    val BLOCKED: EventType<IDBVersionChangeEvent<*>>
         get() = definedExternally
 
     @JsValue("upgradeneeded")
-    val UPGRADENEEDED: EventType<IDBVersionChangeEvent>
+    val UPGRADENEEDED: EventType<IDBVersionChangeEvent<*>>
         get() = definedExternally
 
     @JsValue("versionchange")
-    val VERSION_CHANGE: EventType<IDBVersionChangeEvent>
+    val VERSION_CHANGE: EventType<IDBVersionChangeEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/media/devices/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/media/devices/Event.types.kt
index 19c53e835d87e..44930f8ee347d 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/devices/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/devices/Event.types.kt
@@ -5,5 +5,5 @@ package web.media.devices
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.DEVICE_CHANGE: EventType<Event>
+inline val Event.Companion.DEVICE_CHANGE: EventType<Event<*>>
     get() = EventType("devicechange")
diff --git a/kotlin-browser/src/jsMain/generated/web/media/devices/MediaDevices.kt b/kotlin-browser/src/jsMain/generated/web/media/devices/MediaDevices.kt
index bf8c905c10172..fb2b499791ab7 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/devices/MediaDevices.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/devices/MediaDevices.kt
@@ -22,7 +22,7 @@ sealed external class MediaDevices :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaDevices/devicechange_event)
      */
-    var ondevicechange: EventHandler<Event>?
+    var ondevicechange: EventHandler<Event<MediaDevices>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaDevices/enumerateDevices)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/key/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/media/key/Event.types.kt
index ad683f0c01d15..f7e5fb265510c 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/key/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/key/Event.types.kt
@@ -5,5 +5,5 @@ package web.media.key
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.KEY_STATUSES_CHANGE: EventType<Event>
+inline val Event.Companion.KEY_STATUSES_CHANGE: EventType<Event<*>>
     get() = EventType("keystatuseschange")
diff --git a/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.kt b/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.kt
index 3f7e23827c226..b8932e1d7bfb0 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.kt
@@ -8,6 +8,7 @@ package web.media.key
 
 import js.buffer.ArrayBuffer
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -16,10 +17,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaKeyMessageEvent)
  */
-open external class MediaKeyMessageEvent(
-    override val type: EventType<MediaKeyMessageEvent>,
+open external class MediaKeyMessageEvent<out C : EventTarget?>(
+    override val type: EventType<MediaKeyMessageEvent<C>>,
     init: MediaKeyMessageEventInit,
-) : Event,
+) : Event<C>,
     MediaKeyMessageEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaKeyMessageEvent/message)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.types.kt
index 947ab4206a5c5..ecf1e2a893103 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeyMessageEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface MediaKeyMessageEventTypes {
     @JsValue("message")
-    val MESSAGE: EventType<MediaKeyMessageEvent>
+    val MESSAGE: EventType<MediaKeyMessageEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeySession.kt b/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeySession.kt
index cb9614b2c6b69..39c47b59f1980 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeySession.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/key/MediaKeySession.kt
@@ -36,12 +36,12 @@ sealed external class MediaKeySession :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaKeySession/keystatuseschange_event)
      */
-    var onkeystatuseschange: EventHandler<Event>?
+    var onkeystatuseschange: EventHandler<Event<MediaKeySession>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaKeySession/message_event)
      */
-    var onmessage: EventHandler<MediaKeyMessageEvent>?
+    var onmessage: EventHandler<MediaKeyMessageEvent<MediaKeySession>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaKeySession/sessionId)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.kt b/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.kt
index 91c8629063bdc..d103bbe39f620 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.kt
@@ -8,16 +8,17 @@ package web.media.recorder
 
 import web.blob.Blob
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 import web.time.DOMHighResTimeStamp
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BlobEvent)
  */
-open external class BlobEvent(
-    override val type: EventType<BlobEvent>,
+open external class BlobEvent<out C : EventTarget?>(
+    override val type: EventType<BlobEvent<C>>,
     init: BlobEventInit,
-) : Event,
+) : Event<C>,
     BlobEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BlobEvent/data)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.types.kt
index 69624c0c89441..7610e67ad7ea9 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/recorder/BlobEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface BlobEventTypes {
     @JsValue("dataavailable")
-    val DATA_AVAILABLE: EventType<BlobEvent>
+    val DATA_AVAILABLE: EventType<BlobEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/media/recorder/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/media/recorder/Event.types.kt
index 0253d69c8afdb..6a5116fb998eb 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/recorder/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/recorder/Event.types.kt
@@ -5,14 +5,14 @@ package web.media.recorder
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.PAUSE: EventType<Event>
+inline val Event.Companion.PAUSE: EventType<Event<*>>
     get() = EventType("pause")
 
-inline val Event.Companion.RESUME: EventType<Event>
+inline val Event.Companion.RESUME: EventType<Event<*>>
     get() = EventType("resume")
 
-inline val Event.Companion.START: EventType<Event>
+inline val Event.Companion.START: EventType<Event<*>>
     get() = EventType("start")
 
-inline val Event.Companion.STOP: EventType<Event>
+inline val Event.Companion.STOP: EventType<Event<*>>
     get() = EventType("stop")
diff --git a/kotlin-browser/src/jsMain/generated/web/media/recorder/MediaRecorder.kt b/kotlin-browser/src/jsMain/generated/web/media/recorder/MediaRecorder.kt
index 45753d4b50c59..88989abd7478c 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/recorder/MediaRecorder.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/recorder/MediaRecorder.kt
@@ -28,32 +28,32 @@ external class MediaRecorder(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/dataavailable_event)
      */
-    var ondataavailable: EventHandler<BlobEvent>?
+    var ondataavailable: EventHandler<BlobEvent<MediaRecorder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/error_event)
      */
-    var onerror: EventHandler<ErrorEvent>?
+    var onerror: EventHandler<ErrorEvent<MediaRecorder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/pause_event)
      */
-    var onpause: EventHandler<Event>?
+    var onpause: EventHandler<Event<MediaRecorder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/resume_event)
      */
-    var onresume: EventHandler<Event>?
+    var onresume: EventHandler<Event<MediaRecorder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/start_event)
      */
-    var onstart: EventHandler<Event>?
+    var onstart: EventHandler<Event<MediaRecorder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/stop_event)
      */
-    var onstop: EventHandler<Event>?
+    var onstop: EventHandler<Event<MediaRecorder>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaRecorder/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/source/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/media/source/Event.types.kt
index 12d9b3573911a..e844b366b7247 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/source/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/source/Event.types.kt
@@ -5,26 +5,26 @@ package web.media.source
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.ADD_SOURCE_BUFFER: EventType<Event>
+inline val Event.Companion.ADD_SOURCE_BUFFER: EventType<Event<*>>
     get() = EventType("addsourcebuffer")
 
-inline val Event.Companion.REMOVE_SOURCE_BUFFER: EventType<Event>
+inline val Event.Companion.REMOVE_SOURCE_BUFFER: EventType<Event<*>>
     get() = EventType("removesourcebuffer")
 
-inline val Event.Companion.SOURCE_CLOSE: EventType<Event>
+inline val Event.Companion.SOURCE_CLOSE: EventType<Event<*>>
     get() = EventType("sourceclose")
 
-inline val Event.Companion.SOURCE_ENDED: EventType<Event>
+inline val Event.Companion.SOURCE_ENDED: EventType<Event<*>>
     get() = EventType("sourceended")
 
-inline val Event.Companion.SOURCE_OPEN: EventType<Event>
+inline val Event.Companion.SOURCE_OPEN: EventType<Event<*>>
     get() = EventType("sourceopen")
 
-inline val Event.Companion.UPDATE: EventType<Event>
+inline val Event.Companion.UPDATE: EventType<Event<*>>
     get() = EventType("update")
 
-inline val Event.Companion.UPDATE_END: EventType<Event>
+inline val Event.Companion.UPDATE_END: EventType<Event<*>>
     get() = EventType("updateend")
 
-inline val Event.Companion.UPDATE_START: EventType<Event>
+inline val Event.Companion.UPDATE_START: EventType<Event<*>>
     get() = EventType("updatestart")
diff --git a/kotlin-browser/src/jsMain/generated/web/media/source/MediaSource.kt b/kotlin-browser/src/jsMain/generated/web/media/source/MediaSource.kt
index 8fad99bc843b3..69e0bcaac79ac 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/source/MediaSource.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/source/MediaSource.kt
@@ -26,17 +26,17 @@ external class MediaSource :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaSource/sourceclose_event)
      */
-    var onsourceclose: EventHandler<Event>?
+    var onsourceclose: EventHandler<Event<MediaSource>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaSource/sourceended_event)
      */
-    var onsourceended: EventHandler<Event>?
+    var onsourceended: EventHandler<Event<MediaSource>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaSource/sourceopen_event)
      */
-    var onsourceopen: EventHandler<Event>?
+    var onsourceopen: EventHandler<Event<MediaSource>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaSource/readyState)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/source/SourceBuffer.kt b/kotlin-browser/src/jsMain/generated/web/media/source/SourceBuffer.kt
index bd3d663f91358..eca4b9048250c 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/source/SourceBuffer.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/source/SourceBuffer.kt
@@ -37,27 +37,27 @@ sealed external class SourceBuffer :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBuffer/abort_event)
      */
-    var onabort: EventHandler<Event>?
+    var onabort: EventHandler<Event<SourceBuffer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBuffer/error_event)
      */
-    var onerror: EventHandler<Event>?
+    var onerror: EventHandler<Event<SourceBuffer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBuffer/update_event)
      */
-    var onupdate: EventHandler<Event>?
+    var onupdate: EventHandler<Event<SourceBuffer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBuffer/updateend_event)
      */
-    var onupdateend: EventHandler<Event>?
+    var onupdateend: EventHandler<Event<SourceBuffer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBuffer/updatestart_event)
      */
-    var onupdatestart: EventHandler<Event>?
+    var onupdatestart: EventHandler<Event<SourceBuffer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBuffer/timestampOffset)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/source/SourceBufferList.kt b/kotlin-browser/src/jsMain/generated/web/media/source/SourceBufferList.kt
index d8c8e8b5eba11..f37afb1fff782 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/source/SourceBufferList.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/source/SourceBufferList.kt
@@ -20,10 +20,10 @@ sealed external class SourceBufferList :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBufferList/addsourcebuffer_event)
      */
-    var onaddsourcebuffer: EventHandler<Event>?
+    var onaddsourcebuffer: EventHandler<Event<SourceBufferList>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SourceBufferList/removesourcebuffer_event)
      */
-    var onremovesourcebuffer: EventHandler<Event>?
+    var onremovesourcebuffer: EventHandler<Event<SourceBufferList>>?
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/media/streams/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/media/streams/Event.types.kt
index 9637856e4fbe6..5165e8b47df04 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/streams/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/streams/Event.types.kt
@@ -5,11 +5,11 @@ package web.media.streams
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.ENDED: EventType<Event>
+inline val Event.Companion.ENDED: EventType<Event<*>>
     get() = EventType("ended")
 
-inline val Event.Companion.MUTE: EventType<Event>
+inline val Event.Companion.MUTE: EventType<Event<*>>
     get() = EventType("mute")
 
-inline val Event.Companion.UNMUTE: EventType<Event>
+inline val Event.Companion.UNMUTE: EventType<Event<*>>
     get() = EventType("unmute")
diff --git a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStream.kt b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStream.kt
index 94d6c40807320..c7ffb97de371c 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStream.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStream.kt
@@ -28,12 +28,12 @@ external class MediaStream() : EventTarget {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStream/addtrack_event)
      */
-    var onaddtrack: EventHandler<MediaStreamTrackEvent>?
+    var onaddtrack: EventHandler<MediaStreamTrackEvent<MediaStream>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStream/removetrack_event)
      */
-    var onremovetrack: EventHandler<MediaStreamTrackEvent>?
+    var onremovetrack: EventHandler<MediaStreamTrackEvent<MediaStream>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStream/addTrack)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrack.kt b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrack.kt
index 1cbeac6a69703..034ae4037456f 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrack.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrack.kt
@@ -48,17 +48,17 @@ sealed external class MediaStreamTrack :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStreamTrack/ended_event)
      */
-    var onended: EventHandler<Event>?
+    var onended: EventHandler<Event<MediaStreamTrack>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStreamTrack/mute_event)
      */
-    var onmute: EventHandler<Event>?
+    var onmute: EventHandler<Event<MediaStreamTrack>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStreamTrack/unmute_event)
      */
-    var onunmute: EventHandler<Event>?
+    var onunmute: EventHandler<Event<MediaStreamTrack>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStreamTrack/readyState)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.kt b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.kt
index 9671b9e6a7179..fa79f362052e7 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.kt
@@ -7,6 +7,7 @@
 package web.media.streams
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStreamTrackEvent)
  */
-open external class MediaStreamTrackEvent(
-    override val type: EventType<MediaStreamTrackEvent>,
+open external class MediaStreamTrackEvent<out C : EventTarget?>(
+    override val type: EventType<MediaStreamTrackEvent<C>>,
     init: MediaStreamTrackEventInit,
-) : Event,
+) : Event<C>,
     MediaStreamTrackEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MediaStreamTrackEvent/track)
diff --git a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.types.kt
index d109dd9813b97..71b5fa981154d 100644
--- a/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/media/streams/MediaStreamTrackEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface MediaStreamTrackEventTypes {
     @JsValue("addtrack")
-    val ADD_TRACK: EventType<MediaStreamTrackEvent>
+    val ADD_TRACK: EventType<MediaStreamTrackEvent<*>>
         get() = definedExternally
 
     @JsValue("removetrack")
-    val REMOVE_TRACK: EventType<MediaStreamTrackEvent>
+    val REMOVE_TRACK: EventType<MediaStreamTrackEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIAccess.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIAccess.kt
index ca56c52ead92c..750eb099afbac 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIAccess.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIAccess.kt
@@ -20,7 +20,7 @@ sealed external class MIDIAccess :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIAccess/statechange_event)
      */
-    var onstatechange: EventHandler<MIDIConnectionEvent>?
+    var onstatechange: EventHandler<MIDIConnectionEvent<MIDIAccess>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIAccess/outputs)
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.kt
index 776daf77d7770..888ada472520e 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.kt
@@ -7,6 +7,7 @@
 package web.midi
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIConnectionEvent)
  */
-open external class MIDIConnectionEvent(
-    override val type: EventType<MIDIConnectionEvent>,
+open external class MIDIConnectionEvent<out C : EventTarget?>(
+    override val type: EventType<MIDIConnectionEvent<C>>,
     init: MIDIConnectionEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     MIDIConnectionEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIConnectionEvent/port)
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.types.kt
index a97d07a89d78a..bbca3609617f5 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIConnectionEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface MIDIConnectionEventTypes {
     @JsValue("statechange")
-    val STATE_CHANGE: EventType<MIDIConnectionEvent>
+    val STATE_CHANGE: EventType<MIDIConnectionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIInput.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIInput.kt
index 3dee2710e15c2..fcc3aca116089 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIInput.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIInput.kt
@@ -14,5 +14,5 @@ sealed external class MIDIInput :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIInput/midimessage_event)
      */
-    var onmidimessage: EventHandler<MIDIMessageEvent>?
+    var onmidimessage: EventHandler<MIDIMessageEvent<MIDIInput>>?
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.kt
index ffa4707ee1091..866db1b86a713 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.kt
@@ -8,6 +8,7 @@ package web.midi
 
 import js.typedarrays.Uint8Array
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIMessageEvent)
  */
-open external class MIDIMessageEvent(
-    override val type: EventType<MIDIMessageEvent>,
+open external class MIDIMessageEvent<out C : EventTarget?>(
+    override val type: EventType<MIDIMessageEvent<C>>,
     init: MIDIMessageEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     MIDIMessageEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIMessageEvent/data)
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.types.kt
index e09adb600a550..87e786af73769 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIMessageEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface MIDIMessageEventTypes {
     @JsValue("midimessage")
-    val MIDI_MESSAGE: EventType<MIDIMessageEvent>
+    val MIDI_MESSAGE: EventType<MIDIMessageEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/midi/MIDIPort.kt b/kotlin-browser/src/jsMain/generated/web/midi/MIDIPort.kt
index eb3897c41869f..4b03e3ad93531 100644
--- a/kotlin-browser/src/jsMain/generated/web/midi/MIDIPort.kt
+++ b/kotlin-browser/src/jsMain/generated/web/midi/MIDIPort.kt
@@ -36,7 +36,7 @@ sealed external class MIDIPort :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIPort/statechange_event)
      */
-    var onstatechange: EventHandler<MIDIConnectionEvent>?
+    var onstatechange: EventHandler<MIDIConnectionEvent<MIDIPort>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MIDIPort/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/notifications/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/notifications/Event.types.kt
index 6d4dab1377a1b..064d099f6ba64 100644
--- a/kotlin-browser/src/jsMain/generated/web/notifications/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/notifications/Event.types.kt
@@ -5,8 +5,8 @@ package web.notifications
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.CLICK: EventType<Event>
+inline val Event.Companion.CLICK: EventType<Event<*>>
     get() = EventType("click")
 
-inline val Event.Companion.SHOW: EventType<Event>
+inline val Event.Companion.SHOW: EventType<Event<*>>
     get() = EventType("show")
diff --git a/kotlin-browser/src/jsMain/generated/web/notifications/Notification.kt b/kotlin-browser/src/jsMain/generated/web/notifications/Notification.kt
index b1c6d64b2f6b2..f4793eb5b286c 100644
--- a/kotlin-browser/src/jsMain/generated/web/notifications/Notification.kt
+++ b/kotlin-browser/src/jsMain/generated/web/notifications/Notification.kt
@@ -49,22 +49,22 @@ external class Notification(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Notification/click_event)
      */
-    var onclick: EventHandler<Event>?
+    var onclick: EventHandler<Event<Notification>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Notification/close_event)
      */
-    var onclose: EventHandler<Event>?
+    var onclose: EventHandler<Event<Notification>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Notification/error_event)
      */
-    var onerror: EventHandler<Event>?
+    var onerror: EventHandler<Event<Notification>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Notification/show_event)
      */
-    var onshow: EventHandler<Event>?
+    var onshow: EventHandler<Event<Notification>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Notification/requireInteraction)
diff --git a/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.kt b/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.kt
index e7d8610a09476..aa9fb9e67800b 100644
--- a/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.kt
@@ -6,6 +6,7 @@
 
 package web.payment
 
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -13,10 +14,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PaymentMethodChangeEvent)
  */
-open external class PaymentMethodChangeEvent(
-    override val type: EventType<PaymentMethodChangeEvent>,
+open external class PaymentMethodChangeEvent<out C : EventTarget?>(
+    override val type: EventType<PaymentMethodChangeEvent<C>>,
     init: PaymentMethodChangeEventInit = definedExternally,
-) : PaymentRequestUpdateEvent,
+) : PaymentRequestUpdateEvent<C>,
     PaymentMethodChangeEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PaymentMethodChangeEvent/methodDetails)
diff --git a/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.types.kt
index 665808d5a8a22..0f8f11519372d 100644
--- a/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/payment/PaymentMethodChangeEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface PaymentMethodChangeEventTypes {
     @JsValue("paymentmethodchange")
-    val PAYMENT_METHOD_CHANGE: EventType<PaymentMethodChangeEvent>
+    val PAYMENT_METHOD_CHANGE: EventType<PaymentMethodChangeEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequest.kt b/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequest.kt
index f027dbe2c87e5..191abfd592fc5 100644
--- a/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequest.kt
+++ b/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequest.kt
@@ -27,7 +27,7 @@ external class PaymentRequest(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PaymentRequest/paymentmethodchange_event)
      */
-    var onpaymentmethodchange: EventHandler<PaymentMethodChangeEvent>?
+    var onpaymentmethodchange: EventHandler<PaymentMethodChangeEvent<PaymentRequest>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PaymentRequest/abort)
diff --git a/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequestUpdateEvent.kt b/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequestUpdateEvent.kt
index 2dc8b491e6803..c533fa022b2bd 100644
--- a/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequestUpdateEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/payment/PaymentRequestUpdateEvent.kt
@@ -8,6 +8,7 @@ package web.payment
 
 import js.promise.PromiseLike
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -16,10 +17,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PaymentRequestUpdateEvent)
  */
-open external class PaymentRequestUpdateEvent(
-    override val type: EventType<PaymentRequestUpdateEvent>,
+open external class PaymentRequestUpdateEvent<out C : EventTarget?>(
+    override val type: EventType<PaymentRequestUpdateEvent<C>>,
     init: PaymentRequestUpdateEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     PaymentRequestUpdateEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PaymentRequestUpdateEvent/updateWith)
diff --git a/kotlin-browser/src/jsMain/generated/web/permissions/PermissionStatus.kt b/kotlin-browser/src/jsMain/generated/web/permissions/PermissionStatus.kt
index 01179239c4b6d..93fb12787335e 100644
--- a/kotlin-browser/src/jsMain/generated/web/permissions/PermissionStatus.kt
+++ b/kotlin-browser/src/jsMain/generated/web/permissions/PermissionStatus.kt
@@ -19,7 +19,7 @@ sealed external class PermissionStatus :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PermissionStatus/change_event)
      */
-    var onchange: EventHandler<Event>?
+    var onchange: EventHandler<Event<PermissionStatus>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PermissionStatus/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/pip/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/pip/Event.types.kt
index f4631da1cd508..b41e3e53292e0 100644
--- a/kotlin-browser/src/jsMain/generated/web/pip/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/pip/Event.types.kt
@@ -5,5 +5,5 @@ package web.pip
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.RESIZE: EventType<Event>
+inline val Event.Companion.RESIZE: EventType<Event<*>>
     get() = EventType("resize")
diff --git a/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.kt b/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.kt
index 7b58fd3403293..f45d53985cae4 100644
--- a/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.kt
@@ -7,15 +7,16 @@
 package web.pip
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PictureInPictureEvent)
  */
-open external class PictureInPictureEvent(
-    override val type: EventType<PictureInPictureEvent>,
+open external class PictureInPictureEvent<out C : EventTarget?>(
+    override val type: EventType<PictureInPictureEvent<C>>,
     init: PictureInPictureEventInit,
-) : Event,
+) : Event<C>,
     PictureInPictureEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PictureInPictureEvent/pictureInPictureWindow)
diff --git a/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.types.kt
index f70d60214259e..25f5099f5465c 100644
--- a/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface PictureInPictureEventTypes {
     @JsValue("enterpictureinpicture")
-    val ENTER_PICTURE_IN_PICTURE: EventType<PictureInPictureEvent>
+    val ENTER_PICTURE_IN_PICTURE: EventType<PictureInPictureEvent<*>>
         get() = definedExternally
 
     @JsValue("leavepictureinpicture")
-    val LEAVE_PICTURE_IN_PICTURE: EventType<PictureInPictureEvent>
+    val LEAVE_PICTURE_IN_PICTURE: EventType<PictureInPictureEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureWindow.kt b/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureWindow.kt
index 792de28bd99d3..26542eb8ebb09 100644
--- a/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureWindow.kt
+++ b/kotlin-browser/src/jsMain/generated/web/pip/PictureInPictureWindow.kt
@@ -19,7 +19,7 @@ sealed external class PictureInPictureWindow :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow/resize_event)
      */
-    var onresize: EventHandler<Event>?
+    var onresize: EventHandler<Event<PictureInPictureWindow>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PictureInPictureWindow/width)
diff --git a/kotlin-browser/src/jsMain/generated/web/push/PushEvent.kt b/kotlin-browser/src/jsMain/generated/web/push/PushEvent.kt
index d991fc1feb1ec..dce4861be7fb1 100644
--- a/kotlin-browser/src/jsMain/generated/web/push/PushEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/push/PushEvent.kt
@@ -6,6 +6,7 @@
 
 package web.push
 
+import web.events.EventTarget
 import web.events.EventType
 import web.serviceworker.ExtendableEvent
 
@@ -15,10 +16,10 @@ import web.serviceworker.ExtendableEvent
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PushEvent)
  */
-open external class PushEvent(
-    override val type: EventType<PushEvent>,
+open external class PushEvent<out C : EventTarget?>(
+    override val type: EventType<PushEvent<C>>,
     init: PushEventInit = definedExternally,
-) : ExtendableEvent,
+) : ExtendableEvent<C>,
     PushEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PushEvent/data)
diff --git a/kotlin-browser/src/jsMain/generated/web/push/PushEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/push/PushEvent.types.kt
index 8f44670640868..b1cc47190de56 100644
--- a/kotlin-browser/src/jsMain/generated/web/push/PushEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/push/PushEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface PushEventTypes {
     @JsValue("push")
-    val PUSH: EventType<PushEvent>
+    val PUSH: EventType<PushEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/remoteplayback/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/remoteplayback/Event.types.kt
index e3aea1f72b281..6b7003e4347f2 100644
--- a/kotlin-browser/src/jsMain/generated/web/remoteplayback/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/remoteplayback/Event.types.kt
@@ -5,11 +5,11 @@ package web.remoteplayback
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.CONNECT: EventType<Event>
+inline val Event.Companion.CONNECT: EventType<Event<*>>
     get() = EventType("connect")
 
-inline val Event.Companion.CONNECTING: EventType<Event>
+inline val Event.Companion.CONNECTING: EventType<Event<*>>
     get() = EventType("connecting")
 
-inline val Event.Companion.DISCONNECT: EventType<Event>
+inline val Event.Companion.DISCONNECT: EventType<Event<*>>
     get() = EventType("disconnect")
diff --git a/kotlin-browser/src/jsMain/generated/web/remoteplayback/RemotePlayback.kt b/kotlin-browser/src/jsMain/generated/web/remoteplayback/RemotePlayback.kt
index f60768b6f1110..a68e30193f503 100644
--- a/kotlin-browser/src/jsMain/generated/web/remoteplayback/RemotePlayback.kt
+++ b/kotlin-browser/src/jsMain/generated/web/remoteplayback/RemotePlayback.kt
@@ -16,17 +16,17 @@ sealed external class RemotePlayback :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RemotePlayback/connect_event)
      */
-    var onconnect: EventHandler<Event>?
+    var onconnect: EventHandler<Event<RemotePlayback>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RemotePlayback/connecting_event)
      */
-    var onconnecting: EventHandler<Event>?
+    var onconnecting: EventHandler<Event<RemotePlayback>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RemotePlayback/disconnect_event)
      */
-    var ondisconnect: EventHandler<Event>?
+    var ondisconnect: EventHandler<Event<RemotePlayback>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RemotePlayback/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/Event.types.kt
index f7dceef2ffcbf..396ccd08846d5 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/Event.types.kt
@@ -5,29 +5,29 @@ package web.rtc
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.BUFFERED_AMOUNT_LOW: EventType<Event>
+inline val Event.Companion.BUFFERED_AMOUNT_LOW: EventType<Event<*>>
     get() = EventType("bufferedamountlow")
 
-inline val Event.Companion.CONNECTION_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.CONNECTION_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("connectionstatechange")
 
-inline val Event.Companion.GATHERING_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.GATHERING_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("gatheringstatechange")
 
-inline val Event.Companion.ICE_CONNECTION_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.ICE_CONNECTION_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("iceconnectionstatechange")
 
-inline val Event.Companion.ICE_GATHERING_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.ICE_GATHERING_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("icegatheringstatechange")
 
-inline val Event.Companion.NEGOTIATION_NEEDED: EventType<Event>
+inline val Event.Companion.NEGOTIATION_NEEDED: EventType<Event<*>>
     get() = EventType("negotiationneeded")
 
-inline val Event.Companion.SELECTED_CANDIDATE_PAIR_CHANGE: EventType<Event>
+inline val Event.Companion.SELECTED_CANDIDATE_PAIR_CHANGE: EventType<Event<*>>
     get() = EventType("selectedcandidatepairchange")
 
-inline val Event.Companion.SIGNALING_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.SIGNALING_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("signalingstatechange")
 
-inline val Event.Companion.STATE_CHANGE: EventType<Event>
+inline val Event.Companion.STATE_CHANGE: EventType<Event<*>>
     get() = EventType("statechange")
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFSender.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFSender.kt
index e53c5814efadd..42ccd7bc3f74f 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFSender.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFSender.kt
@@ -18,7 +18,7 @@ sealed external class RTCDTMFSender :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDTMFSender/tonechange_event)
      */
-    var ontonechange: EventHandler<RTCDTMFToneChangeEvent>?
+    var ontonechange: EventHandler<RTCDTMFToneChangeEvent<RTCDTMFSender>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDTMFSender/toneBuffer)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.kt
index 38d2ceaf1d6b1..2136fc51a45b5 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.kt
@@ -7,6 +7,7 @@
 package web.rtc
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDTMFToneChangeEvent)
  */
-open external class RTCDTMFToneChangeEvent(
-    override val type: EventType<RTCDTMFToneChangeEvent>,
+open external class RTCDTMFToneChangeEvent<out C : EventTarget?>(
+    override val type: EventType<RTCDTMFToneChangeEvent<C>>,
     init: RTCDTMFToneChangeEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     RTCDTMFToneChangeEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDTMFToneChangeEvent/tone)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.types.kt
index 5981b26bba427..4b87fdcefddf3 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDTMFToneChangeEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCDTMFToneChangeEventTypes {
     @JsValue("tonechange")
-    val TONE_CHANGE: EventType<RTCDTMFToneChangeEvent>
+    val TONE_CHANGE: EventType<RTCDTMFToneChangeEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannel.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannel.kt
index 6552cd4baa678..cb500c9110a43 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannel.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannel.kt
@@ -59,32 +59,32 @@ sealed external class RTCDataChannel :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/bufferedamountlow_event)
      */
-    var onbufferedamountlow: EventHandler<Event>?
+    var onbufferedamountlow: EventHandler<Event<RTCDataChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/close_event)
      */
-    var onclose: EventHandler<Event>?
+    var onclose: EventHandler<Event<RTCDataChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/closing_event)
      */
-    var onclosing: EventHandler<Event>?
+    var onclosing: EventHandler<Event<RTCDataChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/error_event)
      */
-    var onerror: EventHandler<RTCErrorEvent>?
+    var onerror: EventHandler<RTCErrorEvent<RTCDataChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, RTCDataChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/open_event)
      */
-    var onopen: EventHandler<Event>?
+    var onopen: EventHandler<Event<RTCDataChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannel/ordered)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.kt
index fda40b8b33f70..3e7ab02ff576f 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.kt
@@ -7,15 +7,16 @@
 package web.rtc
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannelEvent)
  */
-open external class RTCDataChannelEvent(
-    override val type: EventType<RTCDataChannelEvent>,
+open external class RTCDataChannelEvent<out C : EventTarget?>(
+    override val type: EventType<RTCDataChannelEvent<C>>,
     init: RTCDataChannelEventInit,
-) : Event,
+) : Event<C>,
     RTCDataChannelEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDataChannelEvent/channel)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.types.kt
index a5a2b844f0938..606e5986c4fe2 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDataChannelEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCDataChannelEventTypes {
     @JsValue("datachannel")
-    val DATA_CHANNEL: EventType<RTCDataChannelEvent>
+    val DATA_CHANNEL: EventType<RTCDataChannelEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDtlsTransport.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDtlsTransport.kt
index dcacbe7611586..10af9a12dfe67 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCDtlsTransport.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCDtlsTransport.kt
@@ -17,12 +17,12 @@ sealed external class RTCDtlsTransport :
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDtlsTransport/iceTransport)
      */
     val iceTransport: RTCIceTransport
-    var onerror: EventHandler<RTCErrorEvent>?
+    var onerror: EventHandler<RTCErrorEvent<RTCDtlsTransport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDtlsTransport/statechange_event)
      */
-    var onstatechange: EventHandler<Event>?
+    var onstatechange: EventHandler<Event<RTCDtlsTransport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCDtlsTransport/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.kt
index 45e09a7da1b88..d1b6d7684fd01 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.kt
@@ -7,15 +7,16 @@
 package web.rtc
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCErrorEvent)
  */
-open external class RTCErrorEvent(
-    override val type: EventType<RTCErrorEvent>,
+open external class RTCErrorEvent<out C : EventTarget?>(
+    override val type: EventType<RTCErrorEvent<C>>,
     init: RTCErrorEventInit,
-) : Event,
+) : Event<C>,
     RTCErrorEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCErrorEvent/error)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.types.kt
index 6767b2dd0afd8..bb83f37cab66f 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCErrorEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCErrorEventTypes {
     @JsValue("error")
-    val ERROR: EventType<RTCErrorEvent>
+    val ERROR: EventType<RTCErrorEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCIceTransport.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCIceTransport.kt
index 18edad53bb62c..6ac18331d5063 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCIceTransport.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCIceTransport.kt
@@ -21,17 +21,17 @@ sealed external class RTCIceTransport :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCIceTransport/gatheringstatechange_event)
      */
-    var ongatheringstatechange: EventHandler<Event>?
+    var ongatheringstatechange: EventHandler<Event<RTCIceTransport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCIceTransport/selectedcandidatepairchange_event)
      */
-    var onselectedcandidatepairchange: EventHandler<Event>?
+    var onselectedcandidatepairchange: EventHandler<Event<RTCIceTransport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCIceTransport/statechange_event)
      */
-    var onstatechange: EventHandler<Event>?
+    var onstatechange: EventHandler<Event<RTCIceTransport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCIceTransport/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnection.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnection.kt
index cb43ef9cb889d..3b70fc73d49df 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnection.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnection.kt
@@ -58,47 +58,47 @@ external class RTCPeerConnection(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/connectionstatechange_event)
      */
-    var onconnectionstatechange: EventHandler<Event>?
+    var onconnectionstatechange: EventHandler<Event<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/datachannel_event)
      */
-    var ondatachannel: EventHandler<RTCDataChannelEvent>?
+    var ondatachannel: EventHandler<RTCDataChannelEvent<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/icecandidate_event)
      */
-    var onicecandidate: EventHandler<RTCPeerConnectionIceEvent>?
+    var onicecandidate: EventHandler<RTCPeerConnectionIceEvent<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/icecandidateerror_event)
      */
-    var onicecandidateerror: EventHandler<RTCPeerConnectionIceErrorEvent>?
+    var onicecandidateerror: EventHandler<RTCPeerConnectionIceErrorEvent<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/iceconnectionstatechange_event)
      */
-    var oniceconnectionstatechange: EventHandler<Event>?
+    var oniceconnectionstatechange: EventHandler<Event<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/icegatheringstatechange_event)
      */
-    var onicegatheringstatechange: EventHandler<Event>?
+    var onicegatheringstatechange: EventHandler<Event<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/negotiationneeded_event)
      */
-    var onnegotiationneeded: EventHandler<Event>?
+    var onnegotiationneeded: EventHandler<Event<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/signalingstatechange_event)
      */
-    var onsignalingstatechange: EventHandler<Event>?
+    var onsignalingstatechange: EventHandler<Event<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/track_event)
      */
-    var ontrack: EventHandler<RTCTrackEvent>?
+    var ontrack: EventHandler<RTCTrackEvent<RTCPeerConnection>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnection/pendingLocalDescription)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.kt
index be05f3e046d57..9a9f60ad36623 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.kt
@@ -7,15 +7,16 @@
 package web.rtc
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnectionIceErrorEvent)
  */
-open external class RTCPeerConnectionIceErrorEvent(
-    override val type: EventType<RTCPeerConnectionIceErrorEvent>,
+open external class RTCPeerConnectionIceErrorEvent<out C : EventTarget?>(
+    override val type: EventType<RTCPeerConnectionIceErrorEvent<C>>,
     init: RTCPeerConnectionIceErrorEventInit,
-) : Event,
+) : Event<C>,
     RTCPeerConnectionIceErrorEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnectionIceErrorEvent/address)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.types.kt
index 80fc02ad0645f..15865e6850156 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceErrorEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCPeerConnectionIceErrorEventTypes {
     @JsValue("icecandidateerror")
-    val ICE_CANDIDATE_ERROR: EventType<RTCPeerConnectionIceErrorEvent>
+    val ICE_CANDIDATE_ERROR: EventType<RTCPeerConnectionIceErrorEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.kt
index 06fe81b408048..c6de90bf4b2f6 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.kt
@@ -7,6 +7,7 @@
 package web.rtc
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnectionIceEvent)
  */
-open external class RTCPeerConnectionIceEvent(
-    override val type: EventType<RTCPeerConnectionIceEvent>,
+open external class RTCPeerConnectionIceEvent<out C : EventTarget?>(
+    override val type: EventType<RTCPeerConnectionIceEvent<C>>,
     init: RTCPeerConnectionIceEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     RTCPeerConnectionIceEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCPeerConnectionIceEvent/candidate)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.types.kt
index fa9edbca80b20..2334e447eb82e 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCPeerConnectionIceEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCPeerConnectionIceEventTypes {
     @JsValue("icecandidate")
-    val ICE_CANDIDATE: EventType<RTCPeerConnectionIceEvent>
+    val ICE_CANDIDATE: EventType<RTCPeerConnectionIceEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCSctpTransport.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCSctpTransport.kt
index ff2cfc0562613..9e5fb49628f1d 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCSctpTransport.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCSctpTransport.kt
@@ -20,7 +20,7 @@ sealed external class RTCSctpTransport :
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCSctpTransport/maxMessageSize)
      */
     val maxMessageSize: Double
-    var onstatechange: EventHandler<Event>?
+    var onstatechange: EventHandler<Event<RTCSctpTransport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCSctpTransport/state)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.kt
index 021b6eede8003..e5fa61f18c0ec 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.kt
@@ -8,6 +8,7 @@ package web.rtc
 
 import js.array.ReadonlyArray
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 import web.media.streams.MediaStream
 import web.media.streams.MediaStreamTrack
@@ -15,10 +16,10 @@ import web.media.streams.MediaStreamTrack
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCTrackEvent)
  */
-open external class RTCTrackEvent(
-    override val type: EventType<RTCTrackEvent>,
+open external class RTCTrackEvent<out C : EventTarget?>(
+    override val type: EventType<RTCTrackEvent<C>>,
     init: RTCTrackEventInit,
-) : Event,
+) : Event<C>,
     RTCTrackEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCTrackEvent/receiver)
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.types.kt
index 0fa0813da27e4..0890884ef4de9 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTrackEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCTrackEventTypes {
     @JsValue("track")
-    val TRACK: EventType<RTCTrackEvent>
+    val TRACK: EventType<RTCTrackEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.kt
index 2a1ff47536244..b22aa247f423a 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.kt
@@ -3,11 +3,12 @@
 package web.rtc
 
 import web.events.Event
+import web.events.EventTarget
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCTransformEvent)
  */
-sealed external class RTCTransformEvent : Event {
+sealed external class RTCTransformEvent<out C : EventTarget?> : Event<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/RTCTransformEvent/transformer)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.types.kt
index 5b0deecf3fea8..fab9521e120ac 100644
--- a/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/rtc/RTCTransformEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface RTCTransformEventTypes {
     @JsValue("rtctransform")
-    val RTC_TRANSFORM: EventType<RTCTransformEvent>
+    val RTC_TRANSFORM: EventType<RTCTransformEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/screen/ScreenOrientation.kt b/kotlin-browser/src/jsMain/generated/web/screen/ScreenOrientation.kt
index 9428a0682c2c9..b0c46edbfebf6 100644
--- a/kotlin-browser/src/jsMain/generated/web/screen/ScreenOrientation.kt
+++ b/kotlin-browser/src/jsMain/generated/web/screen/ScreenOrientation.kt
@@ -15,7 +15,7 @@ sealed external class ScreenOrientation :
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ScreenOrientation/angle)
      */
     val angle: Short
-    var onchange: EventHandler<Event>?
+    var onchange: EventHandler<Event<ScreenOrientation>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ScreenOrientation/type)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/Event.types.kt
index 02db4d3b003e0..84849aa9cdec8 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/Event.types.kt
@@ -5,11 +5,11 @@ package web.serviceworker
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.CONTROLLER_CHANGE: EventType<Event>
+inline val Event.Companion.CONTROLLER_CHANGE: EventType<Event<*>>
     get() = EventType("controllerchange")
 
-inline val Event.Companion.STATE_CHANGE: EventType<Event>
+inline val Event.Companion.STATE_CHANGE: EventType<Event<*>>
     get() = EventType("statechange")
 
-inline val Event.Companion.UPDATE_FOUND: EventType<Event>
+inline val Event.Companion.UPDATE_FOUND: EventType<Event<*>>
     get() = EventType("updatefound")
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.kt
index 0d5b15d242541..09eac9d94376b 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.kt
@@ -8,6 +8,7 @@ package web.serviceworker
 
 import js.promise.Promise
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ExtendableEvent)
  */
-open external class ExtendableEvent(
-    override val type: EventType<ExtendableEvent>,
+open external class ExtendableEvent<out C : EventTarget?>(
+    override val type: EventType<ExtendableEvent<C>>,
     init: ExtendableEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     ExtendableEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ExtendableEvent/waitUntil)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.types.kt
index 2f4760396f0e5..cb59b26f36232 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface ExtendableEventTypes {
     @JsValue("activate")
-    val ACTIVATE: EventType<ExtendableEvent>
+    val ACTIVATE: EventType<ExtendableEvent<*>>
         get() = definedExternally
 
     @JsValue("install")
-    val INSTALL: EventType<ExtendableEvent>
+    val INSTALL: EventType<ExtendableEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.kt
index 0d16fa70c6778..9771e44649bf3 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.kt
@@ -7,6 +7,7 @@
 package web.serviceworker
 
 import js.array.ReadonlyArray
+import web.events.EventTarget
 import web.events.EventType
 import web.messaging.MessagePort
 
@@ -15,10 +16,10 @@ import web.messaging.MessagePort
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ExtendableMessageEvent)
  */
-open external class ExtendableMessageEvent(
-    override val type: EventType<ExtendableMessageEvent>,
+open external class ExtendableMessageEvent<out C : EventTarget?>(
+    override val type: EventType<ExtendableMessageEvent<C>>,
     init: ExtendableMessageEventInit = definedExternally,
-) : ExtendableEvent,
+) : ExtendableEvent<C>,
     ExtendableMessageEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ExtendableMessageEvent/data)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.types.kt
index ebe366f8a6f1b..e0522cabd9b1c 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ExtendableMessageEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface ExtendableMessageEventTypes {
     @JsValue("message")
-    val MESSAGE: EventType<ExtendableMessageEvent>
+    val MESSAGE: EventType<ExtendableMessageEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.kt
index 5582481f788f2..14f8ca7fd73f4 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.kt
@@ -9,6 +9,7 @@ package web.serviceworker
 import js.core.Void
 import js.promise.Promise
 import js.promise.PromiseLike
+import web.events.EventTarget
 import web.events.EventType
 import web.http.Request
 import web.http.Response
@@ -18,10 +19,10 @@ import web.http.Response
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FetchEvent)
  */
-open external class FetchEvent(
-    override val type: EventType<FetchEvent>,
+open external class FetchEvent<out C : EventTarget?>(
+    override val type: EventType<FetchEvent<C>>,
     init: FetchEventInit,
-) : ExtendableEvent,
+) : ExtendableEvent<C>,
     FetchEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FetchEvent/clientId)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.types.kt
index 5e584f7e4196c..fef6c56adaabb 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/FetchEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface FetchEventTypes {
     @JsValue("fetch")
-    val FETCH: EventType<FetchEvent>
+    val FETCH: EventType<FetchEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.kt
index d5452ae7bdddb..65a120cefe2a0 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.kt
@@ -6,6 +6,7 @@
 
 package web.serviceworker
 
+import web.events.EventTarget
 import web.events.EventType
 import web.notifications.Notification
 
@@ -14,10 +15,10 @@ import web.notifications.Notification
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/NotificationEvent)
  */
-open external class NotificationEvent(
-    override val type: EventType<NotificationEvent>,
+open external class NotificationEvent<out C : EventTarget?>(
+    override val type: EventType<NotificationEvent<C>>,
     init: NotificationEventInit,
-) : ExtendableEvent,
+) : ExtendableEvent<C>,
     NotificationEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/NotificationEvent/action)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.types.kt
index 5216aa5d8b0d9..903ad51dc3c12 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/NotificationEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface NotificationEventTypes {
     @JsValue("notificationclick")
-    val NOTIFICATION_CLICK: EventType<NotificationEvent>
+    val NOTIFICATION_CLICK: EventType<NotificationEvent<*>>
         get() = definedExternally
 
     @JsValue("notificationclose")
-    val NOTIFICATION_CLOSE: EventType<NotificationEvent>
+    val NOTIFICATION_CLOSE: EventType<NotificationEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorker.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorker.kt
index 153d3528455d8..cbb5ab066bed5 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorker.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorker.kt
@@ -24,7 +24,7 @@ sealed external class ServiceWorker :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorker/statechange_event)
      */
-    var onstatechange: EventHandler<Event>?
+    var onstatechange: EventHandler<Event<ServiceWorker>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorker/scriptURL)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerContainer.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerContainer.kt
index d3d7f76b17f1f..07b60d966482c 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerContainer.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerContainer.kt
@@ -26,17 +26,17 @@ sealed external class ServiceWorkerContainer :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/controllerchange_event)
      */
-    var oncontrollerchange: EventHandler<Event>?
+    var oncontrollerchange: EventHandler<Event<ServiceWorkerContainer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, ServiceWorkerContainer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, ServiceWorkerContainer>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/ready)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerGlobalScope.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerGlobalScope.kt
index 82b7e613714fa..5a9dfc1a8a1f2 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerGlobalScope.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerGlobalScope.kt
@@ -25,47 +25,47 @@ sealed external class ServiceWorkerGlobalScope :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/activate_event)
      */
-    var onactivate: EventHandler<ExtendableEvent>?
+    var onactivate: EventHandler<ExtendableEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/fetch_event)
      */
-    var onfetch: EventHandler<FetchEvent>?
+    var onfetch: EventHandler<FetchEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/install_event)
      */
-    var oninstall: EventHandler<ExtendableEvent>?
+    var oninstall: EventHandler<ExtendableEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/message_event)
      */
-    var onmessage: EventHandler<ExtendableMessageEvent>?
+    var onmessage: EventHandler<ExtendableMessageEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/notificationclick_event)
      */
-    var onnotificationclick: EventHandler<NotificationEvent>?
+    var onnotificationclick: EventHandler<NotificationEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/notificationclose_event)
      */
-    var onnotificationclose: EventHandler<NotificationEvent>?
+    var onnotificationclose: EventHandler<NotificationEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/push_event)
      */
-    var onpush: EventHandler<PushEvent>?
+    var onpush: EventHandler<PushEvent<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/pushsubscriptionchange_event)
      */
-    var onpushsubscriptionchange: EventHandler<Event>?
+    var onpushsubscriptionchange: EventHandler<Event<ServiceWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope/registration)
diff --git a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerRegistration.kt b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerRegistration.kt
index 2ac5da789aa4a..07b7a1b7b99e8 100644
--- a/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerRegistration.kt
+++ b/kotlin-browser/src/jsMain/generated/web/serviceworker/ServiceWorkerRegistration.kt
@@ -38,7 +38,7 @@ sealed external class ServiceWorkerRegistration :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/updatefound_event)
      */
-    var onupdatefound: EventHandler<Event>?
+    var onupdatefound: EventHandler<Event<ServiceWorkerRegistration>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerRegistration/pushManager)
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/speech/Event.types.kt
index d949af61eac9d..24c72cc7c657a 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/Event.types.kt
@@ -5,5 +5,5 @@ package web.speech
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.VOICES_CHANGED: EventType<Event>
+inline val Event.Companion.VOICES_CHANGED: EventType<Event<*>>
     get() = EventType("voiceschanged")
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesis.kt b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesis.kt
index 72333f191874a..621391416f7ab 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesis.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesis.kt
@@ -17,7 +17,7 @@ sealed external class SpeechSynthesis :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesis/voiceschanged_event)
      */
-    var onvoiceschanged: EventHandler<Event>?
+    var onvoiceschanged: EventHandler<Event<SpeechSynthesis>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesis/paused)
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.kt b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.kt
index 2ebfe89cd650e..dcb7d2af04ca5 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.kt
@@ -6,15 +6,16 @@
 
 package web.speech
 
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisErrorEvent)
  */
-open external class SpeechSynthesisErrorEvent(
-    override val type: EventType<SpeechSynthesisErrorEvent>,
+open external class SpeechSynthesisErrorEvent<out C : EventTarget?>(
+    override val type: EventType<SpeechSynthesisErrorEvent<C>>,
     init: SpeechSynthesisErrorEventInit,
-) : SpeechSynthesisEvent,
+) : SpeechSynthesisEvent<C>,
     SpeechSynthesisErrorEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisErrorEvent/error)
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.types.kt
index 844a41e053fb2..813591ec7125d 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisErrorEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface SpeechSynthesisErrorEventTypes {
     @JsValue("error")
-    val ERROR: EventType<SpeechSynthesisErrorEvent>
+    val ERROR: EventType<SpeechSynthesisErrorEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.kt b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.kt
index 5a3f6aaeaa35e..ce0620293ac70 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.kt
@@ -7,6 +7,7 @@
 package web.speech
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisEvent)
  */
-open external class SpeechSynthesisEvent(
-    override val type: EventType<SpeechSynthesisEvent>,
+open external class SpeechSynthesisEvent<out C : EventTarget?>(
+    override val type: EventType<SpeechSynthesisEvent<C>>,
     init: SpeechSynthesisEventInit,
-) : Event,
+) : Event<C>,
     SpeechSynthesisEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisEvent/charIndex)
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.types.kt
index d49dcaeed7b18..7c3473afac7fd 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisEvent.types.kt
@@ -11,26 +11,26 @@ import web.events.EventType
 
 sealed external interface SpeechSynthesisEventTypes {
     @JsValue("boundary")
-    val BOUNDARY: EventType<SpeechSynthesisEvent>
+    val BOUNDARY: EventType<SpeechSynthesisEvent<*>>
         get() = definedExternally
 
     @JsValue("end")
-    val END: EventType<SpeechSynthesisEvent>
+    val END: EventType<SpeechSynthesisEvent<*>>
         get() = definedExternally
 
     @JsValue("mark")
-    val MARK: EventType<SpeechSynthesisEvent>
+    val MARK: EventType<SpeechSynthesisEvent<*>>
         get() = definedExternally
 
     @JsValue("pause")
-    val PAUSE: EventType<SpeechSynthesisEvent>
+    val PAUSE: EventType<SpeechSynthesisEvent<*>>
         get() = definedExternally
 
     @JsValue("resume")
-    val RESUME: EventType<SpeechSynthesisEvent>
+    val RESUME: EventType<SpeechSynthesisEvent<*>>
         get() = definedExternally
 
     @JsValue("start")
-    val START: EventType<SpeechSynthesisEvent>
+    val START: EventType<SpeechSynthesisEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisUtterance.kt b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisUtterance.kt
index f6bcab48c4cc2..819adb8e8acf4 100644
--- a/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisUtterance.kt
+++ b/kotlin-browser/src/jsMain/generated/web/speech/SpeechSynthesisUtterance.kt
@@ -21,37 +21,37 @@ external class SpeechSynthesisUtterance(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/boundary_event)
      */
-    var onboundary: EventHandler<SpeechSynthesisEvent>?
+    var onboundary: EventHandler<SpeechSynthesisEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/end_event)
      */
-    var onend: EventHandler<SpeechSynthesisEvent>?
+    var onend: EventHandler<SpeechSynthesisEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/error_event)
      */
-    var onerror: EventHandler<SpeechSynthesisErrorEvent>?
+    var onerror: EventHandler<SpeechSynthesisErrorEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/mark_event)
      */
-    var onmark: EventHandler<SpeechSynthesisEvent>?
+    var onmark: EventHandler<SpeechSynthesisEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/pause_event)
      */
-    var onpause: EventHandler<SpeechSynthesisEvent>?
+    var onpause: EventHandler<SpeechSynthesisEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/resume_event)
      */
-    var onresume: EventHandler<SpeechSynthesisEvent>?
+    var onresume: EventHandler<SpeechSynthesisEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/start_event)
      */
-    var onstart: EventHandler<SpeechSynthesisEvent>?
+    var onstart: EventHandler<SpeechSynthesisEvent<SpeechSynthesisUtterance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SpeechSynthesisUtterance/pitch)
diff --git a/kotlin-browser/src/jsMain/generated/web/sse/EventSource.kt b/kotlin-browser/src/jsMain/generated/web/sse/EventSource.kt
index 21acba6d233a1..da155934a0acd 100644
--- a/kotlin-browser/src/jsMain/generated/web/sse/EventSource.kt
+++ b/kotlin-browser/src/jsMain/generated/web/sse/EventSource.kt
@@ -23,17 +23,17 @@ external class EventSource(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/error_event)
      */
-    var onerror: EventHandler<Event>?
+    var onerror: EventHandler<Event<EventSource>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, EventSource>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/open_event)
      */
-    var onopen: EventHandler<Event>?
+    var onopen: EventHandler<Event<EventSource>>?
 
     /**
      * Returns the state of this EventSource object's connection. It can have the values described below.
diff --git a/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.kt b/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.kt
index b510469108a4a..7d3e7b338c814 100644
--- a/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.kt
@@ -7,6 +7,7 @@
 package web.storage
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/StorageEvent)
  */
-open external class StorageEvent(
-    override val type: EventType<StorageEvent>,
+open external class StorageEvent<out C : EventTarget?>(
+    override val type: EventType<StorageEvent<C>>,
     init: StorageEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     StorageEventInit {
     /**
      * Returns the key of the storage item being changed.
diff --git a/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.types.kt
index 4c60969c391f2..a3a851f06402e 100644
--- a/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/storage/StorageEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface StorageEventTypes {
     @JsValue("storage")
-    val STORAGE: EventType<StorageEvent>
+    val STORAGE: EventType<StorageEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.kt
index 9a588aaa31ff7..55050462a29d7 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.kt
@@ -6,6 +6,7 @@
 
 package web.uievents
 
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -13,10 +14,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CompositionEvent)
  */
-open external class CompositionEvent(
-    override val type: EventType<CompositionEvent>,
+open external class CompositionEvent<out C : EventTarget?>(
+    override val type: EventType<CompositionEvent<C>>,
     init: CompositionEventInit = definedExternally,
-) : UIEvent,
+) : UIEvent<C>,
     CompositionEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CompositionEvent/data)
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.types.kt
index 6991dd40d5f38..e7a97cbba654f 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/CompositionEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface CompositionEventTypes {
     @JsValue("compositionend")
-    val COMPOSITION_END: EventType<CompositionEvent>
+    val COMPOSITION_END: EventType<CompositionEvent<*>>
         get() = definedExternally
 
     @JsValue("compositionstart")
-    val COMPOSITION_START: EventType<CompositionEvent>
+    val COMPOSITION_START: EventType<CompositionEvent<*>>
         get() = definedExternally
 
     @JsValue("compositionupdate")
-    val COMPOSITION_UPDATE: EventType<CompositionEvent>
+    val COMPOSITION_UPDATE: EventType<CompositionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.kt
index 828a46ee21fda..c3dcc7d8c233d 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.kt
@@ -7,6 +7,7 @@
 package web.uievents
 
 import web.data.DataTransfer
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DragEvent)
  */
-open external class DragEvent(
-    override val type: EventType<DragEvent>,
+open external class DragEvent<out C : EventTarget?>(
+    override val type: EventType<DragEvent<C>>,
     init: DragEventInit = definedExternally,
-) : MouseEvent {
+) : MouseEvent<C> {
     /**
      * Returns the DataTransfer object for the event.
      *
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.types.kt
index 9ffbbac0ca0bd..ecdaef4ba5f56 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/DragEvent.types.kt
@@ -11,30 +11,30 @@ import web.events.EventType
 
 sealed external interface DragEventTypes {
     @JsValue("drag")
-    val DRAG: EventType<DragEvent>
+    val DRAG: EventType<DragEvent<*>>
         get() = definedExternally
 
     @JsValue("dragend")
-    val DRAG_END: EventType<DragEvent>
+    val DRAG_END: EventType<DragEvent<*>>
         get() = definedExternally
 
     @JsValue("dragenter")
-    val DRAG_ENTER: EventType<DragEvent>
+    val DRAG_ENTER: EventType<DragEvent<*>>
         get() = definedExternally
 
     @JsValue("dragleave")
-    val DRAG_LEAVE: EventType<DragEvent>
+    val DRAG_LEAVE: EventType<DragEvent<*>>
         get() = definedExternally
 
     @JsValue("dragover")
-    val DRAG_OVER: EventType<DragEvent>
+    val DRAG_OVER: EventType<DragEvent<*>>
         get() = definedExternally
 
     @JsValue("dragstart")
-    val DRAG_START: EventType<DragEvent>
+    val DRAG_START: EventType<DragEvent<*>>
         get() = definedExternally
 
     @JsValue("drop")
-    val DROP: EventType<DragEvent>
+    val DROP: EventType<DragEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.kt
index 304a26989f645..7ac45edd9341f 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.kt
@@ -14,10 +14,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FocusEvent)
  */
-open external class FocusEvent(
-    override val type: EventType<FocusEvent>,
+open external class FocusEvent<out C : EventTarget?>(
+    override val type: EventType<FocusEvent<C>>,
     init: FocusEventInit = definedExternally,
-) : UIEvent,
+) : UIEvent<C>,
     FocusEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FocusEvent/relatedTarget)
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.types.kt
index 61400463b6aa7..d296bfa385952 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/FocusEvent.types.kt
@@ -11,18 +11,18 @@ import web.events.EventType
 
 sealed external interface FocusEventTypes {
     @JsValue("blur")
-    val BLUR: EventType<FocusEvent>
+    val BLUR: EventType<FocusEvent<*>>
         get() = definedExternally
 
     @JsValue("focus")
-    val FOCUS: EventType<FocusEvent>
+    val FOCUS: EventType<FocusEvent<*>>
         get() = definedExternally
 
     @JsValue("focusin")
-    val FOCUS_IN: EventType<FocusEvent>
+    val FOCUS_IN: EventType<FocusEvent<*>>
         get() = definedExternally
 
     @JsValue("focusout")
-    val FOCUS_OUT: EventType<FocusEvent>
+    val FOCUS_OUT: EventType<FocusEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.kt
index 64a9da14c5ea6..3f50f834e3653 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.kt
@@ -8,16 +8,17 @@ package web.uievents
 
 import js.array.ReadonlyArray
 import web.data.DataTransfer
+import web.events.EventTarget
 import web.events.EventType
 import web.ranges.StaticRange
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/InputEvent)
  */
-open external class InputEvent(
-    override val type: EventType<InputEvent>,
+open external class InputEvent<out C : EventTarget?>(
+    override val type: EventType<InputEvent<C>>,
     init: InputEventInit = definedExternally,
-) : UIEvent {
+) : UIEvent<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/InputEvent/data)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.types.kt
index 6820bf9054d25..e7f4078bc96a7 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/InputEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface InputEventTypes {
     @JsValue("beforeinput")
-    val BEFORE_INPUT: EventType<InputEvent>
+    val BEFORE_INPUT: EventType<InputEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.kt
index 467863b2ffb50..72010c48ffc71 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.kt
@@ -6,6 +6,7 @@
 
 package web.uievents
 
+import web.events.EventTarget
 import web.events.EventType
 import web.keyboard.KeyCode
 import web.keyboard.ModifierKeyCode
@@ -15,10 +16,10 @@ import web.keyboard.ModifierKeyCode
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/KeyboardEvent)
  */
-open external class KeyboardEvent(
-    override val type: EventType<KeyboardEvent>,
+open external class KeyboardEvent<out C : EventTarget?>(
+    override val type: EventType<KeyboardEvent<C>>,
     init: KeyboardEventInit = definedExternally,
-) : UIEvent {
+) : UIEvent<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/KeyboardEvent/altKey)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.types.kt
index ded39e8ba7fe3..ba9c181c6c94b 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/KeyboardEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface KeyboardEventTypes {
     @JsValue("keydown")
-    val KEY_DOWN: EventType<KeyboardEvent>
+    val KEY_DOWN: EventType<KeyboardEvent<*>>
         get() = definedExternally
 
     @JsValue("keypress")
-    val KEY_PRESS: EventType<KeyboardEvent>
+    val KEY_PRESS: EventType<KeyboardEvent<*>>
         get() = definedExternally
 
     @JsValue("keyup")
-    val KEY_UP: EventType<KeyboardEvent>
+    val KEY_UP: EventType<KeyboardEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.kt
index 79497c8284c73..a04b2d8d63af1 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.kt
@@ -15,10 +15,10 @@ import web.keyboard.ModifierKeyCode
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MouseEvent)
  */
-open external class MouseEvent(
-    override val type: EventType<MouseEvent>,
+open external class MouseEvent<out C : EventTarget?>(
+    override val type: EventType<MouseEvent<C>>,
     init: MouseEventInit = definedExternally,
-) : UIEvent {
+) : UIEvent<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MouseEvent/altKey)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.types.kt
index eea2674c29ab3..0602ec0ba1a88 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/MouseEvent.types.kt
@@ -11,46 +11,46 @@ import web.events.EventType
 
 sealed external interface MouseEventTypes {
     @JsValue("auxclick")
-    val AUX_CLICK: EventType<MouseEvent>
+    val AUX_CLICK: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("click")
-    val CLICK: EventType<MouseEvent>
+    val CLICK: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("contextmenu")
-    val CONTEXT_MENU: EventType<MouseEvent>
+    val CONTEXT_MENU: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("dblclick")
-    val DBL_CLICK: EventType<MouseEvent>
+    val DBL_CLICK: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mousedown")
-    val MOUSE_DOWN: EventType<MouseEvent>
+    val MOUSE_DOWN: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mouseenter")
-    val MOUSE_ENTER: EventType<MouseEvent>
+    val MOUSE_ENTER: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mouseleave")
-    val MOUSE_LEAVE: EventType<MouseEvent>
+    val MOUSE_LEAVE: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mousemove")
-    val MOUSE_MOVE: EventType<MouseEvent>
+    val MOUSE_MOVE: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mouseout")
-    val MOUSE_OUT: EventType<MouseEvent>
+    val MOUSE_OUT: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mouseover")
-    val MOUSE_OVER: EventType<MouseEvent>
+    val MOUSE_OVER: EventType<MouseEvent<*>>
         get() = definedExternally
 
     @JsValue("mouseup")
-    val MOUSE_UP: EventType<MouseEvent>
+    val MOUSE_UP: EventType<MouseEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.kt
index c3bdae6f7f441..98fb089efda9b 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.kt
@@ -7,6 +7,7 @@
 package web.uievents
 
 import js.array.ReadonlyArray
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent)
  */
-open external class PointerEvent(
-    override val type: EventType<PointerEvent>,
+open external class PointerEvent<out C : EventTarget?>(
+    override val type: EventType<PointerEvent<C>>,
     init: PointerEventInit = definedExternally,
-) : MouseEvent {
+) : MouseEvent<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent/height)
      */
@@ -73,12 +74,12 @@ open external class PointerEvent(
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent/getCoalescedEvents)
      */
-    fun getCoalescedEvents(): ReadonlyArray<PointerEvent>
+    fun getCoalescedEvents(): ReadonlyArray<PointerEvent<*>>
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PointerEvent/getPredictedEvents)
      */
-    fun getPredictedEvents(): ReadonlyArray<PointerEvent>
+    fun getPredictedEvents(): ReadonlyArray<PointerEvent<*>>
 
     companion object : PointerEventTypes
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.types.kt
index 352507938dfbf..b7ac843defab2 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/PointerEvent.types.kt
@@ -11,42 +11,42 @@ import web.events.EventType
 
 sealed external interface PointerEventTypes {
     @JsValue("gotpointercapture")
-    val GOT_POINTER_CAPTURE: EventType<PointerEvent>
+    val GOT_POINTER_CAPTURE: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("lostpointercapture")
-    val LOST_POINTER_CAPTURE: EventType<PointerEvent>
+    val LOST_POINTER_CAPTURE: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointercancel")
-    val POINTER_CANCEL: EventType<PointerEvent>
+    val POINTER_CANCEL: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointerdown")
-    val POINTER_DOWN: EventType<PointerEvent>
+    val POINTER_DOWN: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointerenter")
-    val POINTER_ENTER: EventType<PointerEvent>
+    val POINTER_ENTER: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointerleave")
-    val POINTER_LEAVE: EventType<PointerEvent>
+    val POINTER_LEAVE: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointermove")
-    val POINTER_MOVE: EventType<PointerEvent>
+    val POINTER_MOVE: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointerout")
-    val POINTER_OUT: EventType<PointerEvent>
+    val POINTER_OUT: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointerover")
-    val POINTER_OVER: EventType<PointerEvent>
+    val POINTER_OVER: EventType<PointerEvent<*>>
         get() = definedExternally
 
     @JsValue("pointerup")
-    val POINTER_UP: EventType<PointerEvent>
+    val POINTER_UP: EventType<PointerEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/PointerEventInit.kt b/kotlin-browser/src/jsMain/generated/web/uievents/PointerEventInit.kt
index 1d4c0103385e7..0930700b4736b 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/PointerEventInit.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/PointerEventInit.kt
@@ -8,12 +8,12 @@ import js.objects.JsPlainObject
 @JsPlainObject
 external interface PointerEventInit :
     MouseEventInit {
-    val coalescedEvents: ReadonlyArray<PointerEvent>?
+    val coalescedEvents: ReadonlyArray<PointerEvent<*>>?
     val height: Double?
     val isPrimary: Boolean?
     val pointerId: Int?
     val pointerType: String?
-    val predictedEvents: ReadonlyArray<PointerEvent>?
+    val predictedEvents: ReadonlyArray<PointerEvent<*>>?
     val pressure: Float?
     val tangentialPressure: Float?
     val tiltX: Int?
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/ToggleEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/ToggleEvent.kt
index a9a7e23b649f9..b61ec1cb553e3 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/ToggleEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/ToggleEvent.kt
@@ -7,15 +7,16 @@
 package web.uievents
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ToggleEvent)
  */
-open external class ToggleEvent(
-    override val type: EventType<ToggleEvent>,
+open external class ToggleEvent<out C : EventTarget?>(
+    override val type: EventType<ToggleEvent<C>>,
     init: ToggleEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     ToggleEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ToggleEvent/newState)
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.kt
index 599fa783eb8d8..f70538a3eb381 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.kt
@@ -8,6 +8,7 @@
 
 package web.uievents
 
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TouchEvent)
  */
-open external class TouchEvent(
-    override val type: EventType<TouchEvent>,
+open external class TouchEvent<out C : EventTarget?>(
+    override val type: EventType<TouchEvent<C>>,
     init: TouchEventInit = definedExternally,
-) : UIEvent {
+) : UIEvent<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TouchEvent/altKey)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.types.kt
index 69b3525dca1b3..f940718484f81 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/TouchEvent.types.kt
@@ -11,18 +11,18 @@ import web.events.EventType
 
 sealed external interface TouchEventTypes {
     @JsValue("touchcancel")
-    val TOUCH_CANCEL: EventType<TouchEvent>
+    val TOUCH_CANCEL: EventType<TouchEvent<*>>
         get() = definedExternally
 
     @JsValue("touchend")
-    val TOUCH_END: EventType<TouchEvent>
+    val TOUCH_END: EventType<TouchEvent<*>>
         get() = definedExternally
 
     @JsValue("touchmove")
-    val TOUCH_MOVE: EventType<TouchEvent>
+    val TOUCH_MOVE: EventType<TouchEvent<*>>
         get() = definedExternally
 
     @JsValue("touchstart")
-    val TOUCH_START: EventType<TouchEvent>
+    val TOUCH_START: EventType<TouchEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.kt
index 57c12ee9d2fc3..a48b19c0b01a8 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.kt
@@ -7,6 +7,7 @@
 package web.uievents
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 import web.window.Window
 
@@ -15,10 +16,10 @@ import web.window.Window
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/UIEvent)
  */
-open external class UIEvent(
-    override val type: EventType<UIEvent>,
+open external class UIEvent<out C : EventTarget?>(
+    override val type: EventType<UIEvent<C>>,
     init: UIEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     UIEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/UIEvent/detail)
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.types.kt
index f91d2684d9525..45b8b8aa73fb8 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/UIEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface UIEventTypes {
     @JsValue("abort")
-    val ABORT: EventType<UIEvent>
+    val ABORT: EventType<UIEvent<*>>
         get() = definedExternally
 
     @JsValue("resize")
-    val RESIZE: EventType<UIEvent>
+    val RESIZE: EventType<UIEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.kt b/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.kt
index ffcb6689e9efb..669d0ba3d5204 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.kt
@@ -6,6 +6,7 @@
 
 package web.uievents
 
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -13,10 +14,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WheelEvent)
  */
-open external class WheelEvent(
-    override val type: EventType<WheelEvent>,
+open external class WheelEvent<out C : EventTarget?>(
+    override val type: EventType<WheelEvent<C>>,
     init: WheelEventInit = definedExternally,
-) : MouseEvent {
+) : MouseEvent<C> {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WheelEvent/deltaMode)
      */
diff --git a/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.types.kt
index 8563d62024baa..91cf77078b3ab 100644
--- a/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/uievents/WheelEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface WheelEventTypes {
     @JsValue("wheel")
-    val WHEEL: EventType<WheelEvent>
+    val WHEEL: EventType<WheelEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/viewport/VisualViewport.kt b/kotlin-browser/src/jsMain/generated/web/viewport/VisualViewport.kt
index 0aaa85ead45aa..927cff5229e0b 100644
--- a/kotlin-browser/src/jsMain/generated/web/viewport/VisualViewport.kt
+++ b/kotlin-browser/src/jsMain/generated/web/viewport/VisualViewport.kt
@@ -29,12 +29,12 @@ sealed external class VisualViewport :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VisualViewport/resize_event)
      */
-    var onresize: EventHandler<Event>?
+    var onresize: EventHandler<Event<VisualViewport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VisualViewport/scroll_event)
      */
-    var onscroll: EventHandler<Event>?
+    var onscroll: EventHandler<Event<VisualViewport>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/VisualViewport/pageLeft)
diff --git a/kotlin-browser/src/jsMain/generated/web/vtt/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/vtt/Event.types.kt
index e8e0db654c4ce..0dad38c8ae159 100644
--- a/kotlin-browser/src/jsMain/generated/web/vtt/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/vtt/Event.types.kt
@@ -5,11 +5,11 @@ package web.vtt
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.CUE_CHANGE: EventType<Event>
+inline val Event.Companion.CUE_CHANGE: EventType<Event<*>>
     get() = EventType("cuechange")
 
-inline val Event.Companion.ENTER: EventType<Event>
+inline val Event.Companion.ENTER: EventType<Event<*>>
     get() = EventType("enter")
 
-inline val Event.Companion.EXIT: EventType<Event>
+inline val Event.Companion.EXIT: EventType<Event<*>>
     get() = EventType("exit")
diff --git a/kotlin-browser/src/jsMain/generated/web/vtt/TextTrack.kt b/kotlin-browser/src/jsMain/generated/web/vtt/TextTrack.kt
index 2c9248ecebd80..8c884e436483a 100644
--- a/kotlin-browser/src/jsMain/generated/web/vtt/TextTrack.kt
+++ b/kotlin-browser/src/jsMain/generated/web/vtt/TextTrack.kt
@@ -78,7 +78,7 @@ sealed external class TextTrack :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrack/cuechange_event)
      */
-    var oncuechange: EventHandler<Event>?
+    var oncuechange: EventHandler<Event<TextTrack>>?
 
     /**
      * Adds the given cue to textTrack's text track list of cues.
diff --git a/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackCue.kt b/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackCue.kt
index a1501c2c50482..7ac40d7476192 100644
--- a/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackCue.kt
+++ b/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackCue.kt
@@ -34,12 +34,12 @@ sealed external class TextTrackCue :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrackCue/enter_event)
      */
-    var onenter: EventHandler<Event>?
+    var onenter: EventHandler<Event<TextTrackCue>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrackCue/exit_event)
      */
-    var onexit: EventHandler<Event>?
+    var onexit: EventHandler<Event<TextTrackCue>>?
 
     /**
      * Returns true if the text track cue pause-on-exit flag is set, false otherwise.
diff --git a/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackList.kt b/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackList.kt
index 8abe923370adc..efab7abe520e3 100644
--- a/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackList.kt
+++ b/kotlin-browser/src/jsMain/generated/web/vtt/TextTrackList.kt
@@ -18,17 +18,17 @@ sealed external class TextTrackList :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrackList/addtrack_event)
      */
-    var onaddtrack: EventHandler<TrackEvent>?
+    var onaddtrack: EventHandler<TrackEvent<TextTrackList>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrackList/change_event)
      */
-    var onchange: EventHandler<Event>?
+    var onchange: EventHandler<Event<TextTrackList>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrackList/removetrack_event)
      */
-    var onremovetrack: EventHandler<TrackEvent>?
+    var onremovetrack: EventHandler<TrackEvent<TextTrackList>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextTrackList/getTrackById)
diff --git a/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.kt b/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.kt
index 59cdb4790e3dd..8fba293c250ca 100644
--- a/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.kt
@@ -7,6 +7,7 @@
 package web.vtt
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TrackEvent)
  */
-open external class TrackEvent(
-    override val type: EventType<TrackEvent>,
+open external class TrackEvent<out C : EventTarget?>(
+    override val type: EventType<TrackEvent<C>>,
     init: TrackEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     TrackEventInit {
     /**
      * Returns the track object (TextTrack, AudioTrack, or VideoTrack) to which the event relates.
diff --git a/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.types.kt
index c498afc1b18f6..cb3487fa59750 100644
--- a/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/vtt/TrackEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface TrackEventTypes {
     @JsValue("addtrack")
-    val ADD_TRACK: EventType<TrackEvent>
+    val ADD_TRACK: EventType<TrackEvent<*>>
         get() = definedExternally
 
     @JsValue("removetrack")
-    val REMOVE_TRACK: EventType<TrackEvent>
+    val REMOVE_TRACK: EventType<TrackEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/wakelock/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/wakelock/Event.types.kt
index 3778afb3ebfb4..fd676b283d642 100644
--- a/kotlin-browser/src/jsMain/generated/web/wakelock/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/wakelock/Event.types.kt
@@ -5,5 +5,5 @@ package web.wakelock
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.RELEASE: EventType<Event>
+inline val Event.Companion.RELEASE: EventType<Event<*>>
     get() = EventType("release")
diff --git a/kotlin-browser/src/jsMain/generated/web/wakelock/WakeLockSentinel.kt b/kotlin-browser/src/jsMain/generated/web/wakelock/WakeLockSentinel.kt
index bef9cbbb4e3e1..dc3940b0f9a7b 100644
--- a/kotlin-browser/src/jsMain/generated/web/wakelock/WakeLockSentinel.kt
+++ b/kotlin-browser/src/jsMain/generated/web/wakelock/WakeLockSentinel.kt
@@ -18,7 +18,7 @@ sealed external class WakeLockSentinel :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WakeLockSentinel/release_event)
      */
-    var onrelease: EventHandler<Event>?
+    var onrelease: EventHandler<Event<WakeLockSentinel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WakeLockSentinel/released)
diff --git a/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.kt b/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.kt
index 91b7ea5b2bb14..3bb4b708d8d8b 100644
--- a/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.kt
+++ b/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.kt
@@ -3,13 +3,14 @@
 package web.window
 
 import web.events.Event
+import web.events.EventTarget
 
 /**
  * The beforeunload event is fired when the window, the document and its resources are about to be unloaded.
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BeforeUnloadEvent)
  */
-sealed external class BeforeUnloadEvent : Event {
+sealed external class BeforeUnloadEvent<out C : EventTarget?> : Event<C> {
 
 
     companion object : BeforeUnloadEventTypes
diff --git a/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.types.kt b/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.types.kt
index d3ec990a34aae..3d6815ac3b276 100644
--- a/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/window/BeforeUnloadEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface BeforeUnloadEventTypes {
     @JsValue("beforeunload")
-    val BEFORE_UNLOAD: EventType<BeforeUnloadEvent>
+    val BEFORE_UNLOAD: EventType<BeforeUnloadEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/window/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/window/Event.types.kt
index c074ae928c47e..a18c52c0e3485 100644
--- a/kotlin-browser/src/jsMain/generated/web/window/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/window/Event.types.kt
@@ -5,29 +5,29 @@ package web.window
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.DOM_CONTENT_LOADED: EventType<Event>
+inline val Event.Companion.DOM_CONTENT_LOADED: EventType<Event<*>>
     get() = EventType("DOMContentLoaded")
 
-inline val Event.Companion.AFTER_PRINT: EventType<Event>
+inline val Event.Companion.AFTER_PRINT: EventType<Event<*>>
     get() = EventType("afterprint")
 
-inline val Event.Companion.BEFORE_PRINT: EventType<Event>
+inline val Event.Companion.BEFORE_PRINT: EventType<Event<*>>
     get() = EventType("beforeprint")
 
-inline val Event.Companion.LANGUAGE_CHANGE: EventType<Event>
+inline val Event.Companion.LANGUAGE_CHANGE: EventType<Event<*>>
     get() = EventType("languagechange")
 
-inline val Event.Companion.OFFLINE: EventType<Event>
+inline val Event.Companion.OFFLINE: EventType<Event<*>>
     get() = EventType("offline")
 
-inline val Event.Companion.ONLINE: EventType<Event>
+inline val Event.Companion.ONLINE: EventType<Event<*>>
     get() = EventType("online")
 
-inline val Event.Companion.RESIZE: EventType<Event>
+inline val Event.Companion.RESIZE: EventType<Event<*>>
     get() = EventType("resize")
 
-inline val Event.Companion.SCROLL: EventType<Event>
+inline val Event.Companion.SCROLL: EventType<Event<*>>
     get() = EventType("scroll")
 
-inline val Event.Companion.UNLOAD: EventType<Event>
+inline val Event.Companion.UNLOAD: EventType<Event<*>>
     get() = EventType("unload")
diff --git a/kotlin-browser/src/jsMain/generated/web/window/Window.kt b/kotlin-browser/src/jsMain/generated/web/window/Window.kt
index 90169d6c09193..63a7187011222 100644
--- a/kotlin-browser/src/jsMain/generated/web/window/Window.kt
+++ b/kotlin-browser/src/jsMain/generated/web/window/Window.kt
@@ -77,21 +77,21 @@ sealed external class Window :
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/devicemotion_event)
      */
-    var ondevicemotion: EventHandler<DeviceMotionEvent>?
+    var ondevicemotion: EventHandler<DeviceMotionEvent<Window>>?
 
     /**
      * Available only in secure contexts.
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/deviceorientation_event)
      */
-    var ondeviceorientation: EventHandler<DeviceOrientationEvent>?
+    var ondeviceorientation: EventHandler<DeviceOrientationEvent<Window>>?
 
     /**
      * Available only in secure contexts.
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/deviceorientationabsolute_event)
      */
-    var ondeviceorientationabsolute: EventHandler<DeviceOrientationEvent>?
+    var ondeviceorientationabsolute: EventHandler<DeviceOrientationEvent<Window>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/opener)
diff --git a/kotlin-browser/src/jsMain/generated/web/window/WindowEventHandlers.kt b/kotlin-browser/src/jsMain/generated/web/window/WindowEventHandlers.kt
index ea4c6face4b9d..c230a191638fe 100644
--- a/kotlin-browser/src/jsMain/generated/web/window/WindowEventHandlers.kt
+++ b/kotlin-browser/src/jsMain/generated/web/window/WindowEventHandlers.kt
@@ -16,119 +16,119 @@ external interface WindowEventHandlers {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/afterprint_event)
      */
-    var onafterprint: EventHandler<Event>?
+    var onafterprint: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/beforeprint_event)
      */
-    var onbeforeprint: EventHandler<Event>?
+    var onbeforeprint: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/beforeunload_event)
      */
-    var onbeforeunload: EventHandler<BeforeUnloadEvent>?
+    var onbeforeunload: EventHandler<BeforeUnloadEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/gamepadconnected_event)
      */
-    var ongamepadconnected: EventHandler<GamepadEvent>?
+    var ongamepadconnected: EventHandler<GamepadEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/gamepaddisconnected_event)
      */
-    var ongamepaddisconnected: EventHandler<GamepadEvent>?
+    var ongamepaddisconnected: EventHandler<GamepadEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/hashchange_event)
      */
-    var onhashchange: EventHandler<HashChangeEvent>?
+    var onhashchange: EventHandler<HashChangeEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/languagechange_event)
      */
-    var onlanguagechange: EventHandler<Event>?
+    var onlanguagechange: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, *>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, *>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/offline_event)
      */
-    var onoffline: EventHandler<Event>?
+    var onoffline: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/online_event)
      */
-    var ononline: EventHandler<Event>?
+    var ononline: EventHandler<Event<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/pagehide_event)
      */
-    var onpagehide: EventHandler<PageTransitionEvent>?
+    var onpagehide: EventHandler<PageTransitionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/pageshow_event)
      */
-    var onpageshow: EventHandler<PageTransitionEvent>?
+    var onpageshow: EventHandler<PageTransitionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/popstate_event)
      */
-    var onpopstate: EventHandler<PopStateEvent>?
+    var onpopstate: EventHandler<PopStateEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/rejectionhandled_event)
      */
-    var onrejectionhandled: EventHandler<PromiseRejectionEvent>?
+    var onrejectionhandled: EventHandler<PromiseRejectionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/storage_event)
      */
-    var onstorage: EventHandler<StorageEvent>?
+    var onstorage: EventHandler<StorageEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/unhandledrejection_event)
      */
-    var onunhandledrejection: EventHandler<PromiseRejectionEvent>?
+    var onunhandledrejection: EventHandler<PromiseRejectionEvent<*>>?
         get() = definedExternally
         set(value) = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/workers/AbstractWorker.kt b/kotlin-browser/src/jsMain/generated/web/workers/AbstractWorker.kt
index 5de7075202594..e26370a35f84b 100644
--- a/kotlin-browser/src/jsMain/generated/web/workers/AbstractWorker.kt
+++ b/kotlin-browser/src/jsMain/generated/web/workers/AbstractWorker.kt
@@ -14,7 +14,7 @@ external interface AbstractWorker : EventTarget {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorker/error_event)
      */
-    var onerror: EventHandler<ErrorEvent>?
+    var onerror: EventHandler<ErrorEvent<AbstractWorker>>?
         get() = definedExternally
         set(value) = definedExternally
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/workers/DedicatedWorkerGlobalScope.kt b/kotlin-browser/src/jsMain/generated/web/workers/DedicatedWorkerGlobalScope.kt
index 9ef694e0aab08..06fa4ecc9056d 100644
--- a/kotlin-browser/src/jsMain/generated/web/workers/DedicatedWorkerGlobalScope.kt
+++ b/kotlin-browser/src/jsMain/generated/web/workers/DedicatedWorkerGlobalScope.kt
@@ -26,17 +26,17 @@ sealed external class DedicatedWorkerGlobalScope :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, DedicatedWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, DedicatedWorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/rtctransform_event)
      */
-    var onrtctransform: EventHandler<RTCTransformEvent>?
+    var onrtctransform: EventHandler<RTCTransformEvent<DedicatedWorkerGlobalScope>>?
 
     /**
      * Aborts dedicatedWorkerGlobal.
diff --git a/kotlin-browser/src/jsMain/generated/web/workers/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/workers/Event.types.kt
index de45fcd56c83f..477e12ee0ede5 100644
--- a/kotlin-browser/src/jsMain/generated/web/workers/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/workers/Event.types.kt
@@ -5,11 +5,11 @@ package web.workers
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.LANGUAGE_CHANGE: EventType<Event>
+inline val Event.Companion.LANGUAGE_CHANGE: EventType<Event<*>>
     get() = EventType("languagechange")
 
-inline val Event.Companion.OFFLINE: EventType<Event>
+inline val Event.Companion.OFFLINE: EventType<Event<*>>
     get() = EventType("offline")
 
-inline val Event.Companion.ONLINE: EventType<Event>
+inline val Event.Companion.ONLINE: EventType<Event<*>>
     get() = EventType("online")
diff --git a/kotlin-browser/src/jsMain/generated/web/workers/SharedWorkerGlobalScope.kt b/kotlin-browser/src/jsMain/generated/web/workers/SharedWorkerGlobalScope.kt
index d20329329c88e..b735ed68c17c3 100644
--- a/kotlin-browser/src/jsMain/generated/web/workers/SharedWorkerGlobalScope.kt
+++ b/kotlin-browser/src/jsMain/generated/web/workers/SharedWorkerGlobalScope.kt
@@ -20,7 +20,7 @@ sealed external class SharedWorkerGlobalScope :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SharedWorkerGlobalScope/connect_event)
      */
-    var onconnect: EventHandler<MessageEvent<*>>?
+    var onconnect: EventHandler<MessageEvent<*, SharedWorkerGlobalScope>>?
 
     /**
      * Aborts sharedWorkerGlobal.
diff --git a/kotlin-browser/src/jsMain/generated/web/workers/Worker.kt b/kotlin-browser/src/jsMain/generated/web/workers/Worker.kt
index 0aa8e267cdd18..10a20b703c2df 100644
--- a/kotlin-browser/src/jsMain/generated/web/workers/Worker.kt
+++ b/kotlin-browser/src/jsMain/generated/web/workers/Worker.kt
@@ -28,12 +28,12 @@ open external class Worker(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Worker/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, Worker>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Worker/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, Worker>>?
 
     /**
      * Clones message and transmits it to worker's global environment. transfer can be passed as a list of objects that are to be transferred rather than cloned.
diff --git a/kotlin-browser/src/jsMain/generated/web/workers/WorkerGlobalScope.kt b/kotlin-browser/src/jsMain/generated/web/workers/WorkerGlobalScope.kt
index 52a0fa8f6912c..aab291dbad9d1 100644
--- a/kotlin-browser/src/jsMain/generated/web/workers/WorkerGlobalScope.kt
+++ b/kotlin-browser/src/jsMain/generated/web/workers/WorkerGlobalScope.kt
@@ -34,22 +34,22 @@ abstract external class WorkerGlobalScope :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/error_event)
      */
-    var onerror: EventHandler<ErrorEvent>?
+    var onerror: EventHandler<ErrorEvent<WorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/languagechange_event)
      */
-    var onlanguagechange: EventHandler<Event>?
+    var onlanguagechange: EventHandler<Event<WorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/offline_event)
      */
-    var onoffline: EventHandler<Event>?
+    var onoffline: EventHandler<Event<WorkerGlobalScope>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WorkerGlobalScope/online_event)
      */
-    var ononline: EventHandler<Event>?
-    var onrejectionhandled: EventHandler<PromiseRejectionEvent>?
-    var onunhandledrejection: EventHandler<PromiseRejectionEvent>?
+    var ononline: EventHandler<Event<WorkerGlobalScope>>?
+    var onrejectionhandled: EventHandler<PromiseRejectionEvent<WorkerGlobalScope>>?
+    var onunhandledrejection: EventHandler<PromiseRejectionEvent<WorkerGlobalScope>>?
 }
diff --git a/kotlin-browser/src/jsMain/generated/web/xhr/Event.types.kt b/kotlin-browser/src/jsMain/generated/web/xhr/Event.types.kt
index e233610e4c9f8..4b1756216a418 100644
--- a/kotlin-browser/src/jsMain/generated/web/xhr/Event.types.kt
+++ b/kotlin-browser/src/jsMain/generated/web/xhr/Event.types.kt
@@ -5,5 +5,5 @@ package web.xhr
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.READY_STATE_CHANGE: EventType<Event>
+inline val Event.Companion.READY_STATE_CHANGE: EventType<Event<*>>
     get() = EventType("readystatechange")
diff --git a/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequest.kt b/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequest.kt
index a3b20dcb54162..137b72788b4f2 100644
--- a/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequest.kt
+++ b/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequest.kt
@@ -21,7 +21,7 @@ open external class XMLHttpRequest :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/XMLHttpRequest/readystatechange_event)
      */
-    var onreadystatechange: EventHandler<Event>?
+    var onreadystatechange: EventHandler<Event<XMLHttpRequest>>?
 
     /**
      * Returns client's state.
diff --git a/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequestEventTarget.kt b/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequestEventTarget.kt
index e035d450a1649..d1eefe27367f2 100644
--- a/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequestEventTarget.kt
+++ b/kotlin-browser/src/jsMain/generated/web/xhr/XMLHttpRequestEventTarget.kt
@@ -11,11 +11,11 @@ import web.events.ProgressEvent
  */
 sealed external class XMLHttpRequestEventTarget :
     EventTarget {
-    var onabort: EventHandler<ProgressEvent>?
-    var onerror: EventHandler<ProgressEvent>?
-    var onload: EventHandler<ProgressEvent>?
-    var onloadend: EventHandler<ProgressEvent>?
-    var onloadstart: EventHandler<ProgressEvent>?
-    var onprogress: EventHandler<ProgressEvent>?
-    var ontimeout: EventHandler<ProgressEvent>?
+    var onabort: EventHandler<ProgressEvent<XMLHttpRequest>>?
+    var onerror: EventHandler<ProgressEvent<XMLHttpRequest>>?
+    var onload: EventHandler<ProgressEvent<XMLHttpRequest>>?
+    var onloadend: EventHandler<ProgressEvent<XMLHttpRequest>>?
+    var onloadstart: EventHandler<ProgressEvent<XMLHttpRequest>>?
+    var onprogress: EventHandler<ProgressEvent<XMLHttpRequest>>?
+    var ontimeout: EventHandler<ProgressEvent<XMLHttpRequest>>?
 }
diff --git a/kotlin-electron/src/jsMain/kotlin/electron/core/GlobalEvent.ext.kt b/kotlin-electron/src/jsMain/kotlin/electron/core/GlobalEvent.ext.kt
index d8ef1677d7379..c707f4e2d3a92 100644
--- a/kotlin-electron/src/jsMain/kotlin/electron/core/GlobalEvent.ext.kt
+++ b/kotlin-electron/src/jsMain/kotlin/electron/core/GlobalEvent.ext.kt
@@ -3,4 +3,4 @@ package electron.core
 inline val GlobalEvent.returnValue: Any?
     get() = asDynamic().returnValue
 
-inline fun GlobalEvent.asEvent(): web.events.Event = asDynamic()
+inline fun GlobalEvent.asEvent(): web.events.Event<*> = asDynamic()
diff --git a/kotlin-mui-base/src/jsMain/generated/mui/base/ClickAwayListener.kt b/kotlin-mui-base/src/jsMain/generated/mui/base/ClickAwayListener.kt
index 4512d77cf0b2c..a28c50f692c94 100644
--- a/kotlin-mui-base/src/jsMain/generated/mui/base/ClickAwayListener.kt
+++ b/kotlin-mui-base/src/jsMain/generated/mui/base/ClickAwayListener.kt
@@ -26,7 +26,7 @@ external interface ClickAwayListenerProps : react.PropsWithChildren {
     /**
      * Callback fired when a "click away" event is detected.
      */
-    var onClickAway: (event: web.uievents.UIEvent) -> Unit
+    var onClickAway: (event: web.uievents.UIEvent<*>) -> Unit
 
     /**
      * The touch event to listen to. You can disable the listener by providing `false`.
diff --git a/kotlin-mui-base/src/jsMain/generated/mui/base/useSlider.types.kt b/kotlin-mui-base/src/jsMain/generated/mui/base/useSlider.types.kt
index 61e2a24e745f6..a5181f48702d4 100644
--- a/kotlin-mui-base/src/jsMain/generated/mui/base/useSlider.types.kt
+++ b/kotlin-mui-base/src/jsMain/generated/mui/base/useSlider.types.kt
@@ -69,7 +69,7 @@ external interface UseSliderParameters {
      * @param {number | number[]} value The new value.
      * @param {number} activeThumb Index of the currently moved thumb.
      */
-    var onChange: ((event: Event, value: dynamic, activeThumb: Number) -> Unit)?
+    var onChange: ((event: Event<*>, value: dynamic, activeThumb: Number) -> Unit)?
 
     /**
      * Callback function that is fired when the `mouseup` is triggered.
diff --git a/kotlin-mui-material/src/jsMain/generated/mui/material/Slider.kt b/kotlin-mui-material/src/jsMain/generated/mui/material/Slider.kt
index 4d2c8be13250d..98bc972797308 100644
--- a/kotlin-mui-material/src/jsMain/generated/mui/material/Slider.kt
+++ b/kotlin-mui-material/src/jsMain/generated/mui/material/Slider.kt
@@ -175,7 +175,7 @@ external interface SliderOwnProps :
      * @param {number | number[]} value The new value.
      * @param {number} activeThumb Index of the currently moved thumb.
      */
-    var onChange: ((event: Event, value: dynamic, activeThumb: Number) -> Unit)?
+    var onChange: ((event: Event<*>, value: dynamic, activeThumb: Number) -> Unit)?
 
     /**
      * Callback function that is fired when the `mouseup` is triggered.
diff --git a/kotlin-node/src/jsMain/generated/node/events/EventEmitter.kt b/kotlin-node/src/jsMain/generated/node/events/EventEmitter.kt
index 3122613e11e1d..b6c515e859fc2 100644
--- a/kotlin-node/src/jsMain/generated/node/events/EventEmitter.kt
+++ b/kotlin-node/src/jsMain/generated/node/events/EventEmitter.kt
@@ -691,7 +691,7 @@ open external class EventEmitter {
          * @experimental
          * @return Disposable that removes the `abort` listener.
          */
-        fun addAbortListener(signal: AbortSignal, resource: (event: Event) -> Unit): Disposable
+        fun addAbortListener(signal: AbortSignal, resource: (event: Event<AbortSignal>) -> Unit): Disposable
 
         /**
          * This symbol shall be used to install a listener for only monitoring `'error'`events. Listeners installed using this symbol are called before the regular`'error'` listeners are called.
diff --git a/kotlin-react-beautiful-dnd/src/jsMain/kotlin/react/beautiful/dnd/index.kt b/kotlin-react-beautiful-dnd/src/jsMain/kotlin/react/beautiful/dnd/index.kt
index 8a0637932f54e..0c697789b9b5e 100644
--- a/kotlin-react-beautiful-dnd/src/jsMain/kotlin/react/beautiful/dnd/index.kt
+++ b/kotlin-react-beautiful-dnd/src/jsMain/kotlin/react/beautiful/dnd/index.kt
@@ -505,7 +505,7 @@ sealed external interface PreDragActions {
 }
 
 sealed external interface TryGetLockOptions {
-    var sourceEvent: Event?
+    var sourceEvent: Event<*>?
 }
 
 typealias TryGetLock = (
@@ -519,7 +519,7 @@ sealed external interface SensorAPI {
     var canGetLock: (id: DraggableId) -> Boolean
     var isLockClaimed: () -> Boolean
     var tryReleaseLock: () -> Unit
-    var findClosestDraggableId: (event: Event) -> DraggableId?
+    var findClosestDraggableId: (event: Event<*>) -> DraggableId?
     var findOptionsForDraggable: (id: DraggableId) -> DraggableOptions?
 }
 
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/AnimationEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/AnimationEvent.kt
index d95410cde8e27..4fc6ac061b1e5 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/AnimationEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/AnimationEvent.kt
@@ -4,7 +4,7 @@ package react.dom.events
 
 import web.dom.Element
 
-external interface AnimationEvent<out T : Element> : SyntheticEvent<T, NativeAnimationEvent> {
+external interface AnimationEvent<out T : Element> : SyntheticEvent<T, NativeAnimationEvent<T>> {
     val animationName: String
     val elapsedTime: Double
     val pseudoElement: String
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/BaseSyntheticEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/BaseSyntheticEvent.kt
index f8bae0141fcf3..06566b72e97ab 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/BaseSyntheticEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/BaseSyntheticEvent.kt
@@ -3,10 +3,11 @@
 package react.dom.events
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 import web.time.DOMHighResTimeStamp
 
-external interface BaseSyntheticEvent<out E : Event, out C : Any, out T : Any> {
+external interface BaseSyntheticEvent<out E : Event<T>, out C : EventTarget, out T : EventTarget> {
     val nativeEvent: E
     val currentTarget: C
     val target: T
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/ChangeEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/ChangeEvent.kt
index 1977d9fc03879..4f6d331d993e0 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/ChangeEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/ChangeEvent.kt
@@ -5,6 +5,6 @@ package react.dom.events
 import web.dom.Element
 import web.events.Event
 
-external interface ChangeEvent<out T : Element> : SyntheticEvent<T, Event> {
+external interface ChangeEvent<out T : Element> : SyntheticEvent<T, Event<T>> {
     override val target: T
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/ClipboardEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/ClipboardEvent.kt
index 1601dae2cce9f..d04ef7749fad2 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/ClipboardEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/ClipboardEvent.kt
@@ -5,6 +5,6 @@ package react.dom.events
 import web.data.DataTransfer
 import web.dom.Element
 
-external interface ClipboardEvent<out T : Element> : SyntheticEvent<T, NativeClipboardEvent> {
+external interface ClipboardEvent<out T : Element> : SyntheticEvent<T, NativeClipboardEvent<T>> {
     val clipboardData: DataTransfer
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/CompositionEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/CompositionEvent.kt
index a70330350f19b..6899545afa630 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/CompositionEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/CompositionEvent.kt
@@ -4,6 +4,6 @@ package react.dom.events
 
 import web.dom.Element
 
-external interface CompositionEvent<out T : Element> : SyntheticEvent<T, NativeCompositionEvent> {
+external interface CompositionEvent<out T : Element> : SyntheticEvent<T, NativeCompositionEvent<T>> {
     val data: String
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/DragEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/DragEvent.kt
index e0e3e4fac536c..0be5cd7645927 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/DragEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/DragEvent.kt
@@ -5,6 +5,6 @@ package react.dom.events
 import web.data.DataTransfer
 import web.dom.Element
 
-external interface DragEvent<out T : Element> : MouseEvent<T, NativeDragEvent> {
+external interface DragEvent<out T : Element> : MouseEvent<T, NativeDragEvent<T>> {
     val dataTransfer: DataTransfer
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/FocusEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/FocusEvent.kt
index 766265c4a2d5b..32141f5d00a3e 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/FocusEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/FocusEvent.kt
@@ -5,7 +5,7 @@ package react.dom.events
 import web.dom.Element
 import web.events.EventTarget
 
-external interface FocusEvent<out T : Element> : SyntheticEvent<T, NativeFocusEvent> {
+external interface FocusEvent<out T : Element> : SyntheticEvent<T, NativeFocusEvent<T>> {
     val relatedTarget: EventTarget?
     override val target: T
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/FormEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/FormEvent.kt
index b5b9bb6760f1d..109ed24123a05 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/FormEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/FormEvent.kt
@@ -5,4 +5,4 @@ package react.dom.events
 import web.dom.Element
 import web.events.Event
 
-external interface FormEvent<out T : Element> : SyntheticEvent<T, Event>
+external interface FormEvent<out T : Element> : SyntheticEvent<T, Event<T>>
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/InvalidEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/InvalidEvent.kt
index 183238ee237cd..273ba7471c87d 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/InvalidEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/InvalidEvent.kt
@@ -5,6 +5,6 @@ package react.dom.events
 import web.dom.Element
 import web.events.Event
 
-external interface InvalidEvent<out T : Element> : SyntheticEvent<T, Event> {
+external interface InvalidEvent<out T : Element> : SyntheticEvent<T, Event<T>> {
     override val target: T
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/KeyboardEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/KeyboardEvent.kt
index 9aa891cb5ec10..69a17594fc2b1 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/KeyboardEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/KeyboardEvent.kt
@@ -6,7 +6,7 @@ import web.dom.Element
 import web.keyboard.KeyCode
 import web.keyboard.ModifierKeyCode
 
-external interface KeyboardEvent<out T : Element> : UIEvent<T, NativeKeyboardEvent> {
+external interface KeyboardEvent<out T : Element> : UIEvent<T, NativeKeyboardEvent<T>> {
     val altKey: Boolean
     val ctrlKey: Boolean
     val code: KeyCode
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/MouseEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/MouseEvent.kt
index 4a15f4e8ed357..c6b22379ddcea 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/MouseEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/MouseEvent.kt
@@ -8,7 +8,7 @@ import web.keyboard.ModifierKeyCode
 import web.uievents.MouseButton
 import web.uievents.MouseButtons
 
-external interface MouseEvent<out T : Element, out E : NativeMouseEvent> : UIEvent<T, E> {
+external interface MouseEvent<out T : Element, out E : NativeMouseEvent<T>> : UIEvent<T, E> {
     val altKey: Boolean
     val button: MouseButton
     val buttons: MouseButtons
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/NativeEvents.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/NativeEvents.kt
index f86cb510bb13a..49ea0670cd0f6 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/NativeEvents.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/NativeEvents.kt
@@ -2,26 +2,26 @@
 
 package react.dom.events
 
-typealias NativeAnimationEvent = web.animations.AnimationEvent
+typealias NativeAnimationEvent<T> = web.animations.AnimationEvent<T>
 
-typealias NativeClipboardEvent = web.clipboard.ClipboardEvent
+typealias NativeClipboardEvent<T> = web.clipboard.ClipboardEvent<T>
 
-typealias NativeCompositionEvent = web.uievents.CompositionEvent
+typealias NativeCompositionEvent<T> = web.uievents.CompositionEvent<T>
 
-typealias NativeDragEvent = web.uievents.DragEvent
+typealias NativeDragEvent<T> = web.uievents.DragEvent<T>
 
-typealias NativeFocusEvent = web.uievents.FocusEvent
+typealias NativeFocusEvent<T> = web.uievents.FocusEvent<T>
 
-typealias NativeKeyboardEvent = web.uievents.KeyboardEvent
+typealias NativeKeyboardEvent<T> = web.uievents.KeyboardEvent<T>
 
-typealias NativeMouseEvent = web.uievents.MouseEvent
+typealias NativeMouseEvent<T> = web.uievents.MouseEvent<T>
 
-typealias NativeTouchEvent = web.uievents.TouchEvent
+typealias NativeTouchEvent<T> = web.uievents.TouchEvent<T>
 
-typealias NativePointerEvent = web.uievents.PointerEvent
+typealias NativePointerEvent<T> = web.uievents.PointerEvent<T>
 
-typealias NativeTransitionEvent = web.cssom.TransitionEvent
+typealias NativeTransitionEvent<T> = web.cssom.TransitionEvent<T>
 
-typealias NativeUIEvent = web.uievents.UIEvent
+typealias NativeUIEvent<T> = web.uievents.UIEvent<T>
 
-typealias NativeWheelEvent = web.uievents.WheelEvent
+typealias NativeWheelEvent<T> = web.uievents.WheelEvent<T>
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/PointerEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/PointerEvent.kt
index 98a049a247e43..9a72425c4816b 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/PointerEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/PointerEvent.kt
@@ -4,7 +4,7 @@ package react.dom.events
 
 import web.dom.Element
 
-external interface PointerEvent<out T : Element> : MouseEvent<T, NativePointerEvent> {
+external interface PointerEvent<out T : Element> : MouseEvent<T, NativePointerEvent<T>> {
     val pointerId: Int
     val pressure: Double
     val tangentialPressure: Double
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/SyntheticEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/SyntheticEvent.kt
index 4510cc1a973de..c39fc7a997b4d 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/SyntheticEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/SyntheticEvent.kt
@@ -6,4 +6,4 @@ import web.dom.Element
 import web.events.Event
 import web.events.EventTarget
 
-external interface SyntheticEvent<out T : Element, out E : Event> : BaseSyntheticEvent<E, T, EventTarget>
+external interface SyntheticEvent<out T : Element, out E : Event<T>> : BaseSyntheticEvent<E, T, EventTarget>
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/TouchEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/TouchEvent.kt
index e70be60c22cc6..afe8420c3887b 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/TouchEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/TouchEvent.kt
@@ -5,7 +5,7 @@ package react.dom.events
 import web.dom.Element
 import web.keyboard.ModifierKeyCode
 
-external interface TouchEvent<out T : Element> : UIEvent<T, NativeTouchEvent> {
+external interface TouchEvent<out T : Element> : UIEvent<T, NativeTouchEvent<T>> {
     val altKey: Boolean
     val changedTouches: web.uievents.TouchList
     val ctrlKey: Boolean
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/TransitionEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/TransitionEvent.kt
index 59ba947cca950..17e9e82879f9e 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/TransitionEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/TransitionEvent.kt
@@ -4,7 +4,7 @@ package react.dom.events
 
 import web.dom.Element
 
-external interface TransitionEvent<out T : Element> : SyntheticEvent<T, NativeTransitionEvent> {
+external interface TransitionEvent<out T : Element> : SyntheticEvent<T, NativeTransitionEvent<T>> {
     val elapsedTime: Double
     val propertyName: String
     val pseudoElement: String
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/UIEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/UIEvent.kt
index b95d91310ee4a..6c8b62e33a009 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/UIEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/UIEvent.kt
@@ -5,7 +5,7 @@ package react.dom.events
 import web.dom.Element
 import web.window.Window
 
-external interface UIEvent<out T : Element, out E : NativeUIEvent> : SyntheticEvent<T, E> {
+external interface UIEvent<out T : Element, out E : NativeUIEvent<T>> : SyntheticEvent<T, E> {
     val detail: Int
     val view: Window
 }
diff --git a/kotlin-react-dom/src/jsMain/generated/react/dom/events/WheelEvent.kt b/kotlin-react-dom/src/jsMain/generated/react/dom/events/WheelEvent.kt
index 5ee1ea3b3c5be..7dc09dde0a9f1 100644
--- a/kotlin-react-dom/src/jsMain/generated/react/dom/events/WheelEvent.kt
+++ b/kotlin-react-dom/src/jsMain/generated/react/dom/events/WheelEvent.kt
@@ -4,7 +4,7 @@ package react.dom.events
 
 import web.dom.Element
 
-external interface WheelEvent<out T : Element> : MouseEvent<T, NativeWheelEvent> {
+external interface WheelEvent<out T : Element> : MouseEvent<T, NativeWheelEvent<T>> {
     val deltaMode: Int
     val deltaX: Double
     val deltaY: Double
diff --git a/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/LimitedMouseEvent.kt b/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/LimitedMouseEvent.kt
index d4b63d3808f55..978ecec8a802a 100644
--- a/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/LimitedMouseEvent.kt
+++ b/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/LimitedMouseEvent.kt
@@ -5,4 +5,4 @@ package react.router.dom
 
 import web.uievents.MouseEvent
 
-typealias LimitedMouseEvent = MouseEvent
+typealias LimitedMouseEvent = MouseEvent<*>
diff --git a/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useBeforeUnload.kt b/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useBeforeUnload.kt
index 1a92cc5d4a91b..898d8cfa39462 100644
--- a/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useBeforeUnload.kt
+++ b/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useBeforeUnload.kt
@@ -15,6 +15,6 @@ import web.window.BeforeUnloadEvent
  * `React.useCallback()`.
  */
 external fun useBeforeUnload(
-    callback: (event: BeforeUnloadEvent) -> Any?,
+    callback: (event: BeforeUnloadEvent<*>) -> Any?,
     options: UseBeforeUnloadOptions = definedExternally,
-): Unit
+)
diff --git a/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useLinkClickHandler.kt b/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useLinkClickHandler.kt
index 88f47fc2df9bb..19ed75e388524 100644
--- a/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useLinkClickHandler.kt
+++ b/kotlin-react-router-dom/src/jsMain/generated/react/router/dom/useLinkClickHandler.kt
@@ -6,7 +6,6 @@ package react.router.dom
 
 import remix.run.router.To
 import web.dom.Element
-import web.uievents.MouseEvent
 
 /**
  * Handles the click behavior for router `<Link>` components. This is useful if
@@ -16,4 +15,4 @@ import web.uievents.MouseEvent
 external fun <E : Element /* default is HTMLAnchorElement */> useLinkClickHandler(
     to: To,
     options: UseLinkClickHandlerOptions = definedExternally,
-): (event: react.dom.events.MouseEvent<E, MouseEvent>) -> Unit
+): (event: react.dom.events.MouseEvent<E, *>) -> Unit
diff --git a/kotlin-react-select/src/jsMain/kotlin/react/select/Select.kt b/kotlin-react-select/src/jsMain/kotlin/react/select/Select.kt
index 8af898d399b99..8312aef53b3a8 100644
--- a/kotlin-react-select/src/jsMain/kotlin/react/select/Select.kt
+++ b/kotlin-react-select/src/jsMain/kotlin/react/select/Select.kt
@@ -204,10 +204,10 @@ external interface SelectProps<Option : Any, Group : GroupBase<Option>> : PropsW
     var onMenuClose: (() -> Unit)?
 
     /** Fired when the user scrolls to the top of the menu */
-    var onMenuScrollToTop: ((event: UIEvent /* WheelEvent | TouchEvent */) -> Unit)?
+    var onMenuScrollToTop: ((event: UIEvent<*> /* WheelEvent | TouchEvent */) -> Unit)?
 
     /** Fired when the user scrolls to the bottom of the menu */
-    var onMenuScrollToBottom: ((event: UIEvent /* WheelEvent | TouchEvent */) -> Unit)?
+    var onMenuScrollToBottom: ((event: UIEvent<*> /* WheelEvent | TouchEvent */) -> Unit)?
 
     /** Allows control of whether the menu is opened when the Select is focused */
     var openMenuOnFocus: Boolean?
diff --git a/kotlin-react-use/src/jsMain/kotlin/react/use/useEventListener.kt b/kotlin-react-use/src/jsMain/kotlin/react/use/useEventListener.kt
index 2f81a0073b4e8..6a5909ed89177 100644
--- a/kotlin-react-use/src/jsMain/kotlin/react/use/useEventListener.kt
+++ b/kotlin-react-use/src/jsMain/kotlin/react/use/useEventListener.kt
@@ -6,7 +6,7 @@ import web.events.*
 /**
  * [Original](https://usehooks-ts.com/react-hook/use-event-listener)
  */
-fun <T : Event> useEventListener(
+fun <T : Event<*>> useEventListener(
     target: EventTarget?,
     type: EventType<T>,
     options: AddEventListenerOptions? = undefined,
diff --git a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Button.kt b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Button.kt
index 7e7022fe05d26..a000d262c6e06 100644
--- a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Button.kt
+++ b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Button.kt
@@ -28,7 +28,7 @@ external interface ButtonProps : PropsWithChildren, PropsWithClassName {
     var iconSize: Double
     var iconClassName: String
 
-    var onMouseDown: (MouseEvent) -> Unit
+    var onMouseDown: (MouseEvent<*>) -> Unit
 }
 
 @JsName("default")
diff --git a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Checkbox.kt b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Checkbox.kt
index c9627eb5645ac..34bda4542aae2 100644
--- a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Checkbox.kt
+++ b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Checkbox.kt
@@ -19,7 +19,7 @@ external interface CheckboxProps : PropsWithChildren, PropsWithClassName {
     var checked: Boolean
     var indeterminate: Boolean
     var disabled: Boolean
-    var onChange: (InputEvent) -> Unit
+    var onChange: (InputEvent<*>) -> Unit
 }
 
 @JsName("default")
diff --git a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Dropdown.kt b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Dropdown.kt
index 9988f5f6dff85..fe284874cfe84 100644
--- a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Dropdown.kt
+++ b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Dropdown.kt
@@ -25,8 +25,8 @@ external interface DropdownProps : PropsWithClassName {
     var hoverHideTimeOut: Int
     var onShow: () -> Unit
     var onHide: () -> Unit
-    var onMouseEnter: (Event) -> Unit
-    var onMouseLeave: (Event) -> Unit
+    var onMouseEnter: (Event<*>) -> Unit
+    var onMouseLeave: (Event<*>) -> Unit
     //'data-test': PropTypes.string
 }
 
diff --git a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Input.kt b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Input.kt
index 8a1728ff5faf0..5e01e6a6daf09 100644
--- a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Input.kt
+++ b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Input.kt
@@ -20,7 +20,7 @@ external interface InputProps : PropsWithClassName {
     var multiline: Boolean
     var borderless: Boolean
     var compact: Boolean
-    var onChange: (InputEvent) -> Unit
+    var onChange: (InputEvent<*>) -> Unit
     var onClear: () -> Unit
     var inputRef: RefObject<HTMLInputElement>
     var enableShortcuts: Boolean
diff --git a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Link.kt b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Link.kt
index 443a28174b94f..5969adb962619 100644
--- a/kotlin-ring-ui/src/jsMain/kotlin/ringui/Link.kt
+++ b/kotlin-ring-ui/src/jsMain/kotlin/ringui/Link.kt
@@ -15,8 +15,8 @@ external interface LinkProps : PropsWithChildren, PropsWithClassName {
     var pseudo: Boolean
     var hover: Boolean
     var href: String
-    var onPlainLeftClick: (MouseEvent) -> Unit
-    var onClick: (MouseEvent) -> Unit
+    var onPlainLeftClick: (MouseEvent<*>) -> Unit
+    var onClick: (MouseEvent<*>) -> Unit
 }
 
 @JsName("default")
diff --git a/kotlin-web/src/jsMain/generated/web/abort/AbortSignal.kt b/kotlin-web/src/jsMain/generated/web/abort/AbortSignal.kt
index aa6586385872c..85a496083014f 100644
--- a/kotlin-web/src/jsMain/generated/web/abort/AbortSignal.kt
+++ b/kotlin-web/src/jsMain/generated/web/abort/AbortSignal.kt
@@ -26,7 +26,7 @@ sealed external class AbortSignal :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/abort_event)
      */
-    var onabort: EventHandler<Event>?
+    var onabort: EventHandler<Event<AbortSignal>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/reason)
diff --git a/kotlin-web/src/jsMain/generated/web/broadcast/BroadcastChannel.kt b/kotlin-web/src/jsMain/generated/web/broadcast/BroadcastChannel.kt
index f5ab3999a5da2..ae428d3a0b780 100644
--- a/kotlin-web/src/jsMain/generated/web/broadcast/BroadcastChannel.kt
+++ b/kotlin-web/src/jsMain/generated/web/broadcast/BroadcastChannel.kt
@@ -22,12 +22,12 @@ external class BroadcastChannel(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BroadcastChannel/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, BroadcastChannel>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/BroadcastChannel/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, BroadcastChannel>>?
 
     /**
      * Closes the BroadcastChannel object, opening it up to garbage collection.
diff --git a/kotlin-web/src/jsMain/generated/web/events/CustomEvent.kt b/kotlin-web/src/jsMain/generated/web/events/CustomEvent.kt
index e4e84b0189694..7899f9207667a 100644
--- a/kotlin-web/src/jsMain/generated/web/events/CustomEvent.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/CustomEvent.kt
@@ -9,10 +9,10 @@ package web.events
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CustomEvent)
  */
-open external class CustomEvent<out D>(
-    override val type: EventType<CustomEvent<D>>,
+open external class CustomEvent<out D, out C : EventTarget?>(
+    override val type: EventType<CustomEvent<D, C>>,
     init: CustomEventInit<D> = definedExternally,
-) : Event,
+) : Event<C>,
     CustomEventInit<D> {
     /**
      * Returns any custom data event was created with. Typically used for synthetic events.
diff --git a/kotlin-web/src/jsMain/generated/web/events/Event.kt b/kotlin-web/src/jsMain/generated/web/events/Event.kt
index 7595c09bc3a0c..f3cab2750ccf4 100644
--- a/kotlin-web/src/jsMain/generated/web/events/Event.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/Event.kt
@@ -14,8 +14,8 @@ import web.time.DOMHighResTimeStamp
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event)
  */
-open external class Event(
-    open val type: EventType<Event>,
+open external class Event<out C : EventTarget?>(
+    open val type: EventType<Event<C>>,
     init: EventInit = definedExternally,
 ) : EventInit {
     /**
@@ -44,7 +44,7 @@ open external class Event(
      *
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/currentTarget)
      */
-    val currentTarget: EventTarget?
+    val currentTarget: C
 
     /**
      * Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
diff --git a/kotlin-web/src/jsMain/generated/web/events/Event.types.kt b/kotlin-web/src/jsMain/generated/web/events/Event.types.kt
index c6d2c3a794c58..de2da43963b92 100644
--- a/kotlin-web/src/jsMain/generated/web/events/Event.types.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/Event.types.kt
@@ -10,38 +10,38 @@ import seskar.js.JsValue
 
 sealed external interface EventTypes {
     @JsValue("abort")
-    val ABORT: EventType<Event>
+    val ABORT: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("cancel")
-    val CANCEL: EventType<Event>
+    val CANCEL: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("change")
-    val CHANGE: EventType<Event>
+    val CHANGE: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("close")
-    val CLOSE: EventType<Event>
+    val CLOSE: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("closing")
-    val CLOSING: EventType<Event>
+    val CLOSING: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("complete")
-    val COMPLETE: EventType<Event>
+    val COMPLETE: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("error")
-    val ERROR: EventType<Event>
+    val ERROR: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("open")
-    val OPEN: EventType<Event>
+    val OPEN: EventType<Event<*>>
         get() = definedExternally
 
     @JsValue("success")
-    val SUCCESS: EventType<Event>
+    val SUCCESS: EventType<Event<*>>
         get() = definedExternally
 }
diff --git a/kotlin-web/src/jsMain/generated/web/events/EventTarget.kt b/kotlin-web/src/jsMain/generated/web/events/EventTarget.kt
index c0df0f30d8bb1..4975db3ecb193 100644
--- a/kotlin-web/src/jsMain/generated/web/events/EventTarget.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/EventTarget.kt
@@ -11,13 +11,13 @@
 package web.events
 
 open external class EventTarget {
-    fun <T : Event> addEventListener(
+    fun <T : Event<*>> addEventListener(
         type: EventType<T>,
         callback: EventHandler<T>,
         options: AddEventListenerOptions? = definedExternally,
     )
 
-    inline fun <T : Event> addEventHandler(
+    inline fun <T : Event<*>> addEventHandler(
         type: EventType<T>,
         noinline handler: EventHandler<T>,
     ): () -> Unit =
@@ -27,7 +27,7 @@ open external class EventTarget {
             handler = handler,
         )
 
-    inline fun <T : Event> addEventHandler(
+    inline fun <T : Event<*>> addEventHandler(
         type: EventType<T>,
         options: AddEventListenerOptions?,
         noinline handler: EventHandler<T>,
@@ -39,19 +39,19 @@ open external class EventTarget {
             options = options,
         )
 
-    fun <T : Event> removeEventListener(
+    fun <T : Event<*>> removeEventListener(
         type: EventType<T>,
         callback: EventHandler<T>,
         options: EventListenerOptions? = definedExternally,
     )
 
     fun dispatchEvent(
-        event: Event,
+        event: Event<*>,
     ): Boolean
 }
 
 @PublishedApi
-internal fun <T : Event> addEventHandler(
+internal fun <T : Event<*>> addEventHandler(
     target: EventTarget,
     type: EventType<T>,
     handler: EventHandler<T>,
@@ -64,7 +64,7 @@ internal fun <T : Event> addEventHandler(
     )
 
 @PublishedApi
-internal fun <T : Event> addEventHandler(
+internal fun <T : Event<*>> addEventHandler(
     target: EventTarget,
     type: EventType<T>,
     handler: EventHandler<T>,
diff --git a/kotlin-web/src/jsMain/generated/web/events/EventType.kt b/kotlin-web/src/jsMain/generated/web/events/EventType.kt
index 7745c9b84127c..0652c0cc66637 100644
--- a/kotlin-web/src/jsMain/generated/web/events/EventType.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/EventType.kt
@@ -6,9 +6,9 @@
 
 package web.events
 
-sealed external interface EventType<out T : Event>
+sealed external interface EventType<out T : Event<*>>
 
-inline fun <T : Event> EventType(
+inline fun <T : Event<*>> EventType(
     value: String,
 ): EventType<T> =
     value.unsafeCast<EventType<T>>()
diff --git a/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.kt b/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.kt
index 107667902b5fd..5c6a92721a1ab 100644
--- a/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.kt
@@ -13,10 +13,10 @@ import js.core.JsLong
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ProgressEvent)
  */
-open external class ProgressEvent(
-    override val type: EventType<ProgressEvent>,
+open external class ProgressEvent<out C : EventTarget?>(
+    override val type: EventType<ProgressEvent<C>>,
     init: ProgressEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     ProgressEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ProgressEvent/lengthComputable)
diff --git a/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.types.kt b/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.types.kt
index 2ef20eb39db4d..146c7387843b4 100644
--- a/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.types.kt
+++ b/kotlin-web/src/jsMain/generated/web/events/ProgressEvent.types.kt
@@ -10,30 +10,30 @@ import seskar.js.JsValue
 
 sealed external interface ProgressEventTypes {
     @JsValue("abort")
-    val ABORT: EventType<ProgressEvent>
+    val ABORT: EventType<ProgressEvent<*>>
         get() = definedExternally
 
     @JsValue("error")
-    val ERROR: EventType<ProgressEvent>
+    val ERROR: EventType<ProgressEvent<*>>
         get() = definedExternally
 
     @JsValue("load")
-    val LOAD: EventType<ProgressEvent>
+    val LOAD: EventType<ProgressEvent<*>>
         get() = definedExternally
 
     @JsValue("loadend")
-    val LOAD_END: EventType<ProgressEvent>
+    val LOAD_END: EventType<ProgressEvent<*>>
         get() = definedExternally
 
     @JsValue("loadstart")
-    val LOAD_START: EventType<ProgressEvent>
+    val LOAD_START: EventType<ProgressEvent<*>>
         get() = definedExternally
 
     @JsValue("progress")
-    val PROGRESS: EventType<ProgressEvent>
+    val PROGRESS: EventType<ProgressEvent<*>>
         get() = definedExternally
 
     @JsValue("timeout")
-    val TIMEOUT: EventType<ProgressEvent>
+    val TIMEOUT: EventType<ProgressEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.kt b/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.kt
index ad98fd7499d59..0abae0b32c638 100644
--- a/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.kt
+++ b/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.kt
@@ -8,6 +8,7 @@ package web.messaging
 
 import js.array.ReadonlyArray
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -15,10 +16,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessageEvent)
  */
-open external class MessageEvent<out D>(
-    override val type: EventType<MessageEvent<D>>,
+open external class MessageEvent<out D, out C : EventTarget?>(
+    override val type: EventType<MessageEvent<D, C>>,
     init: MessageEventInit<D> = definedExternally,
-) : Event,
+) : Event<C>,
     MessageEventInit<D> {
     /**
      * Returns the data of the message.
diff --git a/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.types.kt b/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.types.kt
index 3257238952ea1..fed8036bbd5e8 100644
--- a/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.types.kt
+++ b/kotlin-web/src/jsMain/generated/web/messaging/MessageEvent.types.kt
@@ -11,14 +11,14 @@ import web.events.EventType
 
 sealed external interface MessageEventTypes {
     @JsValue("connect")
-    val CONNECT: EventType<MessageEvent<*>>
+    val CONNECT: EventType<MessageEvent<*, *>>
         get() = definedExternally
 
     @JsValue("message")
-    val MESSAGE: EventType<MessageEvent<*>>
+    val MESSAGE: EventType<MessageEvent<*, *>>
         get() = definedExternally
 
     @JsValue("messageerror")
-    val MESSAGE_ERROR: EventType<MessageEvent<*>>
+    val MESSAGE_ERROR: EventType<MessageEvent<*, *>>
         get() = definedExternally
 }
diff --git a/kotlin-web/src/jsMain/generated/web/messaging/MessagePort.kt b/kotlin-web/src/jsMain/generated/web/messaging/MessagePort.kt
index 625bfda7f66ee..47aae4a1bbc02 100644
--- a/kotlin-web/src/jsMain/generated/web/messaging/MessagePort.kt
+++ b/kotlin-web/src/jsMain/generated/web/messaging/MessagePort.kt
@@ -20,12 +20,12 @@ sealed external class MessagePort :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessagePort/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, MessagePort>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessagePort/messageerror_event)
      */
-    var onmessageerror: EventHandler<MessageEvent<*>>?
+    var onmessageerror: EventHandler<MessageEvent<*, MessagePort>>?
 
     /**
      * Disconnects the port, so that it is no longer active.
diff --git a/kotlin-web/src/jsMain/generated/web/performance/Event.types.kt b/kotlin-web/src/jsMain/generated/web/performance/Event.types.kt
index 1135376f8d3d9..148426a71efdb 100644
--- a/kotlin-web/src/jsMain/generated/web/performance/Event.types.kt
+++ b/kotlin-web/src/jsMain/generated/web/performance/Event.types.kt
@@ -5,5 +5,5 @@ package web.performance
 import web.events.Event
 import web.events.EventType
 
-inline val Event.Companion.RESOURCE_TIMING_BUFFER_FULL: EventType<Event>
+inline val Event.Companion.RESOURCE_TIMING_BUFFER_FULL: EventType<Event<*>>
     get() = EventType("resourcetimingbufferfull")
diff --git a/kotlin-web/src/jsMain/generated/web/performance/Performance.kt b/kotlin-web/src/jsMain/generated/web/performance/Performance.kt
index b4141980ff6de..24253046891dd 100644
--- a/kotlin-web/src/jsMain/generated/web/performance/Performance.kt
+++ b/kotlin-web/src/jsMain/generated/web/performance/Performance.kt
@@ -22,7 +22,7 @@ sealed external class Performance :
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Performance/resourcetimingbufferfull_event)
      */
-    var onresourcetimingbufferfull: EventHandler<Event>?
+    var onresourcetimingbufferfull: EventHandler<Event<Performance>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Performance/timeOrigin)
diff --git a/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.kt b/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.kt
index 2fa83dc245a06..f6db2d1ed06e8 100644
--- a/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.kt
+++ b/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.kt
@@ -9,15 +9,16 @@ package web.promise
 import js.errors.JsError
 import js.promise.Promise
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent)
  */
-open external class PromiseRejectionEvent(
-    override val type: EventType<PromiseRejectionEvent>,
+open external class PromiseRejectionEvent<out C : EventTarget?>(
+    override val type: EventType<PromiseRejectionEvent<C>>,
     init: PromiseRejectionEventInit,
-) : Event,
+) : Event<C>,
     PromiseRejectionEventInit {
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent/promise)
diff --git a/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.types.kt b/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.types.kt
index d16ac7c656a20..3be48c10d81d6 100644
--- a/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.types.kt
+++ b/kotlin-web/src/jsMain/generated/web/promise/PromiseRejectionEvent.types.kt
@@ -11,10 +11,10 @@ import web.events.EventType
 
 sealed external interface PromiseRejectionEventTypes {
     @JsValue("rejectionhandled")
-    val REJECTION_HANDLED: EventType<PromiseRejectionEvent>
+    val REJECTION_HANDLED: EventType<PromiseRejectionEvent<*>>
         get() = definedExternally
 
     @JsValue("unhandledrejection")
-    val UNHANDLED_REJECTION: EventType<PromiseRejectionEvent>
+    val UNHANDLED_REJECTION: EventType<PromiseRejectionEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.kt b/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.kt
index a6c4a14a98d6e..c57fd79773e38 100644
--- a/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.kt
+++ b/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.kt
@@ -7,6 +7,7 @@
 package web.sockets
 
 import web.events.Event
+import web.events.EventTarget
 import web.events.EventType
 
 /**
@@ -14,10 +15,10 @@ import web.events.EventType
  *
  * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CloseEvent)
  */
-open external class CloseEvent(
-    override val type: EventType<CloseEvent>,
+open external class CloseEvent<out C : EventTarget?>(
+    override val type: EventType<CloseEvent<C>>,
     init: CloseEventInit = definedExternally,
-) : Event,
+) : Event<C>,
     CloseEventInit {
     /**
      * Returns the WebSocket connection close code provided by the server.
diff --git a/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.types.kt b/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.types.kt
index 50510356554f3..7a7c644a9c739 100644
--- a/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.types.kt
+++ b/kotlin-web/src/jsMain/generated/web/sockets/CloseEvent.types.kt
@@ -11,6 +11,6 @@ import web.events.EventType
 
 sealed external interface CloseEventTypes {
     @JsValue("close")
-    val CLOSE: EventType<CloseEvent>
+    val CLOSE: EventType<CloseEvent<*>>
         get() = definedExternally
 }
diff --git a/kotlin-web/src/jsMain/generated/web/sockets/WebSocket.kt b/kotlin-web/src/jsMain/generated/web/sockets/WebSocket.kt
index 48ff7cb8dc66e..52239b8be9249 100644
--- a/kotlin-web/src/jsMain/generated/web/sockets/WebSocket.kt
+++ b/kotlin-web/src/jsMain/generated/web/sockets/WebSocket.kt
@@ -65,22 +65,22 @@ external class WebSocket(
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/close_event)
      */
-    var onclose: EventHandler<CloseEvent>?
+    var onclose: EventHandler<CloseEvent<WebSocket>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/error_event)
      */
-    var onerror: EventHandler<Event>?
+    var onerror: EventHandler<Event<WebSocket>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/message_event)
      */
-    var onmessage: EventHandler<MessageEvent<*>>?
+    var onmessage: EventHandler<MessageEvent<*, WebSocket>>?
 
     /**
      * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/open_event)
      */
-    var onopen: EventHandler<Event>?
+    var onopen: EventHandler<Event<WebSocket>>?
 
     /**
      * Returns the subprotocol selected by the server, if any. It can be used in conjunction with the array form of the constructor's second argument to perform subprotocol negotiation.