task #00023-Vinos_edit_form_theme: Themed
Merge branch '00023-Vinos_edit_form_theme' into develop