Adding terminal control and coloring