Fix deprecated calls, and styles
Created by: sbsrouteur
Sorry for messing the rebase but git.... I did merge from your last changes, hopefully it's more or less the same.
Created by: sbsrouteur
Sorry for messing the rebase but git.... I did merge from your last changes, hopefully it's more or less the same.