Updates for themes submitted by @jaytaylor