Fix infinite worlds, less color changes