Add different outline modes (#937)