update pages index
recolor
fix merge conflict