diff --git a/.idea/.name b/.idea/.name
index ac795d7..f71e8e3 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Emoji Switcher
\ No newline at end of file
+EmojiSwitcher
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..9a8b7e5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -19,5 +19,4 @@
       </profile>
     </annotationProcessing>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/dictionaries/Steven.xml b/.idea/dictionaries/Steven.xml
deleted file mode 100644
index 74148a1..0000000
--- a/.idea/dictionaries/Steven.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="Steven">
-    <words>
-      <w>emoji</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e206d70..97626ba 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b62fe97..0b630ff 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,6 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -14,5 +15,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/RootTools_3_5.xml b/.idea/libraries/RootTools_4_2.xml
similarity index 78%
rename from .idea/libraries/RootTools_3_5.xml
rename to .idea/libraries/RootTools_4_2.xml
index da2380a..659e5b1 100644
--- a/.idea/libraries/RootTools_3_5.xml
+++ b/.idea/libraries/RootTools_4_2.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="RootTools-3.5">
+  <library name="RootTools-4.2">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Emoji Switcher/libs/RootTools-3.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/libs/RootTools-4.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml
new file mode 100644
index 0000000..a6ca07e
--- /dev/null
+++ b/.idea/libraries/appcompat_v7_22_2_0.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="appcompat-v7-22.2.0">
+    <ANNOTATIONS>
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://C:/tools/android-sdk/extras/android/m2repository/com/android/support/appcompat-v7/22.2.0/appcompat-v7-22.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/play_services_6_1_11.xml b/.idea/libraries/play_services_ads_7_5_0.xml
similarity index 53%
rename from .idea/libraries/play_services_6_1_11.xml
rename to .idea/libraries/play_services_ads_7_5_0.xml
index c7fb429..b483079 100644
--- a/.idea/libraries/play_services_6_1_11.xml
+++ b/.idea/libraries/play_services_ads_7_5_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
-  <library name="play-services-6.1.11">
+  <library name="play-services-ads-7.5.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services/6.1.11/res" />
-      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services/6.1.11/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/res" />
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_analytics_7_5_0.xml b/.idea/libraries/play_services_analytics_7_5_0.xml
new file mode 100644
index 0000000..1157d2a
--- /dev/null
+++ b/.idea/libraries/play_services_analytics_7_5_0.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="play-services-analytics-7.5.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/play_services_base_7_5_0.xml b/.idea/libraries/play_services_base_7_5_0.xml
new file mode 100644
index 0000000..754808a
--- /dev/null
+++ b/.idea/libraries/play_services_base_7_5_0.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="play-services-base-7.5.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.5.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.5.0/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_20_0_0.xml b/.idea/libraries/support_annotations_20_0_0.xml
deleted file mode 100644
index ceb0f0c..0000000
--- a/.idea/libraries/support_annotations_20_0_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-annotations-20.0.0">
-    <CLASSES>
-      <root url="jar://C:/android-sdk/extras/android/m2repository/com/android/support/support-annotations/20.0.0/support-annotations-20.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://C:/android-sdk/extras/android/m2repository/com/android/support/support-annotations/20.0.0/support-annotations-20.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml
new file mode 100644
index 0000000..fe973be
--- /dev/null
+++ b/.idea/libraries/support_annotations_22_2_0.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="support-annotations-22.2.0">
+    <CLASSES>
+      <root url="jar://C:/tools/android-sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.0/support-annotations-22.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://C:/tools/android-sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.0/support-annotations-22.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_20_0_0.xml b/.idea/libraries/support_v4_20_0_0.xml
deleted file mode 100644
index 420d544..0000000
--- a/.idea/libraries/support_v4_20_0_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-v4-20.0.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/libs/internal_impl-20.0.0.jar!/" />
-      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/res" />
-      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml
new file mode 100644
index 0000000..f0443e6
--- /dev/null
+++ b/.idea/libraries/support_v4_22_2_0.xml
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="support-v4-22.2.0">
+    <ANNOTATIONS>
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/annotations.zip!/" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars/libs/internal_impl-22.2.0.jar!/" />
+      <root url="file://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/Emoji Switcher/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://C:/tools/android-sdk/extras/android/m2repository/com/android/support/support-v4/22.2.0/support-v4-22.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index feeb5e4..95f0f03 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,44 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
-</project>
-
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 85f1709..024d759 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,5 +6,4 @@
       <module fileurl="file://$PROJECT_DIR$/EmojiSwitcher.iml" filepath="$PROJECT_DIR$/EmojiSwitcher.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index def6a6a..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="" vcs="Git" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Emoji Switcher/Emoji Switcher.iml b/Emoji Switcher/Emoji Switcher.iml
index ff82e59..4e94901 100644
--- a/Emoji Switcher/Emoji Switcher.iml	
+++ b/Emoji Switcher/Emoji Switcher.iml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="EmojiSwitcher" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":Emoji Switcher" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="EmojiSwitcher" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,11 +9,15 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -22,8 +26,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -31,11 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -64,6 +71,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.5.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -79,14 +91,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="play-services-6.1.11" level="project" />
-    <orderEntry type="library" exported="" name="RootTools-3.5" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
     <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
     <orderEntry type="library" exported="" name="guava-18.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-7.5.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-7.5.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-7.5.0" level="project" />
+    <orderEntry type="library" exported="" name="RootTools-4.2" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/Emoji Switcher/build.gradle b/Emoji Switcher/build.gradle
index 6d2b8db..85970f6 100644
--- a/Emoji Switcher/build.gradle	
+++ b/Emoji Switcher/build.gradle	
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.0.2'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 9
         versionName "1.6.1"
     }
@@ -18,8 +18,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:6.1.+'
+    compile 'com.google.android.gms:play-services-ads:7.5.0'
     compile 'commons-io:commons-io:2.4'
-    compile 'com.google.guava:guava:18.+'
-    compile files('libs/RootTools-3.5.jar')
+    compile 'com.google.guava:guava:18.0'
+    compile files('libs/RootTools-4.2.jar')
+    compile 'com.android.support:appcompat-v7:22.2.0'
 }
\ No newline at end of file
diff --git a/Emoji Switcher/libs/RootTools-3.5.jar b/Emoji Switcher/libs/RootTools-3.5.jar
deleted file mode 100644
index 245ec77..0000000
Binary files a/Emoji Switcher/libs/RootTools-3.5.jar and /dev/null differ
diff --git a/Emoji Switcher/libs/RootTools-4.2.jar b/Emoji Switcher/libs/RootTools-4.2.jar
new file mode 100644
index 0000000..794fcde
Binary files /dev/null and b/Emoji Switcher/libs/RootTools-4.2.jar differ
diff --git a/EmojiSwitcher.iml b/EmojiSwitcher.iml
index 0bb6048..0e63261 100644
--- a/EmojiSwitcher.iml
+++ b/EmojiSwitcher.iml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="EmojiSwitcher" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
@@ -15,5 +16,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a26d4e5..cb7baa9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,15 +2,15 @@
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dcd590b..dab2163 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 17 15:56:18 EDT 2014
+#Sun Apr 12 23:25:35 EDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip