diff --git a/dotfiles/.config/rtv/rtv.cfg b/dotfiles/.config/rtv/rtv.cfg
deleted file mode 100644
index 9a29e85e..00000000
--- a/dotfiles/.config/rtv/rtv.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-;.................................................................................
-;
-;    New Start: A modern Arch workflow built with an emphasis on functionality.
-;    Copyright (C) 2017 Donovan Glover
-;
-;    This program is free software: you can redistribute it and/or modify
-;    it under the terms of the GNU General Public License as published by
-;    the Free Software Foundation, either version 3 of the License, or
-;    (at your option) any later version.
-;
-;    This program is distributed in the hope that it will be useful,
-;    but WITHOUT ANY WARRANTY; without even the implied warranty of
-;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;    GNU General Public License for more details.
-;
-;    You should have received a copy of the GNU General Public License
-;    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-;
-;.................................................................................
-
-[rtv]
-; Open the archlinux subreddit by default
-subreddit = archlinux
-
-; Open external links based on mailcap
-enable_media = True
-
-; Hide username if logged in
-hide_username = True
diff --git a/dotfiles/.xmodmap b/dotfiles/.xmodmap
deleted file mode 100644
index 37340d8f..00000000
--- a/dotfiles/.xmodmap
+++ /dev/null
@@ -1,16 +0,0 @@
-! Make Caps Lock the escape key on press and the control key when used in combination with other keys
-! Especially useful for vim and other programs so you don't have to reach for the escape key or the ctrl key
-
-! This file makes the caps lock key function as ctrl and esc
-! Note that you must run xcape -e 'Control_L=Escape' to add the escape functionality
-! TODO: See if this can be expressed in the config file itself
-
-! Clear both the caps lock and control keys
-clear lock
-clear control
-
-! Set the caps lock key to Control_L
-keycode 66 = Control_L
-
-! Reassign the control command to the caps lock and control keys respectively
-add control = Caps_Lock Control_L Control_R
diff --git a/rtv/.config/rtv/rtv.cfg b/rtv/.config/rtv/rtv.cfg
new file mode 100644
index 00000000..8da963aa
--- /dev/null
+++ b/rtv/.config/rtv/rtv.cfg
@@ -0,0 +1,15 @@
+; New Start: A modern Arch workflow built with an emphasis on functionality.
+; Copyright (C) 2017-2018 Donovan Glover
+
+[rtv]
+; Open the archlinux subreddit by default
+subreddit = archlinux
+
+; Open external links based on mailcap
+enable_media = True
+
+; Hide username if logged in
+hide_username = True
+
+; Disable flash
+flash = False
diff --git a/xcape/.xmodmap b/xcape/.xmodmap
new file mode 100644
index 00000000..4fbd2ed2
--- /dev/null
+++ b/xcape/.xmodmap
@@ -0,0 +1,12 @@
+! New Start: A modern Arch workflow built with an emphasis on functionality.
+! Copyright (C) 2017-2018 Donovan Glover
+
+! Clear both the caps lock and control keys
+clear lock
+clear control
+
+! Set the caps lock key to Control_L
+keycode 66 = Control_L
+
+! Reassign the control command to the caps lock and control keys respectively
+add control = Caps_Lock Control_L Control_R
diff --git a/xcape/README.md b/xcape/README.md
new file mode 100644
index 00000000..e31dfaa5
--- /dev/null
+++ b/xcape/README.md
@@ -0,0 +1,5 @@
+# xcape
+
+[`xcape`](https://github.com/alols/xcape) makes Caps Lock the escape key on press and the control key when used in combination with other keys. This is especially useful for vim and other programs so you don't have to reach for the escape key or the ctrl key
+
+By default, `.xmodmap` only adds the `Ctrl` functionality. To add the `Esc` functionality, use `xcape -e 'Control_L=Escape'`.
diff --git a/dotfiles/.config/zathura/zathurarc b/zathura/.config/zathura/zathurarc
similarity index 60%
rename from dotfiles/.config/zathura/zathurarc
rename to zathura/.config/zathura/zathurarc
index 36bf6705..985b71cc 100644
--- a/dotfiles/.config/zathura/zathurarc
+++ b/zathura/.config/zathura/zathurarc
@@ -1,22 +1,5 @@
-##################################################################################
-# 
-#    New Start: A modern Arch workflow built with an emphasis on functionality.
-#    Copyright (C) 2017 Donovan Glover
-# 
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-# 
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-# 
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-# 
-##################################################################################
+# New Start: A modern Arch workflow built with an emphasis on functionality.
+# Copyright (C) 2017 Donovan Glover
 
 set font "Hack 12"              # Use Hack as our font of choice
 set guioptions "v"              # Show a "progress bar" when scrolling up/down