diff --git a/.travis-build.sh b/.travis-build.sh
index ecb5c7149..bcf624db6 100755
--- a/.travis-build.sh
+++ b/.travis-build.sh
@@ -11,8 +11,6 @@
 ##
 ## License: GPLv3
 
-tests=("core" "doc")
-
 if [ $USER != "travis" ]; then
     echo "This script is not designed to run locally."
     echo "Instead, navigate to the appropriate test folder and run make there instead."
@@ -47,11 +45,12 @@ if [ "${FORMATTING}" = "space-test" ]; then
 fi
 
 # Emacs tests
+
 echo "Pwd $(pwd)"
 rm -rf ~/.emacs.d
 ln -sf `pwd` ~/.emacs.d
 
-for test in "${tests[@]}"; do
+for test in "${TESTS[@]}"; do
     rm -rf ~/.emacs.d/elpa
     rm -rf ~/.emacs.d/.cache
     rm -f ~/.spacemacs
diff --git a/.travis.yml b/.travis.yml
index e440e2ccb..43e0dec1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,16 +11,21 @@ before_install:
  - if [ ! -z "$EVM_EMACS" ]; then evm install $EVM_EMACS --use --skip; fi
 
 env:
- - EVM_EMACS=emacs-24.4-travis
- - EVM_EMACS=emacs-24.5-travis
- - EVM_EMACS=emacs-25.1-travis
- - EVM_EMACS=emacs-git-snapshot-travis
+ - TESTS=core EVM_EMACS=emacs-24.4-travis
+ - TESTS=core EVM_EMACS=emacs-24.5-travis
+ - TESTS=core EVM_EMACS=emacs-25.1-travis
+ - TESTS=core EVM_EMACS=emacs-git-snapshot-travis
+ - TESTS=doc EVM_EMACS=emacs-24.4-travis
+ - TESTS=doc EVM_EMACS=emacs-24.5-travis
+ - TESTS=doc EVM_EMACS=emacs-25.1-travis
+ - TESTS=doc EVM_EMACS=emacs-git-snapshot-travis
  - FORMATTING=space-test
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EVM_EMACS=emacs-git-snapshot-travis
+    - env: TESTS=core EVM_EMACS=emacs-git-snapshot-travis
+    - env: TESTS=doc EVM_EMACS=emacs-git-snapshot-travis
 
 script:
   - ./.travis-build.sh
diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org
index 72647eabe..9032e8838 100644
--- a/CONTRIBUTING.org
+++ b/CONTRIBUTING.org
@@ -1,5 +1,4 @@
 #+TITLE: Contribution guidelines
-#+HTML_HEAD_EXTRA: <link rel="stylesheet" type="text/css" href="../css/readtheorg.css" />
 
 Spacemacs is a volunteer effort. We encourage you to pitch in. The community
 makes Spacemacs what it is. We have a few guidelines, which we ask all
@@ -12,12 +11,21 @@ You can only consider reading the sections relevant to what you are going to do:
 
 Thanks! :heart: :heart: :heart:
 
-* Content                                                    :TOC@2:noexport:
+* Content                                                   :TOC_4_gh:noexport:
  - [[#asking-for-help][Asking for help]]
  - [[#reporting-issues][Reporting issues]]
  - [[#contributing-code][Contributing code]]
    - [[#general-contribution-guidelines][General contribution guidelines]]
+     - [[#license][License]]
+     - [[#conventions][Conventions]]
+     - [[#pull-request][Pull-Request]]
+       - [[#ideally-for-simple-prs-most-of-them][Ideally for /simple/ PRs (most of them):]]
+       - [[#for-complex-prs-big-refactoring-etc][For complex PRs (big refactoring, etc):]]
+     - [[#commit-messages][Commit messages]]
    - [[#contributing-a-layer][Contributing a layer]]
+     - [[#file-header][File header]]
+     - [[#author-of-a-new-layer][Author of a new layer]]
+     - [[#contributor-to-an-existing-layer][Contributor to an existing layer]]
    - [[#contributing-a-keybinding][Contributing a keybinding]]
    - [[#contributing-a-banner][Contributing a banner]]
  - [[#additional-information][Additional information]]
@@ -30,7 +38,7 @@ it may hold the answer:
 
 - [[file:doc/FAQ.org][The FAQ]]. Some of the most frequently asked questions are answered there.
 - [[file:doc/DOCUMENTATION.org][The documentation]]. It's the general documentation of Spacemacs.
-- You may also read the =README.org= of the [[file:layers/][relevant layer(s)]].
+- You may also read the =README.org= of the [[file:doc/LAYERS.org][relevant layer(s)]].
 
 If your question is not answered there, then please come into our [[https://gitter.im/syl20bnr/spacemacs][gitter chat]] to
 discuss it with us :relaxed:. We will direct you to a solution, or ask you to
diff --git a/core/core-documentation.el b/core/core-documentation.el
index 0ba607a3a..87d6859be 100644
--- a/core/core-documentation.el
+++ b/core/core-documentation.el
@@ -122,20 +122,17 @@ compatible."
     (goto-char (point-min))
     (while (re-search-forward heading-regexp nil t)
       (let ((heading (match-string 1)))
-        (progn (move-end-of-line nil)
-               (open-line 1)
-               (next-line 1)
-               (insert (format (concat "  :PROPERTIES:\n"
-                                       "  :CUSTOM_ID: %s\n"
-                                       "  :END:\n")
-                               (substring (toc-org-hrefify-gh
-                                           (replace-regexp-in-string
-                                            toc-org-tags-regexp
-                                            ""
-                                            heading))
-                                          ;; Remove # prefix added by
-                                          ;; `toc-org-hrefify-gh'.
-                                          1))))))))
+        (insert (format (concat "\n:PROPERTIES:\n"
+                                ":CUSTOM_ID: %s\n"
+                                ":END:\n")
+                        (substring (toc-org-hrefify-gh
+                                    (replace-regexp-in-string
+                                     toc-org-tags-regexp
+                                     ""
+                                     heading))
+                                   ;; Remove # prefix added by
+                                   ;; `toc-org-hrefify-gh'.
+                                   1)))))))
 
 (defun spacemacs//reroot-links ()
   "Find the links that start with https://github.com/syl20bnr/spacemacs/blob/
@@ -188,10 +185,10 @@ preprocessors for the exported .org files."
           (save-match-data
             (insert-file-contents filename t)
             ;; ===========Add preprocessors here===============
+            (spacemacs//org-heading-annotate-custom-id)
             (spacemacs//add-org-meta-readtheorg-css filename)
             (spacemacs//toc-org-unhrefify-toc)
             (spacemacs//reroot-links)
-            (spacemacs//org-heading-annotate-custom-id)
             (apply origfunc args)
             (set-buffer-modified-p nil)))
         ;; Restore `buffer-file-name' for the buffers that previously visited