SWC-1938: conversion to bootstrap only, still needs rewrite into xml