Demos update: markup changes to new style indicators