VLB-10: First changes to adapt base-theme css