Fix crop bug
Fixed theme logic
Updated schedule