Try to make theme consistent across Windows 7/8