Better label handling, block type colors