LB-751: Theme structure refactoring - use base theme

fixed simpler themes.