Further improvements to the default style handling