Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.