Use namespaces for events, clean up animate override