diff --git a/Dockerfile.nanorc b/Dockerfile.nanorc
new file mode 100644
index 0000000..435b52c
--- /dev/null
+++ b/Dockerfile.nanorc
@@ -0,0 +1,26 @@
+## Syntax highlighting for Dockerfiles
+syntax "Dockerfile" "Dockerfile[^/]*$" "\.dockerfile$"
+
+## Keywords
+icolor red "^(FROM|MAINTAINER|RUN|CMD|LABEL|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD)[[:space:]]"
+
+## Brackets & parenthesis
+color brightgreen "(\(|\)|\[|\])"
+
+## Double ampersand
+color brightmagenta "&&"
+
+## Comments
+icolor cyan "^[[:space:]]*#.*$"
+
+## Blank space at EOL
+color ,green "[[:space:]]+$"
+
+## Strings, single-quoted
+color brightwhite "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+
+## Strings, double-quoted
+color brightwhite ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+
+## Single and double quotes
+color brightyellow "('|\")"
diff --git a/Readme.rst b/Readme.rst
index 61f3bfb..d2d98ac 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -24,3 +24,7 @@ You can also append the contents of ``~/.nano/nanorc`` into your
 ``~/.nanorc`` to include all languages::
 
     cat ~/.nano/nanorc >> ~/.nanorc
