Finished hotkey refactoring. New matches and rejoining matches work again, but joining doesn't yet.