mergin form_styles branch to master (along with other files...)