Issue 396: code formatting

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.

I just noticed that I do also have the changes removing the theme issues in the layout files. Let me know if I should go ahead and close the pull request to remove those changes (so that the commit will only be addressing issue 396).