Updated to upstream release, should fix fedup issues with f20 keys
Add archmap and also k20 keys