+    
+Finally, you can run an automatic installer using the following code::
+
+    $ curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh
diff --git a/arduino.nanorc b/arduino.nanorc
new file mode 100644
index 0000000..3cddedb
--- /dev/null
+++ b/arduino.nanorc
@@ -0,0 +1,116 @@
+
+## FILENAME:    arduino.nanorc
+##
+## DESCRIPTION: The arduino.nanorc syntax files allows syntax highlighting
+##              for Arduino sketch files in the GNU nano text editor.
+##
+## Maintainer:  Nicholas Wilde
+## Version:     0.1
+## DATE:        06/23/2011
+##
+## HOMEPAGE:    http://code.google.com/p/arduino-nano-editor-syntax/
+##
+## COMMENTS:    -Most of the code was taken from the c.nanorc code found with 
+##               GNU nano 2.2.6.
+##              -Direction was taken from the arduino vim syntax code by johannes
+##               <https://bitbucket.org/johannes/arduino-vim-syntax/>
+##              -Tested on Ubuntu Server 11.04 Natty Narwhal and GNU nano 2.2.6
+##
+## DIRECTIONS:  For Ubuntu Server 11.04 Natty Narwhal:
+##              -Move this file <arduino.nanorc> to the nano directory
+##               /usr/share/nano/
+##              -Add arduino.nanorc reference to the nanorc settings file
+##               /etc/nanorc
+##               ...
+##               ## Arduino
+##               /usr/share/nano/arduino.nanorc
+##               ...
+
+syntax "ino"  "\.?ino$"
+
+## 
+color brightred "\<[A-Z_][0-9A-Z_]+\>" 
+
+## 
+color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+
+## Constants
+icolor green "\<(HIGH|LOW|INPUT|OUTPUT)\>"
+
+## Serial Print
+icolor red "\<(DEC|BIN|HEX|OCT|BYTE)\>"
+
+## PI Constants
+icolor green "\<(PI|HALF_PI|TWO_PI)\>"
+
+## ShiftOut
+icolor green "\<(LSBFIRST|MSBFIRST)\>"
+
+## Attach Interrupt
+icolor green "\<(CHANGE|FALLING|RISING)\>"
+
+## Analog Reference
+icolor green "\<(DEFAULT|EXTERNAL|INTERNAL|INTERNAL1V1|INTERNAL2V56)\>"
+
+## === FUNCTIONS === ##
+
+## Data Types
+color green "\<(boolean|byte|char|float|int|long|word)\>"
+
+## Control Structions
+color brightyellow "\<(case|class|default|do|double|else|false|for|if|new|null|private|protected|public|short|signed|static|String|switch|this|throw|try|true|unsigned|void|while)\>" 
+color magenta "\<(goto|continue|break|return)\>"
+
+## Math
+color brightyellow "\<(abs|acos|asin|atan|atan2|ceil|constrain|cos|degrees|exp|floor|log|map|max|min|radians|random|randomSeed|round|sin|sq|sqrt|tan)\>"
+
+## Bits & Bytes
+color brightyellow "\<(bitRead|bitWrite|bitSet|bitClear|bit|highByte|lowByte)\>"
+
+## Analog I/O
+color brightyellow "\<(analogReference|analogRead|analogWrite)\>"
+
+## External Interrupts
+color brightyellow "\<(attachInterrupt|detachInterrupt)\>"
+
+## Time
+color brightyellow "\<(delay|delayMicroseconds|millis|micros)\>"
+
+## Digital I/O
+color brightyellow "\<(pinMode|digitalWrite|digitalRead)\>"
+
+## Interrupts
+color brightyellow "\<(interrupts|noInterrupts)\>"
+
+## Advanced I/O
+color brightyellow "\<(noTone|pulseIn|shiftIn|shiftOut|tone)\>"
+
+## Serial
+color magenta "\<(Serial|Serial1|Serial2|Serial3|begin|end|peek|read|print|println|available|flush)\>"
+
+## Structure
+color brightyellow "\<(setup|loop)\>"
+
+## 
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
+
+## 
+color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+
+## GCC builtins
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightyellow "<[^=    ]*>" ""(\\.|[^"])*""
+
+## This string is VERY resource intensive!
+color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+## Comments
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"
diff --git a/asciidoc.nanorc b/asciidoc.nanorc
index 9de3c6f..de486ed 100644
--- a/asciidoc.nanorc
+++ b/asciidoc.nanorc
@@ -1,4 +1,4 @@
-syntax "asciidoc" "\.(asc|asciidoc)$"
+syntax "asciidoc" "\.(asc|asciidoc|adoc)$"
 
 # main header
 color red "^====+$"
diff --git a/awk.nanorc b/awk.nanorc
index 02ed08b..e037b65 100644
--- a/awk.nanorc
+++ b/awk.nanorc
@@ -22,4 +22,4 @@ color magenta   "\\."
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color brightwhite,cyan "TODO:?"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/coffeescript.nanorc b/coffeescript.nanorc
index 4e1650c..cf75b6c 100644
--- a/coffeescript.nanorc
+++ b/coffeescript.nanorc
@@ -3,7 +3,7 @@ header "^#!.*/(env +)?coffee"
 
 color red "[!&|=/*+-<>]|\<(and|or|is|isnt|not)\>"
 color brightblue "[A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\()" "->"
-color black    "[()]"
+color brightblue "[()]"
 color cyan  "\<(for|of|continue|break|isnt|null|unless|this|else|if|return)\>"
 color cyan  "\<(try|catch|finally|throw|new|delete|typeof|in|instanceof)\>"
 color cyan  "\<(debugger|switch|while|do|class|extends|super)\>"
@@ -13,4 +13,4 @@ color brightyellow "@[A-Za-z0-9_]*"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/conky.nanorc b/conky.nanorc
new file mode 100644
index 0000000..6150c4f
--- /dev/null
+++ b/conky.nanorc
@@ -0,0 +1,18 @@
+##
+## Syntax highlighting for conkyrc files.
+##
+##
+syntax "conky" "(\.*conkyrc.*$|conky.conf)"
+
+## Configuration items
+color green "\<(alignment|append_file|background|border_inner_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_height|default_bar_width|default_color|default_gauge_height|default_gauge_width|default_graph_height|default_graph_width|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|http_refresh|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|lua_shutdown_hook|lua_startup_hook|mail_spool|max_port_monitor_connections|max_text_width|max_user_text|maximum_width|minimum_height|minimum_width|mpd_host|mpd_password|mpd_port|music_player_interval|mysql_host|mysql_port|mysql_user|mysql_password|mysql_db|net_avg_samples|no_buffers|nvidia_display|out_to_console|out_to_http|out_to_ncurses|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|times_in_seconds|top_cpu_separate|top_name_width|total_run_times|update_interval|update_interval_on_battery|uppercase|use_spacer|use_xft|xftalpha|xftfont)\>"
+
+## Configuration item constants
+color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|middle_middle|undecorated|yes)\>"
+
+## Variables
+color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|ical|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|ioscheduler|irc|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\>"
+
+color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color brightred "^TEXT$"
diff --git a/csharp.nanorc b/csharp.nanorc
index 6390b38..8c25d1d 100644
--- a/csharp.nanorc
+++ b/csharp.nanorc
@@ -6,8 +6,7 @@ color brightmagenta  "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?"
 # Annotation
 color magenta   "@[A-Za-z]+"
 
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
-color black    "[(]"
+color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
 color green     "\<(bool|byte|sbyte|char|decimal|double|float|IntPtr|int|uint|long|ulong|object|short|ushort|string|base|this|var|void)\>"
 color cyan  "\<(alias|as|case|catch|checked|default|do|dynamic|else|finally|fixed|for|foreach|goto|if|is|lock|new|null|return|switch|throw|try|unchecked|while)\>"
 color cyan  "\<(abstract|async|class|const|delegate|enum|event|explicit|extern|get|implicit|in|internal|interface|namespace|operator|out|override|params|partial|private|protected|public|readonly|ref|sealed|set|sizeof|stackalloc|static|struct|typeof|unsafe|using|value|virtual|volatile|yield)\>"
@@ -24,4 +23,4 @@ color brightblack "(^|[[:space:]])//.*"
 color brightblack start="/\*" end="\*/"
 color brightwhite,cyan "TODO:?"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/glsl.nanorc b/glsl.nanorc
index bdd1b08..6da2639 100644
--- a/glsl.nanorc
+++ b/glsl.nanorc
@@ -1,7 +1,6 @@
 syntax "glsl" "\.(frag|vert|fp|vp|glsl)$"
 
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
-color black    "[(]"
+color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
 color green     "\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\>"
 color green     "\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\>"
 color cyan  "\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\>"
@@ -13,4 +12,4 @@ color brightblack "(^|[[:space:]])//.*"
 color brightblack start="/\*" end="\*/"
 color brightwhite,cyan "TODO:?"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/go.nanorc b/go.nanorc
index 67351ea..92803cd 100644
--- a/go.nanorc
+++ b/go.nanorc
@@ -1,7 +1,6 @@
 syntax "go" "\.go$"
 
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
-color black    "[(]"
+color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
 color brightblue "\<(append|cap|close|complex|copy|delete|imag|len)\>"
 color brightblue "\<(make|new|panic|print|println|protect|real|recover)\>"
 color green     "\<(u?int(8|16|32|64)?|float(32|64)|complex(64|128))\>"
@@ -20,4 +19,4 @@ color brightblack "(^|[[:space:]])//.*"
 color brightblack start="/\*" end="\*/"
 color brightwhite,cyan "TODO:?"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/haskell.nanorc b/haskell.nanorc
new file mode 100644
index 0000000..8c6bdf0
--- /dev/null
+++ b/haskell.nanorc
@@ -0,0 +1,31 @@
+syntax "haskell" "\.hs$"
+
+## Keywords
+color red "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
+color red "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
+color red "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
+
+## Various symbols
+color cyan "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})"
+
+## Operators
+color magenta "(==|/=|&&|\|\||<|>|<=|>=)"
+
+## Various symbols
+color cyan "(->|<-)"
+color magenta "\.|\$"
+
+## Data constructors
+color magenta "(True|False|Nothing|Just|Left|Right|LT|EQ|GT)"
+
+## Data classes
+color magenta "[ ](Read|Show|Enum|Eq|Ord|Data|Bounded|Typeable|Num|Real|Fractional|Integral|RealFrac|Floating|RealFloat|Monad|MonadPlus|Functor)"
+
+## Strings
+color yellow ""[^\"]*""
+
+## Comments
+color green "--.*"
+color green start="\{-" end="-\}"
+
+color brightred "undefined"
diff --git a/ini.nanorc b/ini.nanorc
index bc4387b..26daea3 100644
--- a/ini.nanorc
+++ b/ini.nanorc
@@ -8,4 +8,4 @@ color red "[=;]"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/inputrc.nanorc b/inputrc.nanorc
index 16b9f30..c0b8f6e 100644
--- a/inputrc.nanorc
+++ b/inputrc.nanorc
@@ -7,4 +7,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color magenta     "\\.?"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..6f3ba8e
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,20 @@
+wget -O /tmp/nanorc.zip https://github.com/scopatz/nanorc/archive/master.zip
+if [ ! -d ~/.nano/ ]
+then
+    mkdir ~/.nano/
+fi
+
+cd ~/.nano/
+
+unzip -o "/tmp/nanorc.zip"
+mv nanorc-master/* ./
+rm -rf nanorc-master
+
+if [ ! -f ~/.nanorc ]
+then
+    touch ~/.nanorc
+fi
+
+cat ~/.nano/nanorc >> ~/.nanorc
+sort -u ~/.nanorc > /tmp/nanorc2
+cat /tmp/nanorc2 > ~/.nanorc
diff --git a/javascript.nanorc b/javascript.nanorc
index fa2d6c5..4b6a46e 100644
--- a/javascript.nanorc
+++ b/javascript.nanorc
@@ -4,7 +4,6 @@ color blue   "\<[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\
 color blue   "\<[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
 color blue   "\<[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
 color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
-color black    "[(]"
 color cyan  "\<(break|case|catch|continue|default|delete|do|else|finally)\>"
 color cyan  "\<(for|function|get|if|in|instanceof|new|return|set|switch)\>"
 color cyan  "\<(switch|this|throw|try|typeof|var|void|while|with)\>"
@@ -20,4 +19,4 @@ color brightblack "/\*.+\*/"
 color brightwhite,cyan "TODO:?"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/json.nanorc b/json.nanorc
index 1740a4c..d6338c9 100644
--- a/json.nanorc
+++ b/json.nanorc
@@ -8,4 +8,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightyellow "\"(\\"|[^"])*\"[[:space:]]*:"  "'(\'|[^'])*'[[:space:]]*:"
 color magenta   "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/keymap.nanorc b/keymap.nanorc
index bc2bdb9..bd89707 100644
--- a/keymap.nanorc
+++ b/keymap.nanorc
@@ -7,4 +7,4 @@ color red "="
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack  "^!.*$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/kickstart.nanorc b/kickstart.nanorc
index 85e2213..255618f 100644
--- a/kickstart.nanorc
+++ b/kickstart.nanorc
@@ -12,4 +12,4 @@ color red         "^-[a-zA-Z0-9*-]+"
 
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/ledger.nanorc b/ledger.nanorc
index fa08338..18fbb7a 100644
--- a/ledger.nanorc
+++ b/ledger.nanorc
@@ -1,9 +1,10 @@
-syntax "ledger" "(^|\.|/)ledger$"
+syntax "ledger" "(^|\.|/)ledger|ldgr|beancount|bnct$"
 
-color brightmagenta  "^([0-9]{4}/[0-9]{2}/[0-9]{2}|[=~]) .*"
-color blue   "^[0-9]{4}/[0-9]{2}/[0-9]{2}"
+color brightmagenta  "^([0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}|[=~]) .*"
+color blue   "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
 color brightyellow "^~ .*"
 color brightblue "^= .*"
-color cyan  "^[[:space:]]+\(?[A-Za-z ]+(:[A-Za-z ]+)*\)?"
-color red "[*]"
+color cyan  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z ]+(:[A-Za-z ]+)*\)?"
+color cyan  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z_-]+(:[A-Za-z_-]+)*\)?"
+color red "[*!]"
 color brightblack  "^[[:space:]]*;.*"
