streamline theme a bit