Fix deprecated config keys
Update style