Update theme code to add some modifications to original

Some commenters on the author's blog article provided some enhancements.