Change colors, refactor header and dictionary entry into components