Improve x-rem mixin