LB-751: Theme structure refactoring - use base theme

Fixed scrolling.