Merge pull request #12 from nigelgbanks/7.x-filename-conventions

Filename conventions.
Forgot the theme