diff --git a/Manifest.txt b/Manifest.txt
index 7d0c5a75621e47bc7e5299c3c7c85ce92cf4605a..9ec7e009af9f0209025f4b3f1fd8059d3d94e766 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,16 +1,22 @@
+.gemtest
+.gitignore
+.yardopts
 History.txt
 Manifest.txt
-README
-README.txt
+README.git
+README.rdoc
 Rakefile
+Rakefile.cross
 TODO
-doap.rdf
+doap.rdf.erb
 examples/RAA.rb
 examples/README
+examples/WhatAQuietStiff.rb
 examples/babelfish.rb
 examples/bounce.rb
 examples/browser.rb
 examples/button.rb
+examples/canvasdemo.rb
 examples/charts.rb
 examples/custom_table_item.rb
 examples/datatarget.rb
@@ -22,6 +28,8 @@ examples/dragdrop.rb
 examples/dragsource.rb
 examples/dropsite.rb
 examples/foursplit.rb
+examples/gdchart.rb
+examples/gembrowser.rb
 examples/gltest.rb
 examples/glviewer.rb
 examples/groupbox.rb
@@ -108,6 +116,7 @@ examples/mditest.rb
 examples/pig.rb
 examples/raabrowser.rb
 examples/ratio.rb
+examples/rmagick.rb
 examples/rulerview.rb
 examples/scintilla-test.rb
 examples/scribble-orig.rb
@@ -127,15 +136,7 @@ ext/fox16/FXRbDataTarget.cpp
 ext/fox16/FXRbGLViewer.cpp
 ext/fox16/FXRuby.cpp
 ext/fox16/MANIFEST
-ext/fox16/core_wrap.cpp
-ext/fox16/dc_wrap.cpp
-ext/fox16/dialogs_wrap.cpp
 ext/fox16/extconf.rb
-ext/fox16/frames_wrap.cpp
-ext/fox16/fx3d_wrap.cpp
-ext/fox16/iconlist_wrap.cpp
-ext/fox16/icons_wrap.cpp
-ext/fox16/image_wrap.cpp
 ext/fox16/impl.cpp
 ext/fox16/include/FXMemoryBuffer.h
 ext/fox16/include/FXRb4Splitter.h
@@ -359,27 +360,302 @@ ext/fox16/include/FXRbXPMIcon.h
 ext/fox16/include/FXRbXPMImage.h
 ext/fox16/include/FXRuby.h
 ext/fox16/include/impl.h
-ext/fox16/include/inlinestubs.h
-ext/fox16/label_wrap.cpp
-ext/fox16/layout_wrap.cpp
-ext/fox16/librb.c
-ext/fox16/list_wrap.cpp
 ext/fox16/make_impl.rb
 ext/fox16/markfuncs.cpp
-ext/fox16/mdi_wrap.cpp
-ext/fox16/menu_wrap.cpp
-ext/fox16/scintilla_wrap.cpp
-ext/fox16/table_wrap.cpp
-ext/fox16/text_wrap.cpp
-ext/fox16/treelist_wrap.cpp
-ext/fox16/ui_wrap.cpp
 ext/fox16/unregisterOwnedObjects.cpp
