Refactored the way hot keys were managed.