diff --git a/docs/Docs.vcproj b/docs/Docs.vcproj
index dedae88..eacab0a 100644
--- a/docs/Docs.vcproj
+++ b/docs/Docs.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Docs"
 	ProjectGUID="{CFAD4001-CC90-415E-87AC-1A85446BFA54}"
 	RootNamespace="Docs"
@@ -89,119 +89,143 @@
 			Name="en_US"
 			>
 			<File
-				RelativePath=".\en_US\appendices.html"
+				RelativePath=".\en_US\appendices.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\backup.html"
+				RelativePath=".\en_US\backup.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\bugreport.html"
+				RelativePath=".\en_US\bugreport.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\commandline.html"
+				RelativePath=".\en_US\commandline.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\connect-error.html"
+				RelativePath=".\en_US\conf.py"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\connect.html"
+				RelativePath=".\en_US\connect-error.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\control-server.html"
+				RelativePath=".\en_US\connect.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\debugger.html"
+				RelativePath=".\en_US\control-server.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\default-xsl.html"
+				RelativePath=".\en_US\debugger.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\editgrid.html"
+				RelativePath=".\en_US\editgrid.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\export.html"
+				RelativePath=".\en_US\export.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\extend.html"
+				RelativePath=".\en_US\extended.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\grantwiz.html"
+				RelativePath=".\en_US\gqb.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\gridopts.html"
+				RelativePath=".\en_US\grantwiz.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\guruhints.html"
+				RelativePath=".\en_US\gridopts.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\index.html"
+				RelativePath=".\en_US\guruhints.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\kerberos.html"
+				RelativePath=".\en_US\index.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\licence.html"
+				RelativePath=".\en_US\introduction.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\macros.html"
+				RelativePath=".\en_US\kerberos.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\main.html"
+				RelativePath=".\en_US\licence.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\maintenance.html"
+				RelativePath=".\en_US\macros.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\openssl.html"
+				RelativePath=".\en_US\main.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\options-tab1.html"
+				RelativePath=".\en_US\maintenance.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\options-tab2.html"
+				RelativePath=".\en_US\make.bat"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\options-tab3.html"
+				RelativePath=".\en_US\openssl.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\options-tab4.html"
+				RelativePath=".\en_US\options-tab1.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\options-tab5.html"
+				RelativePath=".\en_US\options-tab2.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\options.html"
+				RelativePath=".\en_US\options-tab3.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\password.html"
+				RelativePath=".\en_US\options-tab4.rst"
+				>
+			</File>
+			<File
+				RelativePath=".\en_US\options-tab5.rst"
+				>
+			</File>
+			<File
+				RelativePath=".\en_US\options-tab6.rst"
+				>
+			</File>
+			<File
+				RelativePath=".\en_US\options-tab7.rst"
+				>
+			</File>
+			<File
+				RelativePath=".\en_US\options.rst"
+				>
+			</File>
+			<File
+				RelativePath=".\en_US\password.rst"
+				>
+			</File>
+			<File
+				RelativePath=".\en_US\pgadmin3.chw"
 				>
 			</File>
 			<File