+fox-includes/FX4Splitter.h
+fox-includes/FX7Segment.h
+fox-includes/FX885910Codec.h
+fox-includes/FX885911Codec.h
+fox-includes/FX885913Codec.h
+fox-includes/FX885914Codec.h
+fox-includes/FX885915Codec.h
+fox-includes/FX885916Codec.h
+fox-includes/FX88591Codec.h
+fox-includes/FX88592Codec.h
+fox-includes/FX88593Codec.h
+fox-includes/FX88594Codec.h
+fox-includes/FX88595Codec.h
+fox-includes/FX88596Codec.h
+fox-includes/FX88597Codec.h
+fox-includes/FX88598Codec.h
+fox-includes/FX88599Codec.h
+fox-includes/FXAccelTable.h
+fox-includes/FXApp.h
+fox-includes/FXArray.h
+fox-includes/FXArrowButton.h
+fox-includes/FXBMPIcon.h
+fox-includes/FXBMPImage.h
+fox-includes/FXBZFileStream.h
+fox-includes/FXBitmap.h
+fox-includes/FXBitmapFrame.h
+fox-includes/FXBitmapView.h
+fox-includes/FXButton.h
+fox-includes/FXCP1250Codec.h
+fox-includes/FXCP1251Codec.h
+fox-includes/FXCP1252Codec.h
+fox-includes/FXCP1253Codec.h
+fox-includes/FXCP1254Codec.h
+fox-includes/FXCP1255Codec.h
+fox-includes/FXCP1256Codec.h
+fox-includes/FXCP1257Codec.h
+fox-includes/FXCP1258Codec.h
+fox-includes/FXCP437Codec.h
+fox-includes/FXCP850Codec.h
+fox-includes/FXCP852Codec.h
+fox-includes/FXCP855Codec.h
+fox-includes/FXCP856Codec.h
+fox-includes/FXCP857Codec.h
+fox-includes/FXCP860Codec.h
+fox-includes/FXCP861Codec.h
+fox-includes/FXCP862Codec.h
+fox-includes/FXCP863Codec.h
+fox-includes/FXCP864Codec.h
+fox-includes/FXCP865Codec.h
+fox-includes/FXCP866Codec.h
+fox-includes/FXCP869Codec.h
+fox-includes/FXCP874Codec.h
+fox-includes/FXCURCursor.h
+fox-includes/FXCanvas.h
+fox-includes/FXCheckButton.h
+fox-includes/FXChoiceBox.h
+fox-includes/FXColorBar.h
+fox-includes/FXColorDialog.h
+fox-includes/FXColorList.h
+fox-includes/FXColorRing.h
+fox-includes/FXColorSelector.h
+fox-includes/FXColorWell.h
+fox-includes/FXColorWheel.h
+fox-includes/FXComboBox.h
+fox-includes/FXComposeContext.h
+fox-includes/FXComposite.h
+fox-includes/FXCursor.h
+fox-includes/FXDC.h
+fox-includes/FXDCPrint.h
+fox-includes/FXDCWindow.h
+fox-includes/FXDLL.h
+fox-includes/FXDataTarget.h
+fox-includes/FXDate.h
+fox-includes/FXDebugTarget.h
+fox-includes/FXDelegator.h
+fox-includes/FXDial.h
+fox-includes/FXDialogBox.h
+fox-includes/FXDict.h
+fox-includes/FXDir.h
+fox-includes/FXDirBox.h
+fox-includes/FXDirDialog.h
+fox-includes/FXDirList.h
+fox-includes/FXDirSelector.h
+fox-includes/FXDockBar.h
+fox-includes/FXDockHandler.h
+fox-includes/FXDockSite.h
+fox-includes/FXDockTitle.h
+fox-includes/FXDocument.h
+fox-includes/FXDragCorner.h
+fox-includes/FXDrawable.h
+fox-includes/FXDriveBox.h
+fox-includes/FXElement.h
+fox-includes/FXException.h
+fox-includes/FXExpression.h
+fox-includes/FXExtentd.h
+fox-includes/FXExtentf.h
+fox-includes/FXFile.h
+fox-includes/FXFileDialog.h
+fox-includes/FXFileDict.h
+fox-includes/FXFileList.h
+fox-includes/FXFileSelector.h
+fox-includes/FXFileStream.h
+fox-includes/FXFoldingList.h
+fox-includes/FXFont.h
+fox-includes/FXFontDialog.h
+fox-includes/FXFontSelector.h
+fox-includes/FXFrame.h
+fox-includes/FXGIFCursor.h
+fox-includes/FXGIFIcon.h
+fox-includes/FXGIFImage.h
+fox-includes/FXGLCanvas.h
+fox-includes/FXGLCone.h
+fox-includes/FXGLContext.h
+fox-includes/FXGLCube.h
+fox-includes/FXGLCylinder.h
+fox-includes/FXGLObject.h
+fox-includes/FXGLShape.h
+fox-includes/FXGLSphere.h
+fox-includes/FXGLTriangleMesh.h
+fox-includes/FXGLViewer.h
+fox-includes/FXGLVisual.h
+fox-includes/FXGUISignal.h
+fox-includes/FXGZFileStream.h
+fox-includes/FXGradientBar.h
+fox-includes/FXGroupBox.h
+fox-includes/FXHash.h
+fox-includes/FXHeader.h
+fox-includes/FXHorizontalFrame.h
+fox-includes/FXICOIcon.h
+fox-includes/FXICOImage.h
+fox-includes/FXIFFIcon.h
+fox-includes/FXIFFImage.h
+fox-includes/FXIO.h
+fox-includes/FXIcon.h
+fox-includes/FXIconDict.h
+fox-includes/FXIconList.h
+fox-includes/FXIconSource.h
+fox-includes/FXId.h
+fox-includes/FXImage.h
+fox-includes/FXImageFrame.h
+fox-includes/FXImageView.h
+fox-includes/FXInputDialog.h
+fox-includes/FXJPGIcon.h
+fox-includes/FXJPGImage.h
+fox-includes/FXKOI8RCodec.h
+fox-includes/FXKnob.h
+fox-includes/FXLabel.h
+fox-includes/FXList.h
+fox-includes/FXListBox.h
+fox-includes/FXMDIButton.h
+fox-includes/FXMDIChild.h
+fox-includes/FXMDIClient.h
+fox-includes/FXMainWindow.h
+fox-includes/FXMat3d.h
+fox-includes/FXMat3f.h
+fox-includes/FXMat4d.h
+fox-includes/FXMat4f.h
+fox-includes/FXMatrix.h
+fox-includes/FXMemMap.h
+fox-includes/FXMemoryStream.h
+fox-includes/FXMenuBar.h
+fox-includes/FXMenuButton.h
+fox-includes/FXMenuCaption.h
+fox-includes/FXMenuCascade.h
+fox-includes/FXMenuCheck.h
+fox-includes/FXMenuCommand.h
+fox-includes/FXMenuPane.h
+fox-includes/FXMenuRadio.h
+fox-includes/FXMenuSeparator.h
+fox-includes/FXMenuTitle.h
+fox-includes/FXMessageBox.h
+fox-includes/FXObject.h
+fox-includes/FXObjectList.h
+fox-includes/FXOptionMenu.h
+fox-includes/FXPCXIcon.h
+fox-includes/FXPCXImage.h
+fox-includes/FXPNGIcon.h
+fox-includes/FXPNGImage.h
+fox-includes/FXPPMIcon.h
+fox-includes/FXPPMImage.h
+fox-includes/FXPacker.h
+fox-includes/FXPath.h
+fox-includes/FXPicker.h
+fox-includes/FXPipe.h
+fox-includes/FXPoint.h
+fox-includes/FXPopup.h
+fox-includes/FXPrintDialog.h
+fox-includes/FXProgressBar.h
+fox-includes/FXProgressDialog.h
+fox-includes/FXQuatd.h
+fox-includes/FXQuatf.h
+fox-includes/FXRASIcon.h
+fox-includes/FXRASImage.h
+fox-includes/FXRGBIcon.h
+fox-includes/FXRGBImage.h
+fox-includes/FXRadioButton.h
+fox-includes/FXRanged.h
+fox-includes/FXRangef.h
+fox-includes/FXRealSlider.h
+fox-includes/FXRealSpinner.h
+fox-includes/FXRecentFiles.h
+fox-includes/FXRectangle.h
+fox-includes/FXRegion.h
+fox-includes/FXRegistry.h
+fox-includes/FXReplaceDialog.h
+fox-includes/FXRex.h
+fox-includes/FXRootWindow.h
+fox-includes/FXRuler.h
+fox-includes/FXRulerView.h
+fox-includes/FXScrollArea.h
+fox-includes/FXScrollBar.h
+fox-includes/FXScrollPane.h
+fox-includes/FXScrollWindow.h
+fox-includes/FXSearchDialog.h
+fox-includes/FXSeparator.h
+fox-includes/FXSettings.h
+fox-includes/FXShell.h
+fox-includes/FXShutter.h
+fox-includes/FXSize.h
+fox-includes/FXSlider.h
+fox-includes/FXSocket.h
+fox-includes/FXSphered.h
+fox-includes/FXSpheref.h
+fox-includes/FXSpinner.h
+fox-includes/FXSplashWindow.h
+fox-includes/FXSplitter.h
+fox-includes/FXSpring.h
+fox-includes/FXStat.h
+fox-includes/FXStatusBar.h
+fox-includes/FXStatusLine.h
+fox-includes/FXStream.h
+fox-includes/FXString.h
+fox-includes/FXStringDict.h
+fox-includes/FXSwitcher.h
+fox-includes/FXSystem.h
+fox-includes/FXTGAIcon.h
+fox-includes/FXTGAImage.h
+fox-includes/FXTIFIcon.h
+fox-includes/FXTIFImage.h
+fox-includes/FXTabBar.h
+fox-includes/FXTabBook.h
+fox-includes/FXTabItem.h
+fox-includes/FXTable.h
+fox-includes/FXText.h
+fox-includes/FXTextCodec.h
+fox-includes/FXTextField.h
+fox-includes/FXThread.h
+fox-includes/FXToggleButton.h
+fox-includes/FXToolBar.h
+fox-includes/FXToolBarGrip.h
+fox-includes/FXToolBarShell.h
+fox-includes/FXToolBarTab.h
+fox-includes/FXToolTip.h
+fox-includes/FXTopWindow.h
+fox-includes/FXTranslator.h
+fox-includes/FXTreeList.h
+fox-includes/FXTreeListBox.h
+fox-includes/FXTriStateButton.h
+fox-includes/FXURL.h
+fox-includes/FXUTF16Codec.h
+fox-includes/FXUTF32Codec.h
+fox-includes/FXUTF8Codec.h
+fox-includes/FXUndoList.h
+fox-includes/FXVec2d.h
+fox-includes/FXVec2f.h
+fox-includes/FXVec3d.h
+fox-includes/FXVec3f.h
+fox-includes/FXVec4d.h
+fox-includes/FXVec4f.h
+fox-includes/FXVerticalFrame.h
+fox-includes/FXVisual.h
+fox-includes/FXWindow.h
+fox-includes/FXWizard.h
+fox-includes/FXXBMIcon.h
+fox-includes/FXXBMImage.h
+fox-includes/FXXPMIcon.h
+fox-includes/FXXPMImage.h
+fox-includes/README
+fox-includes/fx.h
+fox-includes/fx3d.h
+fox-includes/fxascii.h
+fox-includes/fxdefs.h
+fox-includes/fxkeys.h
+fox-includes/fxunicode.h
+fox-includes/fxver.h
+fox-includes/xincs.h
 index.html
 lib/fox16.rb
 lib/fox16/accel_table.rb
 lib/fox16/aliases.rb
 lib/fox16/bitmapview.rb
 lib/fox16/calendar.rb
