refactor cycle-theme; add context ido-color changes