Modifications to work with Lightt preview.