[Finish #43945315] Multiple style changes