unify theme in progress, mostly working