Track our own keymaster.
[1/2]New Theme engine: Add dependencies to build.

Thanks to Any Mast

And do some house cleaning
Conflicts:
	default.xml
Added "s" for Theme(s)Provider to appease my OCD.