Thanks, I did start from the Figma kit, I am just wondering if there is a simple solution to swapping out the components. I have worked around it by copying a layout from the library and pasting to replace, but this is not the best solution as it affects the entire layout spacing