Added Theme specific HTML builders for Theme styles
Updated templates to use theme HTML style