Fixed some files; new color scheme depending on machine