Updated w/ more accurate color scheme
Merged Upstream