Put some commotio files in their place, and comment out themes
Reworking OTA tools, half way point