diff --git a/data/moods/default/afraid.png b/data/moods/default/afraid.png
index 0de7525eee23dbf232c70bd3c8eced49eaf78584..9b2e2aa25182a1fbcf4fbfc67f0dbf162a0fa2fa 100644
Binary files a/data/moods/default/afraid.png and b/data/moods/default/afraid.png differ
diff --git a/data/moods/default/amazed.png b/data/moods/default/amazed.png
index b40f9061fb91bafe3645f5003c05ce938df16142..1ceaa603b0789b6d71f60770fe59cf75663b478a 100644
Binary files a/data/moods/default/amazed.png and b/data/moods/default/amazed.png differ
diff --git a/data/moods/default/amorous.png b/data/moods/default/amorous.png
new file mode 100644
index 0000000000000000000000000000000000000000..742105e117f0d005ef9a02d044012cab7f5268dc
Binary files /dev/null and b/data/moods/default/amorous.png differ
diff --git a/data/moods/default/angry.png b/data/moods/default/angry.png
index 833b206578e738eba3d83669f929441c9a27d8ac..46c0e6dca756ea84f9a89e2fe8812b5473427a73 100644
Binary files a/data/moods/default/angry.png and b/data/moods/default/angry.png differ
diff --git a/data/moods/default/annoyed.png b/data/moods/default/annoyed.png
index 6149383eb1d50ef82e66b336b84129c83af9acf8..76616aec5772f0f0f9de1a72b61708e1427716ee 100644
Binary files a/data/moods/default/annoyed.png and b/data/moods/default/annoyed.png differ
diff --git a/data/moods/default/anxious.png b/data/moods/default/anxious.png
index 37fc5f5dd4ab4dad62943389a5b0710272a8f7db..59a4960710b02c6b1e5f769ff8880dba2ca5a140 100644
Binary files a/data/moods/default/anxious.png and b/data/moods/default/anxious.png differ
diff --git a/data/moods/default/aroused.png b/data/moods/default/aroused.png
index 8171a341b9e0b31801fa5dd46f9d7d49704066c2..1f022d783d746f05098cf9859b41147f5f16191e 100644
Binary files a/data/moods/default/aroused.png and b/data/moods/default/aroused.png differ
diff --git a/data/moods/default/ashamed.png b/data/moods/default/ashamed.png
index d865f56e4faa018b5bddef2983c64254b43b8cd4..9139a706fa6b401d143af231fa8fc1111b8f2c36 100644
Binary files a/data/moods/default/ashamed.png and b/data/moods/default/ashamed.png differ
diff --git a/data/moods/default/bored.png b/data/moods/default/bored.png
index 8f1ef75014e8fc8fa8aad653ff70227faf9c15c9..b0b562abe32dff92445d4681d327fc4c4a30378a 100644
Binary files a/data/moods/default/bored.png and b/data/moods/default/bored.png differ
diff --git a/data/moods/default/brave.png b/data/moods/default/brave.png
index e9f10c1c2eb5daf778847b53582e109d81473bdc..9351a2583c9225761d3754f0f60ca5a345dfcc19 100644
Binary files a/data/moods/default/brave.png and b/data/moods/default/brave.png differ
diff --git a/data/moods/default/calm.png b/data/moods/default/calm.png
index 770c2dc17c2061432b4cdbf0f72b074de3894977..4b5d0baa1bcc529fa8e853325322f55a2cd3babf 100644
Binary files a/data/moods/default/calm.png and b/data/moods/default/calm.png differ
diff --git a/data/moods/default/cautious.png b/data/moods/default/cautious.png
new file mode 100644
index 0000000000000000000000000000000000000000..293fab7f0838303a733530bceb1e65b6bb93d25d
Binary files /dev/null and b/data/moods/default/cautious.png differ
diff --git a/data/moods/default/cold.png b/data/moods/default/cold.png
index 8a578dbc04983e675b11bc4a807564246e5482da..c52f65dfb65f5f5bb284c3847fc7e5bcc95eb3fa 100644
Binary files a/data/moods/default/cold.png and b/data/moods/default/cold.png differ
diff --git a/data/moods/default/confident.png b/data/moods/default/confident.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0da5932d84396e0b54136bfaa3ec0ad734ff241
Binary files /dev/null and b/data/moods/default/confident.png differ
diff --git a/data/moods/default/confused.png b/data/moods/default/confused.png
index c726e74e17c4a746601eea6114a1155d617b5bdb..4121aec4f62d1ed5213b438284d6619a538fa069 100644
Binary files a/data/moods/default/confused.png and b/data/moods/default/confused.png differ
diff --git a/data/moods/default/contemplative.png b/data/moods/default/contemplative.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d448293dc6e45ebb652b6d637f0326d1fc4b9b6
Binary files /dev/null and b/data/moods/default/contemplative.png differ
diff --git a/data/moods/default/contented.png b/data/moods/default/contented.png
index cfc9b1879d78a2a5daa68ead3f229c8c1f8c4836..ad6ba86ecae82d300b96d34a4d1cdf171a543d3c 100644
Binary files a/data/moods/default/contented.png and b/data/moods/default/contented.png differ
diff --git a/data/moods/default/cranky.png b/data/moods/default/cranky.png
index ce47ce9755680a925d6b975b5c2ef4f9bcaf9164..08dccb7fd26b66c5e895f5bebd1afa8d3439a908 100644
Binary files a/data/moods/default/cranky.png and b/data/moods/default/cranky.png differ
diff --git a/data/moods/default/crazy.png b/data/moods/default/crazy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6390d50f57b96ee473685ccdae98e8ff4f9ab83c
Binary files /dev/null and b/data/moods/default/crazy.png differ
diff --git a/data/moods/default/creative.png b/data/moods/default/creative.png
new file mode 100644
index 0000000000000000000000000000000000000000..321576d0855db358d5bfd8a1af1b09dd3a6a3ee1
Binary files /dev/null and b/data/moods/default/creative.png differ
diff --git a/data/moods/default/curious.png b/data/moods/default/curious.png
index b3d1ee9fbae7fff2c5e48d55d426dff7bb57210c..2fc236394513a2ab629c30ed957c7bb3d058cb31 100644
Binary files a/data/moods/default/curious.png and b/data/moods/default/curious.png differ
diff --git a/data/moods/default/dejected.png b/data/moods/default/dejected.png
new file mode 100644
index 0000000000000000000000000000000000000000..987636b72bf3247fc1d47b56ebd684684096d0fb
Binary files /dev/null and b/data/moods/default/dejected.png differ
diff --git a/data/moods/default/depressed.png b/data/moods/default/depressed.png
index 138358cb0d13c009ec738e1364e09fc11254064f..86f5dcd3253c430be1504ef168ee9fd29c4d1f26 100644
Binary files a/data/moods/default/depressed.png and b/data/moods/default/depressed.png differ
diff --git a/data/moods/default/disappointed.png b/data/moods/default/disappointed.png
index d1269b82d701e9f3c51c79fccfeaa0a17ab4b526..bd7557defe0af9958f3ac9dc2fe0e6f4e63c3f09 100644
Binary files a/data/moods/default/disappointed.png and b/data/moods/default/disappointed.png differ
diff --git a/data/moods/default/disgusted.png b/data/moods/default/disgusted.png
index 8cc505eb64eb98eab9848effb6d256af4e48a1b1..14f426cb4508c67d094cd8b6ffc95a8ef1d3b634 100644
Binary files a/data/moods/default/disgusted.png and b/data/moods/default/disgusted.png differ
diff --git a/data/moods/default/dismayed.png b/data/moods/default/dismayed.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbd7eea6496d8e2dc110568dcd9f38b5252f6a54
Binary files /dev/null and b/data/moods/default/dismayed.png differ
diff --git a/data/moods/default/distracted.png b/data/moods/default/distracted.png
index a7b14637d4c2c61970326074e5e473465a5bb624..9fc9586cd2cd26758995cce8b34e5dcfc6f14645 100644
Binary files a/data/moods/default/distracted.png and b/data/moods/default/distracted.png differ
diff --git a/data/moods/default/embarrassed.png b/data/moods/default/embarrassed.png
index b05c3af04fc99b5992280d52f798f2534ae3a597..a44225140ebd78835aea6e42078e727967880cfe 100644
Binary files a/data/moods/default/embarrassed.png and b/data/moods/default/embarrassed.png differ
diff --git a/data/moods/default/envious.png b/data/moods/default/envious.png
new file mode 100644
index 0000000000000000000000000000000000000000..456b71e6e6e50241da53d78da72e0dc38612e86f
Binary files /dev/null and b/data/moods/default/envious.png differ
diff --git a/data/moods/default/excited.png b/data/moods/default/excited.png
index f622dc27a779687853c29723f8b57d2a8617fe05..c7c0ba2baf4345998e887d19d60c438284455113 100644
Binary files a/data/moods/default/excited.png and b/data/moods/default/excited.png differ
diff --git a/data/moods/default/flirtatious.png b/data/moods/default/flirtatious.png
index 05e9a69422bf1fd9627b0fe04c8fa6cd4042c750..f4ecf1129625d9b4ac9d06a21e2ad4259a73f12d 100644
Binary files a/data/moods/default/flirtatious.png and b/data/moods/default/flirtatious.png differ
diff --git a/data/moods/default/frustrated.png b/data/moods/default/frustrated.png
index 9d180df902d726f1eff3584be6e9406b99aead76..2d2b0b6424a4b990a8614db26d972190216870a2 100644
Binary files a/data/moods/default/frustrated.png and b/data/moods/default/frustrated.png differ
diff --git a/data/moods/default/grateful.png b/data/moods/default/grateful.png
new file mode 100644
index 0000000000000000000000000000000000000000..902166cc9759a50ec4e864cd8908b6a9f25bc87c
Binary files /dev/null and b/data/moods/default/grateful.png differ
diff --git a/data/moods/default/grieving.png b/data/moods/default/grieving.png
new file mode 100644
index 0000000000000000000000000000000000000000..097264877ad96728500e9322c3ec6b0862ac287b
Binary files /dev/null and b/data/moods/default/grieving.png differ
diff --git a/data/moods/default/grumpy.png b/data/moods/default/grumpy.png
index b70737fb302c757367981b3299ad05300c59e9ed..3fec5d171c3a678b6708c167eeb8f91003edd88a 100644
Binary files a/data/moods/default/grumpy.png and b/data/moods/default/grumpy.png differ
diff --git a/data/moods/default/guilty.png b/data/moods/default/guilty.png
index f26c8d35ff31def0aac89dfc874400c321d6930c..1c43b94708f02a48bc35f63d26a5ed984c9d6adc 100644
Binary files a/data/moods/default/guilty.png and b/data/moods/default/guilty.png differ
diff --git a/data/moods/default/happy.png b/data/moods/default/happy.png
index 7048cbf7455dafffce37451af4cbd02907dcbb00..09e2d52653852d1ec8bf0a0987ca06f1606e0f9d 100644
Binary files a/data/moods/default/happy.png and b/data/moods/default/happy.png differ
diff --git a/data/moods/default/hopeful.png b/data/moods/default/hopeful.png
new file mode 100644
index 0000000000000000000000000000000000000000..14ab9312e4ce3d64182b9c6af1894abef1549792
Binary files /dev/null and b/data/moods/default/hopeful.png differ
diff --git a/data/moods/default/hot.png b/data/moods/default/hot.png
index 37456cf56feaeab5b8c6530faacf18e0bdd00a5d..121e9117c6b4c4a03fc5de81e4090c12b6a733f3 100644
Binary files a/data/moods/default/hot.png and b/data/moods/default/hot.png differ
diff --git a/data/moods/default/humbled.png b/data/moods/default/humbled.png
index b74765330060a4990ae08362bef27f6c35cb66a7..a519b3d8f1a16023ddf71ac39ecbdac9a435b9d2 100644
Binary files a/data/moods/default/humbled.png and b/data/moods/default/humbled.png differ
diff --git a/data/moods/default/humiliated.png b/data/moods/default/humiliated.png
index 3b4f00f9999e0da99851d720c804a41d692efc6c..e4476b9b32e135d1ad4a63d267de173fc84d17d0 100644
Binary files a/data/moods/default/humiliated.png and b/data/moods/default/humiliated.png differ
diff --git a/data/moods/default/hungry.png b/data/moods/default/hungry.png
index e756a9562c0cab3f91c944e32f54bb23356283b4..3546c7a287fcb55f7821ba72729e7ef70d94095d 100644
Binary files a/data/moods/default/hungry.png and b/data/moods/default/hungry.png differ
diff --git a/data/moods/default/hurt.png b/data/moods/default/hurt.png
index f4a12ee9b7181480d0bfd61c9cdc9d6dfea89b54..74ea88a5f70eeb54462f40785e8f01494775fc78 100644
Binary files a/data/moods/default/hurt.png and b/data/moods/default/hurt.png differ
diff --git a/data/moods/default/impressed.png b/data/moods/default/impressed.png
index 169a83675ba72d0974ebb992a1605e280cbae6ce..9e89936d0c6d7018bcff5508d19dc5329240d06c 100644
Binary files a/data/moods/default/impressed.png and b/data/moods/default/impressed.png differ
diff --git a/data/moods/default/in_awe.png b/data/moods/default/in_awe.png
index 41c1802832e6df1ceb4e9a7d18ee7dab4db9685d..c67192f25ac6fb9c16625a2911c0d5e357ccca0d 100644
Binary files a/data/moods/default/in_awe.png and b/data/moods/default/in_awe.png differ
diff --git a/data/moods/default/in_love.png b/data/moods/default/in_love.png
index 8a3de140244c9f592b7e03df9f76134ae47fc112..ea6f4ac396c2bf3a944fee1c0e1a2bf8041ceccd 100644
Binary files a/data/moods/default/in_love.png and b/data/moods/default/in_love.png differ
diff --git a/data/moods/default/indignant.png b/data/moods/default/indignant.png
index f9697e294131e39c70cb97b53c8501443aeda7b0..9b12cb2027c581ecdf7d07e092427734023fca86 100644
Binary files a/data/moods/default/indignant.png and b/data/moods/default/indignant.png differ
diff --git a/data/moods/default/interested.png b/data/moods/default/interested.png
index 14115188cdd45460201f8cd86c1c5761743005fb..e5ac625c9752d81e55eab71ec79bfd2e542c4aac 100644
Binary files a/data/moods/default/interested.png and b/data/moods/default/interested.png differ
diff --git a/data/moods/default/intoxicated.png b/data/moods/default/intoxicated.png
index f7c3486b0bb8d8a6663d29174816aca93a153e1c..89d6fe435a3a072c83f51752e6c9e57ad83396fc 100644
Binary files a/data/moods/default/intoxicated.png and b/data/moods/default/intoxicated.png differ
diff --git a/data/moods/default/invincible.png b/data/moods/default/invincible.png
index 7c9718da8393c3c02400251ab6bb6a0f74a57d6e..59bc5b30589a697958fa97b5347833de7190b3dc 100644
Binary files a/data/moods/default/invincible.png and b/data/moods/default/invincible.png differ
diff --git a/data/moods/default/jealous.png b/data/moods/default/jealous.png
index 3982dd5a389b0b56ec4de8372e833212efbeb7e9..74bc20cc1c0c5e8d59cf2fda1c7d56dcaae0945d 100644
Binary files a/data/moods/default/jealous.png and b/data/moods/default/jealous.png differ
diff --git a/data/moods/default/lonely.png b/data/moods/default/lonely.png
index 831cc3e20af75e2ba296dd54814027ddc305b6c3..cfbd8c66b510792f838f0a7b03d95630827b9707 100644
Binary files a/data/moods/default/lonely.png and b/data/moods/default/lonely.png differ
diff --git a/data/moods/default/lost.png b/data/moods/default/lost.png
new file mode 100644
index 0000000000000000000000000000000000000000..54609d9f5463dc9bd166d1b3ae76a92cfd19bfeb
Binary files /dev/null and b/data/moods/default/lost.png differ
diff --git a/data/moods/default/lucky.png b/data/moods/default/lucky.png
new file mode 100644
index 0000000000000000000000000000000000000000..8997947dcaf035db06e4d8b567326c6aa524ea55
Binary files /dev/null and b/data/moods/default/lucky.png differ
diff --git a/data/moods/default/mean.png b/data/moods/default/mean.png
index 43af07012c134e75be30aa93f68cf53f77a1b8ea..2bf5350ce06af278f1886cc2ca1da557b11a255f 100644
Binary files a/data/moods/default/mean.png and b/data/moods/default/mean.png differ
diff --git a/data/moods/default/moody.png b/data/moods/default/moody.png
index f3ab335a858d003f4f76f3fb734197d8709d53bb..8f4643177d3294fa47715258a44d7d3ea7b8de4c 100644
Binary files a/data/moods/default/moody.png and b/data/moods/default/moody.png differ
diff --git a/data/moods/default/nervous.png b/data/moods/default/nervous.png
index 5ab1cfee82c10996a070dc259704293d91b23bbd..70ff2f03f2a9a5cdb9c07e520e9b40b131605157 100644
Binary files a/data/moods/default/nervous.png and b/data/moods/default/nervous.png differ
diff --git a/data/moods/default/neutral.png b/data/moods/default/neutral.png
index a36e6afd2fd7e9e0b80f410e06fc07d605483cb3..2892d48463ac4f1f43c32de38b82ec54ee532d88 100644
Binary files a/data/moods/default/neutral.png and b/data/moods/default/neutral.png differ
diff --git a/data/moods/default/offended.png b/data/moods/default/offended.png
index 21ef0d84931d108e0e27b6811b755035edd5bc37..0cb4950461e4737af08dc3d9f1319acc1b3c2bf0 100644
Binary files a/data/moods/default/offended.png and b/data/moods/default/offended.png differ
diff --git a/data/moods/default/outraged.png b/data/moods/default/outraged.png
new file mode 100644
index 0000000000000000000000000000000000000000..141380cb472739165f38c01190243f533429b311
Binary files /dev/null and b/data/moods/default/outraged.png differ
diff --git a/data/moods/default/playful.png b/data/moods/default/playful.png
index 755b7c2d19cb67a79999bcc9f0411ec7a210966a..2c52f07f02dffc5ab397bbb93d8c55931dd74508 100644
Binary files a/data/moods/default/playful.png and b/data/moods/default/playful.png differ
diff --git a/data/moods/default/proud.png b/data/moods/default/proud.png
index 88e12b7a1915c7967d41e22d3ec149f7d321b2d0..788df04af0458b8e07e60e94629db5b2535bd09c 100644
Binary files a/data/moods/default/proud.png and b/data/moods/default/proud.png differ
diff --git a/data/moods/default/relaxed.png b/data/moods/default/relaxed.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e596492a858d6ef6485dd894beb91c21020af88
Binary files /dev/null and b/data/moods/default/relaxed.png differ
diff --git a/data/moods/default/relieved.png b/data/moods/default/relieved.png
index 2d76cdb3f9a0df96896d5e7ef216628d02791fa2..9d0eb788489595660f1704260f4c06dd12d5d014 100644
Binary files a/data/moods/default/relieved.png and b/data/moods/default/relieved.png differ
diff --git a/data/moods/default/remorseful.png b/data/moods/default/remorseful.png
index 59793fcf11644f5ea9cf250d3937d166dfa8c624..b5d060453b7f3cd02b66d82ef378ca9a5035f776 100644
Binary files a/data/moods/default/remorseful.png and b/data/moods/default/remorseful.png differ
diff --git a/data/moods/default/restless.png b/data/moods/default/restless.png
index 6574b5508b03249edef2e40405841f491aa8b3c9..89276398fbbced9cf4b13bd76083bfb08bb11e68 100644
Binary files a/data/moods/default/restless.png and b/data/moods/default/restless.png differ
diff --git a/data/moods/default/sad.png b/data/moods/default/sad.png
index 32cd11e1262243e16cbe78b2621acfd8fdbed6a6..14006836c9854b3e61b2a63b32a3c96c0581c3ad 100644
Binary files a/data/moods/default/sad.png and b/data/moods/default/sad.png differ
diff --git a/data/moods/default/sarcastic.png b/data/moods/default/sarcastic.png
index 43dca9383977c860cc55a042c5af83211924db3c..5a28d210e646e46ae7b3e87efe4910c8ac9f07c5 100644
Binary files a/data/moods/default/sarcastic.png and b/data/moods/default/sarcastic.png differ
diff --git a/data/moods/default/satisfied.png b/data/moods/default/satisfied.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ee971e4439b2d03d9b809eb25fa6d71c31f02b7
Binary files /dev/null and b/data/moods/default/satisfied.png differ
diff --git a/data/moods/default/serious.png b/data/moods/default/serious.png
index df65d111bb8fbf5b97bbc979d2fe94e8dfbc02a5..ae5fe589b0b650cbef10a32e297e5452f9efde27 100644
Binary files a/data/moods/default/serious.png and b/data/moods/default/serious.png differ
diff --git a/data/moods/default/shocked.png b/data/moods/default/shocked.png
index 1955eb1dcaaafb18fa85369e4420603883b0ec87..3e335cffa835a143bf583ec02bdbea426392c064 100644
Binary files a/data/moods/default/shocked.png and b/data/moods/default/shocked.png differ
diff --git a/data/moods/default/shy.png b/data/moods/default/shy.png
index 90ddc383a082d6aaf8f06bc035c371b2a2226c46..9409f81df746c4f169e71afe4419b38cb6298a41 100644
Binary files a/data/moods/default/shy.png and b/data/moods/default/shy.png differ
diff --git a/data/moods/default/sick.png b/data/moods/default/sick.png
index 4c738eb815213cf91b05e5f5c4eff8e8a82d105e..5e3b41ac95ad487a291d9c2cd62c93215d99d4ec 100644
Binary files a/data/moods/default/sick.png and b/data/moods/default/sick.png differ
diff --git a/data/moods/default/sleepy.png b/data/moods/default/sleepy.png
index 78c17a7762e2ff84e22ed1fd1080a7be2b619d83..47bed88475a6679ecfec0d1010f6c592c2ff95cf 100644
Binary files a/data/moods/default/sleepy.png and b/data/moods/default/sleepy.png differ
diff --git a/data/moods/default/spontaneous.png b/data/moods/default/spontaneous.png
new file mode 100644
index 0000000000000000000000000000000000000000..75be432032a86c86ffe7f80df595d34bdddda9bc
Binary files /dev/null and b/data/moods/default/spontaneous.png differ
diff --git a/data/moods/default/stressed.png b/data/moods/default/stressed.png
index b70f452dd6dab7a73e5332876bbba9ffffbe23d4..92b47782aff2b97e406e7f7114538f9867c15d63 100644
Binary files a/data/moods/default/stressed.png and b/data/moods/default/stressed.png differ
diff --git a/data/moods/default/strong.png b/data/moods/default/strong.png
new file mode 100644
index 0000000000000000000000000000000000000000..044a1c83a8cf4c9c719deb1cf92309899b2aaaa5
Binary files /dev/null and b/data/moods/default/strong.png differ
diff --git a/data/moods/default/surprised.png b/data/moods/default/surprised.png
index 2bc3708636a9717c12b5865323fe16aa611c6714..c1f5f17991d8ea938e7aae067d64765de42c06cd 100644
Binary files a/data/moods/default/surprised.png and b/data/moods/default/surprised.png differ
diff --git a/data/moods/default/thankful.png b/data/moods/default/thankful.png
new file mode 100644
index 0000000000000000000000000000000000000000..e01ffe614f6215327ca0364948c9c36a32a6d155
Binary files /dev/null and b/data/moods/default/thankful.png differ
diff --git a/data/moods/default/thirsty.png b/data/moods/default/thirsty.png
index 1cf9a563162e441805f36e54e495d304ea1f29b6..9b0fc962ac0d9c384576f30b6017c118e65234a0 100644
Binary files a/data/moods/default/thirsty.png and b/data/moods/default/thirsty.png differ
diff --git a/data/moods/default/thoughtful.png b/data/moods/default/thoughtful.png
deleted file mode 100644
index 8d1f93719ba21bd45bdaab8d15b0439cb68338a6..0000000000000000000000000000000000000000
Binary files a/data/moods/default/thoughtful.png and /dev/null differ
diff --git a/data/moods/default/tired.png b/data/moods/default/tired.png
new file mode 100644
index 0000000000000000000000000000000000000000..60bcc5b481b9d0d53ac101e0a84b17db014b1fff
Binary files /dev/null and b/data/moods/default/tired.png differ
diff --git a/data/moods/default/undefined.png b/data/moods/default/undefined.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc3d8b17357334786abe79947618bf5f3db0d341
Binary files /dev/null and b/data/moods/default/undefined.png differ
diff --git a/data/moods/default/weak.png b/data/moods/default/weak.png
new file mode 100644
index 0000000000000000000000000000000000000000..b353131a991d0b0e987e8ff00c7aaa570b58f555
Binary files /dev/null and b/data/moods/default/weak.png differ
diff --git a/data/moods/default/worried.png b/data/moods/default/worried.png
index 3bc126ab7956963f8b2fe98b2f8060ae67ae1ceb..5499458cc4744cc844e38a4953aa32943d7d9dd8 100644
Binary files a/data/moods/default/worried.png and b/data/moods/default/worried.png differ
diff --git a/src/common/pep.py b/src/common/pep.py
index 38c38256139ff50f58f962b73cebd5cb5e755c6e..59e0ab2c27feae2e4668c24cc0f0e03fd9cdc63a 100644
--- a/src/common/pep.py
+++ b/src/common/pep.py
@@ -26,40 +26,90 @@
from common import gajim, xmpp
MOODS = {
- 'afraid': _('Afraid'), 'amazed': _('Amazed'),
- 'angry': _('Angry'), 'annoyed': _('Annoyed'),
- 'anxious': _('Anxious'), 'aroused': _('Aroused'),
- 'ashamed': _('Ashamed'), 'bored': _('Bored'),
- 'brave': _('Brave'), 'calm': _('Calm'),
- 'cold': _('Cold'), 'confused': _('Confused'),
- 'contented': _('Contented'), 'cranky': _('Cranky'),
- 'curious': _('Curious'), 'depressed': _('Depressed'),
- 'disappointed': _('Disappointed'), 'disgusted': _('Disgusted'),
- 'distracted': _('Distracted'), 'embarrassed': _('Embarrassed'),
- 'excited': _('Excited'), 'flirtatious': _('Flirtatious'),
- 'frustrated': _('Frustrated'), 'grumpy': _('Grumpy'),
- 'guilty': _('Guilty'), 'happy': _('Happy'),
- 'hot': _('Hot'), 'humbled': _('Humbled'),
- 'humiliated': _('Humiliated'), 'hungry': _('Hungry'),
- 'hurt': _('Hurt'), 'impressed': _('Impressed'),
- 'in_awe': _('In Awe'), 'in_love': _('In Love'),
- 'indignant': _('Indignant'), 'interested': _('Interested'),
- 'intoxicated': _('Intoxicated'), 'invincible': _('Invincible'),
- 'jealous': _('Jealous'), 'lonely': _('Lonely'),
- 'mean': _('Mean'), 'moody': _('Moody'),
- 'nervous': _('Nervous'), 'neutral': _('Neutral'),
- 'offended': _('Offended'), 'playful': _('Playful'),
- 'proud': _('Proud'), 'relieved': _('Relieved'),
- 'remorseful': _('Remorseful'), 'restless': _('Restless'),
- 'sad': _('Sad'), 'sarcastic': _('Sarcastic'),
- 'serious': _('Serious'), 'shocked': _('Shocked'),
- 'shy': _('Shy'), 'sick': _('Sick'),
- 'sleepy': _('Sleepy'), 'stressed': _('Stressed'),
- 'surprised': _('Surprised'), 'thirsty': _('Thirsty'),
- 'thoughtful': _('Thoughtful'), 'worried': _('Worried')}
-
-# These moods are only available in the Gajim namespace
-GAJIM_MOODS = ['thoughtful']
+ 'afraid': _('Afraid'),
+ 'amazed': _('Amazed'),
+ 'amorous': _('Amorous'),
+ 'angry': _('Angry'),
+ 'annoyed': _('Annoyed'),
+ 'anxious': _('Anxious'),
+ 'aroused': _('Aroused'),
+ 'ashamed': _('Ashamed'),
+ 'bored': _('Bored'),
+ 'brave': _('Brave'),
+ 'calm': _('Calm'),
+ 'cautious': _('Cautious'),
+ 'cold': _('Cold'),
+ 'confident': _('Confident'),
+ 'confused': _('Confused'),
+ 'contemplative': _('Contemplative'),
+ 'contented': _('Contented'),
+ 'cranky': _('Cranky'),
+ 'crazy': _('Crazy'),
+ 'creative': _('Creative'),
+ 'curious': _('Curious'),
+ 'dejected': _('Dejected'),
+ 'depressed': _('Depressed'),
+ 'disappointed': _('Disappointed'),
+ 'disgusted': _('Disgusted'),
+ 'dismayed': _('Dismayed'),
+ 'distracted': _('Distracted'),
+ 'embarrassed': _('Embarrassed'),
+ 'envious': _('Envious'),
+ 'excited': _('Excited'),
+ 'flirtatious': _('Flirtatious'),
+ 'frustrated': _('Frustrated'),
+ 'grateful': _('Grateful'),
+ 'grieving': _('Grieving'),
+ 'grumpy': _('Grumpy'),
+ 'guilty': _('Guilty'),
+ 'happy': _('Happy'),
+ 'hopeful': _('Hopeful'),
+ 'hot': _('Hot'),
+ 'humbled': _('Humbled'),
+ 'humiliated': _('Humiliated'),
+ 'hungry': _('Hungry'),
+ 'hurt': _('Hurt'),
+ 'impressed': _('Impressed'),
+ 'in_awe': _('In_awe'),
+ 'in_love': _('In_love'),
+ 'indignant': _('Indignant'),
+ 'interested': _('Interested'),
+ 'intoxicated': _('Intoxicated'),
+ 'invincible': _('Invincible'),
+ 'jealous': _('Jealous'),
+ 'lonely': _('Lonely'),
+ 'lost': _('Lost'),
+ 'lucky': _('Lucky'),
+ 'mean': _('Mean'),
+ 'moody': _('Moody'),
+ 'nervous': _('Nervous'),
+ 'neutral': _('Neutral'),
+ 'offended': _('Offended'),
+ 'outraged': _('Outraged'),
+ 'playful': _('Playful'),
+ 'proud': _('Proud'),
+ 'relaxed': _('Relaxed'),
+ 'relieved': _('Relieved'),
+ 'remorseful': _('Remorseful'),
+ 'restless': _('Restless'),
+ 'sad': _('Sad'),
+ 'sarcastic': _('Sarcastic'),
+ 'satisfied': _('Satisfied'),
+ 'serious': _('Serious'),
+ 'shocked': _('Shocked'),
+ 'shy': _('Shy'),
+ 'sick': _('Sick'),
+ 'sleepy': _('Sleepy'),
+ 'spontaneous': _('Spontaneous'),
+ 'stressed': _('Stressed'),
+ 'strong': _('Strong'),
+ 'surprised': _('Surprised'),
+ 'thankful': _('Thankful'),
+ 'thirsty': _('Thirsty'),
+ 'tired': _('Tired'),
+ 'undefined': _('Undefined'),
+ 'weak': _('Weak'),
+ 'worried': _('Worried')}
ACTIVITIES = {
'doing_chores': {'category': _('Doing Chores'),
@@ -418,11 +468,7 @@ def user_send_mood(account, mood, message = ''):
return
item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD})
if mood != '':
- if mood in GAJIM_MOODS:
- ns = 'http://gajim.org/moods'
- else:
- ns = None
- item.addChild(mood, namespace = ns)
+ item.addChild(mood)
if message != '':
i = item.addChild('text')
i.addData(message)