Merge remote-tracking branch 'origin/3.2.0-wip' into 3.2.0-wip

Conflicts:
	build/assets/font-awesome/css/font-awesome.css
	build/assets/font-awesome/less/icons.less
	build/assets/font-awesome/less/variables.less
	package.json

_config.yml

@@ -28,8 +28,6 @@ font_awesome:
     url:          https://github.com/FortAwesome/Font-Awesome
     project:      Font-Awesome
     org:          FortAwesome
-  icon_count:     302
-  new_icon_count: 54
 
 bootstrap:
   version:        2.3.1

build/_includes/icons.html

@@ -1,6 +1,6 @@
 {% capture stripe_ad_content %}
 <p class="lead">
-  You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
+  You asked, Font Awesome delivers with {{ icons | version:site.font_awesome.version | size }} shiny new icons in version {{ site.font_awesome.version }}.
   Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
   <!--The ever-expanding list of Font Awesome {{ site.font_awesome.version }} icons.-->
   Need vectors or want to use on the desktop? Check the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
@@ -10,6 +10,7 @@
 
 {% include icons/new.html %}
 {% include icons/web-application.html %}
+{% include icons/currency.html %}
 {% include icons/text-editor.html %}
 {% include icons/directional.html %}
 {% include icons/video-player.html %}

build/_includes/icons/brand.html

@@ -1,36 +1,15 @@
-<section id="brand" class="row">
-  <div class="span12">
-    <h2 class="page-header">Brand Icons</h2>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/css3"><i class="icon-css3"></i> icon-css3</a></li>
-      <li><a href="{{ page.relative_path }}icon/facebook"><i class="icon-facebook"></i> icon-facebook</a></li>
-      <li><a href="{{ page.relative_path }}icon/facebook-sign"><i class="icon-facebook-sign"></i> icon-facebook-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/twitter"><i class="icon-twitter"></i> icon-twitter</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/twitter-sign"><i class="icon-twitter-sign"></i> icon-twitter-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/github"><i class="icon-github"></i> icon-github</a></li>
-      <li><a href="{{ page.relative_path }}icon/github-sign"><i class="icon-github-sign"></i> icon-github-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/html5"><i class="icon-html5"></i> icon-html5</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/linkedin"><i class="icon-linkedin"></i> icon-linkedin</a></li>
-      <li><a href="{{ page.relative_path }}icon/linkedin-sign"><i class="icon-linkedin-sign"></i> icon-linkedin-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/maxcdn"><i class="icon-maxcdn"></i> icon-maxcdn</a></li>
-      <li><a href="{{ page.relative_path }}icon/pinterest"><i class="icon-pinterest"></i> icon-pinterest</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/pinterest-sign"><i class="icon-pinterest-sign"></i> icon-pinterest-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/google-plus"><i class="icon-google-plus"></i> icon-google-plus</a></li>
-      <li><a href="{{ page.relative_path }}icon/google-plus-sign"><i class="icon-google-plus-sign"></i> icon-google-plus-sign</a></li>
-    </ul>
-  </div>
+<section id="brand">
+  <h2 class="page-header">Brand Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Brand Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
 </section>

build/_includes/icons/currency.html

@@ -0,0 +1,15 @@
+<section id="currency">
+  <h2 class="page-header">Currency Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Currency Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
+</section>

build/_includes/icons/directional.html

@@ -1,53 +1,15 @@
-<section id="directional" class="row">
-  <div class="span12">
-    <h2 class="page-header">Directional Icons</h2>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/angle-left"><i class="icon-angle-left"></i> icon-angle-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/angle-right"><i class="icon-angle-right"></i> icon-angle-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/angle-up"><i class="icon-angle-up"></i> icon-angle-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/angle-down"><i class="icon-angle-down"></i> icon-angle-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/arrow-down"><i class="icon-arrow-down"></i> icon-arrow-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/arrow-left"><i class="icon-arrow-left"></i> icon-arrow-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/arrow-right"><i class="icon-arrow-right"></i> icon-arrow-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/arrow-up"><i class="icon-arrow-up"></i> icon-arrow-up</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/caret-down"><i class="icon-caret-down"></i> icon-caret-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/caret-left"><i class="icon-caret-left"></i> icon-caret-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/caret-right"><i class="icon-caret-right"></i> icon-caret-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/caret-up"><i class="icon-caret-up"></i> icon-caret-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-down"><i class="icon-chevron-down"></i> icon-chevron-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-left"><i class="icon-chevron-left"></i> icon-chevron-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-right"><i class="icon-chevron-right"></i> icon-chevron-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-up"><i class="icon-chevron-up"></i> icon-chevron-up</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/chevron-sign-left"><i class="icon-chevron-sign-left"></i> icon-chevron-sign-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-sign-right"><i class="icon-chevron-sign-right"></i> icon-chevron-sign-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-sign-up"><i class="icon-chevron-sign-up"></i> icon-chevron-sign-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/chevron-sign-down"><i class="icon-chevron-sign-down"></i> icon-chevron-sign-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/circle-arrow-down"><i class="icon-circle-arrow-down"></i> icon-circle-arrow-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/circle-arrow-left"><i class="icon-circle-arrow-left"></i> icon-circle-arrow-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/circle-arrow-right"><i class="icon-circle-arrow-right"></i> icon-circle-arrow-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/circle-arrow-up"><i class="icon-circle-arrow-up"></i> icon-circle-arrow-up</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/double-angle-left"><i class="icon-double-angle-left"></i> icon-double-angle-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/double-angle-right"><i class="icon-double-angle-right"></i> icon-double-angle-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/double-angle-up"><i class="icon-double-angle-up"></i> icon-double-angle-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/double-angle-down"><i class="icon-double-angle-down"></i> icon-double-angle-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/hand-down"><i class="icon-hand-down"></i> icon-hand-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/hand-left"><i class="icon-hand-left"></i> icon-hand-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/hand-right"><i class="icon-hand-right"></i> icon-hand-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/hand-up"><i class="icon-hand-up"></i> icon-hand-up</a></li>
-    </ul>
-  </div>
+<section id="directional">
+  <h2 class="page-header">Directional Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Directional Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
 </section>

build/_includes/icons/medical.html

@@ -1,29 +1,15 @@
-<section id="medical" class="row">
-  <div class="span12">
-    <h2 class="page-header">Medical Icons</h2>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/ambulance"><i class="icon-ambulance"></i> icon-ambulance</a></li>
-      <li><a href="{{ page.relative_path }}icon/beaker"><i class="icon-beaker"></i> icon-beaker</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/h-sign"><i class="icon-h-sign"></i> icon-h-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/hospital"><i class="icon-hospital"></i> icon-hospital</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/medkit"><i class="icon-medkit"></i> icon-medkit</a></li>
-      <li><a href="{{ page.relative_path }}icon/plus-sign-alt"><i class="icon-plus-sign-alt"></i> icon-plus-sign-alt</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/stethoscope"><i class="icon-stethoscope"></i> icon-stethoscope</a></li>
-      <li><a href="{{ page.relative_path }}icon/user-md"><i class="icon-user-md"></i> icon-user-md</a></li>
-    </ul>
-  </div>
+<section id="medical">
+  <h2 class="page-header">Medical Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Medical Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
 </section>

build/_includes/icons/new.html

@@ -2,87 +2,19 @@
   <h2 class="page-header">New Icons in {{ site.font_awesome.version }}</h2>
   {% if page.navbar_active != "icons" %}
     <div class="margin-botom-large">
