theme combined
both themes merged
wrong conditions fix
3 pages fixes