Merge pull request #9972 from MrPetovan/task/9971-frio-default-theme