Ecrit.setup update and windows.launch name fix