Improve default style + make the base class the default style