TODO points 1 & 2 done. Cmd color text fixed.