Add Flat-UI bits