Updated FAPI form field wrappers.
Updated template.php to contain the relevant classes