Reverted to working version

Reverted to core version that does not have a menu style, and uses the
internal global symbols for settings.