@@ -217,310 +241,342 @@
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\pgagent-install.html"
+				RelativePath=".\en_US\pgadmin3.hhp.cached"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\pgagent-jobs.html"
+				RelativePath=".\en_US\pgagent-install.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\pgagent-schedules.html"
+				RelativePath=".\en_US\pgagent-jobs.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\pgagent-steps.html"
+				RelativePath=".\en_US\pgagent-schedules.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\pgagent.html"
+				RelativePath=".\en_US\pgagent-steps.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\pgscript.html"
+				RelativePath=".\en_US\pgagent.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\query.html"
+				RelativePath=".\en_US\pgscript.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\querybuilder.html"
+				RelativePath=".\en_US\query.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\reports.html"
+				RelativePath=".\en_US\reports.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\restore.html"
+				RelativePath=".\en_US\restore.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\sample-xml.html"
+				RelativePath=".\en_US\search.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\search.html"
+				RelativePath=".\en_US\slony-example.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony-execute.html"
+				RelativePath=".\en_US\slony-execute.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony-functions.html"
+				RelativePath=".\en_US\slony-functions.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony-install.html"
+				RelativePath=".\en_US\slony-install.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony-overview.html"
+				RelativePath=".\en_US\slony-overview.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony-path.html"
+				RelativePath=".\en_US\slony-path.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony-set.html"
+				RelativePath=".\en_US\slony-set.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\slony.html"
+				RelativePath=".\en_US\slony.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\status.html"
+				RelativePath=".\en_US\status.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\team.html"
+				RelativePath=".\en_US\team.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\translation_team.html"
+				RelativePath=".\en_US\translation_team.rst"
 				>
 			</File>
 			<File
-				RelativePath=".\en_US\using.html"
+				RelativePath=".\en_US\using.rst"
 				>
 			</File>
 			<Filter
 				Name="images"
 				>
 				<File
-					RelativePath=".\en_US\images\backup.png"
+					RelativePath=".\en_US\_static\backup-2.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\backup-3.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\backup-4.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\backup.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\connect.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\debugger.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\editgrid.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\export.png"
+					>
+				</File>
+				<File
+					RelativePath=".\en_US\_static\gqb.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\connect.png"
+					RelativePath=".\en_US\_static\grantwiz.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\debugger.png"
+					RelativePath=".\en_US\_static\gridopt-filter.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\editgrid.png"
+					RelativePath=".\en_US\_static\gridopt-sort.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\export.png"
+					RelativePath=".\en_US\_static\guru-connect.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\grantwiz.png"
+					RelativePath=".\en_US\_static\locks.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\gridopt-filter.png"
+					RelativePath=".\en_US\_static\logfile.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\gridopt-sort.png"
+					RelativePath=".\en_US\_static\main.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\guru-connect.png"
+					RelativePath=".\en_US\_static\maintenance.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\locks.png"
+					RelativePath=".\en_US\_static\manage-macros.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\logfile.png"
+					RelativePath=".\en_US\_static\no-hba.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\main.png"
+					RelativePath=".\en_US\_static\not-running.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\maintenance.png"
+					RelativePath=".\en_US\_static\options-browser.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\manage-macros.png"
+					RelativePath=".\en_US\_static\options-colours.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\no-hba.png"
+					RelativePath=".\en_US\_static\options-general.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\not-running.png"
+					RelativePath=".\en_US\_static\options-logging.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\options-display.png"
+					RelativePath=".\en_US\_static\options-preferences.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\options-general.png"
+					RelativePath=".\en_US\_static\options-querytool.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\options-logging.png"
+					RelativePath=".\en_US\_static\options-querytoolfiles.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\options-pref.png"
+					RelativePath=".\en_US\_static\password.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\options-query.png"
+					RelativePath=".\en_US\_static\pgagent-jobdetails.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\password.png"
+					RelativePath=".\en_US\_static\pgagent-jobproperties.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-jobdetails.png"
+					RelativePath=".\en_US\_static\pgagent-jobstats.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-jobproperties.png"
+					RelativePath=".\en_US\_static\pgagent-scheduledetails1.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-jobstats.png"
+					RelativePath=".\en_US\_static\pgagent-scheduledetails2.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-scheduledetails1.png"
+					RelativePath=".\en_US\_static\pgagent-scheduledetails3.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-scheduledetails2.png"
+					RelativePath=".\en_US\_static\pgagent-scheduleproperties.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-scheduledetails3.png"
+					RelativePath=".\en_US\_static\pgagent-stepdetails.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-scheduleproperties.png"
+					RelativePath=".\en_US\_static\pgagent-stepstats.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-stepdetails.png"
+					RelativePath=".\en_US\_static\query-analyze.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\pgagent-stepstats.png"
+					RelativePath=".\en_US\_static\query-connect.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\query-analyze.png"
+					RelativePath=".\en_US\_static\query.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\query-connect.png"
+					RelativePath=".\en_US\_static\reporttool-html.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\query.png"
+					RelativePath=".\en_US\_static\reporttool-xml.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\reporttool-html.png"
+					RelativePath=".\en_US\_static\restore-2.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\reporttool-xml.png"
+					RelativePath=".\en_US\_static\restore-3.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\restore-content.png"
+					RelativePath=".\en_US\_static\restore-4.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\restore.png"
+					RelativePath=".\en_US\_static\restore.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\search.png"
+					RelativePath=".\en_US\_static\search.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\server.png"
+					RelativePath=".\en_US\_static\server.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-create.png"
+					RelativePath=".\en_US\_static\slony-create.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-execute.png"
+					RelativePath=".\en_US\_static\slony-execute.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-join.png"
+					RelativePath=".\en_US\_static\slony-join.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-listen.png"
+					RelativePath=".\en_US\_static\slony-listen.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-overview.png"
+					RelativePath=".\en_US\_static\slony-overview.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-path.png"
+					RelativePath=".\en_US\_static\slony-path.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-sequence.png"
+					RelativePath=".\en_US\_static\slony-sequence.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-set.png"
+					RelativePath=".\en_US\_static\slony-set.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-subscription.png"
+					RelativePath=".\en_US\_static\slony-subscription.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-table.png"
+					RelativePath=".\en_US\_static\slony-table.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\slony-upgrade.png"
+					RelativePath=".\en_US\_static\slony-upgrade.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\status.png"
+					RelativePath=".\en_US\_static\status.png"
 					>
 				</File>
 				<File
