Fixes everything being red
Manually applies latest commit from master