ROOMS-229: Clean the theme layer

ROOMS-229: Clean the theme layer