diff --git a/man/xmonad.1 b/man/xmonad.1
index 04af000..ded482a 100644
--- a/man/xmonad.1
+++ b/man/xmonad.1
@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 2.11.3.1
+.\" Automatically generated by Pandoc 2.5
.\"
.TH "XMONAD" "1" "30 September 2018" "Tiling Window Manager" ""
.hy
.SH Name
.PP
-xmonad - Tiling Window Manager
+xmonad \- Tiling Window Manager
.SH Description
.PP
\f[I]xmonad\f[R] is a minimalist tiling window manager for X, written in
@@ -36,27 +36,27 @@ featureful window manager in less than 1200 lines of code, with an
emphasis on correctness and robustness.
Internal properties of the window manager are checked using a
combination of static guarantees provided by the type system, and
-type-based automated testing.
+type\-based automated testing.
A benefit of this is that the code is simple to understand, and easy to
modify.
.SH Usage
.PP
\f[I]xmonad\f[R] places each window into a \[lq]workspace\[rq].
Each workspace can have any number of windows, which you can cycle
-though with mod-j and mod-k.
+though with mod\-j and mod\-k.
Windows are either displayed full screen, tiled horizontally, or tiled
vertically.
-You can toggle the layout mode with mod-space, which will cycle through
+You can toggle the layout mode with mod\-space, which will cycle through
the available modes.
.PP
-You can switch to workspace N with mod-N.
-For example, to switch to workspace 5, you would press mod-5.
+You can switch to workspace N with mod\-N.
+For example, to switch to workspace 5, you would press mod\-5.
Similarly, you can move the current window to another workspace with
-mod-shift-N.
+mod\-shift\-N.
.PP
When running with multiple monitors (Xinerama), each screen has exactly
1 workspace visible.
-mod-{w,e,r} switch the focus between screens, while shift-mod-{w,e,r}
+mod\-{w,e,r} switch the focus between screens, while shift\-mod\-{w,e,r}
move the current window to that screen.
When \f[I]xmonad\f[R] starts, workspace 1 is on screen 1, workspace 2 is
on screen 2, etc.
@@ -67,115 +67,115 @@ and visible workspaces are swapped.
xmonad has several flags which you may pass to the executable.
These flags are:
.TP
-\[en]recompile
+.B \[en]recompile
Recompiles your \f[I]xmonad.hs\f[R] configuration
.TP
-\[en]restart
+.B \[en]restart
Causes the currently running \f[I]xmonad\f[R] process to restart
.TP
-\[en]replace
+.B \[en]replace
Replace the current window manager with xmonad
.TP
-\[en]version
+.B \[en]version
Display version of \f[I]xmonad\f[R]
.TP
-\[en]verbose-version
+.B \[en]verbose\-version
Display detailed version of \f[I]xmonad\f[R]
.SS Default keyboard bindings
.TP
-mod-shift-return
+.B mod\-shift\-return
Launch terminal
.TP
-mod-p
+.B mod\-p
Launch dmenu
.TP
-mod-shift-p
+.B mod\-shift\-p
Launch gmrun
.TP
-mod-shift-c
+.B mod\-shift\-c
Close the focused window
.TP
-mod-space
+.B mod\-space
Rotate through the available layout algorithms
.TP
-mod-shift-space
+.B mod\-shift\-space
Reset the layouts on the current workspace to default
.TP
-mod-n
+.B mod\-n
Resize viewed windows to the correct size
.TP
-mod-tab
+.B mod\-tab
Move focus to the next window
.TP
-mod-shift-tab
+.B mod\-shift\-tab
Move focus to the previous window
.TP
-mod-j
+.B mod\-j
Move focus to the next window
.TP
-mod-k
+.B mod\-k
Move focus to the previous window
.TP
-mod-m
+.B mod\-m
Move focus to the master window
.TP
-mod-return
+.B mod\-return
Swap the focused window and the master window
.TP
-mod-shift-j
+.B mod\-shift\-j
Swap the focused window with the next window
.TP
-mod-shift-k
+.B mod\-shift\-k
Swap the focused window with the previous window
.TP
-mod-h
+.B mod\-h
Shrink the master area
.TP
-mod-l
+.B mod\-l
Expand the master area
.TP
-mod-t
+.B mod\-t
Push window back into tiling
.TP
-mod-comma
+.B mod\-comma
Increment the number of windows in the master area
.TP
-mod-period
+.B mod\-period
Deincrement the number of windows in the master area
.TP
-mod-shift-q
+.B mod\-shift\-q
Quit xmonad
.TP
-mod-q
+.B mod\-q
Restart xmonad
.TP
-mod-shift-slash
+.B mod\-shift\-slash
Run xmessage with a summary of the default keybindings (useful for
beginners)
.TP
-mod-question
+.B mod\-question
Run xmessage with a summary of the default keybindings (useful for
beginners)
.TP
-mod-[1..9]
+.B mod\-[1..9]
Switch to workspace N
.TP
-mod-shift-[1..9]
+.B mod\-shift\-[1..9]
Move client to workspace N
.TP
-mod-{w,e,r}
+.B mod\-{w,e,r}
Switch to physical/Xinerama screens 1, 2, or 3
.TP
-mod-shift-{w,e,r}
+.B mod\-shift\-{w,e,r}
Move client to screen 1, 2, or 3
.TP
-mod-button1
+.B mod\-button1
Set the window to floating mode and move by dragging
.TP
-mod-button2
+.B mod\-button2
Raise the window to the top of the stack
.TP
-mod-button3
+.B mod\-button3
Set the window to floating mode and resize by dragging
.SH Examples
.PP
@@ -188,7 +188,7 @@ exec xmonad
.SH Customization
.PP
xmonad is customized in your \f[I]xmonad.hs\f[R], and then restarted
-with mod-q.
+with mod\-q.
You can choose where your configuration file lives by
.IP "1." 3
Setting \f[C]XMONAD_DATA_DIR,\f[R] \f[C]XMONAD_CONFIG_DIR\f[R], and
@@ -201,13 +201,14 @@ Creating \f[I]xmonad.hs\f[R] in \f[C]XDG_CONFIG_HOME\f[R].
Note that, in this case, xmonad will use \f[C]XDG_DATA_HOME\f[R] and
\f[C]XDG_CACHE_HOME\f[R] for its data and cache directory respectively.
.PP
-You can find many extensions to the core feature set in the xmonad-
+You can find many extensions to the core feature set in the xmonad\-
contrib package, available through your package manager or from
xmonad.org (https://xmonad.org).
.SS Modular Configuration
.PP
-As of \f[I]xmonad-0.9\f[R], any additional Haskell modules may be placed
-in \f[I]\[ti]/.xmonad/lib/\f[R] are available in GHC\[cq]s searchpath.
+As of \f[I]xmonad\-0.9\f[R], any additional Haskell modules may be
+placed in \f[I]\[ti]/.xmonad/lib/\f[R] are available in GHC\[cq]s
+searchpath.
Hierarchical modules are supported: for example, the file
\f[I]\[ti]/.xmonad/lib/XMonad/Stack/MyAdditions.hs\f[R] could contain:
.IP
@@ -219,7 +220,7 @@ module XMonad.Stack.MyAdditions (function1) where
.fi
.PP
Your xmonad.hs may then import XMonad.Stack.MyAdditions as if that
-module was contained within xmonad or xmonad-contrib.
+module was contained within xmonad or xmonad\-contrib.
.SH Bugs
.PP
Probably.
diff --git a/man/xmonad.1.html b/man/xmonad.1.html
index 0da9ee1..30c4692 100644
--- a/man/xmonad.1.html
+++ b/man/xmonad.1.html
@@ -7,211 +7,75 @@