diff --git a/jquery-emotions/emotions/calm/beer.png b/jquery-emotions/emotions/calm/beer.png
new file mode 100644
index 0000000..6e45dbb
Binary files /dev/null and b/jquery-emotions/emotions/calm/beer.png differ
diff --git a/jquery-emotions/emotions/calm/confused.png b/jquery-emotions/emotions/calm/confused.png
index ac9f79f..eba9e95 100644
Binary files a/jquery-emotions/emotions/calm/confused.png 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
index 6d38c65..da57f7c 100644
Binary files a/jquery-emotions/emotions/calm/cry.png and b/jquery-emotions/emotions/calm/cry.png differ
diff --git a/jquery-emotions/emotions/calm/friends.png b/jquery-emotions/emotions/calm/friends.png
new file mode 100644
index 0000000..d2d7b63
Binary files /dev/null and b/jquery-emotions/emotions/calm/friends.png differ
diff --git a/jquery-emotions/emotions/calm/mimi.png b/jquery-emotions/emotions/calm/mimi.png
new file mode 100644
index 0000000..afff2be
Binary files /dev/null and b/jquery-emotions/emotions/calm/mimi.png differ
diff --git a/jquery-emotions/jquery.emotions.calm.css b/jquery-emotions/jquery.emotions.calm.css
index 3fbbee2..11a1910 100644
--- a/jquery-emotions/jquery.emotions.calm.css
+++ b/jquery-emotions/jquery.emotions.calm.css
@@ -12,18 +12,45 @@
     background: url("emotions/calm/angel.png");
 }
 
+.emo-beer {
+    background: url("emotions/calm/beer.png");
+    width: 36px;
+    height: 22px;
+}
 .emo-confused {
     background: url("emotions/calm/confused.png");
 }
 
+.emo-cry {
+    background: url("emotions/calm/cry.png");
+}
+
 .emo-devil {
     background: url("emotions/calm/devil.png");
 }
 
+.emo-friends {
+    background: url("emotions/calm/friends.png");
+    width: 67px;
+    height: 23px;
+}
+
+.emo-frown {
+    background: url("emotions/calm/frown.png");
+}
+
+.emo-glasses {
+    background: url("emotions/calm/glasses.png");
+}
+
 .emo-grin {
     background: url("emotions/calm/grin.png");
 }
 
+.emo-grumpy {
+    background: url("emotions/calm/grumpy.png");
+}
+
 .emo-heart {
     background: url("emotions/calm/heart.png");
 }
@@ -32,6 +59,10 @@
     background: url("emotions/calm/kiss.png");
 }
 
+.emo-mimi {
+    background: url("emotions/calm/mimi.png");
+}
+
 .emo-smile {
     background: url("emotions/calm/smile.png");
 }
@@ -40,6 +71,10 @@
     background: url("emotions/calm/sunglasses.png");
 }
 
+.emo-tongue {
+    background: url("emotions/calm/tongue.png");
+}
+
 .emo-unsure {
     background: url("emotions/calm/unsure.png");
 }
@@ -48,22 +83,9 @@
     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.js b/jquery-emotions/jquery.emotions.js
index 2a94530..67b50ff 100644
--- a/jquery-emotions/jquery.emotions.js
+++ b/jquery-emotions/jquery.emotions.js
@@ -31,10 +31,12 @@
                 "o:-)": "angel",
                 "O:-)": "angel",
                 "0:-)": "angel",
+                ":beer:": "beer",
                 "o.O": "confused",
                 "o_O": "confused",
                 ":'(": "cry",
                 "3:)": "devil",
+                ":friends:": "friends",
                 ":(": "frown",
                 "=(": "frown",
                 ":-(": "frown",
@@ -44,6 +46,10 @@
                 ">:(": "grumpy",
                 "<3": "heart",
                 ":*": "kiss",
+                "^_^": "mimi",
+                "^^": "mimi",
+                "^ ^": "mimi",
+                "^-^": "mimi",
                 ":-)": "smile",
                 ":]": "smile",
                 ":)": "smile",