Ensure fall through for the same type.
Change to use border options.