moved some styles to services, base