Major update for Sparkling theme

This update focusses on error free usage, more flexibility for
developers and some code cleanup.