Fixed desktop resolution problems, added mate_points conditions