Implemented more border shorthands