add themes + fix event handler