Fixed animation, cleaned up color code