diff --git a/Makefile.in b/Makefile.in
index 9c4dcdf98e..aab321119f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4099,6 +4099,16 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_propgridiface.o \
 	monodll_propgridpagestate.o \
 	monodll_props.o \
+	monodll_art_internal.o \
+	monodll_art_msw.o \
+	monodll_art_aui.o \
+	monodll_bar.o \
+	monodll_ribbon_buttonbar.o \
+	monodll_ribbon_control.o \
+	monodll_gallery.o \
+	monodll_page.o \
+	monodll_panel.o \
+	monodll_ribbon_toolbar.o \
 	monodll_richtextctrl.o \
 	monodll_richtextbuffer.o \
 	monodll_richtextstyles.o \
@@ -4221,7 +4231,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_wrapsizer.o \
 	monodll_xpmdecod.o \
 	monodll_busyinfo.o \
-	monodll_buttonbar.o \
+	monodll_generic_buttonbar.o \
 	monodll_choicdgg.o \
 	monodll_choicbkg.o \
 	monodll_combog.o \
@@ -4414,7 +4424,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_wrapsizer.o \
 	monodll_xpmdecod.o \
 	monodll_busyinfo.o \
-	monodll_buttonbar.o \
+	monodll_generic_buttonbar.o \
 	monodll_choicdgg.o \
 	monodll_choicbkg.o \
 	monodll_combog.o \
@@ -5899,6 +5909,16 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_propgridiface.o \
 	monolib_propgridpagestate.o \
 	monolib_props.o \
+	monolib_art_internal.o \
+	monolib_art_msw.o \
+	monolib_art_aui.o \
+	monolib_bar.o \
+	monolib_ribbon_buttonbar.o \
+	monolib_ribbon_control.o \
+	monolib_gallery.o \
+	monolib_page.o \
+	monolib_panel.o \
+	monolib_ribbon_toolbar.o \
 	monolib_richtextctrl.o \
 	monolib_richtextbuffer.o \
 	monolib_richtextstyles.o \
@@ -6021,7 +6041,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_wrapsizer.o \
 	monolib_xpmdecod.o \
 	monolib_busyinfo.o \
-	monolib_buttonbar.o \
+	monolib_generic_buttonbar.o \
 	monolib_choicdgg.o \
 	monolib_choicbkg.o \
 	monolib_combog.o \
@@ -6214,7 +6234,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_wrapsizer.o \
 	monolib_xpmdecod.o \
 	monolib_busyinfo.o \
-	monolib_buttonbar.o \
+	monolib_generic_buttonbar.o \
 	monolib_choicdgg.o \
 	monolib_choicbkg.o \
 	monolib_combog.o \
@@ -16130,6 +16150,36 @@ monodll_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(MONO
 monodll_props.o: $(srcdir)/src/propgrid/props.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
 
+monodll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
+
+monodll_art_msw.o: $(srcdir)/src/ribbon/art_msw.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/art_msw.cpp
+
+monodll_art_aui.o: $(srcdir)/src/ribbon/art_aui.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/art_aui.cpp
+
+monodll_bar.o: $(srcdir)/src/ribbon/bar.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/bar.cpp
+
+monodll_ribbon_buttonbar.o: $(srcdir)/src/ribbon/buttonbar.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/buttonbar.cpp
+
+monodll_ribbon_control.o: $(srcdir)/src/ribbon/control.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/control.cpp
+
+monodll_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/gallery.cpp
+
+monodll_page.o: $(srcdir)/src/ribbon/page.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp
+
+monodll_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp
+
+monodll_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+
 monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
 
@@ -18521,7 +18571,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
 
-@COND_USE_GUI_1@monodll_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@monodll_generic_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
 
 @COND_USE_GUI_1@monodll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONODLL_ODEP)
