add several settings

add several settings

fix highlight color on terminal
add several settings
update merge