fix the timer stepping and on*Event prefix
remove redundant states, organise imports
use on*Event prefix
throw error when no default theme is set