Sync with theme-nbs project