Kiosk rebase, mostly done. [#72120260]