Reskin to be more in line with Material theme