Updated screen mixins

Include iPhone 6 and iPhone 6 Plus