Changed more files around, ensured the color per line is working correctly.