theme changes and minor polipo change