+lib/fox16/canvas.rb
 lib/fox16/chore.rb
 lib/fox16/colors.rb
 lib/fox16/core.rb
@@ -392,7 +668,6 @@ lib/fox16/input.rb
 lib/fox16/irb.rb
 lib/fox16/iterators.rb
 lib/fox16/keys.rb
-lib/fox16/kwargs.rb
 lib/fox16/missingdep.rb
 lib/fox16/pseudokeyboard.rb
 lib/fox16/pseudomouse.rb
@@ -403,6 +678,7 @@ lib/fox16/settings.rb
 lib/fox16/signal.rb
 lib/fox16/splashscreen.rb
 lib/fox16/timeout.rb
+lib/fox16/tkcompat.rb
 lib/fox16/undolist.rb
 lib/fox16/version.rb
 rdoc-sources/FX4Splitter.rb
@@ -920,3 +1196,20 @@ test/stress1.rb
 test/stress2.rb
 test/stress3.rb
 test/testcase.rb
+web/community.html
+web/css/style.css
+web/documentation.html
+web/downloads.html
+web/images/bullet.gif
+web/images/button-bg.jpg
+web/images/comment.gif
+web/images/content.jpg
+web/images/dots.jpg
+web/images/footer.jpg
+web/images/fxruby-book.jpg
+web/images/header.png
+web/images/menu.jpg
+web/images/page.gif
+web/images/quote.gif
+web/images/square-green.png
+web/index.html
diff --git a/Rakefile b/Rakefile
index a64e41121745efd6b05ce9cd2002cee64e1879f4..484c88fbdfc0cefb4449ff9520c3cd7cf9e5b485 100755
--- a/Rakefile
+++ b/Rakefile
@@ -9,6 +9,31 @@ load 'Rakefile.cross'
 PKG_VERSION = Fox.fxrubyversion
 FXSCINTILLA_INSTALL_DIR = Pathname( "build/builds/fxscintilla-#{LIBFXSCINTILLA_VERSION}" ).expand_path
 
+SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig-1.3.22.exe" : "swig-1.3.22"
+SWIGFLAGS = "-fcompact -noruntime -c++ -ruby -no_default -I../fox-includes"
+SWIG_LIB = `#{SWIG} -swiglib`.chomp
+SWIG_MODULES = {
+  "core.i" => "core_wrap.cpp",
+  "dcmodule.i" => "dc_wrap.cpp",
+  "dialogs.i" => "dialogs_wrap.cpp",
+  "framesmodule.i" => "frames_wrap.cpp",
+  "iconlistmodule.i" => "iconlist_wrap.cpp",
+  "icons.i" => "icons_wrap.cpp",
+  "image.i" => "image_wrap.cpp",
+  "labelmodule.i" => "label_wrap.cpp",
+  "layout.i" => "layout_wrap.cpp",
+  "listmodule.i" => "list_wrap.cpp",
+  "mdi.i" => "mdi_wrap.cpp",
+  "menumodule.i" => "menu_wrap.cpp",
+  "fx3d.i" => "fx3d_wrap.cpp",
+  "scintilla.i" => "scintilla_wrap.cpp",
+  "table-module.i" => "table_wrap.cpp",
+  "text-module.i" => "text_wrap.cpp",
+  "treelist-module.i" => "treelist_wrap.cpp",
+  "ui.i" => "ui_wrap.cpp"
+}
+
+
 hoe = Hoe.spec "fxruby" do
   # ... project specific data ...
   self.blog_categories = %w{FXRuby}
