3060-3066 3053-3058 (input-related 'refactorings' and subsequent bugfixes and squabbling) reversions went without any merge conflicts, so I think it's OK. your key bindings may be history through, sorry.
some fixes to subor keyboard layot (anyway, unused currently, todo: reckeck key mapping)
[[Split portion of a mixed commit.]]