Added border mixin to base
Added block variables to settings