Language and 2 window kinds added