Merge pull request #3819 from ptpt52/theme