BluePimp: Merge in Pimped once-again