changed themeprovider branch