Merge from master

Also, updated page indicator colors.