Added built in icon support and mac colour scheme