diff --git a/Readme.rst b/Readme.rst
index 85c5b21..c9f257f 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -2,59 +2,20 @@
 Improved Nano Syntax Highlighting Files
 ***************************************
 
-This repository holds {lang}.nanorc files that have improved 
+This repository holds ``{lang}.nanorc`` files that have improved
 definitions of syntax highlighting for various languages.
 These should be placed inside of the ``~/.nano/`` directory.
+Alternatively::
+
+    git clone git@github.com:scopatz/nanorc.git ~/.nano
 
 Once there you should add the languages you want to your
-nano configuration file ``~/.nanorc``.  For example, 
-my config file includes::
+nano configuration file ``~/.nanorc``.  For example::
 
     ## C/C++
     include "~/.nano/c.nanorc"
 
-    ## Fortran
-    include "~/.nano/fortran.nanorc"
-
-    ## HTML
-    include "~/.nano/html.nanorc"
-
-    ## Patch files
-    include "~/.nano/patch.nanorc"
-
-    ## Manpages
-    include "~/.nano/man.nanorc"
-
-    ## Perl
-    include "~/.nano/perl.nanorc"
-
-    ## Python
-    include "~/.nano/python.nanorc"
-
-    ## reST
-    include "~/.nano/reST.nanorc"
-
-    ## Ruby
-    include "~/.nano/ruby.nanorc"
-
-    ## Bourne shell scripts
-    include "~/.nano/sh.nanorc"
-
-    ## makefile .am
-    include "~/.nano/gentoo.nanorc"
-
-    ## TeX
-    include "~/.nano/tex.nanorc"
-
-    ## CSS
-    include "~/.nano/css.nanorc"
-
-    ## php
-    include "~/.nano/php.nanorc"
-
-    ## XML
-    include "~/.nano/xml.nanorc"
-
-    ## Lua
-    include "~/.nano/lua.nanorc"
+You can also append the contents of ``~/.nano/nanorc`` into your
+``~/.nanorc`` to include all languages::
 
