diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 6ce4e7fbc..852c1bcbe 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="89"
+    android:versionCode="90"
     android:versionName="0.0.31.0"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index b7d8f2b1f..4f269d6fd 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -71,18 +71,18 @@ dependencies {
     compile('com.mikepenz:materialdrawer:5.2.6@aar') {
         transitive = true
     }
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:gridlayout-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
-    compile 'com.android.support:preference-v14:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:design:24.0.0'
+    compile 'com.android.support:gridlayout-v7:24.0.0'
+    compile 'com.android.support:recyclerview-v7:24.0.0'
+    compile 'com.android.support:preference-v14:24.0.0'
     compile 'com.android.support:multidex:1.0.1'
 
     // Image Loading/Caching
     compile 'com.squareup.picasso:picasso:2.5.2'
 
     // Emojis
-    compile 'com.github.data5tream:emoji-lib:0.0.2.1'
+    compile 'com.github.viirus:emoji-lib:0.0.3.2'
 
     // Markdown
     compile 'com.commonsware.cwac:anddown:0.2.4'
@@ -133,7 +133,7 @@ dependencies {
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'org.robolectric:shadows-multidex:3.0'
     testCompile "org.robolectric:shadows-support-v4:3.0"
-    testCompile "org.mockito:mockito-core:1.+"
+    testCompile "org.mockito:mockito-core:1.10.19"
 
     //Leak Detection
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
@@ -141,7 +141,7 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 24
     buildToolsVersion "23.0.3"
 
     lintOptions {
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index af46851cb..4d7637ca9 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -42,7 +42,7 @@
                 android:layout_height="match_parent"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
-                <com.github.data5tream.emojilib.EmojiEditText
+                <net.pherth.android.emoji_library.EmojiEditText
                     android:id="@+id/group_description_edittext"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/activity_maintenance.xml b/Habitica/res/layout/activity_maintenance.xml
index 54b3169d5..36ef28caf 100644
--- a/Habitica/res/layout/activity_maintenance.xml
+++ b/Habitica/res/layout/activity_maintenance.xml
@@ -19,7 +19,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="180dp"
                 android:scaleType="centerInside"/>
-        <com.github.data5tream.emojilib.EmojiTextView
+        <net.pherth.android.emoji_library.EmojiTextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 1c61a79e2..507353a58 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -38,7 +38,7 @@
                     android:layout_height="match_parent"
                     app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
-                    <com.github.data5tream.emojilib.EmojiEditText
+                    <net.pherth.android.emoji_library.EmojiEditText
                         android:id="@+id/task_text_edittext"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
                     android:layout_height="72dp"
                     app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
-                    <com.github.data5tream.emojilib.EmojiEditText
+                    <net.pherth.android.emoji_library.EmojiEditText
                         android:id="@+id/task_notes_edittext"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -232,7 +232,7 @@
                     android:background="@drawable/md_transparent"
                     android:contentDescription="Toogle Emoji" />
 
-                <com.github.data5tream.emojilib.EmojiEditText
+                <net.pherth.android.emoji_library.EmojiEditText
                     android:id="@+id/new_checklist"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/checklist_item.xml b/Habitica/res/layout/checklist_item.xml
index 31f2e265f..d2cd4f5f4 100644
--- a/Habitica/res/layout/checklist_item.xml
+++ b/Habitica/res/layout/checklist_item.xml
@@ -17,7 +17,7 @@
         android:id="@+id/delete_item_button"
         android:text="x" />
 
-    <com.github.data5tream.emojilib.EmojiEditText
+    <net.pherth.android.emoji_library.EmojiEditText
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:id="@+id/item_edittext"
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index 5ab74a857..718b821b5 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -19,7 +19,7 @@
             android:button="@drawable/daily_checkbox"
             android:layout_gravity="center_horizontal" />
         </RelativeLayout>
-        <com.github.data5tream.emojilib.EmojiTextView
+        <net.pherth.android.emoji_library.EmojiTextView
             android:id="@+id/checkedTextView"
             style="@style/CardTitle"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 1f1ce83aa..9cdd0a653 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -32,12 +32,12 @@
                 android:paddingTop="@dimen/task_top_bottom_padding"
                 android:id="@+id/linearLayout"
                 android:layout_weight="1">
-            <com.github.data5tream.emojilib.EmojiTextView
+            <net.pherth.android.emoji_library.EmojiTextView
                     android:id="@+id/checkedTextView"
                     style="@style/CardTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
-            <com.github.data5tream.emojilib.EmojiTextView
+            <net.pherth.android.emoji_library.EmojiTextView
                     android:id="@+id/notesTextView"
                     style="@style/CardText"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index e515c18de..f6cbe2ad9 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -61,7 +61,7 @@
                     android:divider="?android:listDivider"
                     android:showDividers="middle"
                     android:orientation="vertical">
-                    <com.github.data5tream.emojilib.EmojiTextView
+                    <net.pherth.android.emoji_library.EmojiTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         bind:parsemarkdown="@{group.description}" />
@@ -74,7 +74,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:text="@{@string/leaderMessage(group.leaderName)}" />
-                        <com.github.data5tream.emojilib.EmojiTextView
+                        <net.pherth.android.emoji_library.EmojiTextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 bind:parsemarkdown="@{group.leaderMessage}"/>
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index 8fcfa7a2d..c8f212339 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -56,13 +56,13 @@
                     android:paddingEnd="16dp"
                     android:paddingBottom="@dimen/task_top_bottom_padding"
                     android:paddingTop="@dimen/task_top_bottom_padding">
-                    <com.github.data5tream.emojilib.EmojiTextView
+                    <net.pherth.android.emoji_library.EmojiTextView
                         android:id="@+id/checkedTextView"
                         style="@style/CardTitle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                    <com.github.data5tream.emojilib.EmojiTextView
+                    <net.pherth.android.emoji_library.EmojiTextView
                         android:id="@+id/notesTextView"
                         style="@style/CardText"
                         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index f000ec02e..a1449417d 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -24,13 +24,13 @@
                         android:paddingRight="@dimen/reward_spacing"
                         android:layout_gravity="center_vertical">
 
-                        <com.github.data5tream.emojilib.EmojiTextView
+                        <net.pherth.android.emoji_library.EmojiTextView
                             android:id="@+id/checkedTextView"
                             style="@style/CardTitle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"/>
 
-                        <com.github.data5tream.emojilib.EmojiTextView
+                        <net.pherth.android.emoji_library.EmojiTextView
                             android:id="@+id/notesTextView"
                             style="@style/CardText"
                             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/tavern_chat_item.xml
index fedfc3372..e1eecce73 100644
--- a/Habitica/res/layout/tavern_chat_item.xml
+++ b/Habitica/res/layout/tavern_chat_item.xml
@@ -96,7 +96,7 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <com.github.data5tream.emojilib.EmojiTextView
+            <net.pherth.android.emoji_library.EmojiTextView
                 android:id="@+id/message_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index cdb6b4301..12246e003 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -34,7 +34,7 @@
             android:layout_weight="1"
             app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
-            <com.github.data5tream.emojilib.EmojiEditText
+            <net.pherth.android.emoji_library.EmojiEditText
                 android:id="@+id/edit.new.message.text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index ea1f4dc63..6f5ed27e7 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -32,13 +32,13 @@
                 android:paddingBottom="@dimen/task_top_bottom_padding"
                 android:paddingTop="@dimen/task_top_bottom_padding"
                 android:layout_weight="1">
-            <com.github.data5tream.emojilib.EmojiTextView
+            <net.pherth.android.emoji_library.EmojiTextView
                     android:id="@+id/checkedTextView"
                     style="@style/CardTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
-            <com.github.data5tream.emojilib.EmojiTextView
+            <net.pherth.android.emoji_library.EmojiTextView
                     android:id="@+id/notesTextView"
                     style="@style/CardText"
                     android:layout_width="match_parent"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
index cad3b770d..32ea55cd8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
@@ -1,12 +1,13 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.github.data5tream.emojilib.EmojiEditText;
-import com.github.data5tream.emojilib.EmojiPopup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
index be874f6f8..535b65799 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.github.data5tream.emojilib.EmojiTextView;
+import net.pherth.android.emoji_library.EmojiTextView;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 5622c79af..14739fb62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.github.data5tream.emojilib.EmojiEditText;
-import com.github.data5tream.emojilib.EmojiPopup;
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
index a9b1ca5a8..b85659703 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.adapter.social;
 
-import com.github.data5tream.emojilib.EmojiEditText;
-import com.github.data5tream.emojilib.EmojiTextView;
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiTextView;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
index b6d006d84..73680e3a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
-import com.github.data5tream.emojilib.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiEditText;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
index c4992433e..c814065c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.helpers;
 
-import com.github.data5tream.emojilib.EmojiTextView;
+import net.pherth.android.emoji_library.EmojiTextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.squareup.picasso.Picasso;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
index 3ed7e5117..a35639606 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.helpers;
 
-import com.github.data5tream.emojilib.EmojiEditText;
-import com.github.data5tream.emojilib.EmojiPopup;
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
 import com.habitrpg.android.habitica.R;
 
 import android.content.Context;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
index f658c05b0..8acf59398 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.helpers;
 
 import com.commonsware.cwac.anddown.AndDown;
-import com.github.data5tream.emojilib.EmojiParser;
+import net.pherth.android.emoji_library.EmojiParser;
 
 import android.text.Html;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
index 490d7b327..35af26452 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks;
 
-import com.github.data5tream.emojilib.EmojiTextView;
+import net.pherth.android.emoji_library.EmojiTextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;