Add configuration options separate_buffer and buffer_style