added final touches on form theming