Combine ThemePluginImpl into Mage Client project to avoid cycling dependency.
fix a bug of package importation that cause code not be able to compiled
update and adjustment