diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp
index 9f8032b89..985b9c0d1 100644
--- a/src/Gui/OnlineDocumentation.cpp
+++ b/src/Gui/OnlineDocumentation.cpp
@@ -232,9 +232,10 @@ QByteArray PythonOnlineHelp::loadResource(const QString& filename) const
             "        return self.bigsection(dir, '#ffffff', '#ee77aa', contents)\n"
             "\n"
             "pydoc.html=FreeCADDoc()\n"
+            "title='FreeCAD Python Modules Index'\n"
             "\n"
-            "heading = pydoc.html.heading(\n"
-            "'<big><big><strong>Python: Index of Modules</strong></big></big>',\n"
+            "heading = pydoc.html.heading("
+            "'<big><big><strong>Python: Index of Modules</strong></big></big>',"
             "'#ffffff', '#7799ee')\n"
             "def bltinlink(name):\n"
             "    return '<a href=\"%s.html\">%s</a>' % (name, name)\n"
@@ -257,13 +258,16 @@ QByteArray PythonOnlineHelp::loadResource(const QString& filename) const
             "        indices.append(ret)\n"
             "contents = heading + string.join(indices) + '''<p align=right>\n"
             "<font color=\"#909090\" face=\"helvetica, arial\"><strong>\n"
-            "pydoc</strong> by Ka-Ping Yee &lt;ping@lfw.org&gt;</font>'''\n";
+            "pydoc</strong> by Ka-Ping Yee &lt;ping@lfw.org&gt;</font>'''\n"
+            "htmldocument=pydoc.html.page(title,contents)\n";
 
         PyObject* result = PyRun_String(cmd.constData(), Py_file_input, dict, dict);
         if (result) {
             Py_DECREF(result);
-            result = PyDict_GetItemString(dict, "contents");
+            result = PyDict_GetItemString(dict, "htmldocument");
             const char* contents = PyString_AsString(result);
+            res.append("HTTP/1.0 200 OK\n");
+            res.append("Content-type: text/html\n");
             res.append(contents);
             return res;
         }
@@ -293,6 +297,8 @@ QByteArray PythonOnlineHelp::loadResource(const QString& filename) const
             Py_DECREF(result);
             result = PyDict_GetItemString(dict, "page");
             const char* page = PyString_AsString(result);
