Move some more media query stuff into the media-queries file