Fix themes compatibility stuff
Merge branch 'thm' of https://github.com/sssemil/Antox into sssemil-thm
Merge branch 'sssemil-thm'