+            res.append("HTTP/1.0 200 OK\n");
+            res.append("Content-type: text/html\n");
             res.append(page);
         }
         else {
diff --git a/src/Mod/Draft/Makefile.am b/src/Mod/Draft/Makefile.am
index fef1303c4..2502ec4d2 100644
--- a/src/Mod/Draft/Makefile.am
+++ b/src/Mod/Draft/Makefile.am
@@ -39,78 +39,97 @@ EXTRA_DIST = \
 		CMakeLists.txt \
 		draft.dox \
 		Resources/Draft.qrc \
-        Resources/translations/Draft_af.ts \
-        Resources/translations/Draft_af.qm \
-        Resources/translations/Draft_de.ts \
-        Resources/translations/Draft_de.qm \
-        Resources/translations/Draft_es.ts \
-        Resources/translations/Draft_es.qm \
-        Resources/translations/Draft_fi.ts \
-        Resources/translations/Draft_fi.qm \
-        Resources/translations/Draft_fr.ts \
-        Resources/translations/Draft_fr.qm \
-        Resources/translations/Draft_hr.ts \
-        Resources/translations/Draft_hr.qm \
-        Resources/translations/Draft_it.ts \
-        Resources/translations/Draft_it.qm \
-        Resources/translations/Draft_nl.ts \
-        Resources/translations/Draft_nl.qm \
-        Resources/translations/Draft_no.ts \
-        Resources/translations/Draft_no.qm \
-        Resources/translations/Draft_pl.ts \
-        Resources/translations/Draft_pl.qm \
-        Resources/translations/Draft_pt.ts \
-        Resources/translations/Draft_pt.qm \
-        Resources/translations/Draft_ru.ts \
-        Resources/translations/Draft_ru.qm \
-        Resources/translations/Draft_se.ts \
-        Resources/translations/Draft_se.qm \
-        Resources/translations/Draft_uk.ts \
-        Resources/translations/Draft_uk.qm \
-        Resources/translations/Draft_zh.ts \
-        Resources/translations/Draft_zh.qm \
-		Resources/icons/preferences-draft.svg \
-		Resources/icons/Draft_AddPoint.svg \
-        Resources/icons/Draft_AddToGroup.svg \
-        Resources/icons/Draft_Apply.svg \
-        Resources/icons/Draft_Arc.svg \
-        Resources/icons/Draft_BSpline.svg \
-        Resources/icons/Draft_Circle.svg \
-        Resources/icons/Draft_Cursor.svg \
-        Resources/icons/Draft_DelPoint.svg \
-        Resources/icons/Draft_Dimension.svg \
-        Resources/icons/Draft_Dot.svg \
-        Resources/icons/Draft_Downgrade.svg \
-        Resources/icons/Draft_Drawing.svg \
-        Resources/icons/Draft_Edit.svg \
-        Resources/icons/Draft_Finish.svg \
-        Resources/icons/Draft_Line.svg \
-        Resources/icons/Draft_Lock.svg \
-        Resources/icons/Draft_Macro.svg \
-        Resources/icons/Draft_Move.svg \
-        Resources/icons/Draft_Offset.svg \
-        Resources/icons/Draft_Point.svg \
-        Resources/icons/Draft_Polygon.svg \
-        Resources/icons/Draft_Rectangle.svg \
-        Resources/icons/Draft_Rotate.svg \
-        Resources/icons/Draft_Scale.svg \
-        Resources/icons/Draft_SelectGroup.svg \
-        Resources/icons/Draft_SelectPlane.svg \
-        Resources/icons/Draft_SwitchMode.svg \
-        Resources/icons/Draft_Text.svg \
-        Resources/icons/Draft_Trimex.svg \
-        Resources/icons/Draft_Upgrade.svg \
-        Resources/icons/Draft_Wire.svg \
-		Resources/icons/Draft_Wipe.svg \
-        Resources/icons/Draft_WireToBSpline.svg \
-        Resources/icons/Draft_Construction.svg \
-		Resources/icons/Draft_Draft.svg \
 		Resources/icons/Draft_2DShapeView.svg \
+		Resources/icons/Draft_AddPoint.svg \
+		Resources/icons/Draft_AddToGroup.svg \
+		Resources/icons/Draft_Apply.svg \
+		Resources/icons/Draft_Arc.svg \
+		Resources/icons/Draft_Array.svg \
+		Resources/icons/Draft_BSpline.svg \
+		Resources/icons/Draft_Circle.svg \
+		Resources/icons/Draft_Clone.svg \
+		Resources/icons/Draft_Construction.svg \
 		Resources/icons/Draft_Cursor.svg \
-        Resources/patterns/concrete.svg \
-        Resources/patterns/cross.svg \
-        Resources/patterns/line.svg \
-        Resources/patterns/simple.svg \
-        Resources/patterns/square.svg \
+		Resources/icons/Draft_DelPoint.svg \
+		Resources/icons/Draft_Dimension.svg \
+		Resources/icons/Draft_Dot.svg \
+		Resources/icons/Draft_Downgrade.svg \
+		Resources/icons/Draft_Draft2Sketch.svg \
+		Resources/icons/Draft_Draft.svg \
+		Resources/icons/Draft_Drawing.svg \
+		Resources/icons/Draft_Edit.svg \
+		Resources/icons/Draft_Finish.svg \
+		Resources/icons/Draft_Line.svg \
+		Resources/icons/Draft_Lock.svg \
+		Resources/icons/Draft_Macro.svg \
+		Resources/icons/Draft_Move.svg \
+		Resources/icons/Draft_Offset.svg \
+		Resources/icons/Draft_Point.svg \
+		Resources/icons/Draft_Polygon.svg \
+		Resources/icons/Draft_Rectangle.svg \
+		Resources/icons/Draft_Rotate.svg \
+		Resources/icons/Draft_Scale.svg \
+		Resources/icons/Draft_SelectGroup.svg \
+		Resources/icons/Draft_SelectPlane.svg \
+		Resources/icons/Draft_SwitchMode.svg \
+		Resources/icons/Draft_Text.svg \
+		Resources/icons/Draft_Trimex.svg \
+		Resources/icons/Draft_Upgrade.svg \
+		Resources/icons/Draft_Wipe.svg \
+		Resources/icons/Draft_Wire.svg \
+		Resources/icons/Draft_WireToBSpline.svg \
+		Resources/icons/preferences-draft.svg \
+		Resources/icons/Snap_Angle.svg \
+		Resources/icons/Snap_Center.svg \
+		Resources/icons/Snap_Endpoint.svg \
+		Resources/icons/Snap_Extension.svg \
+		Resources/icons/Snap_Grid.svg \
+		Resources/icons/Snap_Intersection.svg \
+		Resources/icons/Snap_Lock.svg \
+		Resources/icons/Snap_Midpoint.svg \
+		Resources/icons/Snap_Near.svg \
+		Resources/icons/Snap_Ortho.svg \
+		Resources/icons/Snap_Parallel.svg \
+		Resources/icons/Snap_Perpendicular.svg \
+		Resources/patterns/concrete.svg \
+		Resources/patterns/cross.svg \
+		Resources/patterns/line.svg \
+		Resources/patterns/simple.svg \
+		Resources/patterns/square.svg \
+		Resources/translations/Draft_af.qm \
+		Resources/translations/Draft_af.ts \
+		Resources/translations/Draft_de.qm \
+		Resources/translations/Draft_de.ts \
+		Resources/translations/Draft_es.qm \
+		Resources/translations/Draft_es.ts \
+		Resources/translations/Draft_fi.qm \
+		Resources/translations/Draft_fi.ts \
+		Resources/translations/Draft_fr.qm \
+		Resources/translations/Draft_fr.ts \
+		Resources/translations/Draft_hr.qm \
+		Resources/translations/Draft_hr.ts \
+		Resources/translations/Draft_hu.qm \
+		Resources/translations/Draft_hu.ts \
+		Resources/translations/Draft_it.qm \
+		Resources/translations/Draft_it.ts \
+		Resources/translations/Draft_ja.qm \
+		Resources/translations/Draft_ja.ts \
+		Resources/translations/Draft_nl.qm \
+		Resources/translations/Draft_nl.ts \
+		Resources/translations/Draft_no.qm \
+		Resources/translations/Draft_no.ts \
+		Resources/translations/Draft_pl.qm \
+		Resources/translations/Draft_pl.ts \
+		Resources/translations/Draft_pt.qm \
+		Resources/translations/Draft_pt.ts \
+		Resources/translations/Draft_ru.qm \
+		Resources/translations/Draft_ru.ts \
+		Resources/translations/Draft_se.qm \
+		Resources/translations/Draft_se.ts \
+		Resources/translations/Draft_uk.qm \
+		Resources/translations/Draft_uk.ts \
+		Resources/translations/Draft_zh.qm \
+		Resources/translations/Draft_zh.ts \
 		Resources/ui/userprefs-base.ui \
-        Resources/ui/userprefs-import.ui
+		Resources/ui/userprefs-import.ui
+