-					RelativePath=".\en_US\images\transaction.png"
+					RelativePath=".\en_US\_static\transaction.png"
 					>
 				</File>
 			</Filter>
diff --git a/docs/builddocs.bat b/docs/builddocs.bat
index 1de1720..62caa4f 100644
--- a/docs/builddocs.bat
+++ b/docs/builddocs.bat
@@ -1,15 +1,20 @@
 @echo off
 
+REM Compile the HTML files
+cd ./en_US
+make.bat htmlhelp
+cd ..
+
 REM Compile the HTML Help
 "%ProgramFiles%\HTML Help Workshop\hhc.exe" ./cs_CZ/pgadmin3.hhp
-"%ProgramFiles%\HTML Help Workshop\hhc.exe" ./en_US/pgadmin3.hhp
+"%ProgramFiles%\HTML Help Workshop\hhc.exe" ./en_US/_build/htmlhelp/pgAdminIIIdoc.hhp
 "%ProgramFiles%\HTML Help Workshop\hhc.exe" ./fr_FR/pgadmin3.hhp
 
 REM Regenerate the cache file used by the wx viewer.
 IF NOT EXIST %WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe GOTO NO_HHP2CACHED
 
 "%WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe" ./cs_CZ/pgadmin3.hhp
-"%WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe" ./en_US/pgadmin3.hhp
+"%WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe" ./en_US/_build/htmlhelp/pgAdminIIIdoc.hhp
 "%WXWIN%\utils\hhp2cached\vc_mswu\hhp2cached.exe" ./fr_FR/pgadmin3.hhp
 
 EXIT 0
diff --git a/docs/en_US/conf.py b/docs/en_US/conf.py
index 7e33e48..3bffa99 100644
--- a/docs/en_US/conf.py
+++ b/docs/en_US/conf.py
@@ -111,6 +111,7 @@ html_theme = 'default'
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
 #html_logo = None
+html_logo = 'logo-ltr.jpg'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -132,6 +133,9 @@ html_static_path = ['_static']
 
 # Custom sidebar templates, maps document names to template names.
 #html_sidebars = {}
+html_sidebars = {
+    '**': ['localtoc.html', 'globaltoc.html', 'searchbox.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
