Remove image module dependency
Theme work