Rename animations for readibility (added hyphens), remove no longer used animations, adjust timings