ROOMS-229: Clean the theme layer
Merge pull request #64 from plopesc/rooms-229

ROOMS-229: Clean the theme layer