Feat/bubble media queries

A WIP PR for bubbling media queries.