Add rainbow-mode + cleanup