diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index b515d31a7..cfa43eefd 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -54,6 +54,9 @@
 ;; conditions when doing concurrent builds.
 (setq org-publish-timestamp-directory "@abs_top_builddir@/.org-timestamps/")
 
+;; Prevent tabs from being inserted when org-mode reindent some code.
+(setq-default indent-tabs-mode nil)
+
 (org-babel-do-load-languages
  'org-babel-load-languages
  `((,(if (version< org-version "8.3") 'sh 'shell) . t)
diff --git a/doc/org/spot.css b/doc/org/spot.css
index ef1dfe6de..0dbe505ae 100644
--- a/doc/org/spot.css
+++ b/doc/org/spot.css
@@ -43,18 +43,14 @@ thead tr{background:#ffe35e}
 #content tbody:nth-child(even) tr:nth-child(even){background:#fff3bc}
 #content tbody:nth-child(even) tr:nth-child(odd){background:#fffbe0}
 .org-svg{max-width:100%;width:auto}
-.org-keyword{font-weight:bold}
-.org-builtin{font-weight:bold}
-.org-preprocessor{font-weight:bold}
+.org-keyword,.org-builtin,.org-preprocessor,.org-py-import-from,.org-py-def-class{font-weight:bold}
 .org-string{font-weight:bold;color:#00adad}
 .src-hoa .org-string{font-weight:bold;color:#d70079}
 .org-function-name{font-weight:bold;color:#d70079}
 .org-type{font-weight:bold;color:#00adad}
 .org-comment-delimiter{font-weight:bold;color:#a13672}
 .org-comment{font-style:italic;color:#a13672}
-.org-hoa-keyword{font-weight:bold}
-.org-hoa-builtin{font-weight:bold}
-.org-hoa-acceptance-set{font-weight:bold}
+.org-hoa-keyword,.org-hoa-builtin,.org-hoa-acceptance-set{font-weight:bold}
 .org-hoa-header-uppercase{font-weight:bold;color:#00adad}
 .org-hoa-header-lowercase{color:#00adad}
 .org-hoa-ap-number{color:#d70079}