diff --git a/home.html b/home.html
index bea3d0f..81c8481 100644
--- a/home.html
+++ b/home.html
@@ -5,7 +5,7 @@
     <title>twister</title>
     <link rel="stylesheet" href="css/style.css" type="text/css"/>
     <link rel="stylesheet" href="css/profile.css" type="text/css"/>
-    <link rel="stylesheet" href="jquery-emotions/jquery.emotions.fb.css" type="text/css"/>
+    <link rel="stylesheet" href="jquery-emotions/jquery.emotions.calm.css" type="text/css"/>
     <script src="js/jquery.min.js"></script>
     <script src="js/jQueryPlugins.js"></script>
     <script src="js/jquery.json-2.4.js"></script>
diff --git a/jquery-emotions/emotions/calm/angel.png b/jquery-emotions/emotions/calm/angel.png
new file mode 100644
index 0000000..aa859ee
Binary files /dev/null and b/jquery-emotions/emotions/calm/angel.png differ
diff --git a/jquery-emotions/emotions/calm/confused.png b/jquery-emotions/emotions/calm/confused.png
new file mode 100644
index 0000000..ac9f79f
Binary files /dev/null and b/jquery-emotions/emotions/calm/confused.png differ
diff --git a/jquery-emotions/emotions/calm/cry.png b/jquery-emotions/emotions/calm/cry.png
new file mode 100644
index 0000000..6d38c65
Binary files /dev/null and b/jquery-emotions/emotions/calm/cry.png differ
diff --git a/jquery-emotions/emotions/calm/devil.png b/jquery-emotions/emotions/calm/devil.png
new file mode 100644
index 0000000..ad51be4
Binary files /dev/null and b/jquery-emotions/emotions/calm/devil.png differ
diff --git a/jquery-emotions/emotions/calm/frown.png b/jquery-emotions/emotions/calm/frown.png
new file mode 100644
index 0000000..0813240
Binary files /dev/null and b/jquery-emotions/emotions/calm/frown.png differ
diff --git a/jquery-emotions/emotions/calm/glasses.png b/jquery-emotions/emotions/calm/glasses.png
new file mode 100644
index 0000000..e8870d1
Binary files /dev/null and b/jquery-emotions/emotions/calm/glasses.png differ
diff --git a/jquery-emotions/emotions/calm/grin.png b/jquery-emotions/emotions/calm/grin.png
new file mode 100644
index 0000000..0fa878d
Binary files /dev/null and b/jquery-emotions/emotions/calm/grin.png differ
diff --git a/jquery-emotions/emotions/calm/grumpy.png b/jquery-emotions/emotions/calm/grumpy.png
new file mode 100644
index 0000000..f7786f5
Binary files /dev/null and b/jquery-emotions/emotions/calm/grumpy.png differ
diff --git a/jquery-emotions/emotions/calm/heart.png b/jquery-emotions/emotions/calm/heart.png
new file mode 100644
index 0000000..9cbbc9a
Binary files /dev/null and b/jquery-emotions/emotions/calm/heart.png differ
diff --git a/jquery-emotions/emotions/calm/kiss.png b/jquery-emotions/emotions/calm/kiss.png
new file mode 100644
index 0000000..1fc2251
Binary files /dev/null and b/jquery-emotions/emotions/calm/kiss.png differ
diff --git a/jquery-emotions/emotions/calm/smile.png b/jquery-emotions/emotions/calm/smile.png
new file mode 100644
index 0000000..ede45c0
Binary files /dev/null and b/jquery-emotions/emotions/calm/smile.png differ
diff --git a/jquery-emotions/emotions/calm/sunglasses.png b/jquery-emotions/emotions/calm/sunglasses.png
new file mode 100644
index 0000000..f4bbec8
Binary files /dev/null and b/jquery-emotions/emotions/calm/sunglasses.png differ
diff --git a/jquery-emotions/emotions/calm/tongue.png b/jquery-emotions/emotions/calm/tongue.png
new file mode 100644
index 0000000..cfed661
Binary files /dev/null and b/jquery-emotions/emotions/calm/tongue.png differ
diff --git a/jquery-emotions/emotions/calm/unsure.png b/jquery-emotions/emotions/calm/unsure.png
new file mode 100644
index 0000000..86dc018
Binary files /dev/null and b/jquery-emotions/emotions/calm/unsure.png differ
diff --git a/jquery-emotions/emotions/calm/wink.png b/jquery-emotions/emotions/calm/wink.png
new file mode 100644
index 0000000..d4c7b54
Binary files /dev/null and b/jquery-emotions/emotions/calm/wink.png differ
diff --git a/jquery-emotions/jquery.emotions.calm.css b/jquery-emotions/jquery.emotions.calm.css
new file mode 100644
index 0000000..6b3938f
--- /dev/null
+++ b/jquery-emotions/jquery.emotions.calm.css
@@ -0,0 +1,67 @@
+.emotions {
+    width: 22px;
+    height: 22px;
+    background: url("emotions/blank.png") no-repeat center center;
+    display: inline-block;
+    vertical-align: top;
+}
+
+.emo-angel {
+    background: url("emotions/calm/angel.png");
+}
+
+.emo-confused {
+    background: url("emotions/calm/confused.png");
+}
+
+.emo-devil {
+    background: url("emotions/calm/devil.png");
+}
+
+.emo-grin {
+    background: url("emotions/calm/grin.png");
+}
+
+.emo-heart {
+    background: url("emotions/calm/heart.png");
+}
+
+.emo-kiss {
+    background: url("emotions/calm/kiss.png");
+}
+
+.emo-smile {
+    background: url("emotions/calm/smile.png");
+}
+
+.emo-sunglasses {
+    background: url("emotions/calm/sunglasses.png");
+}
+
+.emo-unsure {
+    background: url("emotions/calm/unsure.png");
+}
+
+.emo-wink {
+    background: url("emotions/calm/wink.png");
+}
+
+.emo-cry {
+    background: url("emotions/calm/cry.png");
+}
+
+.emo-glasses {
+    background: url("emotions/calm/glasses.png");
+}
+
+.emo-grumpy {
+    background: url("emotions/calm/grumpy.png");
+}
+
+.emo-tongue {
+    background: url("emotions/calm/tongue.png");
+}
+
+.emo-frown {
+    background: url("emotions/calm/frown.png");
+}
\ No newline at end of file
diff --git a/jquery-emotions/jquery.emotions.fb.css b/jquery-emotions/jquery.emotions.fb.css
index 9486d12..c4ef1bf 100644
--- a/jquery-emotions/jquery.emotions.fb.css
+++ b/jquery-emotions/jquery.emotions.fb.css
@@ -7,65 +7,65 @@
 }
 
 .emo-angel {
-    background: url("emotions/fb/angel.gif");
+    background: url("emotions/calm/angel.gif");
     width: 16px;
     height: 15px;
 }
 
 .emo-confused {
-    background: url("emotions/fb/confused.gif");
+    background: url("emotions/calm/confused.gif");
 }
 
 .emo-devil {
-    background: url("emotions/fb/devil.gif");
+    background: url("emotions/calm/devil.gif");
     height: 15px;
 }
 
 .emo-grin {
-    background: url("emotions/fb/grin.gif");
+    background: url("emotions/calm/grin.gif");
 }
 
 .emo-heart {
-    background: url("emotions/fb/heart.gif");
+    background: url("emotions/calm/heart.gif");
     width: 15px;
 }
 
 .emo-kiss {
-    background: url("emotions/fb/kiss.gif");
+    background: url("emotions/calm/kiss.gif");
 }
 
 .emo-smile {
-    background: url("emotions/fb/smile.gif");
+    background: url("emotions/calm/smile.gif");
 }
 
 .emo-sunglasses {
-    background: url("emotions/fb/sunglasses.gif");
+    background: url("emotions/calm/sunglasses.gif");
 }
 
 .emo-unsure {
-    background: url("emotions/fb/unsure.gif");
+    background: url("emotions/calm/unsure.gif");
 }
 
 .emo-wink {
-    background: url("emotions/fb/wink.gif");
+    background: url("emotions/calm/wink.gif");
 }
 
 .emo-cry {
-    background: url("emotions/fb/cry.gif");
+    background: url("emotions/calm/cry.gif");
 }
 
 .emo-glasses {
-    background: url("emotions/fb/glasses.gif");
+    background: url("emotions/calm/glasses.gif");
 }
 
 .emo-grumpy {
-    background: url("emotions/fb/grumpy.gif");
+    background: url("emotions/calm/grumpy.gif");
 }
 
 .emo-tongue {
-    background: url("emotions/fb/tongue.gif");
+    background: url("emotions/calm/tongue.gif");
 }
 
 .emo-frown {
-    background: url("emotions/fb/frown.gif");
+    background: url("emotions/calm/frown.gif");
 }
