Finished working with theme aspects of Iris