Cleaned up, added new colors, removed deuplicate #include.