thesis: Re-write event hooks