themes, preview button, paging toolbar, cherry-pick last changes from dev