Use base metric when available
Tweaked media-query boundary
Improved RTL support