cleaning up and changing theme