Rename / ignore
refactor, better colors