Added new base styles and templates