New watch script (wip), corrected templates