(refactor): Save settings last; custom assets flag field