Update to match Carbon and fix pie style