Simplify media queries, stop relying on media type

See #934 

![Monday](http://www.stupidgifs.com/images/full/855.gif)