Integrated term color definitions into color theme
Corrected vrious color definitions