themes and animations fix