Got rid of themes backtracking