Increased variable support

Added an enumerator to include variable types and unify variables across the plugin. Added the variables listed in the issues section and others that I came up with on my own. Added support for the new variables in the text formatter class.

*I accidentally put in an old package name the first time (to edit it in my compiler), so that is what the last two commits are fixing.*