Merge pull request #6530 from Ixiter/develop-theme-frio