Fixing more highlighting issues with @media blocks