Rebuild with new style