Fill in missing block names.
Add script for combining color maps.
New default block colors.