Add settings for line width & mappings
Merge conflicts