Updated Amstrad PCW mappings