Add some more named non-escape windows