updated colors in light, dark and theme files, in template file basic colors uses variables from dark/light files, also changed  to -basic in some files