Change colors to use rgb model
Change block catagogy icons to match new colors

Change-Id: I7b88886d3709bb2d817518b4d1bff00a23502d14