refactor EventType (BEWARE)

also update headers
refactor event types 2
Merge branch 'feat-mask' into develop