diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 5b3702c..d3a5a13 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -249,19 +249,28 @@
 	(":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"),
 	(":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"),
 	(":Mac:Build:Printing.mcp", "Printing.ppc"),
+	(":Mac:Build:AE.mcp", "AE.ppc"),
 	(":Mac:Build:App.mcp", "App.ppc"),
 	(":Mac:Build:Cm.mcp", "Cm.ppc"),
+	(":Mac:Build:Ctl.mcp", "Ctl.ppc"),
+	(":Mac:Build:Dlg.mcp", "Dlg.ppc"),
+	(":Mac:Build:Drag.mcp", "Drag.ppc"),
+	(":Mac:Build:Evt.mcp", "Evt.ppc"),
 	(":Mac:Build:Fm.mcp", "Fm.ppc"),
 	(":Mac:Build:Help.mcp", "Help.ppc"),
 	(":Mac:Build:Icn.mcp", "Icn.ppc"),
 	(":Mac:Build:List.mcp", "List.ppc"),
+	(":Mac:Build:Menu.mcp", "Menu.ppc"),
+	(":Mac:Build:Mlte.mcp", "Mlte.ppc"),
+	(":Mac:Build:Qd.mcp", "Qd.ppc"),
 	(":Mac:Build:Qdoffs.mcp", "Qdoffs.ppc"),
 	(":Mac:Build:Qt.mcp", "Qt.ppc"),
+	(":Mac:Build:Res.mcp", "Res.ppc"),
 	(":Mac:Build:Scrap.mcp", "Scrap.ppc"),
 	(":Mac:Build:Snd.mcp", "Snd.ppc"),
 	(":Mac:Build:Sndihooks.mcp", "Sndihooks.ppc"),
 	(":Mac:Build:TE.mcp", "TE.ppc"),
-	(":Mac:Build:Mlte.mcp", "Mlte.ppc"),
+	(":Mac:Build:Win.mcp", "Win.ppc"),
 	]),
 
 I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
@@ -277,20 +286,29 @@
 	(":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
 ##	(":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"),
 	(":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
+	(":Mac:Build:AE.carbon.mcp", "AE.carbon"),
 	(":Mac:Build:App.carbon.mcp", "App.carbon"),
+	(":Mac:Build:CF.carbon.mcp", "CF.carbon"),
 	(":Mac:Build:Cm.carbon.mcp", "Cm.carbon"),
+	(":Mac:Build:Ctl.carbon.mcp", "Ctl.carbon"),
+	(":Mac:Build:Dlg.carbon.mcp", "Dlg.carbon"),
+	(":Mac:Build:Drag.carbon.mcp", "Drag.carbon"),
+	(":Mac:Build:Evt.carbon.mcp", "Evt.carbon"),
 	(":Mac:Build:Fm.carbon.mcp", "Fm.carbon"),
 	(":Mac:Build:Icn.carbon.mcp", "Icn.carbon"),
 	(":Mac:Build:List.carbon.mcp", "List.carbon"),
+	(":Mac:Build:Menu.carbon.mcp", "Menu.carbon"),
+	(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
+	(":Mac:Build:Qd.carbon.mcp", "Qd.carbon"),
 	(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"),
 	(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"),
+	(":Mac:Build:Res.carbon.mcp", "Res.carbon"),
 	(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"),
 	(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"),
 	(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"),
 	(":Mac:Build:TE.carbon.mcp", "TE.carbon"),
+	(":Mac:Build:Win.carbon.mcp", "Win.carbon"),
 	
-	(":Mac:Build:CF.carbon.mcp", "CF.carbon"),
-	(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
 	]),
 
 I_PPC_FULL : (buildmwproject, "CWIE", [
diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index b7d2f6c..ead0c24 100644
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -105,39 +105,31 @@
 	genpluginproject("all", "_testcapi")
 	
 	# bgen-generated Toolbox modules
+	genpluginproject("carbon", "AE")
+	genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"])
 	genpluginproject("ppc", "App", libraries=["AppearanceLib"])
 	genpluginproject("carbon", "App")
-##	genpluginproject("ppc", "Cm",
-##		libraries=["QuickTimeLib"],
-##		extraexportsymbols=[
-##			"CmpObj_New",
-##			"CmpObj_Convert",
-##			"CmpInstObj_New",
-##			"CmpInstObj_Convert",
-##		])
-##	genpluginproject("carbon", "Cm",
-##		extraexportsymbols=[
-##			"CmpObj_New",
-##			"CmpObj_Convert",
-##			"CmpInstObj_New",
-##			"CmpInstObj_Convert",
-##		])
 	genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"])
 	genpluginproject("carbon", "Cm")
+	genpluginproject("carbon", "Ctl")
+	genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"])
+	genpluginproject("carbon", "Dlg")
+	genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"])
+	genpluginproject("carbon", "Drag")
+	genpluginproject("ppc", "Drag", libraries=["DragLib"])
+	genpluginproject("all", "Evt")
 	genpluginproject("all", "Fm")
 	genpluginproject("ppc", "Help")
 	genpluginproject("ppc", "Icn", libraries=["IconServicesLib"])
 	genpluginproject("carbon", "Icn")
 	genpluginproject("all", "List")
-##	genpluginproject("ppc", "Qt", libraries=["QuickTimeLib", "Cm.ppc.slb", "Qdoffs.ppc.slb"], 
-##			extradirs=["::Plugins"])
+	genpluginproject("carbon", "Menu")
+	genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"])
+	genpluginproject("all", "Qd")
 	genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"])
-##	genpluginproject("carbon", "Qt", libraries=["Cm.carbon.slb", "Qdoffs.carbon.slb"],
-##			extradirs=["::Plugins"])
 	genpluginproject("carbon", "Qt")
-##	genpluginproject("all", "Qdoffs",
-##		extraexportsymbols=["GWorldObj_New", "GWorldObj_Convert"])
 	genpluginproject("all", "Qdoffs")
+	genpluginproject("all", "Res")
 	genpluginproject("all", "Scrap")
 	genpluginproject("ppc", "Snd", libraries=["SoundLib"])
 	genpluginproject("carbon", "Snd")
@@ -146,7 +138,8 @@
 	genpluginproject("carbon", "TE")
 	genpluginproject("ppc", "Mlte", libraries=["Textension"])
 	genpluginproject("carbon", "Mlte")
-	
+	genpluginproject("carbon", "Win")
+	genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"])
 	# Carbon Only?
 	genpluginproject("carbon", "CF")