Revert "cm-11 themes: Build new ThemesProvider"

This reverts commit 942bf85d3cce81125e403725618d81f3510d8aaa.