LB-751: Theme structure refactoring - use base theme

Added update status.