Corrected coder violations.
Resolved merge conflict.
Corrected error in merge correction.
Reverted button type to submit.
Merge pull request #36 from MorganDawe/7.x-Theme_Feedback

7.x theme feedback