Separated base theme into layout and theme