Theme JMC
Make keystore selection work
We have 0.8.3