Initial versions
Fix numbered shortcuts