add themes
fix graph draw
fix merge miss...