fix dotsource variable for extras/.colors; rename variables; move some lines around
fix dotsource variable for extras/.colors; rename variables; move some lines around

americanhanko/dotfiles,americanhanko/dotfiles,americanhanko/dotfiles