De-symbol-ised the config.
Updated to use the new layout names.