Added remaining blocks.

Bug fix: color now set correctly.