diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 082004a59c..51daf3f6d5 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4132,6 +4132,15 @@ sub _convert_def_line_type($$$$)
     } else {
       $category = '';
     }
+    my $category_text = "";
+    my $category_attr = "";
+    my $brk = " ";
+    my $sep = "";
+    if ($self->get_conf('deftypefnnewline') eq 'on') {
+        $brk = "<br/> ";
+        $sep = "\@*";
+    }
+
     if ($command_name eq 'deffn'
         or $command_name eq 'defvr'
         or $command_name eq 'deftp'
@@ -4145,14 +4154,15 @@ sub _convert_def_line_type($$$$)
              or ($command_name eq 'deftypecv'
                  and !$command->{'extra'}->{'def_parsed_hash'}->{'type'}))
             and !$command->{'extra'}->{'def_parsed_hash'}->{'class'})) {
+      $category_text = $category ? $$category{text} : '';
+      $category_attr = " category=\"".$category_text."\"";
+      $category_text = "<span class=\"category\">".$category_text.": </span>";
       if ($arguments) {
-        $tree = $self->gdt("{category}: \@strong{{name}} \@emph{{arguments}}", {
-                'category' => $category,
+        $tree = $self->gdt("\@strong{{name}} \@emph{{arguments}}", {
                 'name' => $name,
                 'arguments' => $arguments});
       } else {
-        $tree = $self->gdt("{category}: \@strong{{name}}", {
-                'category' => $category,
+        $tree = $self->gdt("\@strong{{name}}", {
                 'name' => $name});
       }
     } elsif ($command_name eq 'deftypefn'
@@ -4286,7 +4296,7 @@ sub _convert_def_line_type($$$$)
       }
     }
 
-    return "<dt$index_label>".$self->convert_tree({'type' => '_code',
+    return "<dt$index_label class=\"synopsis\"$category_attr>".$category_text.$self->convert_tree({'type' => '_code',
                              'contents' => [$tree]}) . "</dt>\n";
   } else {
     my $category_prepared = '';
@@ -4360,7 +4370,7 @@ sub _convert_def_command($$$$) {
   return $content if ($self->in_string());
   #print STDERR "IIII $self $cmdname command $command args $args content $content\n";
   if (!$self->get_conf('DEF_TABLE')) {
-    return "<dl>\n". $content ."</dl>\n";
+    return "<dl class=\"definition\">\n". $content ."</dl>\n";
   } else {
     return "<table width=\"100%\">\n" . $content . "</table>\n";
   }