Separately switch in ordinary plugins and themes. Change the convention for plugin information to use dashes rather than camel case.