Issue 396 - Adjusting for code style.

Changes to address the lint problem with themes were made and removed so that there would be only one issue addressed in the pull request (that is why there are two commits).

The only changes are now those to address code formatting, resource file naming, and a couple of method name changes.