Close #51 #53: lighten colors and fix small bugs