I only can outline the things you need to do. You can remap your keys in the file called corgi.xmodmap. It's in the /etc/X11/xkb/ directory.
Here you can remap your Address, Calendar and the Japanese keys too. Study the file a bit and you can remap them correctly.
The keycodes are: for the Japanese keys: 129, 130; for the Calendar, Address: 96, 97.
Good luck!
Zumi