Fix bug with unsetThemeState + more tests.