Some package and hot-key fine-tuning