Added more animation, updated colors