Updated sparkle; updated compiler defines for better granularity.