HG-34 Add categories and refactor some animations