mcornella Merge pull request #7079 from mcornella/refactor-trapd00r-theme …