diff --git a/layers/+vim/which-key/config.vim b/layers/+vim/which-key/config.vim
index 427602dc..4387eb3e 100644
--- a/layers/+vim/which-key/config.vim
+++ b/layers/+vim/which-key/config.vim
@@ -3,3 +3,9 @@ vnoremap <silent> <leader> :<c-u>WhichKeyVisual '<Space>'<CR>
 
 nnoremap <silent> <localleader> :<c-u>WhichKey ','<CR>
 vnoremap <silent> <localleader> :<c-u>WhichKeyVisual ','<CR>
+
+nnoremap <silent> g :<c-u>WhichKey 'g'<CR>
+vnoremap <silent> g :<c-u>WhichKeyVisual 'g'<CR>
+
+nnoremap <silent> z :<c-u>WhichKey 'z'<CR>
+vnoremap <silent> z :<c-u>WhichKeyVisual 'z'<CR>
diff --git a/layers/+fun/goyo/README.md b/layers/+writing/goyo/README.md
similarity index 100%
rename from layers/+fun/goyo/README.md
rename to layers/+writing/goyo/README.md
diff --git a/layers/+fun/goyo/config.vim b/layers/+writing/goyo/config.vim
similarity index 100%
rename from layers/+fun/goyo/config.vim
rename to layers/+writing/goyo/config.vim
diff --git a/layers/+fun/goyo/packages.vim b/layers/+writing/goyo/packages.vim
similarity index 100%
rename from layers/+fun/goyo/packages.vim
rename to layers/+writing/goyo/packages.vim
diff --git a/layers/+writing/taskwarrior/README.md b/layers/+writing/taskwarrior/README.md
new file mode 100644
index 00000000..6c3e233c
--- /dev/null
+++ b/layers/+writing/taskwarrior/README.md
@@ -0,0 +1,24 @@
+# Vimwiki
+
+## Table of Contents
+
+<!-- vim-markdown-toc GFM -->
+* [Description](#description)
+* [Install](#install)
+* [Key Bindings](#key-bindings)
+
+<!-- vim-markdown-toc -->
+
+## Description
+
+This layer adds Vimwiki. Learn more at http://vimwiki.github.io/
+
+## Install
+
+To use this configuration layer, add it to your `~/.spacevim`.
+
+## Key Bindings
+
+Key Binding        | Mode   | Description
+:---:              | :---:  | :---:
+<kbd>SPC W w</kbd> | Normal | Wiki index
diff --git a/layers/+writing/taskwarrior/config.vim b/layers/+writing/taskwarrior/config.vim
new file mode 100644
index 00000000..8c545b20
--- /dev/null
+++ b/layers/+writing/taskwarrior/config.vim
@@ -0,0 +1,3 @@
+" goyo.vim {
+  nnoremap <Leader>wW <Plug>:VimwikiIndex<CR>
+" }
diff --git a/layers/+writing/taskwarrior/packages.vim b/layers/+writing/taskwarrior/packages.vim
new file mode 100644
index 00000000..38a1e299
--- /dev/null
+++ b/layers/+writing/taskwarrior/packages.vim
@@ -0,0 +1,3 @@
+MP 'tbabej/taskwiki'
+MP 'blindFS/vim-taskwarrior'
+
diff --git a/layers/+writing/vimwiki/README.md b/layers/+writing/vimwiki/README.md
new file mode 100644
index 00000000..d9ff0602
--- /dev/null
+++ b/layers/+writing/vimwiki/README.md
@@ -0,0 +1,38 @@
+# Vimwiki
+
+## Table of Contents
+
+<!-- vim-markdown-toc GFM -->
+* [Description](#description)
+* [Install](#install)
+* [Key Bindings](#key-bindings)
+
+<!-- vim-markdown-toc -->
+
+## Description
+
+This layer adds Vimwiki. Learn more at http://vimwiki.github.io/
+
+## Quick start
+
+You'll need to configure at least one wiki in your ~/.spacevim. For example:
+
+```
+let g:vimwiki_list = [{'path': '~/Documents/wikis/ericwiki/',
+											\ 'syntax': 'markdown', 'ext': '.md',
+											\ 'custom_wiki2html': 'wiki2html',
+											\ 'path_html': '~/Sites/Notes/',
+											\ 'diary_rel_path': 'Journal/'
+											\ },
+											\{'path': '~/Documents/wikis/feels/',
+											\ 'syntax': 'markdown', 'ext': '.md',
+											\ 'custom_wiki2html': 'wiki2html',
+											\ 'diary_rel_path': 'Journal/'
+											\ }]
+```
+
+## Key Bindings
+
+Key Binding        | Mode   | Description
+:---:              | :---:  | :---:
+<kbd>SPC W w</kbd> | Normal | Wiki index
diff --git a/layers/+writing/vimwiki/config.vim b/layers/+writing/vimwiki/config.vim
new file mode 100644
index 00000000..8680c547
--- /dev/null
+++ b/layers/+writing/vimwiki/config.vim
@@ -0,0 +1,4 @@
+" goyo.vim {
+  nnoremap <Leader>wW <Plug>:VimwikiIndex<CR>
+  "nnoremap <CR> :VimwikiFollowLink<CR>
+" }
diff --git a/layers/+writing/vimwiki/packages.vim b/layers/+writing/vimwiki/packages.vim
new file mode 100644
index 00000000..997f15d6
--- /dev/null
+++ b/layers/+writing/vimwiki/packages.vim
@@ -0,0 +1,3 @@
+MP 'lervag/wiki.vim'
+MP 'reedes/vim-pencil'
+