bug fix + new themes structure