add links, modify some colors
Merge branch 'work'