--- a/doc/manual/manual_tex4ht.cfg	Fri Jun 03 02:40:13 2016 +0200
+++ b/doc/manual/manual_tex4ht.cfg	Fri Jun 03 14:21:14 2016 +0200
@@ -102,7 +102,7 @@
 
 % Remove hr-tags that tex4ht inserts by default in around floats (e.g. tables) and replace them with a background.
 % Also remove hr-tags around figures, entirely.
-\Configure{float}[]{\HCode{<div style="margin:1em;padding:0.5em;background:rgba(200,200,200,0.1);width:100\%;">}}{}{\HCode{</div>}}
+\Configure{float}[]{\HCode{<div class='blockDiv'>}}{}{\HCode{</div>}}
 \ConfigureEnv{figure}{\HCode{}}{\HCode{}}{}{}
 
 %% Simplest possible table layout - do rest in css.
@@ -127,9 +127,9 @@
 %\ConfigureEnv{lstlisting}{\listingLineReset\Tg<div class="ttDiv">}{\Tg</div>}{}{}
 %\Configure{listings}{}{}{}{\ifnum \lstlineno>0 \Tg<br> \fi \listingLine}
 
-% Make listing/table captions nicer. NOTE: the -0.5em might need to be adapted if the main css changes.@@@
+% Make listing/table captions nicer.
 \Configure{caption}
-	{\HCode{<div class="caption" style="margin:-0.5em 0;text-align:right;color:\#A0A0A0"><small>}}
+	{\HCode{<div class="blockCaption"><small>}}
 	{\HCode{<span class="id">}}
 	{\HCode{</span>: <span class="content">}}
 	{\HCode{</span></small></div>}}
@@ -154,14 +154,10 @@
 
 %http://www.itisnotoverengineering.com/2013/06/syntax-highlighting-with-tex4ht.html
 
-% Simplest possible paragraphs
-% @@@ this creates paragraphs around block level elements, which is not what we would like
-% @@@ but it looks decent, except for the space in the float-element lr-corner
-\Configure{HtmlPar}{\EndP\Tg<p>}{\EndP\Tg<p>}{\HCode{</p>\Hnewline}}{\HCode{</p>\Hnewline}}
-%\Configure{HtmlPar}{\EndP\HCode{}}{\EndP\HCode{}}{\HCode{\Hnewline}}{\HCode{\Hnewline}}
-%\Configure{HtmlPar}{\EndP\Tg<p>}{\EndP\HCode{}}{\HCode{</p>\Hnewline}}{\HCode{\Hnewline}}
-%\Configure{HtmlPar}{\EndP\HCode{}}{\EndP\Tg<p>}{\HCode{\Hnewline}}{\HCode{</p>\Hnewline}}
-
+% Simplest possible paragraphs.
+% Note, we don't use the optional </p> end tags, as we would end up wrapping block level
+% elements like <table> in <p>...</p> pairs.
+\Configure{HtmlPar}{\EndP\Tg<p>}{\EndP\Tg<p>}{\HCode{\Hnewline}}{\HCode{\Hnewline}}
 
 
 % On site navigation texts