Cleanup, graphite theme