Update supalette fields too and move this function (See #1)