Even more aesthetically pleasing
Fix some color things