YOSPOS theme fixes