Merge pull request #1207 from etimberg/feature/v2.0-scale-refactor

Move more scale configs into the scale defaults.