added git and color options