+    cat ~/.nano/nanorc >> ~/.nanorc
diff --git a/import.nanorc b/import.nanorc
deleted file mode 100644
index 70f14a1..0000000
--- a/import.nanorc
+++ /dev/null
@@ -1,108 +0,0 @@
-include ~/.nano/yaml.nanorc
-include ~/.nano/dot.nanorc
-include ~/.nano/fish.nanorc
-include ~/.nano/keymap.nanorc
-include ~/.nano/lua.nanorc
-include ~/.nano/php.nanorc
-include ~/.nano/glsl.nanorc
-include ~/.nano/csharp.nanorc
-include ~/.nano/kickstart.nanorc
-include ~/.nano/email.nanorc
-include ~/.nano/coffeescript.nanorc
-include ~/.nano/json.nanorc
-include ~/.nano/privoxy.nanorc
-include ~/.nano/ini.nanorc
-include ~/.nano/patch.nanorc
-include ~/.nano/systemd.nanorc
-include ~/.nano/nginx.nanorc
-include ~/.nano/ledger.nanorc
-include ~/.nano/awk.nanorc
-include ~/.nano/sh.nanorc
-include ~/.nano/ruby.nanorc
-include ~/.nano/lisp.nanorc
-include ~/.nano/cmake.nanorc
-include ~/.nano/git.nanorc
-include ~/.nano/html.nanorc
-include ~/.nano/colortest.nanorc
-include ~/.nano/xresources.nanorc
-include ~/.nano/tex.nanorc
-include ~/.nano/css.nanorc
-include ~/.nano/go.nanorc
-include ~/.nano/nanorc.nanorc
-include ~/.nano/sql.nanorc
-include ~/.nano/pkg-config.nanorc
-include ~/.nano/man.nanorc
-include ~/.nano/vala.nanorc
-include ~/.nano/java.nanorc
-include ~/.nano/yum.nanorc
-include ~/.nano/inputrc.nanorc
-include ~/.nano/pkgbuild.nanorc
-include ~/.nano/xml.nanorc
-include ~/.nano/sed.nanorc
-include ~/.nano/c.nanorc
-include ~/.nano/javascript.nanorc
-include ~/.nano/cython.nanorc
-include ~/.nano/markdown.nanorc
-include ~/.nano/mpdconf.nanorc
-include ~/.nano/peg.nanorc
-include ~/.nano/main.nanorc
-include ~/.nano/po.nanorc
-include ~/.nano/python.nanorc
-include ~/.nano/makefile.nanorc
-include ~/.nano/vi.nanorc
-include ~/.nano/rpmspec.nanorc
-include ~/.nano/yaml.nanorc
-include ~/.nano/dot.nanorc
-include ~/.nano/fish.nanorc
-include ~/.nano/keymap.nanorc
-include ~/.nano/lua.nanorc
-include ~/.nano/php.nanorc
-include ~/.nano/glsl.nanorc
-include ~/.nano/csharp.nanorc
-include ~/.nano/kickstart.nanorc
-include ~/.nano/email.nanorc
-include ~/.nano/coffeescript.nanorc
-include ~/.nano/json.nanorc
-include ~/.nano/privoxy.nanorc
-include ~/.nano/ini.nanorc
-include ~/.nano/patch.nanorc
-include ~/.nano/import.nanorc
-include ~/.nano/systemd.nanorc
-include ~/.nano/nginx.nanorc
-include ~/.nano/ledger.nanorc
-include ~/.nano/awk.nanorc
-include ~/.nano/sh.nanorc
-include ~/.nano/ruby.nanorc
-include ~/.nano/lisp.nanorc
-include ~/.nano/cmake.nanorc
-include ~/.nano/git.nanorc
-include ~/.nano/html.nanorc
-include ~/.nano/colortest.nanorc
-include ~/.nano/xresources.nanorc
-include ~/.nano/tex.nanorc
-include ~/.nano/css.nanorc
-include ~/.nano/go.nanorc
-include ~/.nano/nanorc.nanorc
-include ~/.nano/sql.nanorc
-include ~/.nano/pkg-config.nanorc
-include ~/.nano/man.nanorc
-include ~/.nano/vala.nanorc
-include ~/.nano/java.nanorc
-include ~/.nano/yum.nanorc
-include ~/.nano/inputrc.nanorc
-include ~/.nano/pkgbuild.nanorc
-include ~/.nano/xml.nanorc
-include ~/.nano/sed.nanorc
-include ~/.nano/c.nanorc
-include ~/.nano/javascript.nanorc
-include ~/.nano/cython.nanorc
-include ~/.nano/markdown.nanorc
-include ~/.nano/mpdconf.nanorc
-include ~/.nano/peg.nanorc
-include ~/.nano/main.nanorc
-include ~/.nano/po.nanorc
-include ~/.nano/python.nanorc
-include ~/.nano/makefile.nanorc
-include ~/.nano/vi.nanorc
-include ~/.nano/rpmspec.nanorc
-include ~/.nano/import.nanorc
diff --git a/nanorc b/nanorc
new file mode 100644
index 0000000..264da2d
--- /dev/null
+++ b/nanorc
@@ -0,0 +1,66 @@
+include ~/.nano/apacheconf.nanorc
+include ~/.nano/asm.nanorc
+include ~/.nano/awk.nanorc
+include ~/.nano/c.nanorc
+include ~/.nano/cmake.nanorc
+include ~/.nano/coffeescript.nanorc
+include ~/.nano/colortest.nanorc
+include ~/.nano/conf.nanorc
+include ~/.nano/csharp.nanorc
+include ~/.nano/css.nanorc
+include ~/.nano/cython.nanorc
+include ~/.nano/dot.nanorc
+include ~/.nano/email.nanorc
+include ~/.nano/fish.nanorc
+include ~/.nano/fortran.nanorc
+include ~/.nano/gentoo.nanorc
+include ~/.nano/git.nanorc
+include ~/.nano/gitcommit.nanorc
+include ~/.nano/glsl.nanorc
+include ~/.nano/go.nanorc
+include ~/.nano/groff.nanorc
+include ~/.nano/haml.nanorc
+include ~/.nano/html.nanorc
+include ~/.nano/ini.nanorc
+include ~/.nano/inputrc.nanorc
+include ~/.nano/java.nanorc
+include ~/.nano/javascript.nanorc
+include ~/.nano/js.nanorc
+include ~/.nano/json.nanorc
+include ~/.nano/keymap.nanorc
+include ~/.nano/kickstart.nanorc
+include ~/.nano/ledger.nanorc
+include ~/.nano/lisp.nanorc
+include ~/.nano/lua.nanorc
+include ~/.nano/makefile.nanorc
+include ~/.nano/man.nanorc
+include ~/.nano/markdown.nanorc
+include ~/.nano/mpdconf.nanorc
+include ~/.nano/mutt.nanorc
+include ~/.nano/nanorc.nanorc
+include ~/.nano/nginx.nanorc
+include ~/.nano/patch.nanorc
+include ~/.nano/peg.nanorc
+include ~/.nano/perl.nanorc
+include ~/.nano/php.nanorc
+include ~/.nano/pkg-config.nanorc
+include ~/.nano/pkgbuild.nanorc
+include ~/.nano/po.nanorc
+include ~/.nano/pov.nanorc
+include ~/.nano/privoxy.nanorc
+include ~/.nano/python.nanorc
+include ~/.nano/reST.nanorc
+include ~/.nano/rpmspec.nanorc
+include ~/.nano/ruby.nanorc
+include ~/.nano/sed.nanorc
+include ~/.nano/sh.nanorc
+include ~/.nano/sql.nanorc
+include ~/.nano/systemd.nanorc
+include ~/.nano/tex.nanorc
+include ~/.nano/vala.nanorc
+include ~/.nano/vi.nanorc
+include ~/.nano/xml.nanorc
+include ~/.nano/xresources.nanorc
+include ~/.nano/yaml.nanorc
+include ~/.nano/yum.nanorc
+include ~/.nano/zshrc.nanorc