cleaned up SCH and replaced components with correct Sparkle ID's