Great refactor

Same thing for greatRefactor branch (move animation option to plugins).