Version 2 merge

Main feature colored part pages added.