Use newest doms event framework 1.6 and update the code to match