Add new condition to GetCurrCol(), fixes #15
Change mapping cmds for color insertion, fixes #16