Minor bug in saving themes causing field name mapping to be ignored