Adding more generic border radius variables