Enable PowerLine fonts
Adjust settings
Merge changes