Remove redondant code source files. Add a new color scheme to the visualization (more a testing thing than a useful thing).
Fix conflicts.