clavier and touchy updates

Clavier now has a load of internal additions,
for greater extensibiity.

It's original theme, and the touch-bar theme,
have been merged into one.

Some bug fixes and improvements have been made
to touchy, solving problems with inconsistencies between
touch and non-touch versions of events.