diff --git a/lisp.nanorc b/lisp.nanorc
index 8094c7f..f892a70 100644
--- a/lisp.nanorc
+++ b/lisp.nanorc
@@ -2,7 +2,6 @@ syntax "lisp" "(emacs|zile)$" "\.(el|li?sp|scm|ss)$"
 
 color brightblue "\([a-z-]+"
 color red "\(([-+*/<>]|<=|>=)|'"
-color black    "\("
 color blue   "\<[0-9]+\>"
 icolor cyan "\<nil\>"
 color brightcyan  "\<[tT]\>"
@@ -11,4 +10,4 @@ color magenta   "'[A-Za-z][A-Za-z0-9_-]+"
 color magenta   "\\.?"
 color brightblack  "(^|[[:space:]]);.*"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/mpdconf.nanorc b/mpdconf.nanorc
index ea57468..347e6f4 100644
--- a/mpdconf.nanorc
+++ b/mpdconf.nanorc
@@ -6,4 +6,4 @@ color brightmagenta "^(input|audio_output|decoder)[[:space:]]*\{|\}"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/nanorc b/nanorc
index 7a9b5cc..12f1b64 100644
--- a/nanorc
+++ b/nanorc
@@ -1,70 +1,76 @@
-include ~/.nano/apacheconf.nanorc
-include ~/.nano/asciidoc.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/perl6.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/scala.nanorc
-include ~/.nano/sed.nanorc
-include ~/.nano/sh.nanorc
-include ~/.nano/sql.nanorc
-include ~/.nano/systemd.nanorc
-include ~/.nano/tcl.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/zsh.nanorc
+include "~/.nano/apacheconf.nanorc"
+include "~/.nano/arduino.nanorc"
+include "~/.nano/asciidoc.nanorc"
+include "~/.nano/asm.nanorc"
+include "~/.nano/awk.nanorc"
+include "~/.nano/cmake.nanorc"
+include "~/.nano/c.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/Dockerfile.nanorc"
+include "~/.nano/dot.nanorc"
+include "~/.nano/email.nanorc"
+include "~/.nano/fish.nanorc"
+include "~/.nano/fortran.nanorc"
+include "~/.nano/gentoo.nanorc"
+include "~/.nano/gitcommit.nanorc"
+include "~/.nano/git.nanorc"
+include "~/.nano/glsl.nanorc"
+include "~/.nano/go.nanorc"
+include "~/.nano/groff.nanorc"
+include "~/.nano/haml.nanorc"
+include "~/.nano/haskell.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/ocaml.nanorc"
+include "~/.nano/patch.nanorc"
+include "~/.nano/peg.nanorc"
+include "~/.nano/perl.nanorc"
+include "~/.nano/perl6.nanorc"
+include "~/.nano/php.nanorc"
+include "~/.nano/pkgbuild.nanorc"
+include "~/.nano/pkg-config.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/rust.nanorc"
+include "~/.nano/scala.nanorc"
+include "~/.nano/sed.nanorc"
+include "~/.nano/sh.nanorc"
+include "~/.nano/sls.nanorc"
+include "~/.nano/sql.nanorc"
+include "~/.nano/systemd.nanorc"
+include "~/.nano/tcl.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/zsh.nanorc"
diff --git a/nginx.nanorc b/nginx.nanorc
index a671237..66148b3 100644
--- a/nginx.nanorc
+++ b/nginx.nanorc
@@ -3,7 +3,6 @@ header "^(server|upstream)[a-z ]*\{$"
 
 color brightmagenta  "\<(events|server|http|location|upstream)[[:space:]]*\{"
 color cyan  "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)"
