More theme changes, added combinator to solution so it will deploy easier