-      You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
+      You asked, Font Awesome delivers with {{ icons | version:site.font_awesome.version | size }} shiny new icons in version {{ site.font_awesome.version }}.
       Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
     </div>
   {% endif %}
 
-
-  <div class="row margin-top">
-    <div class="span3">
-      <ul class="the-icons">
-        <li><a href="{{ page.relative_path }}icon/expand-alt"><i class="icon-expand-alt"></i> icon-expand-alt</a></li>
-        <li><a href="{{ page.relative_path }}icon/collapse-alt"><i class="icon-collapse-alt"></i> icon-collapse-alt</a></li>
-        <li><a href="{{ page.relative_path }}icon/smile"><i class="icon-smile"></i> icon-smile</a></li>
-        <li><a href="{{ page.relative_path }}icon/frown"><i class="icon-frown"></i> icon-frown</a></li>
-        <li><a href="{{ page.relative_path }}icon/meh"><i class="icon-meh"></i> icon-meh</a></li>
-        <li><a href="{{ page.relative_path }}icon/gamepad"><i class="icon-gamepad"></i> icon-gamepad</a></li>
-        <li><a href="{{ page.relative_path }}icon/keyboard"><i class="icon-keyboard"></i> icon-keyboard</a></li>
-        <li><a href="{{ page.relative_path }}icon/flag-alt"><i class="icon-flag-alt"></i> icon-flag-alt</a></li>
-        <li><a href="{{ page.relative_path }}icon/flag-checkered"><i class="icon-flag-checkered"></i> icon-flag-checkered</a></li>
-        <li><a href="{{ page.relative_path }}icon/terminal"><i class="icon-terminal"></i> icon-terminal</a></li>
-        <li><a href="{{ page.relative_path }}icon/code"><i class="icon-code"></i> icon-code</a></li>
-        <li><a href="{{ page.relative_path }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
-        <li><a href="{{ page.relative_path }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
-        <li><a href="{{ page.relative_path }}icon/reply-all"><i class="icon-reply-all"></i> icon-reply-all</a></li>
-        <li><a href="{{ page.relative_path }}icon/reply-all"><i class="icon-mail-reply-all"></i> icon-mail-reply-all <span class="muted">(alias)</span></a></li>
-      </ul>
-    </div>
-    <div class="span3">
-      <ul class="the-icons">
-        <li><a href="{{ page.relative_path }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
-        <li><a href="{{ page.relative_path }}icon/star-half-empty"><i class="icon-star-half-full"></i> icon-star-half-full <span class="muted">(alias)</span></a></li>
-        <li><a href="{{ page.relative_path }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
-        <li><a href="{{ page.relative_path }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
-        <li><a href="{{ page.relative_path }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
-        <li><a href="{{ page.relative_path }}icon/crop"><i class="icon-crop"></i> icon-crop</a></li>
-        <li><a href="{{ page.relative_path }}icon/code-fork"><i class="icon-code-fork"></i> icon-code-fork</a></li>
-        <li><a href="{{ page.relative_path }}icon/unlink"><i class="icon-unlink"></i> icon-unlink</a></li>
-        <li><a href="{{ page.relative_path }}icon/question"><i class="icon-question"></i> icon-question</a></li>
-        <li><a href="{{ page.relative_path }}icon/info"><i class="icon-info"></i> icon-info</a></li>
-        <li><a href="{{ page.relative_path }}icon/exclamation"><i class="icon-exclamation"></i> icon-exclamation</a></li>
-        <li><a href="{{ page.relative_path }}icon/superscript"><i class="icon-superscript"></i> icon-superscript</a></li>
-        <li><a href="{{ page.relative_path }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
-        <li><a href="{{ page.relative_path }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
-        <li><a href="{{ page.relative_path }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
-      </ul>
-    </div>
-    <div class="span3">
-      <ul class="the-icons">
-        <li><a href="{{ page.relative_path }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
-        <li><a href="{{ page.relative_path }}icon/microphone-off"><i class="icon-microphone-off"></i> icon-microphone-off</a></li>
-        <li><a href="{{ page.relative_path }}icon/shield"><i class="icon-shield"></i> icon-shield</a></li>
-        <li><a href="{{ page.relative_path }}icon/calendar-empty"><i class="icon-calendar-empty"></i> icon-calendar-empty</a></li>
-        <li><a href="{{ page.relative_path }}icon/fire-extinguisher"><i class="icon-fire-extinguisher"></i> icon-fire-extinguisher</a></li>
-        <li><a href="{{ page.relative_path }}icon/rocket"><i class="icon-rocket"></i> icon-rocket</a></li>
-        <li><a href="{{ page.relative_path }}icon/maxcdn"><i class="icon-maxcdn"></i> icon-maxcdn</a></li>
-        <li><a href="{{ page.relative_path }}icon/chevron-sign-left"><i class="icon-chevron-sign-left"></i> icon-chevron-sign-left</a></li>
-        <li><a href="{{ page.relative_path }}icon/chevron-sign-right"><i class="icon-chevron-sign-right"></i> icon-chevron-sign-right</a></li>
-        <li><a href="{{ page.relative_path }}icon/chevron-sign-up"><i class="icon-chevron-sign-up"></i> icon-chevron-sign-up</a></li>
-        <li><a href="{{ page.relative_path }}icon/chevron-sign-down"><i class="icon-chevron-sign-down"></i> icon-chevron-sign-down</a></li>
-        <li><a href="{{ page.relative_path }}icon/html5"><i class="icon-html5"></i> icon-html5</a></li>
-        <li><a href="{{ page.relative_path }}icon/css3"><i class="icon-css3"></i> icon-css3</a></li>
-        <li><a href="{{ page.relative_path }}icon/anchor"><i class="icon-anchor"></i> icon-anchor</a></li>
-        <li><a href="{{ page.relative_path }}icon/unlock-alt"><i class="icon-unlock-alt"></i> icon-unlock-alt</a></li>
-      </ul>
-    </div>
-    <div class="span3">
-      <ul class="the-icons">
-        <li><a href="{{ page.relative_path }}icon/bullseye"><i class="icon-bullseye"></i> icon-bullseye</a></li>
-        <li><a href="{{ page.relative_path }}icon/ellipsis-horizontal"><i class="icon-ellipsis-horizontal"></i> icon-ellipsis-horizontal</a></li>
-        <li><a href="{{ page.relative_path }}icon/ellipsis-vertical"><i class="icon-ellipsis-vertical"></i> icon-ellipsis-vertical</a></li>
-        <li><a href="{{ page.relative_path }}icon/rss-sign"><i class="icon-rss-sign"></i> icon-rss-sign</a></li>
-        <li><a href="{{ page.relative_path }}icon/play-sign"><i class="icon-play-sign"></i> icon-play-sign</a></li>
-        <li><a href="{{ page.relative_path }}icon/ticket"><i class="icon-ticket"></i> icon-ticket</a></li>
-        <li><a href="{{ page.relative_path }}icon/minus-sign-alt"><i class="icon-minus-sign-alt"></i> icon-minus-sign-alt</a></li>
-        <li><a href="{{ page.relative_path }}icon/check-minus"><i class="icon-check-minus"></i> icon-check-minus</a></li>
-        <li><a href="{{ page.relative_path }}icon/level-up"><i class="icon-level-up"></i> icon-level-up</a></li>
-        <li><a href="{{ page.relative_path }}icon/level-down"><i class="icon-level-down"></i> icon-level-down</a></li>
-        <li><a href="{{ page.relative_path }}icon/check-sign"><i class="icon-check-sign"></i> icon-check-sign</a></li>
-        <li><a href="{{ page.relative_path }}icon/edit-sign"><i class="icon-edit-sign"></i> icon-edit-sign</a></li>
-        <li><a href="{{ page.relative_path }}icon/external-link-sign"><i class="icon-external-link-sign"></i> icon-external-link-sign</a></li>
-        <li><a href="{{ page.relative_path }}icon/share-sign"><i class="icon-share-sign"></i> icon-share-sign</a></li>
-      </ul>
-    </div>
+  <div class="row the-icons">
+    {% assign icons_new = icons | version:site.font_awesome.version %}
+    {% for icon in icons_new %}
+      <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+      {% for alias in icon.aliases %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+      {% endfor %}
+    {% endfor %}
   </div>
+
 </{% if page.navbar_active == "icons" %}div{% else %}section{% endif %}>

build/_includes/icons/text-editor.html

@@ -1,57 +1,15 @@
-<section id="text-editor" class="row">
-  <div class="span12">
-    <h2 class="page-header">Text Editor Icons</h2>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/file"><i class="icon-file"></i> icon-file</a></li>
-      <li><a href="{{ page.relative_path }}icon/file-alt"><i class="icon-file-alt"></i> icon-file-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/cut"><i class="icon-cut"></i> icon-cut</a></li>
-      <li><a href="{{ page.relative_path }}icon/copy"><i class="icon-copy"></i> icon-copy</a></li>
-      <li><a href="{{ page.relative_path }}icon/paste"><i class="icon-paste"></i> icon-paste</a></li>
-      <li><a href="{{ page.relative_path }}icon/save"><i class="icon-save"></i> icon-save</a></li>
-      <li><a href="{{ page.relative_path }}icon/undo"><i class="icon-undo"></i> icon-undo</a></li>
-      <li><a href="{{ page.relative_path }}icon/repeat"><i class="icon-repeat"></i> icon-repeat</a></li>
-      <li><a href="{{ page.relative_path }}icon/text-height"><i class="icon-text-height"></i> icon-text-height</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/text-width"><i class="icon-text-width"></i> icon-text-width</a></li>
-      <li><a href="{{ page.relative_path }}icon/align-left"><i class="icon-align-left"></i> icon-align-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/align-center"><i class="icon-align-center"></i> icon-align-center</a></li>
-      <li><a href="{{ page.relative_path }}icon/align-right"><i class="icon-align-right"></i> icon-align-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/align-justify"><i class="icon-align-justify"></i> icon-align-justify</a></li>
-      <li><a href="{{ page.relative_path }}icon/indent-left"><i class="icon-indent-left"></i> icon-indent-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/indent-right"><i class="icon-indent-right"></i> icon-indent-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/font"><i class="icon-font"></i> icon-font</a></li>
-      <li><a href="{{ page.relative_path }}icon/bold"><i class="icon-bold"></i> icon-bold</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/italic"><i class="icon-italic"></i> icon-italic</a></li>
-      <li><a href="{{ page.relative_path }}icon/strikethrough"><i class="icon-strikethrough"></i> icon-strikethrough</a></li>
-      <li><a href="{{ page.relative_path }}icon/underline"><i class="icon-underline"></i> icon-underline</a></li>
-      <li><a href="{{ page.relative_path }}icon/superscript"><i class="icon-superscript"></i> icon-superscript</a></li>
-      <li><a href="{{ page.relative_path }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
-      <li><a href="{{ page.relative_path }}icon/link"><i class="icon-link"></i> icon-link</a></li>
-      <li><a href="{{ page.relative_path }}icon/unlink"><i class="icon-unlink"></i> icon-unlink</a></li>
-      <li><a href="{{ page.relative_path }}icon/paper-clip"><i class="icon-paper-clip"></i> icon-paper-clip</a></li>
-      <li><a href="{{ page.relative_path }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/columns"><i class="icon-columns"></i> icon-columns</a></li>
-      <li><a href="{{ page.relative_path }}icon/table"><i class="icon-table"></i> icon-table</a></li>
-      <li><a href="{{ page.relative_path }}icon/th-large"><i class="icon-th-large"></i> icon-th-large</a></li>
-      <li><a href="{{ page.relative_path }}icon/th"><i class="icon-th"></i> icon-th</a></li>
-      <li><a href="{{ page.relative_path }}icon/th-list"><i class="icon-th-list"></i> icon-th-list</a></li>
-      <li><a href="{{ page.relative_path }}icon/list"><i class="icon-list"></i> icon-list</a></li>
-      <li><a href="{{ page.relative_path }}icon/list-ol"><i class="icon-list-ol"></i> icon-list-ol</a></li>
-      <li><a href="{{ page.relative_path }}icon/list-ul"><i class="icon-list-ul"></i> icon-list-ul</a></li>
-      <li><a href="{{ page.relative_path }}icon/list-alt"><i class="icon-list-alt"></i> icon-list-alt</a></li>
-    </ul>
-  </div>
+<section id="text-editor">
+  <h2 class="page-header">Text Editor Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Text Editor Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
 </section>

build/_includes/icons/video-player.html

@@ -1,36 +1,15 @@
-<section id="video-player" class="row">
-  <div class="span12">
-    <h2 class="page-header">Video Player Icons</h2>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/play-circle"><i class="icon-play-circle"></i> icon-play-circle</a></li>
-      <li><a href="{{ page.relative_path }}icon/play-sign"><i class="icon-play-sign"></i> icon-play-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/play"><i class="icon-play"></i> icon-play</a></li>
-      <li><a href="{{ page.relative_path }}icon/pause"><i class="icon-pause"></i> icon-pause</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/stop"><i class="icon-stop"></i> icon-stop</a></li>
-      <li><a href="{{ page.relative_path }}icon/eject"><i class="icon-eject"></i> icon-eject</a></li>
-      <li><a href="{{ page.relative_path }}icon/backward"><i class="icon-backward"></i> icon-backward</a></li>
-      <li><a href="{{ page.relative_path }}icon/forward"><i class="icon-forward"></i> icon-forward</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/fast-backward"><i class="icon-fast-backward"></i> icon-fast-backward</a></li>
-      <li><a href="{{ page.relative_path }}icon/fast-forward"><i class="icon-fast-forward"></i> icon-fast-forward</a></li>
-      <li><a href="{{ page.relative_path }}icon/step-backward"><i class="icon-step-backward"></i> icon-step-backward</a></li>
-      <li><a href="{{ page.relative_path }}icon/step-forward"><i class="icon-step-forward"></i> icon-step-forward</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/fullscreen"><i class="icon-fullscreen"></i> icon-fullscreen</a></li>
-      <li><a href="{{ page.relative_path }}icon/resize-full"><i class="icon-resize-full"></i> icon-resize-full</a></li>
-      <li><a href="{{ page.relative_path }}icon/resize-small"><i class="icon-resize-small"></i> icon-resize-small</a></li>
-    </ul>
-  </div>
+<section id="video-player">
+  <h2 class="page-header">Video Player Icons</h2>
+
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Video Player Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  </div>
+
 </section>

build/_includes/icons/web-application.html

@@ -1,224 +1,15 @@
+<section id="web-application">
+  <h2 class="page-header">Web Application Icons</h2>
 
-<section id="web-application" class="row">
-  <div class="span12">
-    <h2 class="page-header">Web Application Icons</h2>
+  <div class="row the-icons">
+    {% for icon in icons %}
+      {% if icon.categories contains "Web Application Icons" %}
+        <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.id }}"></i> icon-{{ icon.id }}</a></div>
+        {% for alias in icon.aliases %}
+          <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ alias }}"></i> icon-{{ alias }} <span class="muted">(alias)</span></a></div>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
   </div>
 
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/adjust"><i class="icon-adjust"></i> icon-adjust</a></li>
-      <li><a href="{{ page.relative_path }}icon/anchor"><i class="icon-anchor"></i> icon-anchor</a></li>
-      <li><a href="{{ page.relative_path }}icon/asterisk"><i class="icon-asterisk"></i> icon-asterisk</a></li>
-      <li><a href="{{ page.relative_path }}icon/ban-circle"><i class="icon-ban-circle"></i> icon-ban-circle</a></li>
-      <li><a href="{{ page.relative_path }}icon/bar-chart"><i class="icon-bar-chart"></i> icon-bar-chart</a></li>
-      <li><a href="{{ page.relative_path }}icon/barcode"><i class="icon-barcode"></i> icon-barcode</a></li>
-      <li><a href="{{ page.relative_path }}icon/beaker"><i class="icon-beaker"></i> icon-beaker</a></li>
-      <li><a href="{{ page.relative_path }}icon/beer"><i class="icon-beer"></i> icon-beer</a></li>
-      <li><a href="{{ page.relative_path }}icon/bell-alt"><i class="icon-bell-alt"></i> icon-bell-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/bell"><i class="icon-bell"></i> icon-bell</a></li>
-      <li><a href="{{ page.relative_path }}icon/bolt"><i class="icon-bolt"></i> icon-bolt</a></li>
-      <li><a href="{{ page.relative_path }}icon/book"><i class="icon-book"></i> icon-book</a></li>
-      <li><a href="{{ page.relative_path }}icon/bookmark-empty"><i class="icon-bookmark-empty"></i> icon-bookmark-empty</a></li>
-      <li><a href="{{ page.relative_path }}icon/bookmark"><i class="icon-bookmark"></i> icon-bookmark</a></li>
-      <li><a href="{{ page.relative_path }}icon/briefcase"><i class="icon-briefcase"></i> icon-briefcase</a></li>
-      <li><a href="{{ page.relative_path }}icon/bullhorn"><i class="icon-bullhorn"></i> icon-bullhorn</a></li>
-      <li><a href="{{ page.relative_path }}icon/bullseye"><i class="icon-bullseye"></i> icon-bullseye</a></li>
-      <li><a href="{{ page.relative_path }}icon/calendar-empty"><i class="icon-calendar-empty"></i> icon-calendar-empty</a></li>
-      <li><a href="{{ page.relative_path }}icon/calendar"><i class="icon-calendar"></i> icon-calendar</a></li>
-      <li><a href="{{ page.relative_path }}icon/camera-retro"><i class="icon-camera-retro"></i> icon-camera-retro</a></li>
-      <li><a href="{{ page.relative_path }}icon/camera"><i class="icon-camera"></i> icon-camera</a></li>
-      <li><a href="{{ page.relative_path }}icon/certificate"><i class="icon-certificate"></i> icon-certificate</a></li>
-      <li><a href="{{ page.relative_path }}icon/check-empty"><i class="icon-check-empty"></i> icon-check-empty</a></li>
-      <li><a href="{{ page.relative_path }}icon/check-minus"><i class="icon-check-minus"></i> icon-check-minus</a></li>
-      <li><a href="{{ page.relative_path }}icon/check-sign"><i class="icon-check-sign"></i> icon-check-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/check"><i class="icon-check"></i> icon-check</a></li>
-      <li><a href="{{ page.relative_path }}icon/circle-blank"><i class="icon-circle-blank"></i> icon-circle-blank</a></li>
-      <li><a href="{{ page.relative_path }}icon/circle"><i class="icon-circle"></i> icon-circle</a></li>
-      <li><a href="{{ page.relative_path }}icon/cloud-download"><i class="icon-cloud-download"></i> icon-cloud-download</a></li>
-      <li><a href="{{ page.relative_path }}icon/cloud-upload"><i class="icon-cloud-upload"></i> icon-cloud-upload</a></li>
-      <li><a href="{{ page.relative_path }}icon/cloud"><i class="icon-cloud"></i> icon-cloud</a></li>
-      <li><a href="{{ page.relative_path }}icon/code-fork"><i class="icon-code-fork"></i> icon-code-fork</a></li>
-      <li><a href="{{ page.relative_path }}icon/code"><i class="icon-code"></i> icon-code</a></li>
-      <li><a href="{{ page.relative_path }}icon/coffee"><i class="icon-coffee"></i> icon-coffee</a></li>
-      <li><a href="{{ page.relative_path }}icon/cog"><i class="icon-cog"></i> icon-cog</a></li>
-      <li><a href="{{ page.relative_path }}icon/cogs"><i class="icon-cogs"></i> icon-cogs</a></li>
-      <li><a href="{{ page.relative_path }}icon/collapse-alt"><i class="icon-collapse-alt"></i> icon-collapse-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/comment-alt"><i class="icon-comment-alt"></i> icon-comment-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/comment"><i class="icon-comment"></i> icon-comment</a></li>
-      <li><a href="{{ page.relative_path }}icon/comments-alt"><i class="icon-comments-alt"></i> icon-comments-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/comments"><i class="icon-comments"></i> icon-comments</a></li>
-      <li><a href="{{ page.relative_path }}icon/credit-card"><i class="icon-credit-card"></i> icon-credit-card</a></li>
-      <li><a href="{{ page.relative_path }}icon/crop"><i class="icon-crop"></i> icon-crop</a></li>
-      <li><a href="{{ page.relative_path }}icon/dashboard"><i class="icon-dashboard"></i> icon-dashboard</a></li>
-      <li><a href="{{ page.relative_path }}icon/desktop"><i class="icon-desktop"></i> icon-desktop</a></li>
-      <li><a href="{{ page.relative_path }}icon/download-alt"><i class="icon-download-alt"></i> icon-download-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/download"><i class="icon-download"></i> icon-download</a></li>
-      <li><a href="{{ page.relative_path }}icon/edit-sign"><i class="icon-edit-sign"></i> icon-edit-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/edit"><i class="icon-edit"></i> icon-edit</a></li>
-      <li><a href="{{ page.relative_path }}icon/ellipsis-horizontal"><i class="icon-ellipsis-horizontal"></i> icon-ellipsis-horizontal</a></li>
-      <li><a href="{{ page.relative_path }}icon/ellipsis-vertical"><i class="icon-ellipsis-vertical"></i> icon-ellipsis-vertical</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/envelope-alt"><i class="icon-envelope-alt"></i> icon-envelope-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/envelope"><i class="icon-envelope"></i> icon-envelope</a></li>
-      <li><a href="{{ page.relative_path }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
-      <li><a href="{{ page.relative_path }}icon/exchange"><i class="icon-exchange"></i> icon-exchange</a></li>
-      <li><a href="{{ page.relative_path }}icon/exclamation-sign"><i class="icon-exclamation-sign"></i> icon-exclamation-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/exclamation"><i class="icon-exclamation"></i> icon-exclamation</a></li>
-      <li><a href="{{ page.relative_path }}icon/expand-alt"><i class="icon-expand-alt"></i> icon-expand-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/external-link-sign"><i class="icon-external-link-sign"></i> icon-external-link-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/external-link"><i class="icon-external-link"></i> icon-external-link</a></li>
-      <li><a href="{{ page.relative_path }}icon/eye-close"><i class="icon-eye-close"></i> icon-eye-close</a></li>
-      <li><a href="{{ page.relative_path }}icon/eye-open"><i class="icon-eye-open"></i> icon-eye-open</a></li>
-      <li><a href="{{ page.relative_path }}icon/facetime-video"><i class="icon-facetime-video"></i> icon-facetime-video</a></li>
-      <li><a href="{{ page.relative_path }}icon/fighter-jet"><i class="icon-fighter-jet"></i> icon-fighter-jet</a></li>
-      <li><a href="{{ page.relative_path }}icon/film"><i class="icon-film"></i> icon-film</a></li>
-      <li><a href="{{ page.relative_path }}icon/filter"><i class="icon-filter"></i> icon-filter</a></li>
-      <li><a href="{{ page.relative_path }}icon/fire-extinguisher"><i class="icon-fire-extinguisher"></i> icon-fire-extinguisher</a></li>
-      <li><a href="{{ page.relative_path }}icon/fire"><i class="icon-fire"></i> icon-fire</a></li>
-      <li><a href="{{ page.relative_path }}icon/flag-alt"><i class="icon-flag-alt"></i> icon-flag-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/flag-checkered"><i class="icon-flag-checkered"></i> icon-flag-checkered</a></li>
-      <li><a href="{{ page.relative_path }}icon/flag"><i class="icon-flag"></i> icon-flag</a></li>
-      <li><a href="{{ page.relative_path }}icon/folder-close-alt"><i class="icon-folder-close-alt"></i> icon-folder-close-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/folder-close"><i class="icon-folder-close"></i> icon-folder-close</a></li>
-      <li><a href="{{ page.relative_path }}icon/folder-open-alt"><i class="icon-folder-open-alt"></i> icon-folder-open-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/folder-open"><i class="icon-folder-open"></i> icon-folder-open</a></li>
-      <li><a href="{{ page.relative_path }}icon/food"><i class="icon-food"></i> icon-food</a></li>
-      <li><a href="{{ page.relative_path }}icon/frown"><i class="icon-frown"></i> icon-frown</a></li>
-      <li><a href="{{ page.relative_path }}icon/gamepad"><i class="icon-gamepad"></i> icon-gamepad</a></li>
-      <li><a href="{{ page.relative_path }}icon/gift"><i class="icon-gift"></i> icon-gift</a></li>
-      <li><a href="{{ page.relative_path }}icon/glass"><i class="icon-glass"></i> icon-glass</a></li>
-      <li><a href="{{ page.relative_path }}icon/globe"><i class="icon-globe"></i> icon-globe</a></li>
-      <li><a href="{{ page.relative_path }}icon/group"><i class="icon-group"></i> icon-group</a></li>
-      <li><a href="{{ page.relative_path }}icon/hdd"><i class="icon-hdd"></i> icon-hdd</a></li>
-      <li><a href="{{ page.relative_path }}icon/headphones"><i class="icon-headphones"></i> icon-headphones</a></li>
-      <li><a href="{{ page.relative_path }}icon/heart-empty"><i class="icon-heart-empty"></i> icon-heart-empty</a></li>
-      <li><a href="{{ page.relative_path }}icon/heart"><i class="icon-heart"></i> icon-heart</a></li>
-      <li><a href="{{ page.relative_path }}icon/home"><i class="icon-home"></i> icon-home</a></li>
-      <li><a href="{{ page.relative_path }}icon/inbox"><i class="icon-inbox"></i> icon-inbox</a></li>
-      <li><a href="{{ page.relative_path }}icon/info-sign"><i class="icon-info-sign"></i> icon-info-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/info"><i class="icon-info"></i> icon-info</a></li>
-      <li><a href="{{ page.relative_path }}icon/key"><i class="icon-key"></i> icon-key</a></li>
-      <li><a href="{{ page.relative_path }}icon/keyboard"><i class="icon-keyboard"></i> icon-keyboard</a></li>
-      <li><a href="{{ page.relative_path }}icon/laptop"><i class="icon-laptop"></i> icon-laptop</a></li>
-      <li><a href="{{ page.relative_path }}icon/leaf"><i class="icon-leaf"></i> icon-leaf</a></li>
-      <li><a href="{{ page.relative_path }}icon/legal"><i class="icon-legal"></i> icon-legal</a></li>
-      <li><a href="{{ page.relative_path }}icon/lemon"><i class="icon-lemon"></i> icon-lemon</a></li>
-      <li><a href="{{ page.relative_path }}icon/level-down"><i class="icon-level-down"></i> icon-level-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/level-up"><i class="icon-level-up"></i> icon-level-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/lightbulb"><i class="icon-lightbulb"></i> icon-lightbulb</a></li>
-      <li><a href="{{ page.relative_path }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
-      <li><a href="{{ page.relative_path }}icon/lock"><i class="icon-lock"></i> icon-lock</a></li>
-      <li><a href="{{ page.relative_path }}icon/magic"><i class="icon-magic"></i> icon-magic</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/magnet"><i class="icon-magnet"></i> icon-magnet</a></li>
-      <li><a href="{{ page.relative_path }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ page.relative_path }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ page.relative_path }}icon/reply-all"><i class="icon-mail-reply-all"></i> icon-mail-reply-all <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ page.relative_path }}icon/map-marker"><i class="icon-map-marker"></i> icon-map-marker</a></li>
-      <li><a href="{{ page.relative_path }}icon/meh"><i class="icon-meh"></i> icon-meh</a></li>
-      <li><a href="{{ page.relative_path }}icon/microphone-off"><i class="icon-microphone-off"></i> icon-microphone-off</a></li>
-      <li><a href="{{ page.relative_path }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
-      <li><a href="{{ page.relative_path }}icon/minus-sign-alt"><i class="icon-minus-sign-alt"></i> icon-minus-sign-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/minus-sign"><i class="icon-minus-sign"></i> icon-minus-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/minus"><i class="icon-minus"></i> icon-minus</a></li>
-      <li><a href="{{ page.relative_path }}icon/mobile-phone"><i class="icon-mobile-phone"></i> icon-mobile-phone</a></li>
-      <li><a href="{{ page.relative_path }}icon/money"><i class="icon-money"></i> icon-money</a></li>
-      <li><a href="{{ page.relative_path }}icon/move"><i class="icon-move"></i> icon-move</a></li>
-      <li><a href="{{ page.relative_path }}icon/music"><i class="icon-music"></i> icon-music</a></li>
-      <li><a href="{{ page.relative_path }}icon/off"><i class="icon-off"></i> icon-off</a></li>
-      <li><a href="{{ page.relative_path }}icon/ok-circle"><i class="icon-ok-circle"></i> icon-ok-circle</a></li>
-      <li><a href="{{ page.relative_path }}icon/ok-sign"><i class="icon-ok-sign"></i> icon-ok-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/ok"><i class="icon-ok"></i> icon-ok</a></li>
-      <li><a href="{{ page.relative_path }}icon/pencil"><i class="icon-pencil"></i> icon-pencil</a></li>
-      <li><a href="{{ page.relative_path }}icon/phone-sign"><i class="icon-phone-sign"></i> icon-phone-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/phone"><i class="icon-phone"></i> icon-phone</a></li>
-      <li><a href="{{ page.relative_path }}icon/picture"><i class="icon-picture"></i> icon-picture</a></li>
-      <li><a href="{{ page.relative_path }}icon/plane"><i class="icon-plane"></i> icon-plane</a></li>
-      <li><a href="{{ page.relative_path }}icon/plus-sign"><i class="icon-plus-sign"></i> icon-plus-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/plus"><i class="icon-plus"></i> icon-plus</a></li>
-      <li><a href="{{ page.relative_path }}icon/print"><i class="icon-print"></i> icon-print</a></li>
-      <li><a href="{{ page.relative_path }}icon/pushpin"><i class="icon-pushpin"></i> icon-pushpin</a></li>
-      <li><a href="{{ page.relative_path }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
-      <li><a href="{{ page.relative_path }}icon/qrcode"><i class="icon-qrcode"></i> icon-qrcode</a></li>
-      <li><a href="{{ page.relative_path }}icon/question-sign"><i class="icon-question-sign"></i> icon-question-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/question"><i class="icon-question"></i> icon-question</a></li>
-      <li><a href="{{ page.relative_path }}icon/quote-left"><i class="icon-quote-left"></i> icon-quote-left</a></li>
-      <li><a href="{{ page.relative_path }}icon/quote-right"><i class="icon-quote-right"></i> icon-quote-right</a></li>
-      <li><a href="{{ page.relative_path }}icon/random"><i class="icon-random"></i> icon-random</a></li>
-      <li><a href="{{ page.relative_path }}icon/refresh"><i class="icon-refresh"></i> icon-refresh</a></li>
-      <li><a href="{{ page.relative_path }}icon/remove-circle"><i class="icon-remove-circle"></i> icon-remove-circle</a></li>
-      <li><a href="{{ page.relative_path }}icon/remove-sign"><i class="icon-remove-sign"></i> icon-remove-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/remove"><i class="icon-remove"></i> icon-remove</a></li>
-      <li><a href="{{ page.relative_path }}icon/reorder"><i class="icon-reorder"></i> icon-reorder</a></li>
-      <li><a href="{{ page.relative_path }}icon/reply-all"><i class="icon-reply-all"></i> icon-reply-all</a></li>
-      <li><a href="{{ page.relative_path }}icon/reply"><i class="icon-reply"></i> icon-reply</a></li>
-      <li><a href="{{ page.relative_path }}icon/resize-horizontal"><i class="icon-resize-horizontal"></i> icon-resize-horizontal</a></li>
-      <li><a href="{{ page.relative_path }}icon/resize-vertical"><i class="icon-resize-vertical"></i> icon-resize-vertical</a></li>
-      <li><a href="{{ page.relative_path }}icon/retweet"><i class="icon-retweet"></i> icon-retweet</a></li>
-      <li><a href="{{ page.relative_path }}icon/road"><i class="icon-road"></i> icon-road</a></li>
-      <li><a href="{{ page.relative_path }}icon/rocket"><i class="icon-rocket"></i> icon-rocket</a></li>
-      <li><a href="{{ page.relative_path }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ page.relative_path }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ page.relative_path }}icon/rss-sign"><i class="icon-rss-sign"></i> icon-rss-sign</a></li>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="the-icons">
-      <li><a href="{{ page.relative_path }}icon/rss"><i class="icon-rss"></i> icon-rss</a></li>
-      <li><a href="{{ page.relative_path }}icon/screenshot"><i class="icon-screenshot"></i> icon-screenshot</a></li>
-      <li><a href="{{ page.relative_path }}icon/search"><i class="icon-search"></i> icon-search</a></li>
-      <li><a href="{{ page.relative_path }}icon/share-alt"><i class="icon-share-alt"></i> icon-share-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/share-sign"><i class="icon-share-sign"></i> icon-share-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/share"><i class="icon-share"></i> icon-share</a></li>
-      <li><a href="{{ page.relative_path }}icon/shield"><i class="icon-shield"></i> icon-shield</a></li>
-      <li><a href="{{ page.relative_path }}icon/shopping-cart"><i class="icon-shopping-cart"></i> icon-shopping-cart</a></li>
-      <li><a href="{{ page.relative_path }}icon/sign-blank"><i class="icon-sign-blank"></i> icon-sign-blank</a></li>
-      <li><a href="{{ page.relative_path }}icon/signal"><i class="icon-signal"></i> icon-signal</a></li>
-      <li><a href="{{ page.relative_path }}icon/signin"><i class="icon-signin"></i> icon-signin</a></li>
-      <li><a href="{{ page.relative_path }}icon/signout"><i class="icon-signout"></i> icon-signout</a></li>
-      <li><a href="{{ page.relative_path }}icon/sitemap"><i class="icon-sitemap"></i> icon-sitemap</a></li>
-      <li><a href="{{ page.relative_path }}icon/smile"><i class="icon-smile"></i> icon-smile</a></li>
-      <li><a href="{{ page.relative_path }}icon/sort-down"><i class="icon-sort-down"></i> icon-sort-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/sort-up"><i class="icon-sort-up"></i> icon-sort-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/sort"><i class="icon-sort"></i> icon-sort</a></li>
-      <li><a href="{{ page.relative_path }}icon/spinner"><i class="icon-spinner"></i> icon-spinner</a></li>
-      <li><a href="{{ page.relative_path }}icon/star-empty"><i class="icon-star-empty"></i> icon-star-empty</a></li>
-      <li><a href="{{ page.relative_path }}icon/star-half-full"><i class="icon-star-half-full"></i> icon-star-half-full <span class="muted">(alias)</span></a></li>
-      <li><a href="{{ page.relative_path }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
-      <li><a href="{{ page.relative_path }}icon/star-half"><i class="icon-star-half"></i> icon-star-half</a></li>
-      <li><a href="{{ page.relative_path }}icon/star"><i class="icon-star"></i> icon-star</a></li>
-      <li><a href="{{ page.relative_path }}icon/tablet"><i class="icon-tablet"></i> icon-tablet</a></li>
-      <li><a href="{{ page.relative_path }}icon/tag"><i class="icon-tag"></i> icon-tag</a></li>
-      <li><a href="{{ page.relative_path }}icon/tags"><i class="icon-tags"></i> icon-tags</a></li>
-      <li><a href="{{ page.relative_path }}icon/tasks"><i class="icon-tasks"></i> icon-tasks</a></li>
-      <li><a href="{{ page.relative_path }}icon/terminal"><i class="icon-terminal"></i> icon-terminal</a></li>
-      <li><a href="{{ page.relative_path }}icon/thumbs-down"><i class="icon-thumbs-down"></i> icon-thumbs-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/thumbs-up"><i class="icon-thumbs-up"></i> icon-thumbs-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/ticket"><i class="icon-ticket"></i> icon-ticket</a></li>
-      <li><a href="{{ page.relative_path }}icon/time"><i class="icon-time"></i> icon-time</a></li>
-      <li><a href="{{ page.relative_path }}icon/tint"><i class="icon-tint"></i> icon-tint</a></li>
-      <li><a href="{{ page.relative_path }}icon/trash"><i class="icon-trash"></i> icon-trash</a></li>
-      <li><a href="{{ page.relative_path }}icon/trophy"><i class="icon-trophy"></i> icon-trophy</a></li>
-      <li><a href="{{ page.relative_path }}icon/truck"><i class="icon-truck"></i> icon-truck</a></li>
-      <li><a href="{{ page.relative_path }}icon/umbrella"><i class="icon-umbrella"></i> icon-umbrella</a></li>
-      <li><a href="{{ page.relative_path }}icon/unlock-alt"><i class="icon-unlock-alt"></i> icon-unlock-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/unlock"><i class="icon-unlock"></i> icon-unlock</a></li>
-      <li><a href="{{ page.relative_path }}icon/upload-alt"><i class="icon-upload-alt"></i> icon-upload-alt</a></li>
-      <li><a href="{{ page.relative_path }}icon/upload"><i class="icon-upload"></i> icon-upload</a></li>
-      <li><a href="{{ page.relative_path }}icon/user-md"><i class="icon-user-md"></i> icon-user-md</a></li>
-      <li><a href="{{ page.relative_path }}icon/user"><i class="icon-user"></i> icon-user</a></li>
-      <li><a href="{{ page.relative_path }}icon/volume-down"><i class="icon-volume-down"></i> icon-volume-down</a></li>
-      <li><a href="{{ page.relative_path }}icon/volume-off"><i class="icon-volume-off"></i> icon-volume-off</a></li>
-      <li><a href="{{ page.relative_path }}icon/volume-up"><i class="icon-volume-up"></i> icon-volume-up</a></li>
-      <li><a href="{{ page.relative_path }}icon/warning-sign"><i class="icon-warning-sign"></i> icon-warning-sign</a></li>
-      <li><a href="{{ page.relative_path }}icon/wrench"><i class="icon-wrench"></i> icon-wrench</a></li>
-      <li><a href="{{ page.relative_path }}icon/zoom-in"><i class="icon-zoom-in"></i> icon-zoom-in</a></li>
-      <li><a href="{{ page.relative_path }}icon/zoom-out"><i class="icon-zoom-out"></i> icon-zoom-out</a></li>    </ul>
-  </div>
 </section>

