dir -> path
apply_edit_and_module_theme -> apply_edit_with_module_themes
edit_on_convert_to_theme_object -> edit_on_convert_module_theme_to_edit_theme
convert_to_theme_object -> convert_to_edit_theme
Logic catch
Describe better