working on #191: improving app mode change behaviour
working on #191: jalopy