glib: Merge type and color columns in annotations demo