wip for @CustomProvider usage
Replace ManualReveal* with @CustomProvider
Refactore missing presenters