\ No newline at end of file
diff --git a/jquery-emotions/jquery.emotions.js b/jquery-emotions/jquery.emotions.js
index 80cb809..a4a111e 100644
--- a/jquery-emotions/jquery.emotions.js
+++ b/jquery-emotions/jquery.emotions.js
@@ -26,7 +26,13 @@
             replacement: '<span class="emotions emo-{eId}"></span>',
             map: {
                 "o:)": "angel",
+                "0:)": "angel",
+                "O:)": "angel",
+                "o:-)": "angel",
+                "O:-)": "angel",
+                "0:-)": "angel",
                 "o.O": "confused",
+                "o_O": "confused",
                 "3:)": "devil",
                 "<3": "heart",
                 ":*": "kiss",
@@ -34,15 +40,21 @@
                 ":]": "smile",
                 "8|": "sunglasses",
                 ":/": "unsure",
+                ":\\": "unsure",
                 ";)": "wink",
+                ";-)": "wink",
                 ":'(": "cry",
                 ">:(": "grumpy",
                 ":(": "frown",
+                "=(": "frown",
+                ":-(": "frown",
                 "8)": "glasses",
                 ":p": "tongue",
+                ":P": "tongue",
                 ":)": "smile",
                 "=)": "smile",
-                ":D": "grin"
+                ":D": "grin",
+                ":-D": "grin"
             }
         },
         shortcode: function(eId){