Take out comments. Seems to pass tests.
Fix <apps> h key
Separate theme component and keymap caches.