diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9afe507aa..08fcf79e3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -60,6 +60,7 @@ ORG_FILES = \
   org/.dir-locals.el \
   org/init.el.in \
   org/syntax.css \
+  org/spot.css \
   org/autfilt.org \
   org/csv.org \
   org/dstar2tgba.org \
diff --git a/doc/org/.dir-locals.el b/doc/org/.dir-locals.el
index e94e0784a..27c5a42aa 100644
--- a/doc/org/.dir-locals.el
+++ b/doc/org/.dir-locals.el
@@ -21,7 +21,10 @@
 		   :publishing-directory "../userdoc/"
 		   :recursive t
 		   :publishing-function org-publish-org-to-html
-		   :style "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://spot.lip6.fr/css/spot-zenburn.css\" />"
+		   ; Org 8
+		   :html-head "<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
+		   ; Org 7
+		   :style "<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
 		   :auto-preamble t)
 		  ("spot-static"
 		   :base-directory "."
diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index 5968b8d2b..560ba0482 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -38,7 +38,10 @@
 	:publishing-function
 	,(if (require 'org-publish nil t) 'org-publish-org-to-html ; Org 7
 	   'org-html-publish-to-html)                              ; Org 8
-	:style "\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"http://spot.lip6.fr/css/spot-zenburn.css\" />"
+	; Org 8
+	:html-head "<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
+	; Org 7
+	:style "\n<link rel=\"stylesheet\" type=\"text/css\" href=\"syntax.css\" />\n<link rel=\"stylesheet\" type=\"text/css\" href=\"spot.css\" />"
 	:auto-preamble t)
        ("spot-static"
 	:base-directory "@abs_top_srcdir@/doc/org/"
diff --git a/doc/org/spot.css b/doc/org/spot.css
new file mode 100644
index 000000000..3084b9c60
--- /dev/null
+++ b/doc/org/spot.css
@@ -0,0 +1,114 @@
+/*
+  http://paletton.com/#uid=33i0X0kz3BrkeHdpSD1C7r1FAlb
+*/
+
+@media all
+{
+  body {
+    font-family: Arial, sans-serif;
+    font-weight: normal;
+    max-width: 62em;
+    margin: auto;
+    padding: 0 .5em;
+    background-image: url(http://spot.lip6.fr/img/spot64.png);
+    background-repeat: no-repeat;
+    background-position: 25px 25px;
+    }
+    body #content {
+      padding-top: 45px;
+    }
+    body pre {
+      background: #fafafa;
+      border: none;
+      font-family: monospace, courier;
+    }
+    body code {
+      font-weight: bold;
+    }
+    body a {
+      color: #008181; }
+/*    body .title {
+      margin-left: 120px;
+    }*/
+
+  /* TOC inspired by http://jashkenas.github.com/coffee-script */
+  #table-of-contents {
+    font-size: 10pt;
+    position: fixed;
+    right: 0em;
+    top: 0em;
+    padding-right: 8pt;
+    -webkit-box-shadow: 0 0 1em #777777;
+    -moz-box-shadow: 0 0 1em #777777;
+    -webkit-border-bottom-left-radius: 5px;
+    -moz-border-radius-bottomleft: 5px;
+    text-align: right;
+    /* ensure doesn't flow off the screen when expanded */
+    max-height: 80%;
+    overflow: auto; }
+    #table-of-contents h2 {
+      font-size: 10pt;
+      max-width: 8em;
+      font-weight: normal;
+      padding-left: 0.5em;
+      padding-left: 0.5em;
+      padding-top: 0.05em;
+      padding-bottom: 0.05em; }
+    #table-of-contents #text-table-of-contents {
+      display: none;
+      text-align: left; }
+    #table-of-contents:hover #text-table-of-contents {
+      display: block;
+      padding: 0.5em;
+      margin-top: -1.5em; }
+
+  .rss_box {}
+  .rss_title, rss_title a {}
+  .rss_items {}
+  .rss_item a:link, .rss_item a:visited, .rss_item a:active {}
+  .rss_item a:hover {}
+  .rss_date {}
+
+  #org-div-home-and-up {
+      text-align: center;
+      font-size: 100%;
+   }
+  .done   { color: SpringGreen; }
+  .WAIT   { color: Orange; }
+  .timestamp-kwd { color: DeepPink; }
+  div#postamble { visibility: hidden; }
+
+  .outline-2 h2 {
+      border-bottom-style: solid;
+      border-color: #ffe35e;
+  }
+
+  pre.src {
+      padding-top: 8px;
+      border-left-style: solid;
+      border-color: #00adad;
+  }
+  pre.example {
+      border-left-style: solid;
+      border-color: #d80076;
+  }
+  pre.src:before {
+      border: none;
+      border-bottom-style: solid;
+      border-color: #00adad;
+  }
+
+} /* END OF @media all */
+
+@media screen
+{
+  #table-of-contents {
+    float: right;
+    border-left: 1px solid #ffd300;
+    border-bottom: 1px solid  #ffd300;
+    background: #ffe35e;
+    max-width: 50%;
+    overflow: auto;
+    z-index: 10;
+  }
+} /* END OF @media screen */