merge
Separated sliders for x-height
Merged conflicts