build/_includes/jumbotron-slider.html

@@ -13,7 +13,7 @@
             </a>
           </div>
           <div class="shameless-self-promotion">
-            <a href="{{ site.font_awesome.github.url }}" target="_blank"
+            <a href="{{ site.font_awesome.github.url }}"
                onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
               GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
             Version {{ site.font_awesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
@@ -32,7 +32,7 @@
             <div class="item"><div><i class="icon-microphone"></i></div></div>
             <div class="item"><div><i class="icon-shield"></i></div></div>
             <div class="item"><div><i class="icon-star-half-empty"></i></div></div>
-            <div class="item"><div><i class="icon-envelope"></i></div></div>
+            <div class="item"><div><i class="icon-envelope-alt"></i></div></div>
             <div class="item"><div><i class="icon-medkit"></i></div></div>
             <div class="item"><div><i class="icon-book"></i></div></div>
             <div class="item"><div><i class="icon-coffee"></i></div></div>

build/_includes/navbar.html

@@ -15,6 +15,7 @@
           <li class="divider"></li>
           <li><a href="{{ page.relative_path }}icons/#new"><i class="icon-shield icon-fixed-width"></i>&nbsp; New Icons in {{ site.font_awesome.version }}</a></li>
           <li><a href="{{ page.relative_path }}icons/#web-application"><i class="icon-camera-retro icon-fixed-width"></i>&nbsp; Web Application Icons</a></li>
+          <li><a href="{{ page.relative_path }}icons/#currency"><i class="icon-eur icon-fixed-width"></i>&nbsp; Currency Icons</a></li>
           <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="icon-file-alt icon-fixed-width"></i>&nbsp; Text Editor Icons</a></li>
           <li><a href="{{ page.relative_path }}icons/#directional"><i class="icon-hand-right icon-fixed-width"></i>&nbsp; Directional Icons</a></li>
           <li><a href="{{ page.relative_path }}icons/#video-player"><i class="icon-play-sign icon-fixed-width"></i>&nbsp; Video Player Icons</a></li>
@@ -51,7 +52,7 @@
         <li{% if page.navbar_active == "license" %} class="active"{% endif %}><a href="{{ page.relative_path }}license/">License</a></li>
       </ul>
       <ul class="nav pull-right">
-        <li><a href="mailto:{{ site.font_awesome.author.email }}"><i class="icon-envelope"></i>&nbsp; Me</a></li>
+        <li><a href="mailto:{{ site.font_awesome.author.email }}"><i class="icon-envelope-alt"></i>&nbsp; Me</a></li>
       </ul>
     </div>
   </div>

build/_includes/why.html

@@ -1,7 +1,7 @@
 <div id="why">
   <div class="row">
     <div class="span4">
-      <h4><i class="icon-flag"></i> One Font, {{ site.font_awesome.icon_count }} Icons</h4>
+      <h4><i class="icon-flag"></i> One Font, {{ icons | size }} Icons</h4>
       In a single collection, Font Awesome is a pictographic language of web-related actions.
     </div>
     <div class="span4">

build/_plugins/css_preproc_generator.rb

@@ -1,56 +0,0 @@
-##
-# Create Less and Sass files
-
-require 'yaml'
-require 'forwardable'
-require 'debugger'
-
-module Jekyll
-
-  class CssPreProcPage < Page
-
-    def initialize(site, base, dir, name, icons)
-      @site = site
-      @base = base
-      @dir = dir
-      @name = name
-      @icons = icons
-
-      self.process(@name)
-
-      self.read_yaml(File.join(base, site.config['layouts']), @name)
-
-      self.data['icons'] = icons
-    end
-
-  end
-
-  class CssPreProcGenerator < Generator
-
-    ##
-    # Iterate over every described icon in a YAML file and create a page for it
-
-    safe true
-
-    def generate(site)
-      # Need to figure use lessc to generate the files first
-      return
-
-      less_destination = site.config['css_preproc']['less_destination']
-
-      # Less file
-      site.pages << CssPreProcPage.new(
-        site, site.source, less_destination,
-        site.config['css_preproc']['less_layout'],
-        site.icons)
-
-      # Less IE7 file
-      site.pages << CssPreProcPage.new(
-        site, site.source, less_destination,
-        site.config['css_preproc']['less_ie7_layout'],
-        site.icons)
-    end
-
-  end
-
-end

build/assets/font-awesome/less/icons.less

@@ -4,11 +4,12 @@
    readers do not read off random characters that represent icons */
 {% for icon in icons %}
 .icon-{{ icon.id }}:before {
-  content: @icon-{{ icon.id }}
+  content: @{{ icon.id }};
 }
 {% for alias in icon.aliases %}
+// {{ icon.name }} alias
 .icon-{{ alias }}:before {
-  content: @icon-{{ icon.id }}
+  content: @{{ icon.id }};
 }
 {% endfor %}
 {% endfor %}

build/assets/font-awesome/less/path.less

@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
-    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
-//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
+//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
+//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
+//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
+//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
+//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
+  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
 
   font-weight: normal;
   font-style: normal;

build/assets/font-awesome/less/variables.less

@@ -11,7 +11,6 @@
 @iconLight:          #fff;
 @iconDark:           #333;
 
-
 {% for icon in icons %}
-@icon-{{ icon.id }}: "\{{ icon.unicode }}";
+@{{ icon.id }}: "\{{ icon.unicode }}";
 {% endfor %}

build/assets/less/site.less

@@ -210,21 +210,11 @@ section { margin-top: 40px; }
     background: @white;
     font-weight: normal;
   }
-  .watch, .fork {
-//    margin-right: 30px;
-  }
 }
 
 .the-icons {
-  list-style-type: none;
-  margin: 0;
-  li {
-    [class^="icon-"],
-    [class*=" icon-"] {
-      display: inline-block;
-      width: 18/14em;
-      text-align: center;
-    }
+  margin-top: 22px;
+  .span3 {
     a {
       display: block;
       &, &:hover { color: @grayDarker; }
@@ -232,13 +222,16 @@ section { margin-top: 40px; }
       cursor: pointer;
       line-height: 32px;
       height: 32px;
-      padding-left: 12px;
+      padding-left: 10px;
       .border-radius(6px);
 
       [class^="icon-"],
       [class*=" icon-"] {
         width: 32px;
         font-size: 14px;
+        display: inline-block;
+        text-align: right;
+        margin-right: 10px;
       }
 
       &:hover {

build/icons.html

@@ -5,7 +5,7 @@ navbar_active: icons
 relative_path: ../
 ---
 {% capture jumbotron_h1 %}<i class="icon-flag icon-large"></i>&nbsp; The Icons{% endcapture %}
-{% capture jumbotron_p %}The complete set of {{ site.font_awesome.icon_count }} icons in Font Awesome {{ site.font_awesome.version }}{% endcapture %}
+{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in Font Awesome {{ site.font_awesome.version }}{% endcapture %}
 
 {% include jumbotron.html %}
 {% include stripe-social.html %}

build/icons.yml

@@ -20,8 +20,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       Envelope
-    id:         envelope
+  - name:       Envelope Alt
+    id:         envelope-alt
     unicode:    f003
     created:    1.0.0
     categories:
@@ -149,8 +149,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       file
-    id:         file
+  - name:       file-alt
+    id:         file-alt
     unicode:    f016
     created:    1.0.0
     categories:
@@ -902,15 +902,15 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       thumbs-up
-    id:         thumbs-up
+  - name:       thumbs-up-alt
+    id:         thumbs-up-alt
     unicode:    f087
     created:    1.0.0
     categories:
       - Web Application Icons
 
-  - name:       thumbs-down
-    id:         thumbs-down
+  - name:       thumbs-down-alt
+    id:         thumbs-down-alt
     unicode:    f088
     created:    1.0.0
     categories:
@@ -1005,6 +1005,8 @@ icons:
     id:         check-empty
     unicode:    f096
     created:    2.0.0
+    aliases:
+      - unchecked
     categories:
       - Web Application Icons
 
@@ -1239,6 +1241,8 @@ icons:
     id:         paper-clip
     unicode:    f0c6
     created:    2.0.0
+    aliases:
+      - paperclip
     categories:
       - Text Editor Icons
 
@@ -1405,8 +1409,8 @@ icons:
       - Web Application Icons
 
 
-  - name:       envelope-alt
-    id:         envelope-alt
+  - name:       Envelope
+    id:         envelope
     unicode:    f0e0
     created:    2.0.0
     categories:
@@ -1556,8 +1560,8 @@ icons:
     categories:
       - Web Application Icons
 
-  - name:       file-alt
-    id:         file-alt
+  - name:       file-text-alt
+    id:         file-text-alt
     unicode:    f0f6
     created:    3.0.0
     categories:
@@ -1749,6 +1753,12 @@ icons:
     categories:
       - Web Application Icons
 
+  - name:       github-alt
+    id:         github-alt
+    unicode:    f113
+    created:    3.0.0
+    categories:
+      - Brand Icons
 
   - name:       folder-close-alt
     id:         folder-close-alt
@@ -2147,3 +2157,168 @@ icons:
     created:    3.1.0
     categories:
       - Web Application Icons
+
+
+  - name:       Collapse
+    id:         collapse
+    unicode:    f150
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Collapse Top
+    id:         collapse-top
+    unicode:    f151
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Expand
+    id:         expand
+    unicode:    f152
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Euro (EUR)
+    id:         eur
+    unicode:    f153
+    created:    3.2.0
+    aliases:
+      - euro
+    categories:
+      - Currency Icons
+
+  - name:       GBP
+    id:         gbp
+    unicode:    f154
+    created:    3.2.0
+    categories:
+      - Currency Icons
+
+  - name:       US Dollar
+    id:         usd
+    unicode:    f155
+    created:    3.2.0
+    aliases:
+      - dollar
+    categories:
+      - Currency Icons
+
+  - name:       Indian Rupee (INR)
+    id:         inr
+    unicode:    f156
+    created:    3.2.0
+    aliases:
+      - rupee
+    categories:
+      - Currency Icons
+
+  - name:       Japanese Yen (JPY)
+    id:         jpy
+    unicode:    f157
+    created:    3.2.0
+    aliases:
+      - yen
+    categories:
+      - Currency Icons
+
+  - name:       Renminbi (CNY)
+    id:         cny
+    unicode:    f158
+    created:    3.2.0
+    aliases:
+      - renminbi
+    categories:
+      - Currency Icons
+
+  - name:       Korean Won (KRW)
+    id:         krw
+    unicode:    f159
+    created:    3.2.0
+    aliases:
+      - won
+    categories:
+      - Currency Icons
+
+  - name:       Bitcoin (BTC)
+    id:         btc
+    unicode:    f15a
+    created:    3.2.0
+    aliases:
+      - bitcoin
+    categories:
+      - Currency Icons
+      - Brand Icons
+
+  - name:       File
+    id:         file
+    unicode:    f15b
+    created:    3.2.0
+    categories:
+      - Text Editor Icons
+
+  - name:       File Text
+    id:         file-text
+    unicode:    f15c
+    created:    3.2.0
+    categories:
+      - Text Editor Icons
+
+  - name:       Sort By Alphabet
+    id:         sort-by-alphabet
+    unicode:    f15d
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Alphabet Alt
+    id:         sort-by-alphabet-alt
+    unicode:    f15e
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+
+  - name:       Sort By Attributes
+    id:         sort-by-attributes
+    unicode:    f160
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Attributes Alt
+    id:         sort-by-attributes-alt
+    unicode:    f161
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Order
+    id:         sort-by-order
+    unicode:    f162
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       Sort By Order Alt
+    id:         sort-by-order-alt
+    unicode:    f163
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+
+  - name:       thumbs-up
+    id:         thumbs-up
+    unicode:    f164
+    created:    3.2.0
+    categories:
+      - Web Application Icons
+
+  - name:       thumbs-down
+    id:         thumbs-down
+    unicode:    f165
+    created:    3.2.0
+    categories:
+      - Web Application Icons

build/test.html

@@ -1,7 +1,7 @@
 ---
 layout: base
 title: Font Awesome Visual Test Cases
-relative_path: ./
+relative_path: ../
 ---
 
 <section class="container">

package.json

@@ -1,16 +1,30 @@
 {
-  "name": "fontawesome",
+  "name": "font-awesome",
   "description": "The iconic font designed for Bootstrap",
   "version": "3.2.0",
-  "keywords": ["bootstrap", "css", "icon", "font"],
+  "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
   "homepage": "http://fontawesome.io/",
-  "author": "Dave Gandy",
+  "author": {
+    "name": "Dave Gandy",
+    "email": "dave@fontawesome.io"
+  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/FortAwesome/Font-Awesome"
+    "url": "https://github.com/FortAwesome/Font-Awesome.git"
   },
   "licenses": [
-    {}
+    {
+      "type": "SIL OFL 1.1",
+      "url": "http://scripts.sil.org/OFL"
+    },
+    {
+      "type": "MIT License",
+      "url": "http://opensource.org/licenses/mit-license.html"
+    },
+    {
+      "type": "CC BY 3.0",
+      "url": "http://creativecommons.org/licenses/by/3.0/"
+    }
   ],
   "devDependencies": {
     "recess": "1.1.6"