Some style things made by Juha returned from earlier versions