-color black    "[{}]"
 color brightcyan  "\<(on|off)\>"
 color brightyellow "\$[A-Za-z][A-Za-z0-9_]*"
 color red "[*]"
@@ -11,4 +10,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color yellow   start="'$" end="';$"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/ocaml.nanorc b/ocaml.nanorc
new file mode 100644
index 0000000..6f9fc60
--- /dev/null
+++ b/ocaml.nanorc
@@ -0,0 +1,25 @@
+syntax "ocaml" "\.mli?$"
+#uid
+color red "\<[A-Z][0-9a-z_]{2,}\>"
+#declarations
+color green "\<(let|val|method|in|and|rec|private|virtual|constraint)\>"
+#structure items
+color red "\<(type|open|class|module|exception|external)\>"
+#patterns
+color blue "\<(fun|function|functor|match|try|with)\>"
+#patterns-modifiers
+color yellow "\<(as|when|of)\>" 
+#conditions
+color cyan "\<(if|then|else)\>"
+#blocs
+color magenta "\<(begin|end|object|struct|sig|for|while|do|done|to|downto)\>"
+#constantes
+color green "\<(true|false)\>"
+#modules/classes
+color green "\<(include|inherit|initializer)\>"
+#expr modifiers
+color yellow "\<(new|ref|mutable|lazy|assert|raise)\>"
+#comments
+color white start="\(\*" end="\*\)"
+#strings (no multiline handling yet)
+color brightblack ""[^\"]*""
diff --git a/peg.nanorc b/peg.nanorc
index 975c628..858d5f8 100644
--- a/peg.nanorc
+++ b/peg.nanorc
@@ -9,4 +9,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack  "(^|[[:space:]])\-\-.*$"
 color brightwhite,cyan "TODO:?"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/perl6.nanorc b/perl6.nanorc
index ae13d8b..a192ba3 100644
--- a/perl6.nanorc
+++ b/perl6.nanorc
@@ -3,14 +3,11 @@
 ### Found in CPAN - http://cpansearch.perl.org/src/NIGE/Goo-0.09/lib/.gooskel/nanorc
 
 syntax "perl" "\.p6$"
-color brightblue 
-"\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
-color brightblue 
-"\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
+color brightblue "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
+color brightblue "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
 
 # Perl 6 words
-color brightcyan 
-"\<(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\>"
+color brightcyan "\<(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\>"
 color brightmagenta start="[$@%]" end="( |\\W|-)"
 color brightred "".*"|qq\|.*\|"
 color white "[sm]/.*/"
diff --git a/php.nanorc b/php.nanorc
index 8021cac..1ed281c 100644
--- a/php.nanorc
+++ b/php.nanorc
@@ -5,7 +5,7 @@ color white start="<\?(php|=)?" end="\?>"
 color brightblue "([a-zA-Z0-9_-]*)\("
 # Constructs
 color brightblue "(class|extends|goto) ([a-zA-Z0-9_]*)"
-color green "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|true|false|null|TRUE|FALSE|NULL|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in)[^a-z0-9_-]{1}"
+color green "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|true|false|null|TRUE|FALSE|NULL|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|namespace|use)[^a-z0-9_-]{1}"
 color brightblue "[a-zA-Z0-9]+:"
 # Variables
 color white "\$[a-zA-Z_0-9$]*|[=!<>]"
diff --git a/pkg-config.nanorc b/pkg-config.nanorc
index 1d05b03..6dff0f6 100644
--- a/pkg-config.nanorc
+++ b/pkg-config.nanorc
@@ -5,4 +5,4 @@ color cyan  "^(Requires|Libs)(\.private)?:"
 color red "="
 color brightyellow "\$\{[A-Za-z_][A-Za-z0-9_]*\}"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/po.nanorc b/po.nanorc
index 79d521f..f35e49f 100644
--- a/po.nanorc
+++ b/po.nanorc
@@ -5,4 +5,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color magenta   "\\.?"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/privoxy.nanorc b/privoxy.nanorc
index cd8d992..473df51 100644
--- a/privoxy.nanorc
+++ b/privoxy.nanorc
@@ -3,7 +3,7 @@ syntax "privoxy-config" "privoxy/config$"
 color cyan "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
 
 syntax "privoxy-action" "\.action$"
 
@@ -12,11 +12,10 @@ color brightgreen "[{[:space:]]\+block([[:space:]{}]|$)"
 
 color brightred   "-(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
 color brightgreen "\+(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
-color black            "[{}]"
 color magenta           "\\.?"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
 
 syntax "privoxy-filter" "\.filter$"
 
@@ -25,5 +24,5 @@ color brightblue "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEAD
 color magenta   "\\.?"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
 
diff --git a/puppet.nanorc b/puppet.nanorc
index 3e387ab..022c1fc 100644
--- a/puppet.nanorc
+++ b/puppet.nanorc
@@ -5,9 +5,12 @@ syntax "puppet" "\.pp$"
 #This goes first, so the normal builtins will override in some classes
 ## Paramerers
 color brightwhite "^[[:space:]]([a-z][a-z0-9_]+)"
+color brightgreen "\$[a-z:][a-z0-9_:]+"
 
 ## List of built in types, also catches defines
-color yellow "\<(augeas|computer|cron|exec|file|filebucket|group|host|interface|k5login|macauthorization|mailalias|maillist|mcx|mount|nagios_command|nagios_contact|nagios_contactgroup|nagios_host|nagios_hostdependency|nagios_hostescalation|nagios_hostextinfo|nagios_hostgroup|nagios_service|nagios_servicedependency|nagios_serviceescalation|nagios_serviceextinfo|nagios_servicegroup|nagios_timeperiod|notify|package|resources|router|schedule|scheduled_task|selboolean|selmodule|service|ssh_authorized_key|sshkey|stage|tidy|user|vlan|yumrepo|zfs|zone|zpool|)\>"
+color yellow "\<(augeas|computer|cron|exec|file|filebucket|group|host|interface|k5login|macauthorization|mailalias|maillist|mcx|mount|nagios_command|nagios_contact|nagios_contactgroup|nagios_host|nagios_hostdependency|nagios_hostescalation|nagios_hostextinfo|nagios_hostgroup|nagios_service|nagios_servicedependency|nagios_serviceescalation|nagios_serviceextinfo|nagios_servicegroup|nagios_timeperiod|notify|package|resources|router|schedule|scheduled_task|selboolean|selmodule|service|ssh_authorized_key|sshkey|stage|tidy|user|vlan|yumrepo|zfs|zone|zpool|anchor)\>"
+color yellow "\<(class|define|if|else|undef|inherits)\>"
+color red "(=|-|~|>)"
 
 ## Constants
 color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
@@ -31,5 +34,5 @@ color brightcyan "##[^{].*$" "##$"
 ## Some common markers
 color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
 ## Trailing spaces
-color ,red "[[:space:]]+$"
+color red "[[:space:]]+$"
 
diff --git a/python.nanorc b/python.nanorc
index b1ccf49..7ef5d1a 100644
--- a/python.nanorc
+++ b/python.nanorc
@@ -4,7 +4,7 @@ syntax "python" "\.py$"
 header "^#!.*/(env +)?python( |$)"
 
 ## built-in objects
-color cyan "\<(None|self)\>"
+color cyan "\<(None|self|True|False)\>"
 ## built-in attributes
 color cyan "\<(__builtin__|__dict__|__methods__|__members__|__class__|__bases__|__import__|__name__|__doc__|__self__|__debug__)\>"
 ## built-in functions
diff --git a/rpmspec.nanorc b/rpmspec.nanorc
index 4370c1c..e05ad6a 100644
--- a/rpmspec.nanorc
+++ b/rpmspec.nanorc
@@ -23,5 +23,5 @@ color brightmagenta  "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript)
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color blue   "^\*.*$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
 color brightwhite,cyan "TODO:?"
diff --git a/rust.nanorc b/rust.nanorc
new file mode 100644
index 0000000..a8e2e90
--- /dev/null
+++ b/rust.nanorc
@@ -0,0 +1,36 @@
+# Nano configuration for Rust
+# Copyright 2015 The Rust Project Developers.
+#
+# NOTE: Rules are applied in order: later rules re-colorize matching text.
+syntax "rust" "\.rs"
+
+# function definition
+color magenta "fn [a-z0-9_]+"
+
+# Reserved words
+color yellow "\<(abstract|alignof|as|become|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\>"
+
+# macros
+color red "[a-z_]+!"
+
+# Constants
+color magenta "[A-Z][A-Z_]+"
+
+# Traits/Enums/Structs/Types/etc.
+color magenta "[A-Z][a-z]+"
+
+# Strings
+color green "\".*\""
+color green start="\".*\\$" end=".*\""
+# NOTE: This isn't accurate but matching "#{0,} for the end of the string is too liberal
+color green start="r#+\"" end="\"#+"
+
+# Comments
+color blue "//.*"
+color blue start="/\*" end="\*/"
+
+# Attributes
+color magenta start="#!\[" end="\]"
+
+# Some common markers
+color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
diff --git a/scala.nanorc b/scala.nanorc
index d9e8384..b5cf0ea 100644
--- a/scala.nanorc
+++ b/scala.nanorc
@@ -3,7 +3,7 @@
 syntax "scala" "\.scala$"
 color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
 color red "\<(match|val|var|break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
-color cyan "\<(def|object|case|trait|lazy|implicit|abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
+color cyan "\<(def|object|case|trait|lazy|implicit|abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile|sealed)\>"
 color red ""[^"]*""
 color yellow "\<(true|false|null)\>"
 color blue "//.*"
diff --git a/sed.nanorc b/sed.nanorc
index 37692df..84cbafc 100644
--- a/sed.nanorc
+++ b/sed.nanorc
@@ -6,4 +6,4 @@ color brightyellow "\{[0-9]+,?[0-9]*\}"
 color magenta   "\\."
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/sls.nanorc b/sls.nanorc
new file mode 100644
index 0000000..c600865
--- /dev/null
+++ b/sls.nanorc
@@ -0,0 +1,26 @@
+## SaltStack files (*.sls)
+##
+
+syntax "salt" "\.sls$"
+
+# Anything ending in a colon (:), including things that start with a dash (-)
+color blue "^[^ -].*:$"
+color blue ".*:"
+# Except for salt:// URLs
+color white "salt:"
+
+# Numbers, etc
+color red "/*[0-9]/*"
+color red "\<(True|False)\>"
+
+# Anything between two single quotes
+color green ""(\\.|[^"])*"|'(\\.|[^'])*'"
+
+# Matching keywords
+color yellow "\<(grain|grains|compound|pcre|grain_pcre|list|pillar)\>"
+
+# Comments
+color brightblack "^#.*"
+
+# Logic keywords
+color magenta "\<(if|elif|else|or|not|and|endif|end)\>"
diff --git a/sql.nanorc b/sql.nanorc
index 89417c5..650214a 100644
--- a/sql.nanorc
+++ b/sql.nanorc
@@ -31,4 +31,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color yellow   "`(\\.|[^\\`])*`"
 color brightblack  "\-\-.*$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/systemd.nanorc b/systemd.nanorc
index 9a7a658..1a3ea91 100644
--- a/systemd.nanorc
+++ b/systemd.nanorc
@@ -9,4 +9,4 @@ color brightyellow "\$MAINPID"
 color brightcyan "\<(true|false)\>"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/vala.nanorc b/vala.nanorc
index bedac18..34509bd 100644
--- a/vala.nanorc
+++ b/vala.nanorc
@@ -1,8 +1,7 @@
 syntax "vala" "\.vala$"
 
 color green     "\<(float|double|bool|char|int|uint|short|long|void|(un)?signed)\>"
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
-color black    "[(]"
+color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
 color cyan  "\<(for|if|while|do|else|case|default|switch|try|throw|catch)\>"
 color cyan  "\<(inline|typedef|struct|enum|union|extern|static|const)\>"
 color cyan  "\<(operator|new|delete|return|null)\>"
@@ -16,4 +15,4 @@ color brightblack "(^|[[:space:]])//.*"
 color brightblack start="/\*" end="\*/"
 color brightwhite,cyan "TODO:?"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/vi.nanorc b/vi.nanorc
index 6098b82..719dd16 100644
--- a/vi.nanorc
+++ b/vi.nanorc
@@ -1,11 +1,10 @@
 syntax "vi" "(^|/|\.)(ex|vim)rc$|\.vim"
 
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
-color black    "[(]"
+color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
 color cyan  "\<([nvxsoilc]?(nore|un)?map|[nvlx]n|[ico]?no|[cilovx][um]|s?unm)\>"
 color cyan  "\<(snor|nun|nm|set|if|endif|let|unlet)\>"
 color red "[!&=]"
 color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack  "(^|[[:space:]])\"[^"]*$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/xresources.nanorc b/xresources.nanorc
index 3a6287f..a49cb3f 100644
--- a/xresources.nanorc
+++ b/xresources.nanorc
@@ -7,4 +7,4 @@ color red "[*:=]"
 color brightcyan "\<(true|false)\>"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/yaml.nanorc b/yaml.nanorc
index 9956ac7..c2b926b 100644
--- a/yaml.nanorc
+++ b/yaml.nanorc
@@ -10,4 +10,4 @@ color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color brightmagenta  "^---" "^\.\.\." "^%YAML" "^%TAG"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/yum.nanorc b/yum.nanorc
index 58c1a0b..6ca9f05 100644
--- a/yum.nanorc
+++ b/yum.nanorc
@@ -5,4 +5,4 @@ color brightmagenta "^[[:space:]]*\[.*\]$"
 color brightyellow "\$(releasever|arch|basearch|uuid|YUM[0-9])"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
-color ,red "	+"
+color ,red "	+ +| +	+"
diff --git a/zsh.nanorc b/zsh.nanorc
index d9949b6..8bc926d 100644
--- a/zsh.nanorc
+++ b/zsh.nanorc
@@ -1,23 +1,28 @@
 ## Syntax highlighting for ZSH scripts (initially copied from sh.nanorc)
-syntax "zsh" "\.zsh[^\.]+$"
+syntax "zsh" "\.zsh$" "\.?(zshenv|zprofile|zshrc|zlogin|zlogout)$"
 header "^#!.*/(env +)?zsh( |$)"
 
 ## Numbers
 color brightyellow "\b[0-9]+\b"
 
 ## Conditionals and control flow
-color green "\<(always|case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
+color green "\<(always|break|bye|case|continue|disown|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
+
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 ## Conditional flags
 color green "-[Ldefgruwx]\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 
 ## Bash-inherited
-color brightblue "\<(alias|bindkey|builtin|cd|eval|exec|export|jobs|let|popd|pushd|set|source|typeset|umask|unset)\>"
+color brightblue "\<((un)?alias|bindkey|builtin|cd|declare|eval|exec|export|jobs|let|popd|pushd|set|source|typeset|umask|unset)\>"
 ## ZSH-specific
-color brightblue "\<(add-zsh-hook|autoload|compinit|echotc|emulate|print|prompt(init)?|setopt|zle|zmodload|zstyle)\>"
+color brightblue "\<(add-zsh-hook|autoload|chdir|compinit|dirs|(dis|en)able|echotc|emulate|print|prompt(init)?|(un)?setopt|zle|zmodload|zstyle|whence)\>"
+
 ## Common linux commands
-color brightmagenta "\<(cat|chmod|chown|cp|cut|echo|env|false|find|grep|head|install|kill|less|ln|make|mkdir|mv|nice|pwd|rm|rmdir|sed|tar|true|touch|uname|wc|whoami)\>"
+color brightmagenta "\<((g|ig)?awk|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|tar)\>"
+
+## Coreutils commands
+color brightmagenta "\<(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|echo|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\>"
 
 ## Function definition
 icolor brightgreen "^\s+(function\s+)[0-9A-Z_]+\s+\(\)"
diff --git a/zshrc.nanorc b/zshrc.nanorc
new file mode 120000
index 0000000..925a14a
--- /dev/null
+++ b/zshrc.nanorc
@@ -0,0 +1 @@
+zsh.nanorc
\ No newline at end of file