@@ -20870,6 +20920,36 @@ monolib_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(MONO
 monolib_props.o: $(srcdir)/src/propgrid/props.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
 
+monolib_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
+
+monolib_art_msw.o: $(srcdir)/src/ribbon/art_msw.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_msw.cpp
+
+monolib_art_aui.o: $(srcdir)/src/ribbon/art_aui.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_aui.cpp
+
+monolib_bar.o: $(srcdir)/src/ribbon/bar.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/bar.cpp
+
+monolib_ribbon_buttonbar.o: $(srcdir)/src/ribbon/buttonbar.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/buttonbar.cpp
+
+monolib_ribbon_control.o: $(srcdir)/src/ribbon/control.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/control.cpp
+
+monolib_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/gallery.cpp
+
+monolib_page.o: $(srcdir)/src/ribbon/page.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp
+
+monolib_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp
+
+monolib_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+
 monolib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
 
@@ -23261,7 +23341,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
 
-@COND_USE_GUI_1@monolib_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@monolib_generic_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
 
 @COND_USE_GUI_1@monolib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONOLIB_ODEP)
diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 82a35dd4cf..60dab23377 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -5,7 +5,8 @@
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
             $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(QA_SRC)
-            $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RICHTEXT_SRC) $(STC_SRC)
+            $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) $(RICHTEXT_SRC)
+            $(STC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 1a65bf39e5..0a09b92557 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1566,6 +1566,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_propgridiface.obj \
 	$(OBJS)\monodll_propgridpagestate.obj \
 	$(OBJS)\monodll_props.obj \
+	$(OBJS)\monodll_art_internal.obj \
+	$(OBJS)\monodll_art_msw.obj \
+	$(OBJS)\monodll_art_aui.obj \
+	$(OBJS)\monodll_bar.obj \
+	$(OBJS)\monodll_buttonbar.obj \
+	$(OBJS)\monodll_control.obj \
+	$(OBJS)\monodll_gallery.obj \
+	$(OBJS)\monodll_page.obj \
+	$(OBJS)\monodll_panel.obj \
+	$(OBJS)\monodll_toolbar.obj \
 	$(OBJS)\monodll_richtextctrl.obj \
 	$(OBJS)\monodll_richtextbuffer.obj \
 	$(OBJS)\monodll_richtextstyles.obj \
@@ -2252,6 +2262,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_propgridiface.obj \
 	$(OBJS)\monolib_propgridpagestate.obj \
 	$(OBJS)\monolib_props.obj \
+	$(OBJS)\monolib_art_internal.obj \
+	$(OBJS)\monolib_art_msw.obj \
+	$(OBJS)\monolib_art_aui.obj \
+	$(OBJS)\monolib_bar.obj \
+	$(OBJS)\monolib_buttonbar.obj \
+	$(OBJS)\monolib_control.obj \
+	$(OBJS)\monolib_gallery.obj \
+	$(OBJS)\monolib_page.obj \
+	$(OBJS)\monolib_panel.obj \
+	$(OBJS)\monolib_toolbar.obj \
 	$(OBJS)\monolib_richtextctrl.obj \
 	$(OBJS)\monolib_richtextbuffer.obj \
 	$(OBJS)\monolib_richtextstyles.obj \
@@ -6306,6 +6326,27 @@ $(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
+$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
 $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
@@ -6698,6 +6739,11 @@ $(OBJS)\monodll_control.obj: ..\..\src\univ\control.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_control.obj: ..\..\src\ribbon\control.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_dialog.obj: ..\..\src\msw\dialog.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
@@ -6858,6 +6904,11 @@ $(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -7428,6 +7479,11 @@ $(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
@@ -8546,6 +8602,27 @@ $(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
+$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
 $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
@@ -8938,6 +9015,11 @@ $(OBJS)\monolib_control.obj: ..\..\src\univ\control.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_control.obj: ..\..\src\ribbon\control.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_dialog.obj: ..\..\src\msw\dialog.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
@@ -9098,6 +9180,11 @@ $(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -9668,6 +9755,11 @@ $(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index ae9165a644..4275624845 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1584,6 +1584,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_propgridiface.o \
 	$(OBJS)\monodll_propgridpagestate.o \
 	$(OBJS)\monodll_props.o \
+	$(OBJS)\monodll_art_internal.o \
+	$(OBJS)\monodll_art_msw.o \
+	$(OBJS)\monodll_art_aui.o \
+	$(OBJS)\monodll_bar.o \
+	$(OBJS)\monodll_buttonbar.o \
+	$(OBJS)\monodll_control.o \
+	$(OBJS)\monodll_gallery.o \
+	$(OBJS)\monodll_page.o \
+	$(OBJS)\monodll_panel.o \
+	$(OBJS)\monodll_toolbar.o \
 	$(OBJS)\monodll_richtextctrl.o \
 	$(OBJS)\monodll_richtextbuffer.o \
 	$(OBJS)\monodll_richtextstyles.o \
@@ -2276,6 +2286,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_propgridiface.o \
 	$(OBJS)\monolib_propgridpagestate.o \
 	$(OBJS)\monolib_props.o \
+	$(OBJS)\monolib_art_internal.o \
+	$(OBJS)\monolib_art_msw.o \
+	$(OBJS)\monolib_art_aui.o \
+	$(OBJS)\monolib_bar.o \
+	$(OBJS)\monolib_buttonbar.o \
+	$(OBJS)\monolib_control.o \
+	$(OBJS)\monolib_gallery.o \
+	$(OBJS)\monolib_page.o \
+	$(OBJS)\monolib_panel.o \
+	$(OBJS)\monolib_toolbar.o \
 	$(OBJS)\monolib_richtextctrl.o \
 	$(OBJS)\monolib_richtextbuffer.o \
 	$(OBJS)\monolib_richtextstyles.o \
@@ -6464,6 +6484,27 @@ $(OBJS)\monodll_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp
 $(OBJS)\monodll_props.o: ../../src/propgrid/props.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_art_internal.o: ../../src/ribbon/art_internal.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_art_msw.o: ../../src/ribbon/art_msw.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_art_aui.o: ../../src/ribbon/art_aui.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_bar.o: ../../src/ribbon/bar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_gallery.o: ../../src/ribbon/gallery.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_page.o: ../../src/ribbon/page.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_panel.o: ../../src/ribbon/panel.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -6888,6 +6929,11 @@ $(OBJS)\monodll_control.o: ../../src/univ/control.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_control.o: ../../src/ribbon/control.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monodll_dialog.o: ../../src/msw/dialog.cpp
@@ -7112,6 +7158,11 @@ $(OBJS)\monodll_toolbar.o: ../../src/univ/toolbar.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_toolbar.o: ../../src/ribbon/toolbar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monodll_textctrl.o: ../../src/msw/textctrl.cpp
@@ -7698,6 +7749,11 @@ $(OBJS)\monodll_buttonbar.o: ../../src/generic/buttonbar.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_buttonbar.o: ../../src/ribbon/buttonbar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_choicdgg.o: ../../src/generic/choicdgg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8816,6 +8872,27 @@ $(OBJS)\monolib_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp
 $(OBJS)\monolib_props.o: ../../src/propgrid/props.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_art_internal.o: ../../src/ribbon/art_internal.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_art_msw.o: ../../src/ribbon/art_msw.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_art_aui.o: ../../src/ribbon/art_aui.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_bar.o: ../../src/ribbon/bar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_gallery.o: ../../src/ribbon/gallery.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_page.o: ../../src/ribbon/page.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_panel.o: ../../src/ribbon/panel.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9240,6 +9317,11 @@ $(OBJS)\monolib_control.o: ../../src/univ/control.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_control.o: ../../src/ribbon/control.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monolib_dialog.o: ../../src/msw/dialog.cpp
@@ -9464,6 +9546,11 @@ $(OBJS)\monolib_toolbar.o: ../../src/univ/toolbar.cpp
 endif
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_toolbar.o: ../../src/ribbon/toolbar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monolib_textctrl.o: ../../src/msw/textctrl.cpp
@@ -10050,6 +10137,11 @@ $(OBJS)\monolib_buttonbar.o: ../../src/generic/buttonbar.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_buttonbar.o: ../../src/ribbon/buttonbar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_choicdgg.o: ../../src/generic/choicdgg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 71f5912442..39c20e8f0f 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1758,6 +1758,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_propgridiface.obj \
 	$(OBJS)\monodll_propgridpagestate.obj \
 	$(OBJS)\monodll_props.obj \
+	$(OBJS)\monodll_art_internal.obj \
+	$(OBJS)\monodll_art_msw.obj \
+	$(OBJS)\monodll_art_aui.obj \
+	$(OBJS)\monodll_bar.obj \
+	$(OBJS)\monodll_buttonbar.obj \
+	$(OBJS)\monodll_control.obj \
+	$(OBJS)\monodll_gallery.obj \
+	$(OBJS)\monodll_page.obj \
+	$(OBJS)\monodll_panel.obj \
+	$(OBJS)\monodll_toolbar.obj \
 	$(OBJS)\monodll_richtextctrl.obj \
 	$(OBJS)\monodll_richtextbuffer.obj \
 	$(OBJS)\monodll_richtextstyles.obj \
@@ -2450,6 +2460,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_propgridiface.obj \
 	$(OBJS)\monolib_propgridpagestate.obj \
 	$(OBJS)\monolib_props.obj \
+	$(OBJS)\monolib_art_internal.obj \
+	$(OBJS)\monolib_art_msw.obj \
+	$(OBJS)\monolib_art_aui.obj \
+	$(OBJS)\monolib_bar.obj \
+	$(OBJS)\monolib_buttonbar.obj \
+	$(OBJS)\monolib_control.obj \
+	$(OBJS)\monolib_gallery.obj \
+	$(OBJS)\monolib_page.obj \
+	$(OBJS)\monolib_panel.obj \
+	$(OBJS)\monolib_toolbar.obj \
 	$(OBJS)\monolib_richtextctrl.obj \
 	$(OBJS)\monolib_richtextbuffer.obj \
 	$(OBJS)\monolib_richtextstyles.obj \
@@ -6672,6 +6692,27 @@ $(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
+$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
 $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
@@ -7064,6 +7105,11 @@ $(OBJS)\monodll_control.obj: ..\..\src\univ\control.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_control.obj: ..\..\src\ribbon\control.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_dialog.obj: ..\..\src\msw\dialog.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
@@ -7224,6 +7270,11 @@ $(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -7794,6 +7845,11 @@ $(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
@@ -8912,6 +8968,27 @@ $(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
 $(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
 
+$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
 $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
 
@@ -9304,6 +9381,11 @@ $(OBJS)\monolib_control.obj: ..\..\src\univ\control.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_control.obj: ..\..\src\ribbon\control.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_dialog.obj: ..\..\src\msw\dialog.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
@@ -9464,6 +9546,11 @@ $(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -10034,6 +10121,11 @@ $(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index d02c4c6208..df0e1f67df 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -204,6 +204,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_propgridiface.obj &
 	$(OBJS)\monodll_propgridpagestate.obj &
 	$(OBJS)\monodll_props.obj &
+	$(OBJS)\monodll_art_internal.obj &
+	$(OBJS)\monodll_art_msw.obj &
+	$(OBJS)\monodll_art_aui.obj &
+	$(OBJS)\monodll_bar.obj &
+	$(OBJS)\monodll_buttonbar.obj &
+	$(OBJS)\monodll_control.obj &
+	$(OBJS)\monodll_gallery.obj &
+	$(OBJS)\monodll_page.obj &
+	$(OBJS)\monodll_panel.obj &
+	$(OBJS)\monodll_toolbar.obj &
 	$(OBJS)\monodll_richtextctrl.obj &
 	$(OBJS)\monodll_richtextbuffer.obj &
 	$(OBJS)\monodll_richtextstyles.obj &
@@ -901,6 +911,16 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_propgridiface.obj &
 	$(OBJS)\monolib_propgridpagestate.obj &
 	$(OBJS)\monolib_props.obj &
+	$(OBJS)\monolib_art_internal.obj &
+	$(OBJS)\monolib_art_msw.obj &
+	$(OBJS)\monolib_art_aui.obj &
+	$(OBJS)\monolib_bar.obj &
+	$(OBJS)\monolib_buttonbar.obj &
+	$(OBJS)\monolib_control.obj &
+	$(OBJS)\monolib_gallery.obj &
+	$(OBJS)\monolib_page.obj &
+	$(OBJS)\monolib_panel.obj &
+	$(OBJS)\monolib_toolbar.obj &
 	$(OBJS)\monolib_richtextctrl.obj &
 	$(OBJS)\monolib_richtextbuffer.obj &
 	$(OBJS)\monolib_richtextstyles.obj &
@@ -6731,6 +6751,27 @@ $(OBJS)\monodll_propgridpagestate.obj :  .AUTODEPEND ..\..\src\propgrid\propgrid
 $(OBJS)\monodll_props.obj :  .AUTODEPEND ..\..\src\propgrid\props.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_art_internal.obj :  .AUTODEPEND ..\..\src\ribbon\art_internal.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_art_msw.obj :  .AUTODEPEND ..\..\src\ribbon\art_msw.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_art_aui.obj :  .AUTODEPEND ..\..\src\ribbon\art_aui.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_bar.obj :  .AUTODEPEND ..\..\src\ribbon\bar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_gallery.obj :  .AUTODEPEND ..\..\src\ribbon\gallery.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_page.obj :  .AUTODEPEND ..\..\src\ribbon\page.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_panel.obj :  .AUTODEPEND ..\..\src\ribbon\panel.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7155,6 +7196,11 @@ $(OBJS)\monodll_control.obj :  .AUTODEPEND ..\..\src\univ\control.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_control.obj :  .AUTODEPEND ..\..\src\ribbon\control.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monodll_dialog.obj :  .AUTODEPEND ..\..\src\msw\dialog.cpp
@@ -7379,6 +7425,11 @@ $(OBJS)\monodll_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_toolbar.obj :  .AUTODEPEND ..\..\src\ribbon\toolbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monodll_textctrl.obj :  .AUTODEPEND ..\..\src\msw\textctrl.cpp
@@ -7965,6 +8016,11 @@ $(OBJS)\monodll_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_buttonbar.obj :  .AUTODEPEND ..\..\src\ribbon\buttonbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -9083,6 +9139,27 @@ $(OBJS)\monolib_propgridpagestate.obj :  .AUTODEPEND ..\..\src\propgrid\propgrid
 $(OBJS)\monolib_props.obj :  .AUTODEPEND ..\..\src\propgrid\props.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_art_internal.obj :  .AUTODEPEND ..\..\src\ribbon\art_internal.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_art_msw.obj :  .AUTODEPEND ..\..\src\ribbon\art_msw.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_art_aui.obj :  .AUTODEPEND ..\..\src\ribbon\art_aui.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_bar.obj :  .AUTODEPEND ..\..\src\ribbon\bar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_gallery.obj :  .AUTODEPEND ..\..\src\ribbon\gallery.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_page.obj :  .AUTODEPEND ..\..\src\ribbon\page.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_panel.obj :  .AUTODEPEND ..\..\src\ribbon\panel.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -9507,6 +9584,11 @@ $(OBJS)\monolib_control.obj :  .AUTODEPEND ..\..\src\univ\control.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_control.obj :  .AUTODEPEND ..\..\src\ribbon\control.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monolib_dialog.obj :  .AUTODEPEND ..\..\src\msw\dialog.cpp
@@ -9731,6 +9813,11 @@ $(OBJS)\monolib_toolbar.obj :  .AUTODEPEND ..\..\src\univ\toolbar.cpp
 !endif
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_toolbar.obj :  .AUTODEPEND ..\..\src\ribbon\toolbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monolib_textctrl.obj :  .AUTODEPEND ..\..\src\msw\textctrl.cpp
@@ -10317,6 +10404,11 @@ $(OBJS)\monolib_buttonbar.obj :  .AUTODEPEND ..\..\src\generic\buttonbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_buttonbar.obj :  .AUTODEPEND ..\..\src\ribbon\buttonbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_choicdgg.obj :  .AUTODEPEND ..\..\src\generic\choicdgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<