Update component files to match new montage idioms and components