partial transition to new pbp theme