LB-751: Theme structure refactoring - use base theme

Build fixed.