replace dependent PoP with new independent style