Adapted to new strip and layer options (v0.9.21)