Issue #59 - changes resulting from Theme Check run