Merge label styles, slightly tweak border color