add support for colored themes again and fix the caching crash