[New] Affinity Lists Revamp