Convert documentation to publishable format

2015-10-30 12:20:58 +01:00 · 2015-10-30 12:20:58 +01:00 · 13c5b1d24b
parent 9c7c148141
commit 13c5b1d24b
111 changed files with 1758 additions and 1850 deletions
--- a/doc/CONTRIBUTE.org
+++ b/doc/CONTRIBUTE.org
@ -1,28 +1,27 @@
-* Contribute to Spacemacs
+#+SETUPFILE: theme-readtheorg.setup

-** Table of Contents                                                 :TOC@4:
- - [[#contribute-to-spacemacs][Contribute to Spacemacs]]
-   - [[#pull-request-guidelines][Pull Request Guidelines]]
-     - [[#ideally-and-for-simple-prs][Ideally and for /simple/ PRs:]]
-     - [[#for-complex-pull-requests][For complex pull requests:]]
-     - [[#getting-help][Getting Help]]
-   - [[#submitting-a-configuration-layer][Submitting a configuration layer]]
-   - [[#testing][Testing]]
-   - [[#submitting-a-banner][Submitting a banner]]
-   - [[#credits][Credits]]
-     - [[#license][License]]
-     - [[#file-header][File header]]
-     - [[#author-of-a-contribution-layer][Author of a contribution layer]]
-     - [[#contributor-of-a-contribution-layer][Contributor of a contribution layer]]
+* Contribute to Spacemacs                                   :TOC_4_org:noexport:
+ - [[Pull Request Guidelines][Pull Request Guidelines]]
+   - [[Ideally and for /simple/ PRs:][Ideally and for /simple/ PRs:]]
+   - [[For complex pull requests:][For complex pull requests:]]
+   - [[Getting Help][Getting Help]]
+ - [[Submitting a configuration layer][Submitting a configuration layer]]
+ - [[Testing][Testing]]
+ - [[Submitting a banner][Submitting a banner]]
+ - [[Credits][Credits]]
+   - [[License][License]]
+   - [[File header][File header]]
+   - [[Author of a contribution layer][Author of a contribution layer]]
+   - [[Contributor of a contribution layer][Contributor of a contribution layer]]

-** Pull Request Guidelines
+* Pull Request Guidelines
 Spacemacs branch model is inspired from the [[http://nvie.com/posts/a-successful-git-branching-model/][git-flow]] model:
 You'll have to submit your contributions and fixes within a pull-request to
 apply against the =develop= branch.

 /PR = pull request/

-*** Ideally and for /simple/ PRs:
+** Ideally and for /simple/ PRs:
 -  branch from =develop=
 -  one topic per PR
 -  one commit per PR
@ -35,19 +34,19 @@ apply against the =develop= branch.
 Those PRs are /fast-forwarded/ whenever it's possible and
 /cherry-picked/ otherwise (most likely they will be cherry-picked).

-*** For complex pull requests:
+** For complex pull requests:
 -  squash only the commits with uninteresting changes like typos, syntax
   fixes, etc... and keep the important and /isolated/ steps in
   different commits.

 Those PRs are /merged/ and explicitly /not fast-forwarded/.

-*** Getting Help
+** Getting Help
 If you have any question on this process, join the [[https://gitter.im/syl20bnr/spacemacs][gitter
 chatroom]] and ask your questions there. It will be a pleasure to help you to
 contribute!

-** Submitting a configuration layer
+* Submitting a configuration layer
 Contributed configuration layers are stored in the =layers= folder. The
 =layers= folder also contains categories prefixed with =+= to put your
 layers in. For example a layer for a language would go in the
@ -62,9 +61,9 @@ It is recommended to join a =README.org= file with your layer:
  - if a logo exists for the layer you can add it at the top of the =README.org=
    before the TOC. The maximum recommended height is 200 pixels.

-Please read the [[LAYERS.org][tips for writing layers]] first.
+Please read the [[file:LAYERS.org][tips for writing layers]] first.

-** Testing
+* Testing
 Tests live in the =tests= folder, with a folder structure corresponding to the
 rest of the repository.

@ -104,7 +103,7 @@ To add tests for a layer, do the following:

 Spacemacs is lacking tests, so contributions are welcome.

-** Submitting a banner
+* Submitting a banner
 The startup banner is by default randomly chosen among a pool of banners
 each time Spacemacs starts. Banners are located in directory
 =~/.emacs.d/core/banners=.
@ -114,8 +113,8 @@ If you have some ASCII skills you can submit your artwork!
 You are free to choose a reasonable height size but the width size
 should be around 75 characters.

-** Credits
-*** License
+* Credits
+** License
 The license is GPLv3 for all parts specific to Spacemacs, this
 includes: - the initialization and core files - all the layer files.

@ -123,7 +122,7 @@ For files not belonging to Spacemacs like extensions and libraries,
 refer to the header file. Those files should not have an empty header,
 please report any file imported in Spacemacs without a proper header.

-*** File header
+** File header
 Template:

 #+BEGIN_EXAMPLE
@ -140,14 +139,14 @@ Template:
    ;;; License: GPLv3
 #+END_EXAMPLE

-*** Author of a contribution layer
+** Author of a contribution layer
 In the file header: - change =NAME= to the name of the layer, - change
 the default author name =Sylvain Benner= to your name, - do not remove
 the line: =;; Copyright (c) 2012-2014 Sylvain Benner= - modify the
 second copyright line by replacing the default name and dates, *keep*
 =& Contributors= in this line, - other lines should not be modified

-*** Contributor of a contribution layer
+** Contributor of a contribution layer
 You should not modify any header file. A very cool way to show your
 contributions will be available in Spacemacs at some point, /Stay
 Tuned/.
--- a/doc/CONVENTIONS.org
+++ b/doc/CONVENTIONS.org
@ -1,43 +1,43 @@
-* Spacemacs conventions
-** Table of Contents                                                 :TOC@4:
- - [[#spacemacs-conventions][Spacemacs conventions]]
-   - [[#code-guidelines][Code guidelines]]
-     - [[#spacemacs-core-and-layer][Spacemacs core and layer]]
-     - [[#all-layers][All layers]]
-   - [[#key-bindings-conventions][Key bindings conventions]]
-     - [[#reserved-prefix][Reserved prefix]]
-       - [[#user-prefix][User prefix]]
-       - [[#major-mode-prefix][Major mode prefix]]
-       - [[#micro-state][Micro-state]]
-     - [[#evilified-buffers][Evilified buffers]]
-     - [[#navigation][Navigation]]
-       - [[#n-and-n][n and N]]
-       - [[#code-navigation][Code Navigation]]
-       - [[#insert-state-buffers][=insert state= buffers]]
-     - [[#evaluation][Evaluation]]
-     - [[#repls][REPLs]]
-       - [[#send-code][Send code]]
-       - [[#in-terminal][In terminal]]
-     - [[#building-and-compilation][Building and Compilation]]
-     - [[#debugging][Debugging]]
-     - [[#plain-text-markup-languages][Plain Text Markup Languages]]
-       - [[#headers][Headers]]
-       - [[#insertion-of-common-elements][Insertion of common elements]]
-       - [[#text-manipulation][Text manipulation]]
-       - [[#movement-in-normal-mode][Movement in normal mode]]
-       - [[#promotion-demotion-and-element-movement][Promotion, Demotion and element movement]]
-       - [[#table-editing][Table editing]]
-     - [[#tests][Tests]]
-       - [[#all-languages][All languages]]
-       - [[#language-specific][Language specific]]
-     - [[#toggles][Toggles]]
-     - [[#refactoring][Refactoring]]
-     - [[#help-or-documentation][Help or Documentation]]
-   - [[#writing-documentation][Writing documentation]]
-     - [[#spacing-in-documentation][Spacing in documentation]]
+#+SETUPFILE: theme-readtheorg.setup

-** Code guidelines
-*** Spacemacs core and layer
+* Spacemacs conventions                                     :TOC_4_org:noexport:
+ - [[Code guidelines][Code guidelines]]
+   - [[Spacemacs core and layer][Spacemacs core and layer]]
+   - [[All layers][All layers]]
+ - [[Key bindings conventions][Key bindings conventions]]
+   - [[Reserved prefix][Reserved prefix]]
+     - [[User prefix][User prefix]]
+     - [[Major mode prefix][Major mode prefix]]
+     - [[Micro-state][Micro-state]]
+   - [[Evilified buffers][Evilified buffers]]
+   - [[Navigation][Navigation]]
+     - [[n and N][n and N]]
+     - [[Code Navigation][Code Navigation]]
+     - [[=insert state= buffers][=insert state= buffers]]
+   - [[Evaluation][Evaluation]]
+   - [[REPLs][REPLs]]
+     - [[Send code][Send code]]
+     - [[In terminal][In terminal]]
+   - [[Building and Compilation][Building and Compilation]]
+   - [[Debugging][Debugging]]
+   - [[Plain Text Markup Languages][Plain Text Markup Languages]]
+     - [[Headers][Headers]]
+     - [[Insertion of common elements][Insertion of common elements]]
+     - [[Text manipulation][Text manipulation]]
+     - [[Movement in normal mode][Movement in normal mode]]
+     - [[Promotion, Demotion and element movement][Promotion, Demotion and element movement]]
+     - [[Table editing][Table editing]]
+   - [[Tests][Tests]]
+     - [[All languages][All languages]]
+     - [[Language specific][Language specific]]
+   - [[Toggles][Toggles]]
+   - [[Refactoring][Refactoring]]
+   - [[Help or Documentation][Help or Documentation]]
+ - [[Writing documentation][Writing documentation]]
+   - [[Spacing in documentation][Spacing in documentation]]
+
+* Code guidelines
+** Spacemacs core and layer
 Function names follow these conventions:
  - =spacemacs/xxx= is an interactive function called =xxx=
  - =spacemacs//xxx= is a private function called =xxx= (implementation details)
@ -47,22 +47,22 @@ Variables follow these conventions:
  - =spacemacs-xxx= is a variable
  - =spacemacs--xxx= is a private variable (implementation details)

-*** All layers
+** All layers
 A package is initialized in a function with name =<layer>/init-xxx= where:
  - =<layer>= is the layer name
  - =xxx= is the package name

-** Key bindings conventions
-*** Reserved prefix
-**** User prefix
+* Key bindings conventions
+** Reserved prefix
+*** User prefix
 ~SPC o~ and ~SPC m o~ must not be used by any layer. They are reserved for the
 user.

-**** Major mode prefix
+*** Major mode prefix
 ~SPC m~ is reserved for the current major mode. Three keys bindings are not an
 issue (ie. ~SPC m h d~) since ~SPC m~ can be accessed via ~,~.

-**** Micro-state
+*** Micro-state
 Whenever possible a micro-state should be enabled with ~M-SPC~ and ~s-M-SPC~. We
 need the latter bindings on OS X since ~M-SPC~ is used by the OS for spotlight.

@ -71,7 +71,7 @@ buffers are good candidates to be put on ~M-SPC~ and ~s-M-SPC~.

 It is recommended to add ~q~ to leave the micro-state.

-*** Evilified buffers
+** Evilified buffers
 /Evilifying/ a buffer is to set the =evilified state= as the default
 state for the major mode of the buffer.

@ -100,17 +100,17 @@ rules:
 If a key binding cannot be remapped then it is ignored and a warning message
 is displayed in =*Messages*=.

-*** Navigation
-**** n and N
+** Navigation
+*** n and N
 To be consistent with the Vim way, ~n~ and ~N~ are favored over Emacs ~n~ and
 ~p~.

 Ideally a micro-state should be provided to smooth the navigation
 experience. A micro-state allows to repeat key bindings without entering
 each time the prefix commands. More info on micro-states in the
-[[DOCUMENTATION.org#micro-states][documentation]].
+[[file:DOCUMENTATION.org::Micro-states][documentation]].

-**** Code Navigation
+*** Code Navigation
 The prefix for going to something is ~SPC m g~.

 | Key     | Description                                     |
@ -121,7 +121,7 @@ The prefix for going to something is ~SPC m g~.
 | ~m g G~ | go to things under point in other window        |
 | ~m g t~ | go to corresponding test file if any            |

-**** =insert state= buffers
+*** =insert state= buffers
 Navigation in buffers like =Helm= and =ido= which are in =insert state=
 should be performed with ~C-j~ and ~C-k~ bindings for vertical movements.

@ -130,7 +130,7 @@ should be performed with ~C-j~ and ~C-k~ bindings for vertical movements.
 | ~C-j~ | go down     |
 | ~C-k~ | go up       |

-*** Evaluation
+** Evaluation
 Live evaluation of code is under the prefix ~SPC m e~.

 | Key     | Description                                       |
@ -142,8 +142,8 @@ Live evaluation of code is under the prefix ~SPC m e~.
 | ~m e l~ | evaluate line                                     |
 | ~m e r~ | evaluate region                                   |

-*** REPLs
-**** Send code
+** REPLs
+*** Send code
 A lot of languages can interact with a REPL. To help keeping a
 consistent behavior between those languages the following conventions
 should be followed:
@ -168,7 +168,7 @@ should be followed:

 Note: we don't distinguish between the file and the buffer.

-**** In terminal
+*** In terminal
 History navigation in shells or REPLs buffers should be bound as well to
 ~C-j~ and ~C-k~.

@ -179,7 +179,7 @@ History navigation in shells or REPLs buffers should be bound as well to
    | ~C-l~ | clear screen               |
    | ~C-r~ | search backward in history |

-*** Building and Compilation
+** Building and Compilation
 The base prefix for major mode specific compilation is ~SPC m c~.

    | Key Binding | Description       |
@ -191,7 +191,7 @@ The base prefix for major mode specific compilation is ~SPC m c~.
 Note: we don't distinguish between the file and the buffer. We can
 implement an auto-save of the buffer before compiling the buffer.

-*** Debugging
+** Debugging
 The base prefix for debugging commands is ~SPC d~.

 | Key Binding | Description             |
@ -213,11 +213,11 @@ Notes:
    the spacemacs level and ideally the function should be proposed as a patch
    upstream (major mode repository).

-*** Plain Text Markup Languages
+** Plain Text Markup Languages
 For layers supporting markup languages please follow the following
 keybindings whenever applicable.

-**** Headers
+*** Headers
 All header functionality should be grouped under ~SPC m h~

 | Key Binding | Description                                      |
@ -226,7 +226,7 @@ All header functionality should be grouped under ~SPC m h~
 | ~m h I~     | Insert a header alternative method (if existing) |
 | ~m h 1..10~ | Insert a header of level 1..10 (if possible)     |

-**** Insertion of common elements
+*** Insertion of common elements
 Insertion of common elements like links or footnotes should be grouped
 under ~SPC m i~

@ -238,7 +238,7 @@ under ~SPC m i~
 | ~m i u~     | Insert url       |
 | ~m i w~     | Insert wiki-link |

-**** Text manipulation
+*** Text manipulation
 Manipulation of text regions should be grouped under ~SPC m x~

 | Key Binding | Description                   |
@ -252,7 +252,7 @@ Manipulation of text regions should be grouped under ~SPC m x~
 | ~m x u~     | Make region underlined        |
 | ~m x v~     | Make region verbose           |

-**** Movement in normal mode
+*** Movement in normal mode
 In normal mode Vim style movement should be enabled with these keybindings:

 | Key Binding | Description                            |
@ -262,7 +262,7 @@ In normal mode Vim style movement should be enabled with these keybindings:
 | ~g k~       | Move to previous heading on same level |
 | ~g l~       | Move down one level in headings        |

-**** Promotion, Demotion and element movement
+*** Promotion, Demotion and element movement
 Promotion, demotion and movement of headings or list elements (whatever is
 possible) should be enabled with the following keys in any mode

@ -273,17 +273,17 @@ possible) should be enabled with the following keys in any mode
 | ~M-k~       | Move element up              |
 | ~M-l~       | Demote heading by one level  |

-**** Table editing
+*** Table editing
 If table specific commands are available the they are grouped under the
 ~SPC m t~ group.

-*** Tests
+** Tests
 A lot of languages have their own test frameworks. These frameworks
 share common actions that we can unite under the same key bindings:
 - ~SPC m t~ is the prefix for test execution.
 - ~SPC m t X~ is used to execute ~SPC m t x~ but in debug mode (if supported).

-**** All languages
+*** All languages

 | Key     | Description                                                  |
 |---------+--------------------------------------------------------------|
@ -298,7 +298,7 @@ Note: we don't distinguish between the file and the buffer. We can
 implement an auto-save of the buffer before executing the tests of
 buffer.

-**** Language specific
+*** Language specific
 | Key     | Description                                      |
 |---------+--------------------------------------------------|
 | ~m t m~ | execute the tests of the current module          |
@ -309,14 +309,14 @@ buffer.
 Note that there are overlaps, depending on the language we will choose
 one or more bindings for the same thing

-*** Toggles
+** Toggles
 - Global toggles are under ~SPC t~, ~SPC T~ and ~SPC C-t~
 - Major mode toggles are only under ~SPC m T~

-*** Refactoring
+** Refactoring
 Refactoring prefix is ~SPC m r~.

-*** Help or Documentation
+** Help or Documentation
 The base prefix for help commands is ~SPC h~. Documentation is considered
 as an help command.

@ -325,11 +325,11 @@ as an help command.
 | ~m h h~ | documentation of thing under point |
 | ~m h r~ | documentation of selected region   |

-** Writing documentation
+* Writing documentation
 Spacemacs provides an example layer =README.org= file in
 =~/.emacs.d/core/templates/layer-README.template=.

-*** Spacing in documentation
+** Spacing in documentation
 Spacemacs tries to keep the documentation consistent between all layers by
 providing some rules for spacing:
  - After each header, you should not add an empty line
--- a/doc/DOCUMENTATION.org
+++ b/doc/DOCUMENTATION.org
--- a/doc/FAQ.org
+++ b/doc/FAQ.org
@ -1,64 +1,66 @@
-* FAQ                                                                 :TOC@4:
-   - [[#common][Common]]
-     - [[#which-version-of-spacemacs-am-i-running][Which version of Spacemacs am I running?]]
-     - [[#what-is-the-official-pronunciation-of-spacemacs][What is the official pronunciation of Spacemacs?]]
-     - [[#why-are-packages-installed-with-package-install-automatically-deleted-by-spacemacs-when-it-boots][Why are packages installed with =package-install= automatically deleted by Spacemacs when it boots?]]
-     - [[#the-spacemacs-banner-is-ugly-what-should-i-do][The Spacemacs banner is ugly, what should I do?]]
-     - [[#the-powerline-separators-are-ugly-how-can-i-fix-them][The powerline separators are ugly, how can I fix them?]]
-     - [[#the-powerline-separators-have-no-anti-aliasing-what-can-i-do][The powerline separators have no anti-aliasing, what can I do?]]
-     - [[#why-is-after-init-hook-not-executed][Why is after-init-hook not executed?]]
-     - [[#what-is-the-difference-between-spacemacs-base-and-spacemacs-distributions][What is the difference between =spacemacs-base= and =spacemacs= distributions?]]
-     - [[#how-can-i-change-or-define-an-alias-for-an-evil-leader-prefix][How can I change or define an alias for an =evil-leader= prefix?]]
-     - [[#should-i-place-my-settings-in-user-init-or-user-config][Should I place my settings in =user-init= or =user-config=?]]
-     - [[#why-do-some-of-my-org-related-settings-cause-problems][Why do some of my =org=-related settings cause problems?]]
-   - [[#how-do-i][How do I]]
-     - [[#disable-a-package-completely][Disable a package completely?]]
-     - [[#disable-a-package-only-for-a-specific-major-mode][Disable a package only for a specific major-mode?]]
-     - [[#disable-company-for-a-specific-major-mode][Disable company for a specific major-mode?]]
-     - [[#change-special-buffer-rules][Change special buffer rules?]]
-     - [[#enable-navigation-by-visual-lines][Enable navigation by visual lines?]]
-     - [[#disable-evilification-of-a-mode][Disable evilification of a mode?]]
-     - [[#include-underscores-in-word-motions][Include underscores in word motions?]]
-     - [[#setup-path][Setup =$PATH=?]]
-   - [[#windows][Windows]]
-     - [[#why-do-the-fonts-look-crappy-on-windows][Why do the fonts look crappy on Windows?]]
-     - [[#why-is-there-no-spacemacs-logo-in-the-startup-buffer][Why is there no Spacemacs logo in the startup buffer?]]
-     - [[#why-are-all-packages-unavailable][Why are all packages unavailable?]]
-   - [[#os-x][OS X]]
-     - [[#why-are-the-powerline-colors-not-correct-on-os-x][Why are the powerline colors not correct on OS X?]]
+#+SETUPFILE: theme-readtheorg.setup 

-** Common
-*** Which version of Spacemacs am I running?
+* FAQ                                                       :TOC_4_org:noexport:
+ - [[Common][Common]]
+   - [[Which version of Spacemacs am I running?][Which version of Spacemacs am I running?]]
+   - [[What is the official pronunciation of Spacemacs?][What is the official pronunciation of Spacemacs?]]
+   - [[Why are packages installed with =package-install= automatically deleted by Spacemacs when it boots?][Why are packages installed with =package-install= automatically deleted by Spacemacs when it boots?]]
+   - [[The Spacemacs banner is ugly, what should I do?][The Spacemacs banner is ugly, what should I do?]]
+   - [[The powerline separators are ugly, how can I fix them?][The powerline separators are ugly, how can I fix them?]]
+   - [[The powerline separators have no anti-aliasing, what can I do?][The powerline separators have no anti-aliasing, what can I do?]]
+   - [[Why is after-init-hook not executed?][Why is after-init-hook not executed?]]
+   - [[What is the difference between =spacemacs-base= and =spacemacs= distributions?][What is the difference between =spacemacs-base= and =spacemacs= distributions?]]
+   - [[How can I change or define an alias for an =evil-leader= prefix?][How can I change or define an alias for an =evil-leader= prefix?]]
+   - [[Should I place my settings in =user-init= or =user-config=?][Should I place my settings in =user-init= or =user-config=?]]
+   - [[Why do some of my =org=-related settings cause problems?][Why do some of my =org=-related settings cause problems?]]
+ - [[How do I...][How do I...]]
+   - [[Disable a package completely?][Disable a package completely?]]
+   - [[Disable a package only for a specific major-mode?][Disable a package only for a specific major-mode?]]
+   - [[Disable company for a specific major-mode?][Disable company for a specific major-mode?]]
+   - [[Change special buffer rules?][Change special buffer rules?]]
+   - [[Enable navigation by visual lines?][Enable navigation by visual lines?]]
+   - [[Disable evilification of a mode?][Disable evilification of a mode?]]
+   - [[Include underscores in word motions?][Include underscores in word motions?]]
+   - [[Setup =$PATH=?][Setup =$PATH=?]]
+ - [[Windows][Windows]]
+   - [[Why do the fonts look crappy on Windows?][Why do the fonts look crappy on Windows?]]
+   - [[Why is there no Spacemacs logo in the startup buffer?][Why is there no Spacemacs logo in the startup buffer?]]
+   - [[Why are all packages unavailable?][Why are all packages unavailable?]]
+ - [[OS X][OS X]]
+   - [[Why are the powerline colors not correct on OS X?][Why are the powerline colors not correct on OS X?]]
+
+* Common
+** Which version of Spacemacs am I running?
 The version is displayed on the upper right corner of the loading screen. You
 may also just type ~SPC f e v~.

-*** What is the official pronunciation of Spacemacs?
+** What is the official pronunciation of Spacemacs?
 As it is written, that is _space_ then _macs_.

-*** Why are packages installed with =package-install= automatically deleted by Spacemacs when it boots?
+** Why are packages installed with =package-install= automatically deleted by Spacemacs when it boots?
 To declare new packages you have to create a new configuration layer, see the
 [[file:QUICK_START.org][quick start guide]].

-*** The Spacemacs banner is ugly, what should I do?
+** The Spacemacs banner is ugly, what should I do?
 Install the default font supported by Spacemacs or choose a fixed width font.
 More information in the font section of the [[file:DOCUMENTATION.org][documentation]].

-*** The powerline separators are ugly, how can I fix them?
+** The powerline separators are ugly, how can I fix them?
 Use the property =:powerline-scale= of the variable =dotspacemacs-default-font=.
 See font section of the [[file:DOCUMENTATION.org][documentation]] for more details.

-*** The powerline separators have no anti-aliasing, what can I do?
+** The powerline separators have no anti-aliasing, what can I do?
 Emacs powerline uses XMP images to draw the separators in a graphical
 environment. You can have anti-aliasing if you use the =utf8= separator. Note
 that by default the =utf8= separator is used in a terminal. See the powerline
 section in the font section of the [[file:DOCUMENTATION.org][documentation]].

-*** Why is after-init-hook not executed?
+** Why is after-init-hook not executed?
 Don't launch Spacemacs with =emacs -q -l init.el= command. This command will run
 the hooked function in =after-init-hook= before the evaluation of the passed =-l
 init.el= file.

-*** What is the difference between =spacemacs-base= and =spacemacs= distributions?
+** What is the difference between =spacemacs-base= and =spacemacs= distributions?
 The =distribution= concept was introduced in 0.104.x. You can now choose
 between two distributions =spacemacs= or =spacemacs-base=.
 =spacemacs-base= contains only a minimal set of packages; whereas =spacemacs=
@ -68,7 +70,7 @@ Set the distribution with =dotspacemacs-distribution= variable. The default is
 check out the =packages.el= file in the respective folders in the
 =+distribution= folder of the =layers/= directory.

-*** How can I change or define an alias for an =evil-leader= prefix?
+** How can I change or define an alias for an =evil-leader= prefix?
 It is possible to change an =evil-leader= prefix by binding its keymap to
 another sequence. For instance, if you want to switch ~SPC l~
 (=evil-avy-goto-line=) with ~SPC L~ (=perspectives= layer) to make the later
@ -80,21 +82,21 @@ easier to reach, you can use:
  "L" 'evil-avy-goto-line)
 #+end_src

-*** Should I place my settings in =user-init= or =user-config=?
+** Should I place my settings in =user-init= or =user-config=?
 Any variable that layer configuration code will *read* and *act on* must be set
 in =user-init=, and any variable that Spacemacs explicitly sets but you wish to
 *override* must be set in =user-config=.

 Anything that isn't just setting a variable should 99% be in =user-config=.

-*** Why do some of my =org=-related settings cause problems?
+** Why do some of my =org=-related settings cause problems?
 Since version 0.104, spacemacs uses the `org` version from the org ELPA
 repository instead of the one shipped with emacs. Then, any `org` related code
 should not be loaded before `dotspacemacs/user-config`, otherwise both versions
 will be loaded and will conflict.

-** How do I
-*** Disable a package completely?
+* How do I...
+** Disable a package completely?
 To completely disable a package and effectively uninstalling it even if
 it is part of your used layers, look for the variable
 =dotspacemacs-excluded-packages= in your dotfile and add the package
@ -104,7 +106,7 @@ name to it:
  (setq-default dotspacemacs-excluded-packages '(package1 package2 ...))
 #+end_src

-*** Disable a package only for a specific major-mode?
+** Disable a package only for a specific major-mode?
 This is done by removing the hook added by Spacemacs. For example to
 remove =flycheck= support in python buffers, look for the function
 =dotspacemacs/user-config= in your dotfile and add the following code:
@ -116,7 +118,7 @@ remove =flycheck= support in python buffers, look for the function
 *Hint* to know the name of the major-mode of the current buffer press:
 ~SPC h d v major-mode RET~

-*** Disable company for a specific major-mode?
+** Disable company for a specific major-mode?
 It may be handy to disable =company= for a given mode if you plan on
 configuring =auto-complete= instead. On easy way to do it is to use the
 macro =spacemacs|disable-company= in the function =dotspacemacs/user-config=
@ -127,7 +129,7 @@ of your dotfile. The following snippet disables company for
    (spacemacs|disable-company python-mode)
 #+end_src

-*** Change special buffer rules?
+** Change special buffer rules?
 To change the way spacemacs marks buffers as useless, you can customize
 =spacemacs-useless-buffers-regexp= which marks buffers matching the
 regexp as useless. The variable =spacemacs-useful-buffers-regexp= marks
@ -143,7 +145,7 @@ Examples:
    (push "\\*Messages\\*" spacemacs-useful-buffers-regexp)
 #+end_src

-*** Enable navigation by visual lines?
+** Enable navigation by visual lines?
 Add the following snippet to your =dostpacemacs/config= function:

 #+begin_src emacs-lisp
@ -155,7 +157,7 @@ Add the following snippet to your =dostpacemacs/config= function:
    (define-key evil-visual-state-map "k" 'evil-previous-visual-line)
 #+end_src

-*** Disable evilification of a mode?
+** Disable evilification of a mode?
 You can ensure a mode opens in emacs state by using =evil-set-initial-state=.

 #+begin_src emacs-lisp
@ -179,7 +181,7 @@ binding in the mode's map, e.g. for =magit-status-mode=,
      (kbd dotspacemacs-leader-key) evil-leader--default-map))
 #+end_src

-*** Include underscores in word motions?
+** Include underscores in word motions?
 You can modify the syntax table of the mode in question. For example, for Python
 mode:

@ -188,7 +190,7 @@ mode:
    (modify-syntax-entry ?_ "w" python-mode-syntax-table))
 #+end_src

-*** Setup =$PATH=?
+** Setup =$PATH=?
 Some layers require certain tools to be available on your =$PATH=. This means
 that your =$PATH= must contain the installation paths for those tools. For
 example, if you have installed some tools to =~/.local/bin= and want them to be
@ -206,7 +208,7 @@ Users of =fish= should add following line to their =config.fish= file (should be
 in =$XDG_CONFIG_HOME= or its default value - =~/.config/fish=). Note that =-x=
 part is very important.

-#+BEGIN_SRC
+#+BEGIN_SRC fish
 set -x PATH ~/.local/bin $PATH
 #+END_SRC

@ -236,17 +238,17 @@ In that case you have the option of updating the value of =exec-path= in the
 (add-to-list 'exec-path "~/.local/bin/")
 #+END_SRC

-** Windows
-*** Why do the fonts look crappy on Windows?
+* Windows
+** Why do the fonts look crappy on Windows?
 You can install [[https://code.google.com/p/mactype/][MacType]] on Windows to get very nice looking fonts. It is
 also recommended to disable smooth scrolling on Windows.

-*** Why is there no Spacemacs logo in the startup buffer?
+** Why is there no Spacemacs logo in the startup buffer?
 A GUI build of emacs supporting image display is required.
 You can follow the instructions [[http://stackoverflow.com/questions/2650041/emacs-under-windows-and-png-files][here]]. Alternatively you can download binaries
 of emacs with image support included such as [[http://emacsbinw64.sourceforge.net/][this one]].

-*** Why are all packages unavailable?
+** Why are all packages unavailable?
 Check if your Emacs has HTTPS capabilities by doing =M-:= and then:

 #+begin_src emacs-lisp
@ -256,8 +258,8 @@ Check if your Emacs has HTTPS capabilities by doing =M-:= and then:
 If this returns =nil=, you need to install the GnuTLS DDL file in the same
 directory as Emacs. See [[https://www.gnu.org/software/emacs/manual/html_mono/emacs-gnutls.html#Help-For-Users][here]] for instructions.

-** OS X
-*** Why are the powerline colors not correct on OS X?
+* OS X
+** Why are the powerline colors not correct on OS X?
 This is a [[https://github.com/milkypostman/powerline/issues/54][known issue]] as of Emacs 24.4 due to =ns-use-srgb-colorspace=
-defaulting to true. It is recommended to use the [[github.com/railwaycat/homebrew-emacsmacport][emacs-mac-port]] build. See the
+defaulting to true. It is recommended to use the [[http://github.com/railwaycat/homebrew-emacsmacport][emacs-mac-port]] build. See the
 install section in the [[file:../README.md][README]] for more details.
--- a/doc/LAYERS.org
+++ b/doc/LAYERS.org
@ -1,31 +1,31 @@
-* Configuration Layers                                                   :TOC@4:
- - [[#introduction][Introduction]]
- - [[#nomenclature][Nomenclature]]
- - [[#the-emacs-loading-process][The Emacs loading process]]
-   - [[#emacs-lisp-files][Emacs Lisp files]]
-     - [[#loading-a-file][Loading a file]]
-   - [[#features][Features]]
-     - [[#the-load-path][The load path]]
-   - [[#auto-loading][Auto-loading]]
-   - [[#eval-after-load][Eval after load]]
-   - [[#use-package][Use-package]]
- - [[#anatomy-of-a-layer][Anatomy of a layer]]
-   - [[#packagesel][packages.el]]
-   - [[#configel-funcsel-and-keybindingsel][config.el, funcs.el and keybindings.el]]
- - [[#the-spacemacs-loading-process][The Spacemacs loading process]]
- - [[#case-study-auto-completion][Case study: auto-completion]]
- - [[#layer-tips-and-tricks][Layer tips and tricks]]
-   - [[#cross-dependencies][Cross-dependencies]]
-   - [[#use-package][Use-package]]
-   - [[#use-package-hooks][Use-package hooks]]
-   - [[#best-practices][Best practices]]
-     - [[#package-ownership][Package ownership]]
-     - [[#localize-your-configuration][Localize your configuration]]
-     - [[#load-ordering][Load ordering]]
-     - [[#no-require][No require]]
-     - [[#auto-load-everything][Auto-load everything]]
- - [[#how-do-i--idiomatically][How do I ... idiomatically?]]
-   - [[#setup-auto-completion-for-a-major-mode][Setup auto-completion for a major mode]]
+* Configuration Layers                                      :TOC_4_org:noexport:
+ - [[Introduction][Introduction]]
+ - [[Nomenclature][Nomenclature]]
+ - [[The Emacs loading process][The Emacs loading process]]
+   - [[Emacs Lisp files][Emacs Lisp files]]
+     - [[Loading a file][Loading a file]]
+   - [[Features][Features]]
+     - [[The load path][The load path]]
+   - [[Auto-loading][Auto-loading]]
+   - [[Eval after load][Eval after load]]
+   - [[Use-package][Use-package]]
+ - [[Anatomy of a layer][Anatomy of a layer]]
+   - [[packages.el][packages.el]]
+   - [[config.el, funcs.el and keybindings.el][config.el, funcs.el and keybindings.el]]
+ - [[The Spacemacs loading process][The Spacemacs loading process]]
+ - [[Case study: auto-completion][Case study: auto-completion]]
+ - [[Layer tips and tricks][Layer tips and tricks]]
+   - [[Cross-dependencies][Cross-dependencies]]
+   - [[Use-package][Use-package]]
+   - [[Use-package hooks][Use-package hooks]]
+   - [[Best practices][Best practices]]
+     - [[Package ownership][Package ownership]]
+     - [[Localize your configuration][Localize your configuration]]
+     - [[Load ordering][Load ordering]]
+     - [[No require][No require]]
+     - [[Auto-load everything][Auto-load everything]]
+ - [[How do I ... idiomatically?][How do I ... idiomatically?]]
+   - [[Setup auto-completion for a major mode][Setup auto-completion for a major mode]]

 * Introduction
 This document is intended as a tutorial for users who are interested in writing
--- a/doc/QUICK_START.org
+++ b/doc/QUICK_START.org
@ -1,18 +1,18 @@
-* Configuration                                                       :TOC@4:
-   - [[#configuration-layers][Configuration layers]]
-   - [[#dotfile-spacemacs][Dotfile (.spacemacs)]]
-   - [[#dotdirectory-spacemacsd][Dotdirectory (~/.spacemacs.d)]]
-   - [[#learning-spacemacs][Learning Spacemacs]]
-     - [[#editing-styles][Editing Styles]]
-     - [[#the-leader-keys][The leader keys]]
-     - [[#evil-tutor][Evil-tutor]]
-     - [[#universal-argument][Universal argument]]
-     - [[#configuration-layers-and-package-discovery][Configuration layers and Package discovery]]
-     - [[#key-bindings-discovery][Key bindings discovery]]
-     - [[#describe-functions][Describe functions]]
-   - [[#how-tos][How-To's]]
+* Configuration                                             :TOC_4_org:noexport:
+ - [[Configuration layers][Configuration layers]]
+ - [[Dotfile (.spacemacs)][Dotfile (.spacemacs)]]
+ - [[Dotdirectory (~/.spacemacs.d)][Dotdirectory (~/.spacemacs.d)]]
+ - [[Learning Spacemacs][Learning Spacemacs]]
+   - [[Editing Styles][Editing Styles]]
+   - [[The leader keys][The leader keys]]
+   - [[Evil-tutor][Evil-tutor]]
+   - [[Universal argument][Universal argument]]
+   - [[Configuration layers and Package discovery][Configuration layers and Package discovery]]
+   - [[Key bindings discovery][Key bindings discovery]]
+   - [[Describe functions][Describe functions]]
+ - [[How-To's][How-To's]]

-** Configuration layers
+* Configuration layers
 Spacemacs divides its configuration into self-contained units called
 =configuration layers=. These layers are stacked on top of each other
 to achieve a custom configuration.
@ -29,9 +29,9 @@ own layer.

 The following command creates a layer in the =private= directory:

-#+BEGIN_SRC
+#+BEGIN_EXAMPLE
    <SPC> : configuration-layer/create-layer RET
-#+END_SRC
+#+END_EXAMPLE

 Any configuration layers you create must be explicitly loaded in =~/.spacemacs=.

@ -39,7 +39,7 @@ Note: For your privacy, the contents of the =private= directory are not
 under source control. See the section on private configuration management in
 the [[file:DOCUMENTATION.org][documentation]].

-** Dotfile (.spacemacs)
+* Dotfile (.spacemacs)
 As mentioned =.spacemacs= controls which configuration layers to load and
 is also a means to customizing Spacemacs.

@ -82,18 +82,18 @@ The [[file:../core/templates/.spacemacs.template][dotfile template]] contain fur
 Spacemacs. See the dotfile configuration section of the [[file:DOCUMENTATION.org][documentation]] for
 more details.

-** Dotdirectory (~/.spacemacs.d)
+* Dotdirectory (~/.spacemacs.d)
 Like =Emacs=, Spacemacs initialization can also be contained in an =init.el= file
 in a special directory =~/.spacemacs.d=. The contents of the dotfile should be
 then copied in the =init.el= file.

-** Learning Spacemacs
-*** Editing Styles
+* Learning Spacemacs
+** Editing Styles
 Spacemacs can be used by Vim users or Emacs users by setting the
 =dotspacemacs-editing-style= variable to =vim=, =emacs= or even =hybrid=
 in the dotfile =~/.spacemacs=.

-*** The leader keys
+** The leader keys
 Spacemacs key bindings use a leader key which is by default bound to
 ~SPC~ (space bar) in =vim= or =hybrid= editing styles and ~M-m~ in =emacs=
 style.
@ -109,23 +109,23 @@ There is secondary leader key called the major-mode leader key which is
 set to ~,~ by default. This key is a shortcut for ~SPC m~
 where all the major-mode specific commands are bound.

-*** Evil-tutor
+** Evil-tutor
 If you are willing to learn the Vim key bindings (highly recommended since
 you can benefit from them even in =emacs= style), press ~SPC h T~
 to begin an Evil-adapted Vimtutor.

-*** Universal argument
+** Universal argument
 In =vim= editing style the universal argument defaults to ~SPC u~
 instead of ~C-u~ because the latter is used to scroll up as in Vim.

-*** Configuration layers and Package discovery
+** Configuration layers and Package discovery
 By using =helm-spacemacs= with ~SPC f e h~ you can quickly search
 for a package and get the name of the layers using it.

 You can also easily go to the =README.org= of a layer or go to the initialization
 function of a package.

-*** Key bindings discovery
+** Key bindings discovery
 Thanks to [[https://github.com/justbur/emacs-which-key][which-key]], whenever a prefix command is pressed (like ~SPC~)
 a buffer appears after one second listing the possible keys for this prefix.

@ -144,7 +144,7 @@ type a pattern like this regular expression:

 which would list all =buffer= related bindings.

-*** Describe functions
+** Describe functions
 =Describe functions= are powerful Emacs introspection commands to get information
 about functions, variables, modes etc. These commands are bound thusly:

@ -155,5 +155,5 @@ about functions, variables, modes etc. These commands are bound thusly:
 | ~SPC h d m~ | describe-mode     |
 | ~SPC h d v~ | describe-variable |

-** How-To's
+* How-To's
 Some quick =how-to's= are compiled in the [[file:HOWTOs.org][HOWTOs.org]] file.
--- a/doc/VIMUSERS.org
+++ b/doc/VIMUSERS.org
@ -1,37 +1,40 @@
-* Migrating from vim                                                    :TOC@4:
- - [[#purpose-of-this-document][Purpose of this document]]
- - [[#philosophy][Philosophy]]
- - [[#basic-orientation][Basic orientation]]
-     - [[#terms][Terms]]
-       - [[#modes-vs-states][Modes vs. States]]
-       - [[#layers][Layers]]
-       - [[#micro-states][Micro-states]]
-     - [[#keybinding-conventions][Keybinding conventions]]
-     - [[#running-commands][Running commands]]
-     - [[#buffer-and-window-management][Buffer and window management]]
-       - [[#buffers][Buffers]]
-       - [[#windows][Windows]]
-     - [[#files][Files]]
-     - [[#the-help-system][The Help System]]
-     - [[#exploring][Exploring]]
- - [[#customization][Customization]]
-   - [[#the-spacemacs-file][The .spacemacs file]]
-   - [[#emacs-lisp][Emacs Lisp]]
-     - [[#variables][Variables]]
-     - [[#keybindings][Keybindings]]
-     - [[#functions][Functions]]
-   - [[#activating-a-layer][Activating a Layer]]
-   - [[#creating-a-layer][Creating a Layer]]
-   - [[#installing-a-single-package][Installing a single package]]
-   - [[#loading-packages][Loading packages]]
-   - [[#uninstalling-a-package][Uninstalling a package]]
-   - [[#common-tweaks][Common tweaks]]
-     - [[#changing-the-escape-key][Changing the escape key]]
-     - [[#changing-the-colorscheme][Changing the colorscheme]]
-     - [[#nohlsearch][Nohlsearch]]
-     - [[#sessions][Sessions]]
-     - [[#navigating-using-visual-lines][Navigating using visual lines]]
- - [[#other-useful-links][Other useful links]]
+#+SETUPFILE: theme-readtheorg.setup
+
+* Migrating from vim                                        :TOC_4_org:noexport:
+ - [[Purpose of this document][Purpose of this document]]
+ - [[Philosophy][Philosophy]]
+ - [[Basic orientation][Basic orientation]]
+   - [[Terms][Terms]]
+     - [[Modes vs. States][Modes vs. States]]
+     - [[Layers][Layers]]
+     - [[Micro-states][Micro-states]]
+   - [[Keybinding conventions][Keybinding conventions]]
+   - [[Running commands][Running commands]]
+   - [[Buffer and window management][Buffer and window management]]
+     - [[Buffers][Buffers]]
+       - [[Special buffers][Special buffers]]
+     - [[Windows][Windows]]
+   - [[Files][Files]]
+   - [[The Help System][The Help System]]
+   - [[Exploring][Exploring]]
+ - [[Customization][Customization]]
+   - [[The .spacemacs file][The .spacemacs file]]
+   - [[Emacs Lisp][Emacs Lisp]]
+     - [[Variables][Variables]]
+     - [[Keybindings][Keybindings]]
+     - [[Functions][Functions]]
+   - [[Activating a Layer][Activating a Layer]]
+   - [[Creating a Layer][Creating a Layer]]
+   - [[Installing a single package][Installing a single package]]
+   - [[Loading packages][Loading packages]]
+   - [[Uninstalling a package][Uninstalling a package]]
+   - [[Common tweaks][Common tweaks]]
+     - [[Changing the escape key][Changing the escape key]]
+     - [[Changing the colorscheme][Changing the colorscheme]]
+     - [[Nohlsearch][Nohlsearch]]
+     - [[Sessions][Sessions]]
+     - [[Navigating using visual lines][Navigating using visual lines]]
+ - [[Other useful links][Other useful links]]

 * Purpose of this document
 This document is intended to supplement the Spacemacs documentation by bridging
@ -51,11 +54,11 @@ read both files to fully understand Spacemacs.
 vim and the nicer configuration language of Emacs.

 * Basic orientation
-*** Terms
+** Terms
 Spacemacs uses some different terminology than vim, which can cause confusion
 for new users. This section attempts to clear up any confusion.

-**** Modes vs. States
+*** Modes vs. States
 In vim you have various editing modes like =insert mode= and =visual mode= to
 manipulate text. In Emacs, we have [[./DOCUMENTATION.org#states][states]]. These are equivalent to vim modes.
 For example, =evil-insert-state= is the same as =insert-mode= in vim.
@ -69,7 +72,7 @@ generally a corresponding =major-mode= per filetype. An example of a =major-mode
 =python-mode=, which provides python specific settings in python files. There is
 only one =major-mode= per buffer.

-**** Layers
+*** Layers
 Spacemacs has the concept of layers. Layers are similar to vim plugins. They
 provide new features to use in Spacemacs. However, layers are often comprised of
 several packages that integrate well with each other. For example, the =python=
@ -77,9 +80,9 @@ layer includes support for auto-completion, documentation look-up, tests, and
 much more by using several different packages. This keeps you from thinking
 about what packages to install, and instead worry about what features you want.
 More information on layers can be found in the [[./VIMUSERS.org#customization][customization]] section and in the
-[[./DOCUMENTATION.org#configuration-layers][documentation]]. There is also a more in-depth guide on writing layers [[LAYERS.org][here]].
+[[./DOCUMENTATION.org#configuration-layers][documentation]]. There is also a more in-depth guide on writing layers [[file:LAYERS.org][here]].

-**** Micro-states
+*** Micro-states
 Spacemacs provides a special functionality called micro-states. Micro-states
 allow similar commands to be run in succession without repeatedly pressing the
 ~<Leader>~ key. Micro-states are usually triggered by using a keybinding with the
@ -91,7 +94,7 @@ bottom of your window. To exit a micro-state press ~q~.

 [[file:img/spacemacs-scale-micro-state.png]]

-*** Keybinding conventions
+** Keybinding conventions
 Spacemacs uses ~SPC~ as its ~<Leader>~ key. This document will use ~SPC~ to refer to
 the ~<Leader>~ key. All keybindings are mnemonic and are organized under the
 ~<Leader>~ key. For example, the keybindings for language-specific commands are
@ -104,7 +107,7 @@ Spacemacs uses [[https://github.com/justbur/emacs-which-key][which-key]] to show

 [[file:img/which-key.png]]

-*** Running commands
+** Running commands
 Emacs commands can be run using ~SPC :~. This will pop up a buffer using [[https://github.com/emacs-helm/helm][Helm]]
 which can be used to run any Emacs command. You can also run many ex commands
 using ~:~, just like in vim.
@ -112,8 +115,8 @@ using ~:~, just like in vim.
 Note: You can run Emacs interactive commands using ~:~, but you cannot run ex
 commands using ~SPC :~.

-*** Buffer and window management
-**** Buffers
+** Buffer and window management
+*** Buffers
 Buffers in Emacs and vim are essentially the same. The keybindings for buffers
 are located under the ~SPC b~ prefix.

@ -128,12 +131,12 @@ are located under the ~SPC b~ prefix.
 | ~SPC b K~                 | Kill all buffers except the current buffer.          |
 | ~SPC b .~                 | Buffer micro-state.                                  |

-***** Special buffers
+**** Special buffers
 By default Emacs creates a lot of buffers that most people will never need, like
 =*Messages*=. Spacemacs automatically ignores these when using these
 key bindings. More information can be found [[./DOCUMENTATION.org#special-buffers][here]].

-**** Windows
+*** Windows
 Windows are like splits in vim. They are useful for editing multiple files at
 once. All window keybindings are under the ~SPC w~ prefix.

@ -145,7 +148,7 @@ once. All window keybindings are under the ~SPC w~ prefix.
 | ~SPC w H/J/K/L~        | Move the current window.             |
 | ~SPC w .~              | Window micro-state.                  |

-*** Files
+** Files
 All file commands in Spacemacs are available under the ~SPC f~ prefix.

 | Keybinding        | Function                                                     |
@ -156,7 +159,7 @@ All file commands in Spacemacs are available under the ~SPC f~ prefix.
 | ~:x~              | Save the current file and quit.                              |
 | ~:e <file>~       | Open =<file>=                                                |

-*** The Help System
+** The Help System
 Emacs has an extensive help system. All keybindings under the ~SPC h d~ prefix
 allow convenient access to the help system. The most important of these
 keybindings are ~SPC h d f~ , ~SPC h d k~ , and ~SPC h d v~. There is also the
@ -172,7 +175,7 @@ keybindings are ~SPC h d f~ , ~SPC h d k~ , and ~SPC h d v~. There is also the
 Whenever, you see weird behavior or want to know what something does, these
 functions are the first thing you should refer to.

-*** Exploring
+** Exploring
 There are a few ways to explore the functionality of Spacemacs. One is to read
 the [[https://github.com/syl20bnr/spacemacs][source code]] on Github. You can begin to feel your way around Emacs Lisp and
 how Spacemacs works this way. You can also use the following keybindings to
@ -360,7 +363,7 @@ to override the configuration of a package in another layer, use a
 If a package is not available on MELPA, you must use a local package or a
 package recipe. For more details see [[file:LAYERS.org#anatomy-of-a-layer][anatomy of a layer]].

-Make sure you [[#activating-a-layer][add]] your layer to your =.spacemacs= file and restart to
+Make sure you [[Activating a Layer][add]] your layer to your =.spacemacs= file and restart to
 activate it.

 A detailed description of the loading process and how layers work can be found in
@ -372,7 +375,7 @@ and don't want to maintain a whole layer. Spacemacs provides a variable in the
 =dotspacemacs/layers= function in =.spacemacs= called
 =dotspacemacs-additional-packages=. Just add a package name to the list and it
 will be installed when you restart. Loading the package is covered in the next
-[[#loading-packages][section]].
+[[Loading packages][section]].

 ** Loading packages
 Ever wonder how Spacemacs can load over a 100 packages in just a few seconds?
@ -455,7 +458,7 @@ when you are not navigating between them. You can use ~SPC s c~ or ~:nohlsearch~
 to disable search result highlighting.

 To disable the result highlighting when it is not needed anymore automatically,
-you can [[#uninstalling-a-package][uninstall]] the =evil-search-highlight-persist= package.
+you can [[Uninstalling a package][uninstall]] the =evil-search-highlight-persist= package.

 *** Sessions
 Spacemacs does not automatically restore your windows and buffers when you
--- a/doc/theme-readtheorg.setup
+++ b/doc/theme-readtheorg.setup
@ -0,0 +1,9 @@
+# -*- mode: org; -*-
+
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="http://www.pirilampo.org/styles/readtheorg/css/htmlize.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="http://www.pirilampo.org/styles/readtheorg/css/readtheorg.css"/>
+
+#+HTML_HEAD: <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+#+HTML_HEAD: <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="http://www.pirilampo.org/styles/lib/js/jquery.stickytableheaders.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="http://www.pirilampo.org/styles/readtheorg/js/readtheorg.js"></script>
--- a/layers/+config-files/ansible/README.org
+++ b/layers/+config-files/ansible/README.org
@ -2,17 +2,15 @@

 [[file:img/ansible.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description
-
 This layer adds support for Ansible-flavored YAML buffers.

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -21,6 +19,6 @@ To use this contribution add it to your =~/.spacemacs=

 * Key bindings

-| Key Binding   | Description                              |
-|---------------+------------------------------------------|
-| ~SPC m a ?~   | looks up documentation using [[https://github.com/lunaryorn/ansible-doc.el][ansible-doc]] |
+| Key Binding | Description                              |
+|-------------+------------------------------------------|
+| ~SPC m a ?~ | looks up documentation using [[https://github.com/lunaryorn/ansible-doc.el][ansible-doc]] |
--- a/layers/+config-files/dockerfile/README.org
+++ b/layers/+config-files/dockerfile/README.org
@ -2,17 +2,15 @@

 [[file:img/docker.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description
-
 This layer provides syntax highlighting and build functionality for Docker files.

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -21,6 +19,6 @@ To use this contribution add it to your =~/.spacemacs=

 * Key bindings

-| Key Binding   | Description                                        |
-|---------------+----------------------------------------------------|
-| ~SPC m c b~   | build current buffer via =dockerfile-build-buffer= |
+| Key Binding | Description                                        |
+|-------------+----------------------------------------------------|
+| ~SPC m c b~ | build current buffer via =dockerfile-build-buffer= |
--- a/layers/+config-files/puppet/README.org
+++ b/layers/+config-files/puppet/README.org
@ -2,21 +2,19 @@

 [[file:img/puppet.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description
-
 This layer aims at providing support for the Puppet DSL using [[https://github.com/lunaryorn/puppet-mode][puppet-mode]].

 * Features
-
 Puppetfile support via [[http://melpa.org/#/puppetfile-mode][puppetfile-mode]]

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -24,7 +22,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key bindings
-
 The following key bindings are available in Puppet Mode:

 | Key Binding | Description                                       |
--- a/layers/+config-files/salt/README.org
+++ b/layers/+config-files/salt/README.org
@ -2,9 +2,10 @@

 [[file:img/saltstack.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description
 This layer provides syntax highlighting for Saltstack files.
@ -18,6 +19,6 @@ To use this contribution add it to your =~/.spacemacs=

 * Key bindings

-| Key Binding   | Description                                  |
-|---------------+----------------------------------------------|
-| ~SPC m p b~   | mmm-mode parse buffer via =mmm-parse-buffer= |
+| Key Binding | Description                                  |
+|-------------+----------------------------------------------|
+| ~SPC m p b~ | mmm-mode parse buffer via =mmm-parse-buffer= |
--- a/layers/+config-files/terraform/README.org
+++ b/layers/+config-files/terraform/README.org
@ -3,17 +3,15 @@
 [[file:img/terraform.png]]


-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description
-
 This layer provides syntax support for Terraform `.tf` files using
 [terraform-mode](https://github.com/syohex/emacs-terraform-mode).

 * Install
-
 To use this layer add it to your `~/.spacemacs`

 #+BEGIN_SRC emacs-lisp
--- a/layers/+email/gnus/README.org
+++ b/layers/+email/gnus/README.org
@ -2,13 +2,13 @@

 [[file:img/gnus.gif]]

-* Table of Contents                                                   :TOC@4:
- - [[#install][Install]]
- - [[#basic-concepts][Basic Concepts]]
- - [[#adding-news-sources][Adding news sources]]
- - [[#configuring-gmail][Configuring gmail]]
- - [[#org-mime-in-org-layer][Org MIME in Org layer]]
- - [[#keybindings][Keybindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Install][Install]]
+ - [[Basic Concepts][Basic Concepts]]
+ - [[Adding news sources][Adding news sources]]
+ - [[Configuring gmail][Configuring gmail]]
+ - [[Org MIME in Org layer][Org MIME in Org layer]]
+ - [[Keybindings][Keybindings]]

 * Install

@ -44,7 +44,7 @@ following:
      ))
 #+END_SRC

-For adding RSS Feeds please see the [[#Keybindings][keybindings section]].
+For adding RSS Feeds please see the [[Keybindings][keybindings section]].

 * Configuring gmail

@ -85,10 +85,10 @@ To configure Gnus with gmail support you can add the following to your
 Authentication for your gmail account is best stored in an =authinfo= or
 =authinfo.pgp= file. It must be of the form:

-#+BEGIN_SRC
+#+BEGIN_EXAMPLE
 machine smtp.gmail.com login name@gmail.com password SUPER_SECRET_PASS
 machine imap.gmail.com login name@gmail.com port 993 password SUPER_SECRET_PASS
-#+END_SRC
+#+END_EXAMPLE

 If you use two-step verification the password has to be an [[https://support.google.com/accounts/answer/185833?hl=en][application specific
 password]].
@ -108,15 +108,15 @@ Please see the [[http://www.gnus.org/manual.html][manual]] for a complete list.

 Basic and Spacemacs specific keybindings can be found in the following table.

-| Key Binding | Gnus mode - Description                                  |
-|-------------+----------------------------------------------------------|
-| ~SPC a g~   | Starts Gnus                                              |
-| ~m~         | New Message                                              |
-| ~G R~       | Group Buffer - Add RSS feed                              |
-| ~^~         | Open Server Buffer. Browse Newsgroups.                   |
-| ~T n~       | Group Buffer - new Topic                                 |
-| ~T m~       | Group Buffer - Move Group to Topic                       |
-| ~K~         | Article Buffer - Previous article                        |
-| ~J~         | Article Buffer - Next article                            |
-| ~RET~       | Summary Buffer(RSS) - Open article Link in browser       |
-| ~TAB~       | Summary Buffer(RSS) - Open article and switch to it      |
+| Key Binding | Gnus mode - Description                             |
+|-------------+-----------------------------------------------------|
+| ~SPC a g~   | Starts Gnus                                         |
+| ~m~         | New Message                                         |
+| ~G R~       | Group Buffer - Add RSS feed                         |
+| ~^~         | Open Server Buffer. Browse Newsgroups.              |
+| ~T n~       | Group Buffer - new Topic                            |
+| ~T m~       | Group Buffer - Move Group to Topic                  |
+| ~K~         | Article Buffer - Previous article                   |
+| ~J~         | Article Buffer - Next article                       |
+| ~RET~       | Summary Buffer(RSS) - Open article Link in browser  |
+| ~TAB~       | Summary Buffer(RSS) - Open article and switch to it |
--- a/layers/+frameworks/django/README.org
+++ b/layers/+frameworks/django/README.org
@ -1,23 +1,21 @@
 #+TITLE: Python contribution layer for Spacemacs
 [[file:img/django.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#fabric][Fabric]]
-     - [[#files][Files]]
-     - [[#interactive][Interactive]]
-     - [[#server][Server]]
-     - [[#southsyncdb][South/Syncdb]]
-     - [[#test][Test]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Fabric][Fabric]]
+   - [[Files][Files]]
+   - [[Interactive][Interactive]]
+   - [[Server][Server]]
+   - [[South/Syncdb][South/Syncdb]]
+   - [[Test][Test]]

 * Description
-
 This layer adds support for the Python [[https://www.djangoproject.com/][Django]] framework via [[https://github.com/davidmiller/pony-mode][pony-mode]].

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -25,7 +23,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key Bindings
-
 Django related key bindings uses  [[https://github.com/davidmiller/pony-mode][pony-mode]] and are behind the prefix ~SPC m j~.

 Configuration options for pony-mode are documented at
--- a/layers/+frameworks/react/README.org
+++ b/layers/+frameworks/react/README.org
@ -1,30 +1,27 @@
-* React contribution layer for Spacemacs
+#+TITLE: React contribution layer for Spacemacs

-#+CAPTION: logo
+[[file:img/react.png]]

-[[img/react.png]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features][Features]]
+ - [[Install][Install]]
+ - [[Optional Configuration][Optional Configuration]]
+ - [[Key Bindings][Key Bindings]]
+   - [[js2-mode][js2-mode]]
+   - [[Folding (js2-mode)][Folding (js2-mode)]]
+   - [[Refactoring (js2-refactor)][Refactoring (js2-refactor)]]
+   - [[Formatting (web-beautify)][Formatting (web-beautify)]]
+     - [[Documentation (js-doc)][Documentation (js-doc)]]
+   - [[Auto-complete and documentation (tern)][Auto-complete and documentation (tern)]]
+   - [[JSON][JSON]]

-** Table of Contents                                                  :TOC@4:
- - [[#react-contribution-layer-for-spacemacs][React contribution layer for Spacemacs]]
-   - [[#description][Description]]
-     - [[#features][Features]]
-   - [[#install][Install]]
-   - [[#optional-configuration][Optional Configuration]]
- - [[#key-bindings][Key Bindings]]
-   - [[#js2-mode][js2-mode]]
-   - [[#folding-js2-mode][Folding (js2-mode)]]
-   - [[#refactoring-js2-refactor][Refactoring (js2-refactor)]]
-   - [[#formatting-web-beautify][Formatting (web-beautify)]]
-     - [[#documentation-js-doc][Documentation (js-doc)]]
-   - [[#auto-complete-and-documentation-tern][Auto-complete and documentation (tern)]]
-   - [[#json][JSON]]
-
-** Description
+* Description

 ES6 and JSX ready configuration layer for React
 It will automatically recognize =.jsx= and =.react.js= files

-*** Features
+** Features
 - on-the-fly syntax checking
 - proper syntax highlight and indentation with jsx
 - ternjs turbocharged autocompletion as in js2-mode
@ -32,7 +29,7 @@ It will automatically recognize =.jsx= and =.react.js= files
 - js2-refactor
 - js-doc

-** TODO Install
+* Install

 To use this contribution add it to your =~/.spacemacs=

@ -86,7 +83,7 @@ Be sure to have the ~e4x~ option set to ~true~ on your ~.jsbeautifyrc~ here it i
  }
 #+END_SRC

-** Optional Configuration
+* Optional Configuration

 You may refer to the =web-mode= configuration for fine tuning the indenting behaviour.

--- a/layers/+frameworks/ruby-on-rails/README.org
+++ b/layers/+frameworks/ruby-on-rails/README.org
@ -2,21 +2,19 @@

 [[file:img/ror.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#code-navigation][Code Navigation]]
-     - [[#refactoring][Refactoring]]
-     - [[#run-commands][RUN commands]]
-     - [[#ex-commands][Ex-commands]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Code Navigation][Code Navigation]]
+   - [[Refactoring][Refactoring]]
+   - [[RUN commands][RUN commands]]
+   - [[Ex-commands][Ex-commands]]

 * Description
-
 This layer aims at providing support for the Ruby on Rails framework.

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -24,7 +22,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key bindings
-
 ** Code Navigation

 | Key binding   | Description                                                     |
--- a/layers/+fun/emoji/README.org
+++ b/layers/+fun/emoji/README.org
@ -2,15 +2,14 @@

 #+HTML: :blue_heart::green_heart::heart::gift_heart::heartbeat::heartpulse::purple_heart::sparkling_heart::yellow_heart:

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#emoji-dedicated-buffer][Emoji dedicated buffer]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Emoji dedicated buffer][Emoji dedicated buffer]]

 * Description
-
 This layer adds support for Emoji emoticons from [[http://www.emoji-cheat-sheet.com/][emoji-cheat-sheet.com]].

 ** Features:
@ -20,7 +19,6 @@ This layer adds support for Emoji emoticons from [[http://www.emoji-cheat-sheet.
 - Completion of Emojis using [[https://github.com/dunn/company-emoji][company-emoji]]
  
 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
--- a/layers/+fun/games/README.org
+++ b/layers/+fun/games/README.org
@ -2,15 +2,15 @@

 [[file:img/games.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#2048][2048]]
-     - [[#tetris][Tetris]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[2048][2048]]
+   - [[Pacmacs][Pacmacs]]
+   - [[Tetris][Tetris]]

 * Description
-
 This layer allows you to play evilified games in spacemacs.

 The games available now are:
@ -19,7 +19,6 @@ The games available now are:
 - Tetris
  
 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -27,7 +26,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key bindings
-
 To run a game:

 | Key Binding | Description                            |
@ -50,13 +48,13 @@ Possible helm actions:

 ** Pacmacs

-| Key Binding | Description       |
-|-------------+-------------------|
-| ~h~         | Move left  |
-| ~j~         | Move down  |
-| ~k~         | Move up    |
-| ~l~         | Move right |
-|             |                   |
+| Key Binding | Description |
+|-------------+-------------|
+| ~h~         | Move left   |
+| ~j~         | Move down   |
+| ~k~         | Move up     |
+| ~l~         | Move right  |
+|             |             |
 ** Tetris

 | Key Binding | Description                    |
--- a/layers/+fun/xkcd/README.org
+++ b/layers/+fun/xkcd/README.org
@ -2,15 +2,14 @@

 [[file:img/xkcd.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#tell-me-how-to-spawn-the-xkcd-greatness][Tell me how to spawn the xkcd greatness!!]]
-     - [[#okay-what-now][Okay, what now]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Tell me how to spawn the xkcd greatness!!][Tell me how to spawn the xkcd greatness!!]]
+   - [[Okay, what now][Okay, what now]]

 * Description
-
 This layer adds a [[http://xkcd.com/][xkcd]] navigation mode using [[https://github.com/vibhavp/emacs-xkcd][emacs-xkcd]].

 Features:
@ -20,7 +19,6 @@ Features:
 - Cache the comics in =.cache/xkcd=

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -28,7 +26,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key Bindings
-
 ** Tell me how to spawn the xkcd greatness!!

 | Key Binding | Description    |
@ -36,7 +33,6 @@ To use this contribution add it to your =~/.spacemacs=
 | ~SPC a x~   | Open xkcd mode |

 ** Okay, what now
-
 You can now move through the comics with these

 | Key Binding | Description                         |
--- a/layers/+irc/erc/README.org
+++ b/layers/+irc/erc/README.org
@ -1,20 +1,18 @@
 #+TITLE: ERC contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#os-x][OS X]]
-     - [[#social-graph][Social graph]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[OS X][OS X]]
+   - [[Social graph][Social graph]]
+ - [[Key bindings][Key bindings]]

 * Description
-
 Layer for [[http://www.emacswiki.org/emacs/ERC][ERC IRC chat]].

 * Features
-
 - Highlight nicks (using [[https://github.com/leathekd/erc-hl-nicks][erc-hl-nicks]])
 - Image inline support (using [[https://github.com/kidd/erc-image.el][erc-image]])
 - Logging to ~/.emacs.d/.cache/erc-logs and ViewLogMode for viewing logs
@ -32,9 +30,7 @@ Layer for [[http://www.emacswiki.org/emacs/ERC][ERC IRC chat]].
  using the =emoji= layer or having a proper font) :clap:

 * Install
-
 ** Layer
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -42,29 +38,27 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 ** OS X
-
 It's recommended to install the [[https://github.com/alloy/terminal-notifier][terminal-notifier gem]] so that you get
 notifications via the OS X Notification Center.

 ** Social graph
-
 [[https://github.com/vibhavp/erc-social-graph][erc-social-graph]] needs graphviz to be installed on your system.

 * Key bindings

-| Key Binding   | Description                                           |
-|---------------+-------------------------------------------------------|
-| ~SPC a i e~   | Starts ERC                                            |
-| ~SPC a i E~   | Starts ERC via TLS/SSL                                |
-| ~SPC a i i~   | Switch to next active ERC buffer                      |
-| ~SPC m b~     | Switch between ERC buffers                            |
-| ~SPC m d~     | Interactively input a user action and send it to IRC. |
-| ~SPC m D~     | Draw Social Graph using  [[https://github.com/vibhavp/erc-social-graph][erc-social-graph]]             |
-| ~SPC m j~     | Join a channel, executes the /join command            |
-| ~SPC m n~     | Run "/names #channel" in the current channel.         |
-| ~SPC m l~     | Run the /list command                                 |
-| ~SPC m p~     | Part from the channel                                 |
-| ~SPC m q~     | Quit server                                           |
+| Key Binding | Description                                           |
+|-------------+-------------------------------------------------------|
+| ~SPC a i e~ | Starts ERC                                            |
+| ~SPC a i E~ | Starts ERC via TLS/SSL                                |
+| ~SPC a i i~ | Switch to next active ERC buffer                      |
+| ~SPC m b~   | Switch between ERC buffers                            |
+| ~SPC m d~   | Interactively input a user action and send it to IRC. |
+| ~SPC m D~   | Draw Social Graph using  [[https://github.com/vibhavp/erc-social-graph][erc-social-graph]]             |
+| ~SPC m j~   | Join a channel, executes the /join command            |
+| ~SPC m n~   | Run "/names #channel" in the current channel.         |
+| ~SPC m l~   | Run the /list command                                 |
+| ~SPC m p~   | Part from the channel                                 |
+| ~SPC m q~   | Quit server                                           |

 *Note:* If you want to connect securely to an IRC server, you must run =erc-tls=
     command on ~SPC a i E~ instead of the =erc= command.
--- a/layers/+irc/rcirc/README.org
+++ b/layers/+irc/rcirc/README.org
@ -2,30 +2,28 @@

 [[file:img/irc.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#configuration][Configuration]]
-     - [[#storing-the-credentials-in-your-dotfile][Storing the credentials in your dotfile]]
-       - [[#example][Example:]]
-     - [[#storing-the-credentials-in-your-dropbox][Storing the credentials in your Dropbox]]
-       - [[#example][Example:]]
-     - [[#storing-the-credentials-in-authinfo][Storing the credentials in authinfo]]
-     - [[#connecting-behind-a-znc-bouncer-and-storing-the-credentials-in-authinfo][Connecting behind a ZNC bouncer and storing the credentials in authinfo]]
-       - [[#disclaimer][Disclaimer]]
-       - [[#note][Note]]
- - [[#key-bindings][Key Bindings]]
- - [[#rcirc-documentation][Rcirc documentation]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Configuration][Configuration]]
+     - [[Storing the credentials in your dotfile][Storing the credentials in your dotfile]]
+       - [[Example:][Example:]]
+     - [[Storing the credentials in your Dropbox][Storing the credentials in your Dropbox]]
+       - [[Example:][Example:]]
+     - [[Storing the credentials in authinfo][Storing the credentials in authinfo]]
+     - [[Connecting behind a ZNC bouncer and storing the credentials in authinfo][Connecting behind a ZNC bouncer and storing the credentials in authinfo]]
+       - [[Disclaimer][Disclaimer]]
+       - [[Note][Note]]
+ - [[Key Bindings][Key Bindings]]
+ - [[Rcirc documentation][Rcirc documentation]]

 * Description
-
 This layer provide support for [[http://www.gnu.org/software/emacs/manual/html_mono/rcirc.html][rcirc]] with optional support for authinfo
 and ZNC.

 * Features
-
 - Store channel logs into =~/.emacs.d/.cache/rcirc-logs/<channel>=
 - Support for credentials stored in =~/.authinfo.gpg= (need to have gnutls) 
 - Support ZNC support (with optional =~/.authinfo.gpg=)
@ -35,9 +33,7 @@ and ZNC.
  using the =emoji= layer or having a proper font) :clap:
  
 * Install
-
 ** Layer
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -45,7 +41,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 ** Configuration
-
 There are several ways to configure rcirc supported by the layer:
 - By storing your credentials in =rcirc-server-alist= in your dotfile (not
  secured)
@ -55,7 +50,6 @@ There are several ways to configure rcirc supported by the layer:
 - By using a ZNC bouncer _and_ storing your credentials (secured)
  
 *** Storing the credentials in your dotfile
-
 You can store your servers configuration along with your credentials in the
 =dotspacemacs/user-config= of your dotfile.

@ -64,7 +58,6 @@ your dotfile is often stored in a public repository and is not crypted. This
 is convenient but not recommended.

 **** Example:
-
 #+BEGIN_SRC emacs-lisp
 (setq rcirc-server-alist
  '(("irc.freenode.net"
@ -75,7 +68,6 @@ is convenient but not recommended.
 #+END_SRC

 *** Storing the credentials in your Dropbox
-
 You can store your servers configuration along with your credentials in
 your dropbox in the file =~/Dropbox/emacs/pinit-rcirc.el=.

@ -86,7 +78,6 @@ of the file containing your credentials. This is convenient but not
 recommended.

 **** Example:
-
 #+BEGIN_SRC emacs-lisp
 (setq rcirc-server-alist
  '(("irc.freenode.net"
@ -97,7 +88,6 @@ recommended.
 #+END_SRC

 *** Storing the credentials in authinfo
-
 This method is considered secured and is the recommended way to configure
 rcirc.

@ -110,9 +100,10 @@ rcirc.
   #+END_SRC

 2) In your =~/.authinfo.gpg= file store your credentials like this:
-   #+BEGIN_SRC
+
+   #+BEGIN_EXAMPLE
   machine irc.freenode.net port nickserv user <user> password <passwd>
-   #+END_SRC
+   #+END_EXAMPLE

 3) At last you need to provide your servers configuration in the
 =dotspacemacs/user-config= function of your dotfile:
@ -126,7 +117,6 @@ rcirc.
   #+END_SRC

 *** Connecting behind a ZNC bouncer and storing the credentials in authinfo
-
 This methods is also secured since it uses authinfo _but_ you must secure your
 ZNC server configuration as well!

@ -152,11 +142,11 @@ For now authinfo is mandatory to use the ZNC configuration.
   #+END_SRC

 2) In your =~/.authinfo.gpg= file store your credentials like this:
-   
-   #+BEGIN_SRC
+
+   #+BEGIN_EXAMPLE
   machine freenode.spacemacsserver.me port irc user spacemacs_user/freenode password ZNC_PASSWORD
   machine geekshed.spacemacsserver.me port irc user spacemacs_user/geekshed password ZNC_PASSWORD
-   #+END_SRC
+   #+END_EXAMPLE

 *Important* =port= must be set to =irc=. This is a convention of the layer to
   retrieve the credentials for the ZNC configuration.
@ -195,5 +185,4 @@ In normal state:
 | ~C-k~       | previous item in history |

 * Rcirc documentation
-
 The rcirc documentation can be found [[http://www.gnu.org/software/emacs/manual/html_mono/rcirc.html][here]]. 
--- a/layers/+keyboard-layouts/bepo/README.org
+++ b/layers/+keyboard-layouts/bepo/README.org
@ -1,31 +1,30 @@
-* bepo contribution layer for Spacemacs
+#+TITLE: bepo contribution layer for Spacemacs

 #+CAPTION: logo

 [[file:img/bepo.png]]

-** Table of Contents                                                  :TOC@4:
- - [[#bepo-contribution-layer-for-spacemacs][bepo contribution layer for Spacemacs]]
-   - [[#description][Description]]
-   - [[#mapping][Mapping]]
-   - [[#supported-modespackageslayer][Supported modes/packages/layer]]
-   - [[#install][Install]]
-   - [[#key-bindings][Key bindings]]
-     - [[#company][company]]
-     - [[#evil][evil]]
-     - [[#evil-escape][evil-escape]]
-     - [[#evil-surround][evil-surround]]
-     - [[#evil-window][evil-window]]
-     - [[#helm][helm]]
-     - [[#magit][magit]]
-     - [[#neotree][neotree]]
-     - [[#org][org]]
-     - [[#ranger][ranger]]
-     - [[#spacemacs-specific][spacemacs-specific]]
-   - [[#contributors][Contributors]]
-   - [[#sources][Sources]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Mapping][Mapping]]
+ - [[Supported modes/packages/layer][Supported modes/packages/layer]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[company][company]]
+   - [[evil][evil]]
+   - [[evil-escape][evil-escape]]
+   - [[evil-surround][evil-surround]]
+   - [[evil-window][evil-window]]
+   - [[helm][helm]]
+   - [[magit][magit]]
+   - [[neotree][neotree]]
+   - [[org][org]]
+   - [[ranger][ranger]]
+   - [[spacemacs-specific][spacemacs-specific]]
+ - [[Contributors][Contributors]]
+ - [[Sources][Sources]]

-** Description
+* Description
 This layer change the key bindings in spacemacs to be compatible with the [[http://bepo.fr/][bepo]]
 keyboard layout. =bepo= is a keyboard layout optimized for the French language.
 This package first switch traditional ~hjkl~ movement keys with ~ctsr~, and then
@ -33,7 +32,7 @@ try to correct the bugs induced by these changes in other modes/packages.

 [[file:img/keymap.png]]

-** Mapping
+* Mapping
 The mapping correction is the one proposed for vim on the bepo's official [[http://bepo.fr/wiki/Vim#Principe][wiki]].
 This layer tries to do the following changes when the following characters are
 used for *doing a movement*:
@ -95,7 +94,7 @@ Note: One difference exists with the wiki version: the ~w~ is *not* remapped to
 ~C-w~ to avoid having to change its meaning in other modes. Spacemacs provides
 already a ~SPC w~ key binding for working with windows.

-** Supported modes/packages/layer
+* Supported modes/packages/layer
 - avy
 - company
 - evil
@ -109,18 +108,18 @@ already a ~SPC w~ key binding for working with windows.
 - ranger
 - spacemacs

-** Install
+* Install
 To use this contribution add it to your =~/.spacemacs=

 #+begin_src emacs-lisp
  (setq-default dotspacemacs-configuration-layers '(bepo))
 #+end_src

-** Key bindings
+* Key bindings
 Thanks to `wich-keys`, you shouldn't probably have to go through this list, the
 keys being shown after a small delay following a keypress.

-*** company
+** company
 |-------------+----------------------------+--------------------|
 | Key Binding | Description                | Replace/equivalent |
 |-------------+----------------------------+--------------------|
@ -129,7 +128,7 @@ keys being shown after a small delay following a keypress.
 | ~C-r~       | Company complete selection | ~C-l~              |
 |-------------+----------------------------+--------------------|

-*** evil
+** evil
 |-------------+----------------------------+--------------------|
 | Key Binding | Description                | Replace/equivalent |
 |-------------+----------------------------+--------------------|
@ -160,21 +159,21 @@ keys being shown after a small delay following a keypress.
 | ~«~         | Unindent                   | ~<~                |
 |-------------+----------------------------+--------------------|

-*** evil-escape
+** evil-escape
 |-------------+-------------+--------------------|
 | Key Binding | Description | Replace/equivalent |
 |-------------+-------------+--------------------|
 | ~gq~        | Escape      | ~fd~               |
 |-------------+-------------+--------------------|

-*** evil-surround
+** evil-surround
 |-------------+-------------------------------+--------------------|
 | Key Binding | Description                   | Replace/equivalent |
 |-------------+-------------------------------+--------------------|
 | ~k~         | Evil-surround functionnalites | ~s~                |
 |-------------+-------------------------------+--------------------|

-*** evil-window
+** evil-window
 |-------------+------------------------------+--------------------|
 | Key Binding | Description                  | Replace/equivalent |
 |-------------+------------------------------+--------------------|
@ -200,7 +199,7 @@ keys being shown after a small delay following a keypress.
 | ~SPC é~     | Alias for ~SPC w~            | ~SPC w~            |
 |-------------+------------------------------+--------------------|

-*** helm
+** helm
 |-------------+---------------------------------------+--------------------|
 | Key Binding | Description                           | Replace/equivalent |
 |-------------+---------------------------------------+--------------------|
@ -211,7 +210,7 @@ keys being shown after a small delay following a keypress.
 | ~C-k~       | Helm find files run grep              | ~C-s~              |
 |-------------+---------------------------------------+--------------------|

-*** magit
+** magit
 |-------------+----------------+--------------------|
 | Key Binding | Description    | Replace/equivalent |
 |-------------+----------------+--------------------|
@ -223,7 +222,7 @@ keys being shown after a small delay following a keypress.
 | ~h~         | Discard change | ~k~                |
 |-------------+----------------+--------------------|

-*** neotree
+** neotree
 |-------------+--------------------------------------+--------------------|
 | Key Binding | Description                          | Replace/equivalent |
 |-------------+--------------------------------------+--------------------|
@ -243,7 +242,7 @@ keys being shown after a small delay following a keypress.
 |-------------+--------------------------------------+--------------------|
 | ~H~         | Neotree change root                  | ~R~                |
 |-------------+--------------------------------------+--------------------|
-*** org
+** org
 |---------------+--------------------------------------|
 | Key Binding   | Description                          |
 |---------------+--------------------------------------|
@ -310,7 +309,7 @@ keys being shown after a small delay following a keypress.
 | ~SPC »~       | Org metaright                        |
 |---------------+--------------------------------------|

-*** ranger
+** ranger
 |-------------+---------------------+--------------------|
 | Key Binding | Description         | Replace/equivalent |
 |-------------+---------------------+--------------------|
@ -328,7 +327,7 @@ keys being shown after a small delay following a keypress.
 | ~K~         | Eshell              | ~S~                |
 |-------------+---------------------+--------------------|

-*** spacemacs-specific
+** spacemacs-specific
 |-------------+--------------------------------------+--------------------|
 | Key Binding | Description                          | Replace/equivalent |
 |-------------+--------------------------------------+--------------------|
@ -348,9 +347,9 @@ keys being shown after a small delay following a keypress.
 | ~SPC i Yw~  | Auto yasnippet persist snippet       | ~SPC i Sw~         |
 |-------------+--------------------------------------+--------------------|

-** Contributors
+* Contributors
 - Fabien Dubosson

-** Sources
+* Sources
 The bepo logo and the keymap image come from the [[http://bepo.fr/][bepo]] official website. They are
 licensed under the [[http://creativecommons.org/licenses/by-sa/3.0/deed.en][CC-BY-SA]].
--- a/layers/+lang/agda/README.org
+++ b/layers/+lang/agda/README.org
@ -1,12 +1,12 @@
 #+TITLE: Agda contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#some-features][Some features:]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#agda][Agda]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Some features:][Some features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Agda][Agda]]
+ - [[Key bindings][Key bindings]]

 * Description
 This layer adds support for the [[http://wiki.portal.chalmers.se/agda/pmwiki.php][Agda]] programming language.
--- a/layers/+lang/asciidoc/README.org
+++ b/layers/+lang/asciidoc/README.org
@ -1,12 +1,12 @@
 #+TITLE: Asciidoc contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#feature][Feature]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#element-insertion][Element insertion]]
-     - [[#promotion-demotion][Promotion, Demotion]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Feature][Feature]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Element insertion][Element insertion]]
+   - [[Promotion, Demotion][Promotion, Demotion]]

 * Description
 This layer adds [[https://asciidoctor.org][AsciiDoc]] markup language support to Spacemacs.
@ -23,7 +23,6 @@ To use this contribution add it to your `~/.spacemacs`
 #+END_SRC

 * Key bindings
-
 ** Element insertion

 | Key Binding | Description                                   |
--- a/layers/+lang/autohotkey/README.org
+++ b/layers/+lang/autohotkey/README.org
@ -2,11 +2,11 @@

 [[file:img/ahk.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]

 * Description

--- a/layers/+lang/c-c++/README.org
+++ b/layers/+lang/c-c++/README.org
@ -3,24 +3,22 @@
 [[file:img/ccpp.jpg]]
 [[file:img/cmake.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#default-mode-for-header-files][Default mode for header files]]
-   - [[#enable-clang-support][Enable Clang support]]
-     - [[#clang-format][clang-format]]
-     - [[#company-clang-and-flycheck][Company-clang and flycheck]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Default mode for header files][Default mode for header files]]
+   - [[Enable Clang support][Enable Clang support]]
+     - [[clang-format][clang-format]]
+     - [[Company-clang and flycheck][Company-clang and flycheck]]
+ - [[Key Bindings][Key Bindings]]

 * Description
-
 This layer adds configuration for C/C++ language as well support for [[http://www.cmake.org/][CMake]]
 scripts.

 * Features
-
 - Support syntax checking via flycheck with Clang.
 - Support for disassembly of code with [[https://github.com/jart/disaster][disaster]].
 - Support code reformatting with [[http://clang.llvm.org/docs/ClangFormat.html][clang-format]].
@ -31,9 +29,7 @@ scripts.
  demonstration of refactoring features. (when =semantic= layer is included)

 * Install
-
 ** Layer
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -43,7 +39,6 @@ To use this contribution add it to your =~/.spacemacs=
 *Note:* [[https://github.com/tuhdo/semantic-refactor][semantic-refactor]] is only available for Emacs 24.4+

 ** Default mode for header files
-
 By default header files are opened in =c-mode=, you can open them in =c++-mode=
 by setting the variable =c-c++-default-mode-for-headers= to =c++-mode=.

@ -58,7 +53,6 @@ variable at the root of your project. More info on directory local variables
 can be found in the [[http://www.gnu.org/software/emacs/manual/html_node/elisp/Directory-Local-Variables.html][dir-locals]].

 ** Enable Clang support
-
 To enable Clang support set the layer variable =c-c++-enable-clang-support=
 to =t= in the dotfile:

@ -68,7 +62,6 @@ to =t= in the dotfile:
 #+END_SRC

 *** clang-format
-
 [[http://clang.llvm.org/docs/ClangFormat.html][clang-format]] allows reformatting either a selected region of code
 (=clang-format-region=) or a whole buffer (=clang-format-buffer=) to make it
 conform to a style defined in a =.clang-format= file. This file is either
@ -89,7 +82,6 @@ particular mode or all modes in your =dotspacemacs/user-config= (within your
 #+END_SRC

 *** Company-clang and flycheck
-
 This layer adds some fancy improvements to =company-clang=.
 It includes a hook to load a projects =.clang_complete= file, which is
 just a text file with one clang flag per line, a format also used by
--- a/layers/+lang/clojure/README.org
+++ b/layers/+lang/clojure/README.org
@ -2,32 +2,32 @@

 [[file:img/clojure.png]] [[file:img/cider.png]]

-* Table of Contents                                                  :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#pretty-symbols][Pretty Symbols]]
-   - [[#cider-and-clj-refactor][CIDER and clj-refactor]]
-     - [[#quick-start-with-boot][Quick Start with boot]]
-     - [[#quick-start-with-lein][Quick Start with lein]]
-     - [[#more-details][More details]]
- - [[#key-bindings][Key Bindings]]
-   - [[#working-with-clojure-files-barfage-slurpage--more][Working with clojure files (barfage, slurpage & more)]]
-   - [[#leader][Leader]]
-     - [[#documentation][Documentation]]
-     - [[#evaluation][Evaluation]]
-     - [[#goto][Goto]]
-     - [[#repl][REPL]]
-     - [[#tests][Tests]]
-     - [[#toggles][Toggles]]
-     - [[#debugging][Debugging]]
-     - [[#refactoring][Refactoring]]
-     - [[#reformatting][Reformatting]]
-   - [[#cider-buffers][CIDER Buffers]]
-     - [[#stacktrace-mode][stacktrace-mode]]
-     - [[#inspector-mode][inspector-mode]]
-     - [[#test-report-mode][test-report-mode]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Pretty Symbols][Pretty Symbols]]
+   - [[CIDER and clj-refactor][CIDER and clj-refactor]]
+     - [[Quick Start with boot][Quick Start with boot]]
+     - [[Quick Start with lein][Quick Start with lein]]
+     - [[More details][More details]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Working with clojure files (barfage, slurpage & more)][Working with clojure files (barfage, slurpage & more)]]
+   - [[Leader][Leader]]
+     - [[Documentation][Documentation]]
+     - [[Evaluation][Evaluation]]
+     - [[Goto][Goto]]
+     - [[REPL][REPL]]
+     - [[Tests][Tests]]
+     - [[Toggles][Toggles]]
+     - [[Debugging][Debugging]]
+     - [[Refactoring][Refactoring]]
+     - [[Reformatting][Reformatting]]
+   - [[CIDER Buffers][CIDER Buffers]]
+     - [[stacktrace-mode][stacktrace-mode]]
+     - [[inspector-mode][inspector-mode]]
+     - [[test-report-mode][test-report-mode]]

 * Description

--- a/layers/+lang/common-lisp/README.org
+++ b/layers/+lang/common-lisp/README.org
@ -2,18 +2,18 @@

 [[file:img/slime.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-   - [[#working-with-lisp-files-barfage-slurpage--more][Working with lisp files (barfage, slurpage & more)]]
-   - [[#leader][Leader]]
-     - [[#help][Help]]
-     - [[#evaluation][Evaluation]]
-     - [[#repl][REPL]]
-     - [[#compile][Compile]]
-     - [[#navigation][Navigation]]
-     - [[#macroexpansion][Macroexpansion]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Working with lisp files (barfage, slurpage & more)][Working with lisp files (barfage, slurpage & more)]]
+   - [[Leader][Leader]]
+     - [[Help][Help]]
+     - [[Evaluation][Evaluation]]
+     - [[REPL][REPL]]
+     - [[Compile][Compile]]
+     - [[Navigation][Navigation]]
+     - [[Macroexpansion][Macroexpansion]]

 * Description
 A Spacemacs contribution layer providing Common Lisp support via [[https://github.com/slime/slime][SLIME]].
--- a/layers/+lang/csharp/README.org
+++ b/layers/+lang/csharp/README.org
@ -2,24 +2,24 @@

 [[file:img/csharp.png]] [[file:img/dotnet.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#packages-included][Packages Included]]
- - [[#install][Install]]
-     - [[#prerequisites][Prerequisites]]
-         - [[#aspnet-5][ASP.NET 5]]
-         - [[#curl][curl]]
-         - [[#omnisharp-server][Omnisharp server]]
- - [[#caveats][Caveats]]
- - [[#key-bindings][Key Bindings]]
-     - [[#compilation][Compilation]]
-     - [[#filesolutionproject-manipulation][File/Solution/Project manipulation]]
-     - [[#navigation][Navigation]]
-     - [[#helpers-documentation-info][Helpers (documentation, info)]]
-     - [[#refactoring][Refactoring]]
-     - [[#omnisharp-server-interaction][OmniSharp server interaction]]
-     - [[#tests][Tests]]
-     - [[#code-manipulation][Code manipulation]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Packages Included][Packages Included]]
+ - [[Install][Install]]
+   - [[Prerequisites][Prerequisites]]
+     - [[ASP.NET 5][ASP.NET 5]]
+     - [[curl][curl]]
+     - [[Omnisharp server][Omnisharp server]]
+ - [[Caveats][Caveats]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Compilation][Compilation]]
+   - [[File/Solution/Project manipulation][File/Solution/Project manipulation]]
+   - [[Navigation][Navigation]]
+   - [[Helpers (documentation, info)][Helpers (documentation, info)]]
+   - [[Refactoring][Refactoring]]
+   - [[OmniSharp server interaction][OmniSharp server interaction]]
+   - [[Tests][Tests]]
+   - [[Code manipulation][Code manipulation]]

 * Description

--- a/layers/+lang/d/README.org
+++ b/layers/+lang/d/README.org
@ -2,24 +2,17 @@

 [[file:img/dlogo.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description
-
 This simple layer adds support for the [[http://dlang.org/][D language]].
 It adds =d-mode= as well as integrating it with =auto-completion= and =syntax-checking=.

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
  (setq-default dotspacemacs-configuration-layers '(d))
 #+END_SRC
-
-* Key Bindings
-
-None for now.
--- a/layers/+lang/elixir/README.org
+++ b/layers/+lang/elixir/README.org
@ -2,20 +2,20 @@

 [[file:img/elixir.png]] with [[file:img/alchemist.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#refcard][Refcard]]
-     - [[#help][Help]]
-     - [[#mix][Mix]]
-     - [[#project][Project]]
-     - [[#evaluation-in-place][Evaluation in place]]
-     - [[#repl-interactions][REPL interactions]]
-     - [[#tests][Tests]]
-     - [[#compile][Compile]]
-     - [[#execute][Execute]]
-     - [[#code-definition-jump][Code Definition Jump]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Refcard][Refcard]]
+   - [[Help][Help]]
+   - [[Mix][Mix]]
+   - [[Project][Project]]
+   - [[Evaluation in place][Evaluation in place]]
+   - [[REPL interactions][REPL interactions]]
+   - [[Tests][Tests]]
+   - [[Compile][Compile]]
+   - [[Execute][Execute]]
+   - [[Code Definition Jump][Code Definition Jump]]

 * Description

--- a/layers/+lang/elm/README.org
+++ b/layers/+lang/elm/README.org
@ -2,25 +2,25 @@

 [[file:img/elm.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#elm-platform][Elm Platform]]
-     - [[#os-x-and-windows-installers][OS X and Windows installers]]
-     - [[#universal-installer-using-npm][Universal installer using npm]]
-     - [[#source-code][Source code]]
-   - [[#elm-mode][elm-mode]]
-   - [[#elm-oracle][elm-oracle]]
- - [[#basic-usage-tips][Basic usage tips]]
-   - [[#compilation][Compilation]]
-   - [[#reactor][Reactor]]
- - [[#key-bindings][Key bindings]]
-   - [[#elm-make][elm-make]]
-   - [[#elm-repl][elm-repl]]
-   - [[#elm-reactor][elm-reactor]]
-   - [[#elm-package][elm-package]]
-     - [[#package-list-buffer][package list buffer]]
-   - [[#elm-oracle][elm-oracle]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Elm Platform][Elm Platform]]
+     - [[OS X and Windows installers][OS X and Windows installers]]
+     - [[Universal installer using npm][Universal installer using npm]]
+     - [[Source code][Source code]]
+   - [[elm-mode][elm-mode]]
+   - [[elm-oracle][elm-oracle]]
+ - [[Basic usage tips][Basic usage tips]]
+   - [[Compilation][Compilation]]
+   - [[Reactor][Reactor]]
+ - [[Key bindings][Key bindings]]
+   - [[elm-make][elm-make]]
+   - [[elm-repl][elm-repl]]
+   - [[elm-reactor][elm-reactor]]
+   - [[elm-package][elm-package]]
+     - [[package list buffer][package list buffer]]
+   - [[elm-oracle][elm-oracle]]

 * Description
 This layer adds support for [[http://elm-lang.org][Elm]].
--- a/layers/+lang/emacs-lisp/README.org
+++ b/layers/+lang/emacs-lisp/README.org
@ -2,14 +2,14 @@

 [[file:img/emacs-lisp.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#auto-compile][Auto-compile]]
- - [[#key-bindings][Key bindings]]
-   - [[#working-with-lisp-files-barfage-slurpage--more][Working with lisp files (barfage, slurpage & more)]]
-   - [[#leader][Leader]]
-   - [[#srefactor][srefactor]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Auto-compile][Auto-compile]]
+ - [[Key bindings][Key bindings]]
+   - [[Working with lisp files (barfage, slurpage & more)][Working with lisp files (barfage, slurpage & more)]]
+   - [[Leader][Leader]]
+   - [[srefactor][srefactor]]

 * Description
 This layer gathers all the configuration related to emacs-lisp. This should
--- a/layers/+lang/erlang/README.org
+++ b/layers/+lang/erlang/README.org
@ -2,9 +2,9 @@

 [[file:img/erlang.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description

--- a/layers/+lang/ess/README.org
+++ b/layers/+lang/ess/README.org
@ -2,12 +2,12 @@

 [[file:img/r.jpg]]

-* Table of Contents                                                   :TOC@4:
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-   - [[#inferior-repl-process][Inferior REPL process]]
-   - [[#helpers][Helpers]]
- - [[#options][Options]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Inferior REPL process][Inferior REPL process]]
+   - [[Helpers][Helpers]]
+ - [[Options][Options]]

 * Install
 To use this contribution add it to your =~/.spacemacs=
--- a/layers/+lang/fsharp/README.org
+++ b/layers/+lang/fsharp/README.org
@ -2,12 +2,12 @@

 [[file:img/fsharp.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#packages-included][Packages Included]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#repl][REPL]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Packages Included][Packages Included]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[REPL][REPL]]

 * Description

--- a/layers/+lang/go/README.org
+++ b/layers/+lang/go/README.org
@ -2,17 +2,17 @@

 [[file:img/go.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
- - [[#install][Install]]
-   - [[#pre-requisites][Pre-requisites]]
-   - [[#layer][Layer]]
- - [[#configuration][Configuration]]
-   - [[#formatting][Formatting]]
- - [[#working-with-go][Working with Go]]
-   - [[#go-commands-start-with-m][Go commands (start with =m=):]]
-   - [[#go-oracle][Go Oracle]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Pre-requisites][Pre-requisites]]
+   - [[Layer][Layer]]
+ - [[Configuration][Configuration]]
+   - [[Formatting][Formatting]]
+ - [[Working with Go][Working with Go]]
+   - [[Go commands (start with =m=):][Go commands (start with =m=):]]
+   - [[Go Oracle][Go Oracle]]

 * Description
 This layer adds extensive support for go.
@ -23,7 +23,6 @@ This layer adds extensive support for go.
 - Source analysis using [[http://golang.org/s/oracle-user-manual][go-oracle]]

 * Install
-
 ** Pre-requisites
 You will need =gocode= and =godef=:

@ -48,22 +47,27 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Configuration
-
 ** Formatting
 By default, go buffers are run through =gofmt= on save. To use a different
 formatter, set the value of =gofmt-command=, e.g.

 #+begin_src emacs-lisp
  (setq gofmt-command "goimports")
-  or
+#+end_src
+
+or
+
+#+begin_src emacs-lisp
  (go :variables gofmt-command "goimports")
 #+end_src
-#
-If you're using =gocheck= in your project you can use the =go-use-gocheck-for-testing= variable to enable suite testing and to get single function testing to work.
+
+If you're using =gocheck= in your project you can use the
+=go-use-gocheck-for-testing= variable to enable suite testing and to get single
+function testing to work.

 * Working with Go
-
 ** Go commands (start with =m=):
+
 | Key Binding | Description                                                                           |
 |-------------+---------------------------------------------------------------------------------------|
 | ~SPC m h h~ | godoc at point                                                                        |
--- a/layers/+lang/haskell/README.org
+++ b/layers/+lang/haskell/README.org
@ -2,32 +2,32 @@

 [[file:img/haskell.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#dependencies][Dependencies]]
-   - [[#setup-path][Setup PATH]]
-   - [[#ghc-mod-support][ghc-mod support]]
-     - [[#stack-users][Stack users]]
-   - [[#optional-extras][Optional extras]]
-     - [[#ghci-ng-support][GHCi-ng support]]
-       - [[#stack-users][Stack users]]
-       - [[#ghc-mod-users][ghc-mod users]]
-     - [[#structured-haskell-mode][structured-haskell-mode]]
-     - [[#hindent][hindent]]
- - [[#key-bindings][Key bindings]]
-   - [[#documentation][Documentation]]
-   - [[#debug][Debug]]
-   - [[#repl][REPL]]
-   - [[#cabal-commands][Cabal commands]]
-   - [[#cabal-files][Cabal files]]
- - [[#faq][FAQ]]
-   - [[#repl-doesnt-work][REPL doesn't work]]
-   - [[#repl-is-stuck][REPL is stuck]]
-   - [[#i-am-using-stack-and-ghc-mod-but-ghc-mod-doesnt-work][I am using =stack= and =ghc-mod=, but =ghc-mod= doesn't work]]
-   - [[#indentation-doesnt-reset-when-pressing-return-after-empty-line][Indentation doesn't reset when pressing return after empty line]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Dependencies][Dependencies]]
+   - [[Setup PATH][Setup PATH]]
+   - [[ghc-mod support][ghc-mod support]]
+     - [[Stack users][Stack users]]
+   - [[Optional extras][Optional extras]]
+     - [[GHCi-ng support][GHCi-ng support]]
+       - [[Stack users][Stack users]]
+       - [[ghc-mod users][ghc-mod users]]
+     - [[structured-haskell-mode][structured-haskell-mode]]
+     - [[hindent][hindent]]
+ - [[Key bindings][Key bindings]]
+   - [[Documentation][Documentation]]
+   - [[Debug][Debug]]
+   - [[REPL][REPL]]
+   - [[Cabal commands][Cabal commands]]
+   - [[Cabal files][Cabal files]]
+ - [[FAQ][FAQ]]
+   - [[REPL doesn't work][REPL doesn't work]]
+   - [[REPL is stuck][REPL is stuck]]
+   - [[I am using =stack= and =ghc-mod=, but =ghc-mod= doesn't work][I am using =stack= and =ghc-mod=, but =ghc-mod= doesn't work]]
+   - [[Indentation doesn't reset when pressing return after empty line][Indentation doesn't reset when pressing return after empty line]]

 * Description
 This layer adds support for the [[https://www.haskell.org/][Haskell]] language.
--- a/layers/+lang/html/README.org
+++ b/layers/+lang/html/README.org
@ -2,13 +2,13 @@

 [[file:img/html.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-   - [[#web-mode][Web mode]]
-   - [[#cssscss][CSS/SCSS]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features][Features]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Web mode][Web mode]]
+   - [[CSS/SCSS][CSS/SCSS]]

 * Description
 This layer adds support for editing HTML and CSS.
@ -27,7 +27,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key Bindings
-
 ** Web mode

 | Key Binding | Description                                               |
--- a/layers/+lang/idris/README.org
+++ b/layers/+lang/idris/README.org
@ -2,18 +2,18 @@

 [[file:img/idris.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#idris][Idris]]
- - [[#key-bindings][Key bindings]]
-     - [[#shorthands][Shorthands]]
-     - [[#interactive-editing][Interactive editing]]
-     - [[#documentation][Documentation]]
-     - [[#repl][REPL]]
-     - [[#active-term-manipulations][Active term manipulations]]
-     - [[#build-system][Build system]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Idris][Idris]]
+ - [[Key bindings][Key bindings]]
+   - [[Shorthands][Shorthands]]
+   - [[Interactive editing][Interactive editing]]
+   - [[Documentation][Documentation]]
+   - [[REPL][REPL]]
+   - [[Active term manipulations][Active term manipulations]]
+   - [[Build system][Build system]]

 * Description
 This layer adds support for the [[http://www.idris-lang.org/][Idris]] language.
--- a/layers/+lang/ipython-notebook/README.org
+++ b/layers/+lang/ipython-notebook/README.org
@ -1,27 +1,27 @@
 #+TITLE: IPython Notebook contribution layer for Spacemacs (WIP)

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#list-of-todos][List of TODOS]]
-     - [[#maybe-itd-be-better-if-there-was-a-state-for-this][Maybe it'd be better if there was a state for this]]
-     - [[#make-more-keybinding-to-connect-to-a-python-buffer][Make more keybinding to =connect= to a python buffer.]]
-     - [[#deleting-visual-regions-dont-work-find-out-why][Deleting visual regions don't work, find out why.]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#dependencies][Dependencies]]
-     - [[#what-needs-to-be-run][What needs to be run]]
- - [[#using-the-ipython-notebook][Using the IPython notebook]]
-     - [[#open-notebook-list][Open Notebook List]]
-     - [[#key-bindings][Key Bindings]]
-         - [[#micro-state-ipython-notebook][Micro-state: =ipython-notebook=]]
-         - [[#normal-mode][Normal mode]]
-         - [[#insert-mode][Insert mode]]
-         - [[#traceback-mode][Traceback mode]]
- - [[#screenshots][Screenshots]]
-     - [[#light][Light]]
-     - [[#dark][Dark]]
- - [[#bonus][Bonus]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[List of TODOS][List of TODOS]]
+   - [[Maybe it'd be better if there was a state for this][Maybe it'd be better if there was a state for this]]
+   - [[Make more keybinding to =connect= to a python buffer.][Make more keybinding to =connect= to a python buffer.]]
+   - [[Deleting visual regions don't work, find out why.][Deleting visual regions don't work, find out why.]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Dependencies][Dependencies]]
+   - [[What needs to be run][What needs to be run]]
+ - [[Using the IPython notebook][Using the IPython notebook]]
+   - [[Open Notebook List][Open Notebook List]]
+   - [[Key Bindings][Key Bindings]]
+     - [[Micro-state: =ipython-notebook=][Micro-state: =ipython-notebook=]]
+     - [[Normal mode][Normal mode]]
+     - [[Insert mode][Insert mode]]
+     - [[Traceback mode][Traceback mode]]
+ - [[Screenshots][Screenshots]]
+   - [[Light][Light]]
+   - [[Dark][Dark]]
+ - [[Bonus][Bonus]]

 * Description
 This layer adds support for the package =emacs-ipython-notebook=.
--- a/layers/+lang/java/README.org
+++ b/layers/+lang/java/README.org
@ -2,24 +2,24 @@

 [[file:img/java.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#layer-installation][Layer Installation]]
-   - [[#layer][Layer]]
-   - [[#eclim][Eclim]]
-     - [[#installation][Installation]]
-     - [[#usage][Usage]]
- - [[#key-bindings][Key bindings]]
-   - [[#java-mode][Java-mode]]
-     - [[#project-management][Project management]]
-     - [[#maven][Maven]]
-     - [[#goto][Goto]]
-     - [[#refactoring][Refactoring]]
-     - [[#documentation-find][Documentation, Find]]
-     - [[#problems][Problems]]
-     - [[#tests][Tests]]
-   - [[#problems-buffer][Problems buffer]]
-   - [[#projects-buffer][Projects buffer]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Layer Installation][Layer Installation]]
+   - [[Layer][Layer]]
+   - [[Eclim][Eclim]]
+     - [[Installation][Installation]]
+     - [[Usage][Usage]]
+ - [[Key bindings][Key bindings]]
+   - [[Java-mode][Java-mode]]
+     - [[Project management][Project management]]
+     - [[Maven][Maven]]
+     - [[Goto][Goto]]
+     - [[Refactoring][Refactoring]]
+     - [[Documentation, Find][Documentation, Find]]
+     - [[Problems][Problems]]
+     - [[Tests][Tests]]
+   - [[Problems buffer][Problems buffer]]
+   - [[Projects buffer][Projects buffer]]

 * Description
 This layer adds support for the Java language using the [[http://eclim.org][Eclim]] client/server.
--- a/layers/+lang/javascript/README.org
+++ b/layers/+lang/javascript/README.org
@ -2,19 +2,19 @@

 [[file:img/javascript.png]] [[file:img/coffee.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
- - [[#configuration][Configuration]]
- - [[#key-bindings][Key Bindings]]
-     - [[#js2-mode][js2-mode]]
-     - [[#folding-js2-mode][Folding (js2-mode)]]
-     - [[#refactoring-js2-refactor][Refactoring (js2-refactor)]]
-     - [[#formatting-web-beautify][Formatting (web-beautify)]]
-         - [[#documentation-js-doc][Documentation (js-doc)]]
-     - [[#auto-complete-and-documentation-tern][Auto-complete and documentation (tern)]]
-     - [[#json][JSON]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+ - [[Configuration][Configuration]]
+ - [[Key Bindings][Key Bindings]]
+   - [[js2-mode][js2-mode]]
+   - [[Folding (js2-mode)][Folding (js2-mode)]]
+   - [[Refactoring (js2-refactor)][Refactoring (js2-refactor)]]
+   - [[Formatting (web-beautify)][Formatting (web-beautify)]]
+     - [[Documentation (js-doc)][Documentation (js-doc)]]
+   - [[Auto-complete and documentation (tern)][Auto-complete and documentation (tern)]]
+   - [[JSON][JSON]]

 * Description

--- a/layers/+lang/latex/README.org
+++ b/layers/+lang/latex/README.org
@ -2,18 +2,18 @@

 [[file:img/latex.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#auto-completion][Auto-completion]]
-   - [[#previewing][Previewing]]
-   - [[#build-command][Build command]]
-   - [[#auto-fill][Auto-fill]]
- - [[#keybindings][Keybindings]]
-   - [[#reftex][RefTeX]]
- - [[#maintainer][Maintainer]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features][Features]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Auto-completion][Auto-completion]]
+   - [[Previewing][Previewing]]
+   - [[Build command][Build command]]
+   - [[Auto-fill][Auto-fill]]
+ - [[Keybindings][Keybindings]]
+   - [[RefTeX][RefTeX]]
+ - [[Maintainer][Maintainer]]

 * Description

@ -79,7 +79,7 @@ The variable =latex-nofill-env= provide the list of environment names where
 * Keybindings

 | Key Binding | Description                                             |
-|-------------+---------------------------------------------------------+
+|-------------+---------------------------------------------------------|
 | ~SPC m *~   | TeX documentation, can be very slow                     |
 | ~SPC m b~   | build                                                   |
 | ~SPC m c~   | close LaTeX environment                                 |
--- a/layers/+lang/lua/README.org
+++ b/layers/+lang/lua/README.org
@ -2,12 +2,12 @@

 [[file:img/lua.gif]]

-* Table of Contents                                                  :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#commands][Commands]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Commands][Commands]]

 * Description

--- a/layers/+lang/markdown/README.org
+++ b/layers/+lang/markdown/README.org
@ -2,22 +2,22 @@

 [[file:img/markdown.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
- - [[#install][Install]]
- - [[#usage][Usage]]
- - [[#key-bindings][Key bindings]]
-   - [[#element-insertion][Element insertion]]
-   - [[#element-removal][Element removal]]
-   - [[#completion-and-cycling][Completion, and Cycling]]
-   - [[#following-and-jumping][Following and Jumping]]
-   - [[#indentation][Indentation]]
-   - [[#header-navigation][Header navigation]]
-   - [[#buffer-wide-commands][Buffer-wide commands]]
-   - [[#list-editing][List editing]]
-   - [[#movement][Movement]]
-   - [[#promotion-demotion][Promotion, Demotion]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+ - [[Usage][Usage]]
+ - [[Key bindings][Key bindings]]
+   - [[Element insertion][Element insertion]]
+   - [[Element removal][Element removal]]
+   - [[Completion, and Cycling][Completion, and Cycling]]
+   - [[Following and Jumping][Following and Jumping]]
+   - [[Indentation][Indentation]]
+   - [[Header navigation][Header navigation]]
+   - [[Buffer-wide commands][Buffer-wide commands]]
+   - [[List editing][List editing]]
+   - [[Movement][Movement]]
+   - [[Promotion, Demotion][Promotion, Demotion]]

 * Description

--- a/layers/+lang/nim/README.org
+++ b/layers/+lang/nim/README.org
@ -2,12 +2,12 @@

 [[file:img/logo.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
- - [[#working-with-nim][Working with Nim]]
-     - [[#nim-commands-start-with-m][Nim commands (start with =m=):]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+ - [[Working with Nim][Working with Nim]]
+   - [[Nim commands (start with =m=):][Nim commands (start with =m=):]]

 * Description

@ -26,6 +26,6 @@ To use this contribution add it to your =~/.spacemacs=
 * Working with Nim

 ** Nim commands (start with =m=):
-| Key Binding | Description                                               |
-|-------------+-----------------------------------------------------------|
-| ~SPC m c r~ | nim compile --run main.nim
+| Key Binding | Description                |
+|-------------+----------------------------|
+| ~SPC m c r~ | nim compile --run main.nim |
--- a/layers/+lang/ocaml/README.org
+++ b/layers/+lang/ocaml/README.org
@ -2,18 +2,18 @@

 [[file:img/ocaml.png]]

-* Table of Content                                                    :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#opam-packages][OPAM packages]]
- - [[#key-bindings][Key Bindings]]
-   - [[#repl-utop][REPL (utop)]]
- - [[#todos][TODOS]]
-   - [[#add-more-proper-spacemacs-key-bindings-for-basic-merlin-tasks][Add more proper spacemacs key-bindings for basic merlin tasks]]
-   - [[#add-proper-keybindings-for-ocamldebug][Add proper keybindings for ocamldebug]]
-   - [[#add-more-keybindings-for-tuareg-mode][Add more keybindings for tuareg-mode]]
+* Table of Content                                          :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[OPAM packages][OPAM packages]]
+ - [[Key Bindings][Key Bindings]]
+   - [[REPL (utop)][REPL (utop)]]
+ - [[TODOS][TODOS]]
+   - [[Add more proper spacemacs key-bindings for basic merlin tasks][Add more proper spacemacs key-bindings for basic merlin tasks]]
+   - [[Add proper keybindings for ocamldebug][Add proper keybindings for ocamldebug]]
+   - [[Add more keybindings for tuareg-mode][Add more keybindings for tuareg-mode]]

 * Description
 This is a very basic layer for editing ocaml files.
--- a/layers/+lang/php/README.org
+++ b/layers/+lang/php/README.org
@ -2,11 +2,11 @@
 
 [[file:img/php.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description

--- a/layers/+lang/purescript/README.org
+++ b/layers/+lang/purescript/README.org
@ -2,13 +2,13 @@

 [[file:img/purescript-logo.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#purescript][Purescript]]
-         - [[#imports][Imports]]
-     - [[#repl][REPL]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Purescript][Purescript]]
+     - [[Imports][Imports]]
+   - [[REPL][REPL]]

 * Description

--- a/layers/+lang/python/README.org
+++ b/layers/+lang/python/README.org
@ -2,24 +2,24 @@

 [[file:img/python.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#test-runner][Test runner]]
-   - [[#anaconda-dependencies][Anaconda dependencies]]
-   - [[#automatic-buffer-formatting-on-save][Automatic buffer formatting on save]]
-   - [[#autoflake][autoflake]]
-   - [[#pylookup][pylookup]]
- - [[#key-bindings][Key Bindings]]
-   - [[#inferior-repl-process][Inferior REPL process]]
-   - [[#running-python-script-in-shell][Running Python Script in shell]]
-   - [[#testing][Testing]]
-   - [[#refactoring][Refactoring]]
-   - [[#other-python-commands][Other Python commands]]
- - [[#configuration][Configuration]]
-   - [[#fill-column][Fill column]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Test runner][Test runner]]
+   - [[Anaconda dependencies][Anaconda dependencies]]
+   - [[Automatic buffer formatting on save][Automatic buffer formatting on save]]
+   - [[autoflake][autoflake]]
+   - [[pylookup][pylookup]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Inferior REPL process][Inferior REPL process]]
+   - [[Running Python Script in shell][Running Python Script in shell]]
+   - [[Testing][Testing]]
+   - [[Refactoring][Refactoring]]
+   - [[Other Python commands][Other Python commands]]
+ - [[Configuration][Configuration]]
+   - [[Fill column][Fill column]]

 * Description
 This layer adds support for the Python language.
@ -34,8 +34,8 @@ This layer adds support for the Python language.
 - PEP8 compliant formatting via [[https://github.com/google/yapf][YAPF]]
 - Suppression of unused import with [[https://github.com/myint/autoflake][autoflake]]
 - Use the ~%~ key to jump between blocks with [[https://github.com/redguardtoo/evil-matchit][evil-matchit]]
-* Install

+* Install
 ** Layer
 To use this contribution add it to your =~/.spacemacs=

@ -59,9 +59,10 @@ The root of the project is detected with a =.git= directory or a =setup.cfg= fil
 =anaconda-mode= tries to install the dependencies itself but sometimes
 it does not work and you may encounter the following message when
 opening a python buffer:
-#+begin_src
+
+#+begin_example
    Blocking call to accept-process-output with quit inhibited!!
-#+end_src
+#+end_example

 To fix this, install the =anaconda-mode= [[https://github.com/proofit404/anaconda-mode/blob/master/requirements.txt][anaconda-deps]] by hand:

--- a/layers/+lang/racket/README.org
+++ b/layers/+lang/racket/README.org
@ -2,15 +2,15 @@

 [[file:img/racket.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#navigation][Navigation]]
-     - [[#documentation][Documentation]]
-     - [[#tests][Tests]]
-     - [[#repl][REPL]]
-     - [[#other-key-bindings][Other key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Navigation][Navigation]]
+   - [[Documentation][Documentation]]
+   - [[Tests][Tests]]
+   - [[REPL][REPL]]
+   - [[Other key bindings][Other key bindings]]

 * Description

--- a/layers/+lang/ruby/README.org
+++ b/layers/+lang/ruby/README.org
@ -2,22 +2,20 @@

 [[file:img/ruby.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#prerequisites][Prerequisites]]
-   - [[#ruby-version-management][Ruby version management]]
- - [[#key-bindings][Key bindings]]
-   - [[#ruby-enh-ruby-mode-robe-inf-ruby-ruby-tools][Ruby (enh-ruby-mode, robe, inf-ruby, ruby-tools)]]
-   - [[#ruby-test-mode][ruby-test-mode]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Prerequisites][Prerequisites]]
+   - [[Ruby version management][Ruby version management]]
+ - [[Key bindings][Key bindings]]
+   - [[Ruby (enh-ruby-mode, robe, inf-ruby, ruby-tools)][Ruby (enh-ruby-mode, robe, inf-ruby, ruby-tools)]]
+   - [[ruby-test-mode][ruby-test-mode]]

 * Description
-
 This layer provides support for the Ruby language with [[https://github.com/zenspider/enhanced-ruby-mode][enh-ruby-mode]] and [[https://github.com/dgutov/robe][robe-mode]].
 Optionally Enh Ruby Mode can be replaced with the built-in Emacs Ruby Mode.

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -34,7 +32,6 @@ This layer supports two different Ruby modes: Emacs' built-in Ruby Mode and
 #+END_SRC

 ** Prerequisites
-
 Some of the advanced features supported by this layer depend on external gems
 that need to be installed in the context of your project (see below for guidance
 based on your version manager):
@ -57,7 +54,6 @@ specific documentation for details and caveats):
 #+END_SRC

 ** Ruby version management
-
 This layer supports the use of [[https://rvm.io/][RVM]] and [[https://github.com/sstephenson/rbenv][Rbenv]].
 To enable it, set the =ruby-version-manager= var in your =~/.spacemacs=:

@ -70,7 +66,6 @@ To enable it, set the =ruby-version-manager= var in your =~/.spacemacs=:
 Possible values are =rbenv= and =rvm=.

 * Key bindings
-
 ** Ruby (enh-ruby-mode, robe, inf-ruby, ruby-tools)

 | Key binding | Description                                          |
@ -91,7 +86,6 @@ Possible values are =rbenv= and =rvm=.
 | ~%~         | [[https://github.com/redguardtoo/evil-matchit][evil-matchit]] jumps between blocks                    |

 ** ruby-test-mode
-
 ruby-test-mode comes bundled with spacemacs, but this contribution adds
 a couple of useful keybindings:

--- a/layers/+lang/rust/README.org
+++ b/layers/+lang/rust/README.org
@ -2,12 +2,12 @@

 [[file:img/rust.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#cargo][Cargo]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Cargo][Cargo]]
+ - [[Key bindings][Key bindings]]

 * Description
 This layer aims to support [[http://www.rust-lang.org/][Rust]] development in Spacemacs.
@ -16,7 +16,6 @@ It supports [[http://doc.crates.io/index.html][Cargo]], and has some basic auto-
 though Racer needs some additional configurations as described on their page.

 * Install
-
 ** Layer
 To use this layer, add it to your =~/.spacemacs=

--- a/layers/+lang/scala/README.org
+++ b/layers/+lang/scala/README.org
@ -2,26 +2,26 @@

 [[file:img/scala.png]] with [[file:img/ensime.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#layer-installation][Layer Installation]]
- - [[#ensime][Ensime]]
-     - [[#installation][Installation]]
-     - [[#usage][Usage]]
- - [[#scalastyle][Scalastyle]]
- - [[#key-bindings][Key bindings]]
-     - [[#ensime-key-bindings][Ensime key bindings]]
-         - [[#search][Search]]
-         - [[#sbt][sbt]]
-         - [[#typecheck][Typecheck]]
-         - [[#debug][Debug]]
-         - [[#errors][Errors]]
-         - [[#goto][Goto]]
-         - [[#documentation-inspect][Documentation, Inspect]]
-         - [[#server][Server]]
-         - [[#refactoring][Refactoring]]
-         - [[#tests][Tests]]
-         - [[#repl][REPL]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Layer Installation][Layer Installation]]
+ - [[Ensime][Ensime]]
+   - [[Installation][Installation]]
+   - [[Usage][Usage]]
+ - [[Scalastyle][Scalastyle]]
+ - [[Key bindings][Key bindings]]
+   - [[Ensime key bindings][Ensime key bindings]]
+     - [[Search][Search]]
+     - [[sbt][sbt]]
+     - [[Typecheck][Typecheck]]
+     - [[Debug][Debug]]
+     - [[Errors][Errors]]
+     - [[Goto][Goto]]
+     - [[Documentation, Inspect][Documentation, Inspect]]
+     - [[Server][Server]]
+     - [[Refactoring][Refactoring]]
+     - [[Tests][Tests]]
+     - [[REPL][REPL]]

 * Description

--- a/layers/+lang/scheme/README.org
+++ b/layers/+lang/scheme/README.org
@ -1,15 +1,15 @@
 #+TITLE: Scheme contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#compiling-][Compiling ]]
-     - [[#navigation][Navigation]]
-     - [[#documentation][Documentation]]
-     - [[#insertion][Insertion]]
-     - [[#macroexpansion][Macroexpansion]]
-     - [[#repl][REPL]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Compiling ][Compiling ]]
+   - [[Navigation][Navigation]]
+   - [[Documentation][Documentation]]
+   - [[Insertion][Insertion]]
+   - [[Macroexpansion][Macroexpansion]]
+   - [[REPL][REPL]]

 * Description

--- a/layers/+lang/shell-scripts/README.org
+++ b/layers/+lang/shell-scripts/README.org
@ -2,10 +2,10 @@

 [[file:img/fish.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]

 * Description

--- a/layers/+lang/sml/README.org
+++ b/layers/+lang/sml/README.org
@ -2,12 +2,12 @@

 [[file:img/sml.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#form-completion][Form Completion]]
-     - [[#repl][REPL]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Form Completion][Form Completion]]
+   - [[REPL][REPL]]

 * Description

--- a/layers/+lang/sql/README.org
+++ b/layers/+lang/sql/README.org
@ -2,14 +2,14 @@

 [[file:img/sql.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-     - [[#highlighting][Highlighting]]
-     - [[#inferior-process-interactions-sqli][Inferior Process Interactions (SQLi)]]
-         - [[#send-sql-queries-to-sqli][Send SQL queries to SQLi:]]
-     - [[#sqli-buffer][SQLi buffer]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Highlighting][Highlighting]]
+   - [[Inferior Process Interactions (SQLi)][Inferior Process Interactions (SQLi)]]
+     - [[Send SQL queries to SQLi:][Send SQL queries to SQLi:]]
+   - [[SQLi buffer][SQLi buffer]]

 * Description

--- a/layers/+lang/typescript/README.org
+++ b/layers/+lang/typescript/README.org
@ -2,12 +2,12 @@

 [[file:img/TypeScript.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#prerequisites][Prerequisites]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Prerequisites][Prerequisites]]
+ - [[Key bindings][Key bindings]]

 * Description

--- a/layers/+lang/vimscript/README.org
+++ b/layers/+lang/vimscript/README.org
@ -1,8 +1,8 @@
 #+TITLE: Vimscript language contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description

--- a/layers/+lang/windows-scripts/README.org
+++ b/layers/+lang/windows-scripts/README.org
@ -2,15 +2,14 @@

 [[file:img/ps.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key Bindings]]
-     - [[#powershell][Powershell]]
-     - [[#batch-dosel][Batch (dos.el)]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Powershell][Powershell]]
+   - [[Batch (dos.el)][Batch (dos.el)]]

 * Description
-
 This simple layer adds support for the Powershell scripting language as well
 as support for batch files.

@ -19,7 +18,6 @@ Incuded packages for extensions:
 - =.bat=: [[http://www.emacswiki.org/emacs/dos.el][dos.el]]

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -27,9 +25,7 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Key Bindings
-
 ** Powershell
-
 No useful bindings.

 ** Batch (dos.el)
--- a/layers/+lang/yaml/README.org
+++ b/layers/+lang/yaml/README.org
@ -1,15 +1,13 @@
 #+TITLE: YAML contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description
-
 This layer provides syntax highlighting for YAML files.

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
--- a/layers/+source-control/git/README.org
+++ b/layers/+source-control/git/README.org
@ -2,25 +2,25 @@

 [[file:img/git.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-     - [[#recommended-settings][Recommended Settings]]
-   - [[#magit-status-fullscreen][Magit status fullscreen]]
-   - [[#magit-auto-complete][Magit auto-complete]]
-   - [[#magit-svn-plugin][Magit SVN plugin]]
-   - [[#git][Git]]
-   - [[#git-flow][Git-Flow]]
- - [[#working-with-git][Working with Git]]
-   - [[#magit][Magit]]
-   - [[#staging-lines][Staging lines]]
-   - [[#commit-message-editing-buffer][Commit message editing buffer]]
-   - [[#interactive-rebase-buffer][Interactive rebase buffer]]
-   - [[#quick-guide-for-recurring-use-cases-in-magit][Quick guide for recurring use cases in Magit]]
-   - [[#git-flow][Git-Flow]]
-   - [[#git-time-machine][Git time machine]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+     - [[Recommended Settings][Recommended Settings]]
+   - [[Magit status fullscreen][Magit status fullscreen]]
+   - [[Magit auto-complete][Magit auto-complete]]
+   - [[Magit SVN plugin][Magit SVN plugin]]
+   - [[Git][Git]]
+   - [[Git-Flow][Git-Flow]]
+ - [[Working with Git][Working with Git]]
+   - [[Magit][Magit]]
+   - [[Staging lines][Staging lines]]
+   - [[Commit message editing buffer][Commit message editing buffer]]
+   - [[Interactive rebase buffer][Interactive rebase buffer]]
+   - [[Quick guide for recurring use cases in Magit][Quick guide for recurring use cases in Magit]]
+   - [[Git-Flow][Git-Flow]]
+   - [[Git time machine][Git time machine]]

 * Description
 This layers adds extensive support for [[http://git-scm.com/][git]].
@ -140,34 +140,34 @@ Here are the often used bindings inside a =status buffer=:

 | Key Binding | Description                                         |
 |-------------+-----------------------------------------------------|
-| ~/~           | evil-search                                         |
-| ~$~           | open =command output buffer=                          |
-| ~c c~         | open a =commit message buffer=                        |
-| ~b b~         | checkout a branch                                   |
-| ~b c~         | create a branch                                     |
-| ~f f~         | fetch changes                                       |
-| ~F -r F~      | pull and rebase                                     |
-| ~gr~          | refresh                                             |
-| ~j~           | goto next magit section                             |
-| ~C-j~         | next visual line                                    |
-| ~k~           | goto previous magit section                         |
-| ~C-k~         | previous visual line                                |
-| ~l l~         | open =log buffer=                                     |
-| ~n~           | next search occurrence                              |
-| ~N~           | previous search occurrence                          |
-| ~o~           | revert item at point                                |
-| ~P P~         | push                                                |
-| ~q~           | quit                                                |
-| ~s~           | on a file or hunk in a diff: stage the file or hunk |
-| ~x~           | discard changes                                     |
-| ~+~           | on a hunk: increase hunk size                       |
-| ~-~           | on a hunk: decrease hunk size                       |
-| ~S~           | stage all                                           |
-| ~TAB~         | on a file: expand/collapse diff                     |
-| ~u~           | on a staged file: unstage                           |
-| ~U~           | unstage all staged files                            |
-| ~v or V~      | select multiple lines                               |
-| ~z z~         | stash changes                                       |
+| ~/~         | evil-search                                         |
+| ~$~         | open =command output buffer=                        |
+| ~c c~       | open a =commit message buffer=                      |
+| ~b b~       | checkout a branch                                   |
+| ~b c~       | create a branch                                     |
+| ~f f~       | fetch changes                                       |
+| ~F -r F~    | pull and rebase                                     |
+| ~gr~        | refresh                                             |
+| ~j~         | goto next magit section                             |
+| ~C-j~       | next visual line                                    |
+| ~k~         | goto previous magit section                         |
+| ~C-k~       | previous visual line                                |
+| ~l l~       | open =log buffer=                                   |
+| ~n~         | next search occurrence                              |
+| ~N~         | previous search occurrence                          |
+| ~o~         | revert item at point                                |
+| ~P P~       | push                                                |
+| ~q~         | quit                                                |
+| ~s~         | on a file or hunk in a diff: stage the file or hunk |
+| ~x~         | discard changes                                     |
+| ~+~         | on a hunk: increase hunk size                       |
+| ~-~         | on a hunk: decrease hunk size                       |
+| ~S~         | stage all                                           |
+| ~TAB~       | on a file: expand/collapse diff                     |
+| ~u~         | on a staged file: unstage                           |
+| ~U~         | unstage all staged files                            |
+| ~v or V~    | select multiple lines                               |
+| ~z z~       | stash changes                                       |

 ** Staging lines
 Magit allows you to stage specific lines by selecting them in a diff and hitting
@ -192,19 +192,19 @@ will discard the commit message.

 | Key Binding | Description    |
 |-------------+----------------|
-| ~c~ or ~p~      | pick           |
-| ~e~           | edit           |
-| ~f~           | fixup          |
-| ~j~           | go down        |
-| ~gj~          | move line down |
-| ~k~           | go up          |
-| ~gk~          | move line up   |
-| ~d~ or ~x~      | kill line      |
-| ~r~           | reword         |
-| ~s~           | squash         |
-| ~u~           | undo           |
-| ~y~           | insert         |
-| ~!~           | execute        |
+| ~c~ or ~p~  | pick           |
+| ~e~         | edit           |
+| ~f~         | fixup          |
+| ~j~         | go down        |
+| ~gj~        | move line down |
+| ~k~         | go up          |
+| ~gk~        | move line up   |
+| ~d~ or ~x~  | kill line      |
+| ~r~         | reword         |
+| ~s~         | squash         |
+| ~u~         | undo           |
+| ~y~         | insert         |
+| ~!~         | execute        |

 ** Quick guide for recurring use cases in Magit

--- a/layers/+source-control/github/README.org
+++ b/layers/+source-control/github/README.org
@ -2,15 +2,15 @@

 [[file:img/github.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
- - [[#key-bindings][Key Bindings]]
-     - [[#magit-gh-pulls][magit-gh-pulls]]
-     - [[#gistel][gist.el]]
-     - [[#browse-files][Browse files]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+ - [[Key Bindings][Key Bindings]]
+   - [[magit-gh-pulls][magit-gh-pulls]]
+   - [[gist.el][gist.el]]
+   - [[Browse files][Browse files]]

 * Description

--- a/layers/+source-control/perforce/README.org
+++ b/layers/+source-control/perforce/README.org
@ -2,10 +2,10 @@

 [[file:img/p4.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description

--- a/layers/+source-control/version-control/README.org
+++ b/layers/+source-control/version-control/README.org
@ -1,11 +1,11 @@
 #+TITLE: Version-Control contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+ - [[Key Bindings][Key Bindings]]

 * Description

@ -29,7 +29,7 @@ To use this contribution add it to your =~/.spacemacs=

 | Key Binding | Description   |
 |-------------+---------------|
-| ~SPC g h g~     | Go to hunk    |
-| ~SPC g h N~     | Previous hunk |
-| ~SPC g h n~     | Next hunk     |
-| ~SPC g h r~     | Revert hunk   |
+| ~SPC g h g~ | Go to hunk    |
+| ~SPC g h N~ | Previous hunk |
+| ~SPC g h n~ | Next hunk     |
+| ~SPC g h r~ | Revert hunk   |
--- a/layers/+tools/dash/README.org
+++ b/layers/+tools/dash/README.org
@ -3,17 +3,17 @@

 [[file:img/zeal.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#dash-os-x][Dash (OS X)]]
-     - [[#zeal-linux--windows][Zeal (Linux & Windows)]]
-     - [[#check-documentation-for-x-at-point][Check Documentation for x-at-point]]
- - [[#key-bindings][Key bindings]]
-     - [[#helm-dash][helm-dash]]
- - [[#todos][TODOs]]
-     - [[#done-check-zeal][DONE Check zeal]]
-     - [[#todo-make-helm-dash-use-zeal-or-dash-docsets-by-default][TODO Make helm-dash use zeal or dash docsets by default.]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Dash (OS X)][Dash (OS X)]]
+   - [[Zeal (Linux & Windows)][Zeal (Linux & Windows)]]
+   - [[Check Documentation for x-at-point][Check Documentation for x-at-point]]
+ - [[Key bindings][Key bindings]]
+   - [[helm-dash][helm-dash]]
+ - [[TODOs][TODOs]]
+   - [[Check zeal][Check zeal]]
+   - [[Make helm-dash use zeal or dash docsets by default.][Make helm-dash use zeal or dash docsets by default.]]

 * Description
 +*This layer works only on OS X for the moment*+
--- a/layers/+tools/evernote/README.org
+++ b/layers/+tools/evernote/README.org
@ -2,13 +2,13 @@

 [[file:img/evernote.png]] with [[file:img/geeknote.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#geeknote][geeknote]]
-   - [[#geeknoteel][geeknote.el]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[geeknote][geeknote]]
+   - [[geeknote.el][geeknote.el]]
+ - [[Key Bindings][Key Bindings]]

 * Description
 This layer groups together packages to work with [[https://evernote.com/][Evernote]].
--- a/layers/+tools/fasd/README.org
+++ b/layers/+tools/fasd/README.org
@ -1,11 +1,11 @@
 #+TITLE: fasd contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#fasd][fasd]]
- - [[#keybindings][Keybindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[fasd][fasd]]
+ - [[Keybindings][Keybindings]]

 * Description

--- a/layers/+tools/pandoc/README.org
+++ b/layers/+tools/pandoc/README.org
@ -1,12 +1,12 @@
 #+TITLE: Pandoc contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#pandoc][Pandoc]]
- - [[#usage][Usage]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Pandoc][Pandoc]]
+ - [[Usage][Usage]]
+ - [[Key Bindings][Key Bindings]]

 * Description

--- a/layers/+tools/ranger/README.org
+++ b/layers/+tools/ranger/README.org
@ -1,13 +1,13 @@
 #+TITLE: Ranger contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#configuration][Configuration]]
-   - [[#customizing][Customizing]]
-   - [[#parent-options][Parent options]]
-   - [[#preview-options][Preview options]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Configuration][Configuration]]
+   - [[Customizing][Customizing]]
+   - [[Parent options][Parent options]]
+   - [[Preview options][Preview options]]
+ - [[Key Bindings][Key Bindings]]

 * Description

@ -111,27 +111,27 @@ To set the max files size (in MB), set the following parameter:

 | Key Binding | Description                                          |
 |-------------+------------------------------------------------------|
-| ~SPC a r~     | launch ranger                                        |
+| ~SPC a r~   | launch ranger                                        |
 | SPC a d     | deer (minimal ranger window in current directory)    |
-| ~C-p~         | (ranger) toggle ranger in dired buffer               |
-| ~j~           | (ranger) navigate down                               |
-| ~k~           | (ranger) navigate up                                 |
-| ~C-j~         | (ranger) scroll preview window down                  |
-| ~C-k~         | (ranger) scroll preview window up                    |
-| ~f~           | (ranger) search for file names                       |
-| ~i~           | (ranger) show preview of current file                |
-| ~zi~          | (ranger) toggle showing literal / full-text previews |
-| ~zh~          | (ranger) toggle showing dotfiles                     |
-| ~o~           | (ranger) sort options                                |
-| ~H~           | (ranger) search through history                      |
-| ~h~           | (ranger) go up directory                             |
-| ~l~           | (ranger) find file / enter directory                 |
-| ~RET~         | (ranger) find file / enter directory                 |
-| ~q~           | (ranger) quit                                        |
-| ~r~           | (ranger) revert buffer                               |
-| ~z-~          | (ranger) reduce number of parents                    |
-| ~z+~          | (ranger) increment number of parents                 |
-| ~v~           | (ranger) toggle all marks                            |
-| ~V~           | (ranger) visually select lines                       |
-| ~S~           | (ranger) enter shell                                 |
-| ~C-SPC~       | (ranger) mark current file                           |
+| ~C-p~       | (ranger) toggle ranger in dired buffer               |
+| ~j~         | (ranger) navigate down                               |
+| ~k~         | (ranger) navigate up                                 |
+| ~C-j~       | (ranger) scroll preview window down                  |
+| ~C-k~       | (ranger) scroll preview window up                    |
+| ~f~         | (ranger) search for file names                       |
+| ~i~         | (ranger) show preview of current file                |
+| ~zi~        | (ranger) toggle showing literal / full-text previews |
+| ~zh~        | (ranger) toggle showing dotfiles                     |
+| ~o~         | (ranger) sort options                                |
+| ~H~         | (ranger) search through history                      |
+| ~h~         | (ranger) go up directory                             |
+| ~l~         | (ranger) find file / enter directory                 |
+| ~RET~       | (ranger) find file / enter directory                 |
+| ~q~         | (ranger) quit                                        |
+| ~r~         | (ranger) revert buffer                               |
+| ~z-~        | (ranger) reduce number of parents                    |
+| ~z+~        | (ranger) increment number of parents                 |
+| ~v~         | (ranger) toggle all marks                            |
+| ~V~         | (ranger) visually select lines                       |
+| ~S~         | (ranger) enter shell                                 |
+| ~C-SPC~     | (ranger) mark current file                           |
--- a/layers/+tools/tmux/README.org
+++ b/layers/+tools/tmux/README.org
@ -1,10 +1,9 @@
 #+TITLE: Tmux contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#what-is-this][What is this]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[What is this][What is this]]

 * What is this
-
 This is an extension to support [[https://github.com/Keithbsmiley/evil-tmux-navigator][evil-tmux-navigator]]. It requires a little
 configuration for tmux, so check the upstream documentation.

--- a/layers/+tools/vagrant/README.org
+++ b/layers/+tools/vagrant/README.org
@ -2,14 +2,14 @@

 [[file:img/vagrant.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#vagrant][Vagrant]]
-     - [[#testing][Testing]]
- - [[#keybindings][Keybindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Vagrant][Vagrant]]
+   - [[Testing][Testing]]
+ - [[Keybindings][Keybindings]]

 * Description

--- a/layers/+tools/wakatime/README.org
+++ b/layers/+tools/wakatime/README.org
@ -2,13 +2,13 @@

 [[file:img/wakatime.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#wakatime-program][Wakatime Program]]
-     - [[#layer][Layer]]
-     - [[#api-keys][API Keys]]
-         - [[#note-to-venv-workon-users][Note to =venv-workon= users:]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Wakatime Program][Wakatime Program]]
+   - [[Layer][Layer]]
+   - [[API Keys][API Keys]]
+     - [[Note to =venv-workon= users:][Note to =venv-workon= users:]]

 * Description
 This layer adds support for Wakatime.
--- a/layers/+tools/ycmd/README.org
+++ b/layers/+tools/ycmd/README.org
@ -1,13 +1,13 @@
 #+TITLE: YCMD contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#ycmd][YCMD]]
-     - [[#other-requirements][Other Requirements]]
- - [[#configuration][Configuration]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[YCMD][YCMD]]
+   - [[Other Requirements][Other Requirements]]
+ - [[Configuration][Configuration]]
+ - [[Key Bindings][Key Bindings]]

 * Description

--- a/layers/+vim/evil-commentary/README.org
+++ b/layers/+vim/evil-commentary/README.org
@ -1,9 +1,9 @@
 #+TITLE: Evil-commentary contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]

 * Description
 This layer replaces [[https://github.com/redguardtoo/evil-nerd-commenter][evil-nerd-commenter]] with [[https://github.com/linktohack/evil-commentary][evil-commentary]] for those
--- a/layers/+vim/evil-snipe/README.org
+++ b/layers/+vim/evil-snipe/README.org
@ -2,15 +2,15 @@

 [[file:img/Cat_With_Rifle.jpg]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#improved-f-and-t-search-behavior][Improved f and t search behavior]]
-     - [[#two-character-search-with-s][Two-character search with s]]
-     - [[#more-scopes][More scopes]]
-     - [[#symbol-groups][Symbol groups]]
- - [[#todo-key-bindings][TODO Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Improved f and t search behavior][Improved f and t search behavior]]
+   - [[Two-character search with s][Two-character search with s]]
+   - [[More scopes][More scopes]]
+   - [[Symbol groups][Symbol groups]]
+ - [[Key bindings][Key bindings]]

 * Description
 The package [[https://github.com/hlissner/evil-snipe][evil-snipe]]
--- a/layers/+vim/unimpaired/README.org
+++ b/layers/+vim/unimpaired/README.org
@ -1,8 +1,8 @@
 #+TITLE: Unimpaired port contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Key bindings][Key bindings]]

 * Description

--- a/layers/+vim/vim-empty-lines/README.org
+++ b/layers/+vim/vim-empty-lines/README.org
@ -1,8 +1,8 @@
 #+TITLE: Vim-empty-lines contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description

--- a/layers/+vim/vim-powerline/README.org
+++ b/layers/+vim/vim-powerline/README.org
@ -1,8 +1,8 @@
 #+TITLE: vim-powerline contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]

 * Description
 A powerline theme modeled after the vim powerline theme.
--- a/layers/+vim/vinegar/README.org
+++ b/layers/+vim/vinegar/README.org
@ -1,10 +1,10 @@
 #+TITLE: Vinegar contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features]]
-   - [[#mouse-bindings][Mouse bindings]]
-   - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features][Features]]
+   - [[Mouse bindings][Mouse bindings]]
+   - [[Key bindings][Key bindings]]

 * Description

--- a/layers/+window-management/eyebrowse/README.org
+++ b/layers/+window-management/eyebrowse/README.org
@ -2,15 +2,14 @@

 [[file:img/eyebrowse.gif]] [[file:img/i3wm.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#removing-additional-help][Removing additional help]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Removing additional help][Removing additional help]]
+ - [[Key bindings][Key bindings]]

 * Description
-
 This layer adds [[https://i3wm.org/][i3wm]] like workspaces thanks to the [[https://github.com/wasamasa/eyebrowse][eyebrowse]] package.

 Once the layer is activated a new number is added to the right side of the
@ -31,9 +30,7 @@ It is also possible to give a label to a the current workspace by pressing
 ~r~ in the micro-state.

 * Install
-
 ** Layer
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -41,7 +38,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 ** Removing additional help
-
 Once you know the key bindings to navigate between the workspaces you
 may want to disable the exhaustive help in the workspace micro-state.
 Set the variable =eyebrowse-display-help= to =nil=
--- a/layers/+window-management/perspectives/README.org
+++ b/layers/+window-management/perspectives/README.org
@ -1,26 +1,23 @@
 #+TITLE: Perspectives contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#custom-perspective-macro][Custom Perspective Macro]]
- - [[#predefined-custom-perspectives][Predefined custom perspectives]]
-         - [[#per-project-custom-perpsective][Per project custom perpsective]]
-         - [[#org-agenda-custom-perspective][Org-agenda custom perspective]]
-         - [[#rcirc-custom-perspective][RCIRC custom perspective]]
- - [[#key-bindings][Key Bindings]]
-     - [[#custom-perspectives-key-bindings][Custom Perspectives Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Custom Perspective Macro][Custom Perspective Macro]]
+ - [[Predefined custom perspectives][Predefined custom perspectives]]
+     - [[Per project custom perpsective][Per project custom perpsective]]
+     - [[Org-agenda custom perspective][Org-agenda custom perspective]]
+     - [[RCIRC custom perspective][RCIRC custom perspective]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Custom Perspectives Key Bindings][Custom Perspectives Key Bindings]]

 * Description
-
 This contrib layer sets up perspective-mode. And also defines custom
 perspectives with a macro so that you don't have to do more steps.

 * Install
-
 ** Layer
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -28,7 +25,6 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 ** Custom Perspective Macro
-
 If you want to add a new custom-persp (for example if you want to have
 IRC on its own perspective or maybe calendar or gnus) you have to use
 the macro =custom-persp= as follows:
@ -64,9 +60,7 @@ Then you just need to add a keybinding to your custom persp, we use
 #+END_SRC

 * Predefined custom perspectives
-
 *** Per project custom perpsective
-
 As the name suggests, this persp-projectile mode creates a new perspective
 once you switch to a new project with ~SPC p p~. It must be said that in the
 current implementation in order for this to work you must first open a
@ -79,7 +73,6 @@ custom-perspective like ~SPC L o e~ to go to the init.el in the spacemacs.
 #+END_SRC

 *** Org-agenda custom perspective
-
 Here we define a custom perspective that adds items to your org-agenda. If you
 do not know what that is check the [[https://www.gnu.org/software/emacs/manual/html_node/org/Agenda-commands.html][docs]].

@ -88,7 +81,6 @@ with one simple command you can gather all the todos from all the agenda files
 you have and show them in a single buffer. (in evil the command starts with ~;a~)

 *** RCIRC custom perspective
-
 Now you can also open rcirc in a new layer to keep all the chat buffers in one
 perspective isolated from your work buffers.

@ -100,7 +92,6 @@ You will have to use the perspective layer as well as the rcirc layer:
 #+END_SRC

 * Key Bindings
-
 Prefix command for perspective commands is ~SPC L~ (for Layout).

 | Key Binding | Description                                        |
--- a/layers/auto-completion/README.org
+++ b/layers/auto-completion/README.org
@ -1,26 +1,25 @@
-#+TITLE: Auto-Completion configuration layer for Spacemacs
+#+TITLE: Auto-completion layer

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#configuration][Configuration]]
-   - [[#key-bindings][Key bindings]]
-   - [[#tooltips][Tooltips]]
-   - [[#sort-results-by-usage][Sort results by usage]]
-   - [[#show-snippets-in-auto-completion-popup][Show snippets in auto-completion popup]]
-   - [[#enable-company-or-auto-complete-globally][Enable company or auto-complete globally]]
-   - [[#replacing-company-by-auto-complete][Replacing company by auto-complete]]
-   - [[#add-auto-completion-in-a-layer][Add auto-completion in a layer]]
-     - [[#in-configel][In =config.el=]]
-     - [[#in-packagesel][In =packages.el=]]
- - [[#key-bindings][Key Bindings]]
-   - [[#company][Company]]
-   - [[#auto-complete][Auto-complete]]
-   - [[#yasnippet][Yasnippet]]
-   - [[#auto-yasnippet][Auto-yasnippet]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Configuration][Configuration]]
+   - [[Key bindings][Key bindings]]
+   - [[Tooltips][Tooltips]]
+   - [[Sort results by usage][Sort results by usage]]
+   - [[Show snippets in auto-completion popup][Show snippets in auto-completion popup]]
+   - [[Enable company or auto-complete globally][Enable company or auto-complete globally]]
+   - [[Replacing company by auto-complete][Replacing company by auto-complete]]
+   - [[Add auto-completion in a layer][Add auto-completion in a layer]]
+     - [[In =config.el=][In =config.el=]]
+     - [[In =packages.el=][In =packages.el=]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Company][Company]]
+   - [[Auto-complete][Auto-complete]]
+   - [[Yasnippet][Yasnippet]]
+   - [[Auto-yasnippet][Auto-yasnippet]]

 * Description
-
 This layer provides auto-completion to Spacemacs.

 The following completion engines are supported:
@ -32,7 +31,6 @@ Snippets are supported via [[https://github.com/capitaomorte/yasnippet][yasnippe
 This layer also configures =hippie-expand=.

 * Install
-
 To use this configuration layer add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -40,9 +38,7 @@ To use this configuration layer add it to your =~/.spacemacs=
 #+END_SRC

 * Configuration
-
 ** Key bindings
-
 You can customize the user experience of auto-completion with the following
 layer variables:

@ -81,7 +77,6 @@ The default configuration of the layer is:
 you don't use it already.

 ** Tooltips
-
 To enable docstring tooltips set =auto-completion-enable-help-tooltip= to =t=

 #+BEGIN_SRC emacs-lisp
@ -91,7 +86,6 @@ To enable docstring tooltips set =auto-completion-enable-help-tooltip= to =t=
 #+END_SRC

 ** Sort results by usage
-
 To enable sorting auto-completion results by their usage frequency set
 =auto-completion-enable-sort-by-usage= to =t=.
 This feature is provided by the [[https://github.com/company-mode/company-statistics][company-statistics]] package when =company=
@ -105,7 +99,6 @@ The variable has no effect when =auto-complete= is used.
 #+END_SRC

 ** Show snippets in auto-completion popup
-
 By default, snippets are not shown in the auto-completion popup. To show them in
 the popup, set the variable =auto-completion-enable-snippets-in-popup= to =t=.

@ -116,7 +109,6 @@ the popup, set the variable =auto-completion-enable-snippets-in-popup= to =t=.
 #+END_SRC

 ** Enable company or auto-complete globally
-
 By default Spacemacs enables auto-completion explicitly for each supported
 major-mode, it means that =company= and =auto-complete= are not enabled
 globally, it allows more flexibility to choose an auto-completion engine
@ -131,23 +123,19 @@ Note that if you want to enable =auto-complete= globally you will have to
 disable =company= first, see the next section to do so.

 ** Replacing company by auto-complete
-
 You can disable =company= by adding it to the =dotspacemacs-excluded-packages=
 variable, then you are free to enable =auto-complete= globally.

 ** Add auto-completion in a layer
-
 Here is an example to add =company= auto-completion to python buffer:

 *** In =config.el=
-
 #+BEGIN_SRC emacs-lisp
  ;; Define the buffer local company backend variable
  (spacemacs|defvar-company-backends python-mode)
 #+END_SRC

 *** In =packages.el=
-
 #+BEGIN_SRC emacs-lisp
  ;; Add the relevant packages to the layer
  (setq python-packages
@ -172,7 +160,6 @@ Here is an example to add =company= auto-completion to python buffer:
 #+END_SRC

 * Key Bindings
-
 ** Company

 | Key Binding | Description                                                              |
--- a/layers/better-defaults/README.org
+++ b/layers/better-defaults/README.org
@ -1,17 +1,16 @@
-#+TITLE: Better Defaults contribution layer for Spacemacs
+#+TITLE: Better Defaults layer

 [[file:img/emacs.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#functions][Functions]]
-   - [[#spacemacssmart-move-beginning-of-line][spacemacs/smart-move-beginning-of-line]]
-   - [[#spacemacsbackward-kill-word-or-region][spacemacs/backward-kill-word-or-region]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Functions][Functions]]
+   - [[=spacemacs/smart-move-beginning-of-line=][=spacemacs/smart-move-beginning-of-line=]]
+   - [[=spacemacs/backward-kill-word-or-region=][=spacemacs/backward-kill-word-or-region=]]
+ - [[Key bindings][Key bindings]]

 * Description
-
 This layer enhances the default commands of Emacs and is primarily intended to
 be used with the =emacs= editing style as it does not change anything in the Vim
 key bindings.
@ -23,7 +22,6 @@ style.
 The commands defined in this layer are taken from various sources like [[https://github.com/bbatsov/prelude][Prelude]].

 * Install
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
@ -31,14 +29,11 @@ To use this contribution add it to your =~/.spacemacs=
 #+END_SRC

 * Functions
-
-** spacemacs/smart-move-beginning-of-line
-
+** =spacemacs/smart-move-beginning-of-line=
 Pressed one time, go to the first non-whitespace character of the line, pressed
 again, go to the beginning of the line.

-** spacemacs/backward-kill-word-or-region
-
+** =spacemacs/backward-kill-word-or-region=
 A combination of =kill-region= and =backward-kill-word=, depending on whether
 there is an active region. If there's an active region kill that. If not kill
 the preceding word.
--- a/layers/chinese/README.org
+++ b/layers/chinese/README.org
@ -2,18 +2,18 @@
 [[file:img/China.png]]  [[file:img/Chinese.png]]


-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#configuration][Configuration]]
-     - [[#configure-the-default-input-method配置默认中文输入法][Configure the Default Input Method(配置默认中文输入法)]]
-     - [[#configure-the-chinese-pyim-input-method配置中文拼音输入法][Configure the =Chinese-pyim= Input Method(配置中文拼音输入法)]]
-     - [[#enable-youdao有道-dictionary激活有道字典][Enable YouDao(有道) Dictionary(激活有道字典)]]
-     - [[#set-monospaced-font-size设置等宽字体）][Set monospaced font size(设置等宽字体）]]
- - [[#key-bindings][Key Bindings]]
-   - [[#youdao-dictionary][Youdao Dictionary]]
-   - [[#find-by-pinyin-dired][Find-by-pinyin-dired]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Configuration][Configuration]]
+     - [[Configure the Default Input Method(配置默认中文输入法)][Configure the Default Input Method(配置默认中文输入法)]]
+     - [[Configure the =Chinese-pyim= Input Method(配置中文拼音输入法)][Configure the =Chinese-pyim= Input Method(配置中文拼音输入法)]]
+     - [[Enable YouDao(有道) Dictionary(激活有道字典)][Enable YouDao(有道) Dictionary(激活有道字典)]]
+     - [[Set monospaced font size(设置等宽字体）][Set monospaced font size(设置等宽字体）]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Youdao Dictionary][Youdao Dictionary]]
+   - [[Find-by-pinyin-dired][Find-by-pinyin-dired]]

 * Description
 This Layer adds Chinese related packages:
--- a/layers/chrome/README.org
+++ b/layers/chrome/README.org
@ -2,13 +2,13 @@

 [[file:img/chrome.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#feature][Feature:]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#chrome-extension][Chrome extension]]
- - [[#configuration][Configuration]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Feature:][Feature:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Chrome extension][Chrome extension]]
+ - [[Configuration][Configuration]]

 * Description

--- a/layers/colors/README.org
+++ b/layers/colors/README.org
@ -2,15 +2,15 @@

 [[file:img/rainbow_dash.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#enable-rainbow-identifiers][Enable rainbow-identifiers]]
-     - [[#enable-nyan-cat][Enable Nyan cat]]
- - [[#key-bindings][Key bindings]]
-     - [[#rainbow-identifiers][Rainbow Identifiers]]
-     - [[#rainbow-mode][Rainbow Mode]]
-     - [[#nyan-mode][Nyan Mode]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Enable rainbow-identifiers][Enable rainbow-identifiers]]
+   - [[Enable Nyan cat][Enable Nyan cat]]
+ - [[Key bindings][Key bindings]]
+   - [[Rainbow Identifiers][Rainbow Identifiers]]
+   - [[Rainbow Mode][Rainbow Mode]]
+   - [[Nyan Mode][Nyan Mode]]

 * Description

--- a/layers/cscope/README.org
+++ b/layers/cscope/README.org
@ -2,14 +2,14 @@

 [[file:img/cscope.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#cscope][Cscope]]
-     - [[#pycscope][PyCscope]]
- - [[#usage][Usage]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Cscope][Cscope]]
+   - [[PyCscope][PyCscope]]
+ - [[Usage][Usage]]
+ - [[Key bindings][Key bindings]]

 * Description
 This layer provides bindings for using [[http://cscope.sourceforge.net][Cscope]] and [[https://github.com/portante/pycscope][PyCscope]] in Spacemacs.
@ -54,7 +54,6 @@ pip install pycscope
 #+END_SRC

 * Usage
-
 Before using any helm-cscope commands, remember to create a Cscope index file.
 Do it by running the command =cscope-index-files= for C and C++ projects, or the
 command =cscope/run-pycscope= for Python projects, bound to ~SPC m g i~.
--- a/layers/deft/README.org
+++ b/layers/deft/README.org
@ -1,12 +1,12 @@
 #+TITLE: Deft configuration layer for Spacemacs

-* Table of Content                                                    :TOC@4:
- - [[#description][Description]]
-   - [[#differences-from-default][Differences from default]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#configuration][Configuration]]
- - [[#key-bindings][Key Bindings]]
+* Table of Content                                          :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Differences from default][Differences from default]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Configuration][Configuration]]
+ - [[Key Bindings][Key Bindings]]

 * Description

--- a/layers/finance/README.org
+++ b/layers/finance/README.org
@ -1,13 +1,13 @@
 #+TITLE: Finance contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
- - [[#configuration][Configuration]]
-   - [[#ledger][Ledger]]
- - [[#key-bindings][Key bindings]]
-   - [[#ledger][Ledger]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+ - [[Configuration][Configuration]]
+   - [[Ledger][Ledger]]
+ - [[Key bindings][Key bindings]]
+   - [[Ledger][Ledger]]

 * Description

--- a/layers/floobits/README.org
+++ b/layers/floobits/README.org
@ -2,20 +2,17 @@

 [[file:img/floobits.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
- - [[#key-bindings][Key Bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+ - [[Key Bindings][Key Bindings]]

 * Description
-
 This layer adds support for peer programming tool [[https://github.com/Floobits/floobits-emacs][floobits]].

 * Install
-
 ** Layer
-
 To use this contribution add it to your =~/.spacemacs=

 #+BEGIN_SRC emacs-lisp
--- a/layers/geolocation/README.org
+++ b/layers/geolocation/README.org
@ -1,16 +1,16 @@
 #+TITLE: Geolocation contribution layer for Spacemacs

-* Table of Contents  :TOC@4:
- - [[#description][Description]]
-   - [[#supported-packages-in-this-layer][Supported packages in this layer]]
- - [[#install][Install]]
- - [[#configuration][Configuration]]
-   - [[#location][Location]]
-   - [[#theme-changer][theme-changer]]
-   - [[#sunshine-weather-forecast][sunshine (weather forecast)]]
-   - [[#osx-location][osx-location]]
- - [[#key-bindings][Key Bindings]]
-   - [[#weather][Weather]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Supported packages in this layer][Supported packages in this layer]]
+ - [[Install][Install]]
+ - [[Configuration][Configuration]]
+   - [[Location][Location]]
+   - [[theme-changer][theme-changer]]
+   - [[sunshine (weather forecast)][sunshine (weather forecast)]]
+   - [[osx-location][osx-location]]
+ - [[Key Bindings][Key Bindings]]
+   - [[Weather][Weather]]

 * Description
 This layer offers few location sensitive adjustment to Emacs, such as
--- a/layers/gtags/README.org
+++ b/layers/gtags/README.org
@ -1,13 +1,13 @@
 #+TITLE: Helm Gtags contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#features][Features]]
- - [[#install][Install]]
-     - [[#gnu-global][GNU Global]]
- - [[#usage][Usage]]
-     - [[#eldoc-integration][Eldoc integration]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Features][Features]]
+ - [[Install][Install]]
+   - [[GNU Global][GNU Global]]
+ - [[Usage][Usage]]
+   - [[Eldoc integration][Eldoc integration]]
+ - [[Key bindings][Key bindings]]

 * Description

--- a/layers/ibuffer/README.org
+++ b/layers/ibuffer/README.org
@ -1,11 +1,11 @@
 #+TITLE: ibuffer contribution layer for Spacemacs

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
-     - [[#grouping-buffers][Grouping buffers]]
- - [[#key-bindings][Key bindings]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Grouping buffers][Grouping buffers]]
+ - [[Key bindings][Key bindings]]

 * Description

--- a/layers/jabber/README.org
+++ b/layers/jabber/README.org
@ -2,14 +2,14 @@

 [[file:img/jabber-logo.gif]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
- - [[#install][Install]]
- - [[#key-bindings][Key bindings]]
-   - [[#jabber-roster][Jabber Roster]]
- - [[#hipchat][HipChat]]
-   - [[#authentication][Authentication]]
-   - [[#joining-rooms][Joining rooms]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+ - [[Install][Install]]
+ - [[Key bindings][Key bindings]]
+   - [[Jabber Roster][Jabber Roster]]
+ - [[HipChat][HipChat]]
+   - [[Authentication][Authentication]]
+   - [[Joining rooms][Joining rooms]]

 * Description
 This layer adds keybindings for jabber.el. jabber.el is a Jabber (XMPP) client for Emacs
--- a/layers/nixos/README.org
+++ b/layers/nixos/README.org
@ -2,13 +2,13 @@

 [[file:img/nixos.jpg]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-     - [[#features][Features:]]
- - [[#install][Install]]
-     - [[#layer][Layer]]
- - [[#key-bindings][Key Bindings]]
-     - [[#nixos-options][NixOS Options]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+ - [[Key Bindings][Key Bindings]]
+   - [[NixOS Options][NixOS Options]]

 * Description

--- a/layers/org/README.org
+++ b/layers/org/README.org
@ -2,31 +2,30 @@

 [[file:img/org.png]]

-* Table of Contents                                                   :TOC@4:
- - [[#description][Description]]
-   - [[#features][Features:]]
-   - [[#note][Note]]
- - [[#install][Install]]
-   - [[#layer][Layer]]
-   - [[#github-support][Github support]]
-   - [[#gnuplot-support][Gnuplot support]]
-   - [[#different-bullets][Different bullets]]
- - [[#key-bindings][Key bindings]]
-   - [[#org][Org]]
-   - [[#org-with-evil-org-mode][Org with evil-org-mode]]
-     - [[#tables][Tables]]
-     - [[#tree-][Tree ]]
-     - [[#element-insertion][Element insertion]]
-     - [[#links][Links]]
-     - [[#emphasis][Emphasis]]
-     - [[#tagging][Tagging]]
-   - [[#pomodoro][Pomodoro]]
-   - [[#presentation][Presentation]]
-   - [[#org-repo-todo][Org-repo-todo]]
-   - [[#org-mime][Org-MIME]]
+* Table of Contents                                         :TOC_4_org:noexport:
+ - [[Description][Description]]
+   - [[Features:][Features:]]
+   - [[Note][Note]]
+ - [[Install][Install]]
+   - [[Layer][Layer]]
+   - [[Github support][Github support]]
+   - [[Gnuplot support][Gnuplot support]]
+   - [[Different bullets][Different bullets]]
+ - [[Key bindings][Key bindings]]
+   - [[Org][Org]]
+   - [[Org with evil-org-mode][Org with evil-org-mode]]
+     - [[Tables][Tables]]
+     - [[Tree ][Tree ]]
+     - [[Element insertion][Element insertion]]
+     - [[Links][Links]]
+     - [[Emphasis][Emphasis]]
+     - [[Tagging][Tagging]]
+   - [[Pomodoro][Pomodoro]]
+   - [[Presentation][Presentation]]
+   - [[Org-repo-todo][Org-repo-todo]]
+   - [[Org-MIME][Org-MIME]]

 * Description
-
 This layer enables  [[http://orgmode.org/][org mode]] for Spacemacs.

 ** Features:
@ -78,6 +77,7 @@ You can tweak the bullets displayed in the org buffer in the function

 * Key bindings
 ** Org
+
 | Key Binding | Description                    |
 |-------------+--------------------------------|
 | ~SPC a o #~ | org agenda list stuck projects |
@ -96,6 +96,7 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~SPC C T~   | ort/capture-checkitem          |

 ** Org with evil-org-mode
+
 | Key Binding                                  | Description                                  |
 |----------------------------------------------+----------------------------------------------|
 | ~SPC m '~                                    | org-edit-special                             |
@ -129,6 +130,7 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~SPC s l~                                    | spacemacs/jump-in-buffer (jump to a heading) |

 *** Tables
+
 | Key Binding   | Description                                                                |
 |---------------+----------------------------------------------------------------------------|
 | ~SPC m t a~   | Align the table at point by aligning all vertical bars                     |
@ -160,6 +162,7 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~SPC m t w~   | Wrap several fields in a column like a paragraph                           |

 *** Tree 
+
 | Key Binding | Description           |
 |-------------+-----------------------|
 | ~SPC m S l~ | org-demote-subtree    |
@ -199,6 +202,7 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~M-t~       | org-insert-todo-heading nil+ org-metaright |

 *** Element insertion
+
 | Key Binding | Description                      |
 |-------------+----------------------------------|
 | ~SPC m h i~ | org-insert-heading-after-current |
@ -207,11 +211,13 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~SPC m i l~ | org-insert-link                  |

 *** Links
+
 | Key Binding | Description       |
 |-------------+-------------------|
 | ~RET~       | org-open-at-point |

 *** Emphasis
+
 | Key Binding | Description                |
 |-------------+----------------------------|
 | ~SPC m x b~ | make region bold           |
@ -223,11 +229,13 @@ You can tweak the bullets displayed in the org buffer in the function
 | ~SPC m x v~ | make region verbose        |

 *** Tagging
+
 | Key Binding | Description  |
 |-------------+--------------|
 | ~SPC m :~   | org-set-tags |

 ** Pomodoro
+
 | Key Binding | Description       |
 |-------------+-------------------|
 | ~SPC m p~   | starts a pomodoro |
@ -242,11 +250,13 @@ org-present must be activated explicitly by typing: ~SPC : org-present~
 | ~q~         | quit           |

 ** Org-repo-todo
+
 | Key Binding | Description    |
 |-------------+----------------|
 | ~SPC m g t~ | ort/goto-todos |

 ** Org-MIME
+
 | Key Binding | Description                                       |
 |-------------+---------------------------------------------------|
 | ~SPC m M~   | in =message-mode= buffers convert into html email |
--- a/Show More
+++ b/Show More