Removed duplicate NameToKey calls
Xojo tabstops
Merge branch 'hotfix/Fix_double_hex_encoding'