Finish consolidating reset form styles into base form styles