Adopting the new ICONV configuration variables
Adopting new macros helping with options

Removed several lines using helping macro
Plist related definitions are under the automatically generated