Added colour support and window headers