Refactored HTML5 text input addon

Avoids upcoming SASS varialbe rescoping issues.
Refactored HTML5 button input addon

Avoids upcoming SASS varialbe rescoping issues.