Add border variable, change border radius variable unit