diff --git a/.idea/.name b/.idea/.name
index 363e30f..9b4330a 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Awkscape
\ No newline at end of file
+Awkscape 
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <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 0804331..af69317 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.4" />
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c60d22d..4e3cec0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,11 +43,14 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="SvnConfiguration">
+    <configuration>$USER_HOME$/.subversion</configuration>
+  </component>
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.7</last-edited>
+          <last-edited>1.6</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/mobile/mobile.iml b/mobile/mobile.iml
index 3db261d..1a7db24 100644
--- a/mobile/mobile.iml
+++ b/mobile/mobile.iml
@@ -113,31 +113,31 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="play-services-maps-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-wallet-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-drive-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-appstate-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-games-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-fitness-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-maps-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-gcm-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-panorama-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appindexing-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-cast-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-location-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-ads-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-identity-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-safetynet-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-plus-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-appindexing-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-panorama-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-location-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="phone-gest-lib-0.8.2" level="project" />
-    <orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-appinvite-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-safetynet-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-nearby-7.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appinvite-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-gcm-7.3.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-nearby-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-fitness-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="phone-gest-lib-0.8.2" level="project" />
+    <orderEntry type="library" exported="" name="play-services-plus-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appstate-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-games-7.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-identity-7.3.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/mobile/src/main/java/hackny/awkscape/AlarmActivity.java b/mobile/src/main/java/hackny/awkscape/AlarmActivity.java
index ec46598..4448fe1 100644
--- a/mobile/src/main/java/hackny/awkscape/AlarmActivity.java
+++ b/mobile/src/main/java/hackny/awkscape/AlarmActivity.java
@@ -13,7 +13,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.view.Window;
 import android.view.WindowManager;
 
 import android.os.Handler;
@@ -27,15 +26,6 @@ public class AlarmActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-        setContentView(R.layout.activity_alarm);
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_alarm);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
diff --git a/mobile/src/main/res/layout/activity_alarm.xml b/mobile/src/main/res/layout/activity_alarm.xml
index 97d6b91..79cc811 100644
--- a/mobile/src/main/res/layout/activity_alarm.xml
+++ b/mobile/src/main/res/layout/activity_alarm.xml
@@ -6,14 +6,12 @@
     android:layout_height="match_parent" android:fitsSystemWindows="true"
     tools:context="hackny.awkscape.AlarmActivity">
 
-
     <android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
-        android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay"
-        android:background="@mipmap/calling">
+        android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">
 
         <android.support.v7.widget.Toolbar android:id="@+id/toolbar"
             android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/transparent" app:popupTheme="@style/AppTheme.PopupOverlay" />
+            android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </android.support.design.widget.AppBarLayout>
 
diff --git a/mobile/src/main/res/mipmap-hdpi/calling.png b/mobile/src/main/res/mipmap-hdpi/calling.png
deleted file mode 100644
index 9a11265..0000000
Binary files a/mobile/src/main/res/mipmap-hdpi/calling.png and /dev/null differ
diff --git a/mobile/src/main/res/mipmap-hdpi/received.png b/mobile/src/main/res/mipmap-hdpi/received.png
deleted file mode 100644
index a570fc4..0000000
Binary files a/mobile/src/main/res/mipmap-hdpi/received.png and /dev/null differ
diff --git a/wear/src/main/java/hackny/awkscape/MainWatchActivity.java b/wear/src/main/java/hackny/awkscape/MainWatchActivity.java
index 0dce4d6..82a65d1 100644
--- a/wear/src/main/java/hackny/awkscape/MainWatchActivity.java
+++ b/wear/src/main/java/hackny/awkscape/MainWatchActivity.java
@@ -1,8 +1,6 @@
 package hackny.awkscape;
 
-import android.content.Context;
 import android.os.Bundle;
-import android.os.Vibrator;
 import android.support.wearable.view.BoxInsetLayout;
 import android.view.View;
 import android.widget.TextView;
@@ -64,15 +62,11 @@ public void onSnap() {
 
     @Override
     public void onFlick() {
-        Vibrator vibration2 = (Vibrator)this.getSystemService(Context.VIBRATOR_SERVICE);
-        vibration2.vibrate(2000);
         Toast.makeText(this,"It's a flick!",Toast.LENGTH_LONG).show();
     }
 
     @Override
     public void onTwist() {
-        Vibrator vibration1 = (Vibrator)this.getSystemService(Context.VIBRATOR_SERVICE);
-        vibration1.vibrate(200);
         Toast.makeText(this,"Just twist it",Toast.LENGTH_LONG).show();
     }
 
diff --git a/wear/wear.iml b/wear/wear.iml
index 01a8d8d..81ef5cb 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -94,12 +94,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="gesturelibrary-0.8.8" level="project" />
     <orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="wearable-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="gesturelibrary-0.8.8" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
   </component>
 </module>
\ No newline at end of file