Added formatters for non translatable options
Corrected CS