tweaked Astyle configuration
few manual changes Astyle couldn't catch
template type name changes again