Rename variables for consistency
Refine BasicTheme animation