Improve the regex for matching screens