revert almost all changes to providers. persist colors and avoid duplicates inside store/account