You can use WAT Fix for removing problematic activators and activate with Windows Loader or Microsoft Toolkit.
I am not 100% sure for Windows Thin PC (is it possible to add it on W7 AIO disc) because it's an embedded Windows.
I provide download links of every version of Windows 7 (except Home Basic 64-bit which official ISO doesn't exist) for making W7 AIO ISO.