Add better support for rounded corners

Is there better naming convention in mind?