cleanup code, make the title change color too