diff --git a/Gemfile b/Gemfile
index b245f1f7..234b45ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,4 @@ gem 'fog'
 gem 'mime-types'
 gem 'rake'
 gem 'nokogiri'
+gem 'smoke'
diff --git a/public/index.html b/public/index.html
index 4dcc27cf..960617bf 100755
--- a/public/index.html
+++ b/public/index.html
@@ -134,10 +134,10 @@ <h2>People</h2>
       <li><div><img src="graphics/emojis/kissing.png"> :<span class="name">kissing</span>:</div></li>
       <li><div><img src="graphics/emojis/kissing_smiling_eyes.png"> :<span class="name">kissing_smiling_eyes</span>:</div></li>
       <li><div><img src="graphics/emojis/stuck_out_tongue.png"> :<span class="name">stuck_out_tongue</span>:</div></li>
-      <li><div><img src="graphics/emojis/sleeping.png"> :<span class="name">sleeping</span>:</div></li>
+      <li><div><img src="graphics/emojis/sleeping.png"> :<span class="name" data-alternative-name="sleep">sleeping</span>:</div></li>
       <li><div><img src="graphics/emojis/worried.png"> :<span class="name">worried</span>:</div></li>
       <li><div><img src="graphics/emojis/frowning.png"> :<span class="name">frowning</span>:</div></li>
-      <li><div><img src="graphics/emojis/anguished.png"> :<span class="name">anguished</span>:</div></li>
+      <li><div><img src="graphics/emojis/anguished.png"> :<span class="name" data-alternative-name="depressed, sad">anguished</span>:</div></li>
       <li><div><img src="graphics/emojis/open_mouth.png"> :<span class="name">open_mouth</span>:</div></li>
       <li><div><img src="graphics/emojis/grimacing.png"> :<span class="name">grimacing</span>:</div></li>
       <li><div><img src="graphics/emojis/confused.png"> :<span class="name">confused</span>:</div></li>
@@ -203,10 +203,10 @@ <h2>People</h2>
       <li><div><img src="graphics/emojis/sweat_drops.png"> :<span class="name" data-alternative-name="water">sweat_drops</span>:</div></li>
       <li><div><img src="graphics/emojis/notes.png"> :<span class="name">notes</span>:</div></li>
       <li><div><img src="graphics/emojis/musical_note.png"> :<span class="name">musical_note</span>:</div></li>
-      <li><div><img src="graphics/emojis/fire.png"> :<span class="name">fire</span>:</div></li>
+      <li><div><img src="graphics/emojis/fire.png"> :<span class="name" data-alternative-name="flame">fire</span>:</div></li>
       <li><div><img src="graphics/emojis/hankey.png"> :<span class="name">hankey</span>:</div></li>
       <li><div><img src="graphics/emojis/poop.png"> :<span class="name">poop</span>:</div></li>
-      <li><div><img src="graphics/emojis/shit.png"> :<span class="name">shit</span>:</div></li>
+      <li><div><img src="graphics/emojis/shit.png"> :<span class="name"=data-alternative-name="poop">shit</span>:</div></li>
       <li><div><img src="graphics/emojis/plus1.png"> :<span class="name">+1</span>:</div></li>
       <li><div><img src="graphics/emojis/thumbsup.png"> :<span class="name">thumbsup</span>:</div></li>
       <li><div><img src="graphics/emojis/-1.png"> :<span class="name">-1</span>:</div></li>
@@ -312,7 +312,7 @@ <h2>Nature</h2>
       <li><div><img src="graphics/emojis/sunny.png"> :<span class="name">sunny</span>:</div></li>
       <li><div><img src="graphics/emojis/umbrella.png"> :<span class="name" data-alternative-name="water, rain">umbrella</span>:</div></li>
       <li><div><img src="graphics/emojis/cloud.png"> :<span class="name">cloud</span>:</div></li>
-      <li><div><img src="graphics/emojis/snowflake.png"> :<span class="name">snowflake</span>:</div></li>
+      <li><div><img src="graphics/emojis/snowflake.png"> :<span class="name" data-alternative-name="snow">snowflake</span>:</div></li>
       <li><div><img src="graphics/emojis/snowman.png"> :<span class="name">snowman</span>:</div></li>
       <li><div><img src="graphics/emojis/zap.png"> :<span class="name">zap</span>:</div></li>
       <li><div><img src="graphics/emojis/cyclone.png"> :<span class="name">cyclone</span>:</div></li>