cleaned up theme