#55: Merge and fix General settings