@@ -25,6 +50,15 @@ hoe = Hoe.spec "fxruby" do
   }
   self.test_globs = ["test/**/TC_*.rb"]
   self.version = PKG_VERSION
+  self.readme_file = 'README.rdoc'
+  self.extra_rdoc_files << self.readme_file
+
+  spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/).reject{|f| f=~/^fox-includes|^web/ }
+  spec_extras[:files] += SWIG_MODULES.values.map{|f| File.join("ext/fox16", f) }
+  spec_extras[:files] << 'ext/fox16/include/inlinestubs.h'
+  spec_extras[:files] << 'ext/fox16/librb.c'
+  spec_extras[:files] << 'doap.rdf'
+  spec_extras[:files] << 'lib/fox16/kwargs.rb'
 end
 
 # Make sure extension is built before tests are run
@@ -58,30 +92,6 @@ end
 # c:/ruby-1.8.6-p383-preview2/devkit/msys/1.0.11/usr/local/share/swig/1.3.22
 # before running swig on MinGW.
 namespace :swig do
-  SWIG = (RUBY_PLATFORM =~ /mingw/) ? "swig-1.3.22.exe" : "swig-1.3.22"
-  SWIGFLAGS = "-fcompact -noruntime -c++ -ruby -no_default -I../fox-includes"
-  SWIG_LIB = `#{SWIG} -swiglib`.chomp
-  SWIG_MODULES = {
-    "core.i" => "core_wrap.cpp",
-    "dcmodule.i" => "dc_wrap.cpp",
-    "dialogs.i" => "dialogs_wrap.cpp",
-    "framesmodule.i" => "frames_wrap.cpp",
-    "iconlistmodule.i" => "iconlist_wrap.cpp",
-    "icons.i" => "icons_wrap.cpp",
-    "image.i" => "image_wrap.cpp",
-    "labelmodule.i" => "label_wrap.cpp",
-    "layout.i" => "layout_wrap.cpp",
-    "listmodule.i" => "list_wrap.cpp",
-    "mdi.i" => "mdi_wrap.cpp",
-    "menumodule.i" => "menu_wrap.cpp",
-    "fx3d.i" => "fx3d_wrap.cpp",
-    "scintilla.i" => "scintilla_wrap.cpp",
-    "table-module.i" => "table_wrap.cpp",
-    "text-module.i" => "text_wrap.cpp",
-    "treelist-module.i" => "treelist_wrap.cpp",
-    "ui.i" => "ui_wrap.cpp"
-  }
-
   def wrapper_src_file_path(wrapper_src_file_name)
     File.join("..", "ext", "fox16", wrapper_src_file_name)
   end