Imported NOA and fixed some theme errors