diff --git a/assets/minecraft/optifine/color.properties b/assets/minecraft/optifine/color.properties
index d6e5ddc..12b2699 100644
--- a/assets/minecraft/optifine/color.properties
+++ b/assets/minecraft/optifine/color.properties
@@ -1,24 +1,28 @@
 ###############################################################################
+# Sample configuration for OptiFine's Custom Colors feature.
+# Based on the configuration for MCPatcher's Custom Colors mod.
+#
+###############################################################################
 # color.properties
 ###############################################################################
-# Sample color.properties file for use with MCPatcher's Custom Colors mod.
-#
-# This file is offered without any copyright restrictions. Please copy and
-# modify it to suit your needs.  Then place it at /color.properties in your
-# texture pack.
 #
 # You only need to provide values for the properties you wish to change.  The
 # default Minecraft values for each property are given below for convenience.
 #
-# Property names are case-sensitive.
+# All property names are case-sensitive.
 # All colors are in hex rgb format, 000000 to ffffff.
+# All paths are relative to assets/minecraft unless otherwise stated.
 ###############################################################################
 
 ###############################################################################
 # Base color of particle effects
 ###############################################################################
+# Base water particle (splashes, bubbles, drops) color.  Biome water color
+# multiplier is applied to this value.  The value should match the color of
+# your base water texture.  If your base water texture is grey so that you do
+# coloring via misc/watercolorX.png, you should set this to ffffff.
 particle.portal=C15320
-drop.water=30587F
+particle.water=30587F
 
 ###############################################################################
 # Nether and End colors
@@ -61,6 +65,12 @@ potion.water=385dc6
 
 ###############################################################################
 # Spawner egg colors
+# egg.<shell|spots>.<entity>=<color>
+# The entity name can be given in short or in full form.
+# The separator ":" in the full form has to be escaped.
+# For example:
+#   egg.shell.creeper=0da70b
+#   egg.spots.minecraft\:creeper=000000
 ###############################################################################
 
 
@@ -116,31 +126,44 @@ text.sign=000000
 # Complete file list
 ###############################################################################
 # Below is a full list of files used by the Custom Colors mod:
-# /color.properties - this file
-# /misc/redstonecolor.png - 16x1 redstone colors (0=fully off, 15=fully on)
-# /misc/stemcolor.png - 8x1 pumpkin/melon stem colors (0=sprout, 7=fully grown)
-# /misc/lavadropcolor.png - Nx1 lava drop colors (x=age of particle in ticks)
-# /misc/swampgrasscolor.png - 256x256 swamp grass color palette
-# /misc/swampfoliagecolor.png - 256x256 swamp foliage color palette
-# /misc/pinecolor.png - 256x256 pine tree color palette
-# /misc/birchcolor.png - 256x256 birch tree color palette
-# /misc/watercolorX.png - 256x256 water color palette
-# /misc/underwatercolor.png - 256x256 underwater color
-# /misc/fogcolor0.png - 256x256 fog color for the overworld
-# /misc/skycolor0.png - 256x256 sky color for the overworld
-# /environment/lightmap0.png - Nx32 overworld lighting palettes
-# /environment/lightmap-1.png - Nx32 Nether lighting palettes
-# /environment/lightmap1.png - Nx32 End lighting palettes
+# NOTE: ~ is shorthand for the optifine folder (assets/minecraft/optifine)
+# ~/color.properties - this file
+# ~/colormap/redstone.png - 16x1 redstone colors (0=fully off, 15=fully on)
+# ~/colormap/pumpkinstem.png - 8x1 pumpkin stem colors (0=sprout, 7=fully grown)
+# ~/colormap/melonstem.png - 8x1 melon stem colors (0=sprout, 7=fully grown)
+# ~/colormap/lavadrop.png - Nx1 lava drop colors (x=age of particle in ticks)
+# ~/colormap/myceliumparticle.png - any size, random mycelium particle colors
+# ~/colormap/xporb.png - any size, array of xp orb colors
+# ~/colormap/durability.png - any size, array of item durability colors
+#
+# ~/colormap/swampgrass.png - 256x256 swamp grass color palette
+# ~/colormap/swampfoliage.png - 256x256 swamp foliage color palette
+# ~/colormap/pine.png - 256x256 pine tree color palette
+# ~/colormap/birch.png - 256x256 birch tree color palette
+# ~/colormap/water.png - 256x256 water color palette
+# ~/colormap/underwater.png - 256x256 underwater color
+# ~/colormap/underlava.png - 256x256 underlava color
+# ~/colormap/fog0.png - 256x256 fog color for the overworld
+# ~/colormap/sky0.png - 256x256 sky color for the overworld
+#
+# ~/lightmap/world0.png - Nx32 or Nx64 overworld lighting palettes
+# ~/lightmap/world-1.png - Nx32 or Nx64 Nether lighting palettes
+# ~/lightmap/world1.png - Nx32 or Nx64 End lighting palettes
 
 ###############################################################################
 # Custom biome palettes
 ###############################################################################
 # You may assign custom biome palettes to any standard block (i.e. one that
-# does not already have its own special color multiplier method).  The syntax
-# for this in color.properties is
-#   palette.block.<image in texture pack>=<list of block IDs>
-# The image must exist in your texture pack and must be 256x256.  For example,
-# to color all stone and ore blocks with /misc/stonecolor.png
-#   palette.block./misc/stonecolor.png=1 14 15 16 21 56 73 74
-# Block ID + metadata is also supported using the following syntax:
-#   palette.block./misc/sandstone.png=24 43:1 44:1
+# does not already have its own special color multiplier method).  Each custom
+# colormap should have a properties file in ~/colormap/custom.  See
+# colormap.properties for more details.
+#
+# Default custom colormap format:
+# Mojang-style temperature+humidity maps:
+#   palette.format=vanilla
+# OptiFine-style grid (x=biome ID, y=height) maps:
+#   palette.format=grid
+# Note that this setting does not affect the vanilla foliage and grass
+# colormaps in assets/minecraft/textures/colormap.  It can also be overridden
+# per-colormap in each individual properties file in ~/colormap/custom
+