Style updates using latest versions from Anita. Work in progress