diff --git a/.gitmodules b/.gitmodules
index c914300a..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "_Emoji/emoji-data"]
-	path = _Emoji/emoji-data
-	url = git@github.com:iamcal/emoji-data.git
-[submodule "_Emoji/emojione2.x"]
-	path = _Emoji/emojione2.x
-	url = git@github.com:emojione/emojione.git
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7052b8..635999df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/build.gradle b/build.gradle
index e4b2c262..3fa4d080 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,10 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.google.gms:google-services:3.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,6 +23,7 @@ allprojects {
         jcenter()
         maven { url 'https://maven.google.com' }
         maven { url 'https://jitpack.io' }
+        google()
     }
 }