Updated theming and labels
Updating demo page and README