Updating package
Refactoring includes to be css.
Refactoring checkbox variables
Merging in radio button variables