move all account name definitions into settings, and fix some style issues