Fixed imports
Merged branch 'scope-colors' (woops)