Be more careful when defining/parsing theme keys.
Be careful with command remapping.