diff --git a/Wearable/build.gradle b/Wearable/build.gradle
index 244cc19..332123f 100644
--- a/Wearable/build.gradle
+++ b/Wearable/build.gradle
@@ -5,16 +5,24 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+}
+
 
 
 dependencies {
 
+    compile 'com.android.support:wear:26.0.0'
 
 
     compile 'com.google.android.gms:play-services-wearable:10.2.4'
@@ -35,7 +43,8 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 25
+
+        compileSdkVersion 26
 
     buildToolsVersion "25.0.3"
 
@@ -43,9 +52,12 @@ android {
         versionCode 1
         versionName "1.0"
 
-        minSdkVersion 24
+        minSdkVersion 23
+
+        targetSdkVersion 26
+
+        multiDexEnabled true
 
-        targetSdkVersion 25
     }
 
     compileOptions {
diff --git a/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java b/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
index 3673545..6afd814 100644
--- a/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
+++ b/Wearable/src/main/java/com/example/android/wearable/wear/alwayson/MainActivity.java
@@ -24,7 +24,6 @@
 import android.os.Handler;
 import android.os.Message;
 import android.support.wearable.activity.WearableActivity;
-import android.support.wearable.view.WatchViewStub;
 import android.util.Log;
 import android.widget.TextView;
 
@@ -124,22 +123,14 @@ public void onCreate(Bundle savedInstanceState) {
                 ambientStateIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
 
+        mTimeTextView = (TextView) findViewById(R.id.time);
+        mTimeStampTextView = (TextView) findViewById(R.id.time_stamp);
+        mStateTextView = (TextView) findViewById(R.id.state);
+        mUpdateRateTextView = (TextView) findViewById(R.id.update_rate);
+        mDrawCountTextView = (TextView) findViewById(R.id.draw_count);
 
-        /** Determines whether watch is round or square and applies proper view. **/
-        final WatchViewStub stub = (WatchViewStub) findViewById(R.id.watch_view_stub);
-        stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() {
-            @Override
-            public void onLayoutInflated(WatchViewStub stub) {
-
-                mTimeTextView = (TextView) stub.findViewById(R.id.time);
-                mTimeStampTextView = (TextView) stub.findViewById(R.id.time_stamp);
-                mStateTextView = (TextView) stub.findViewById(R.id.state);
-                mUpdateRateTextView = (TextView) stub.findViewById(R.id.update_rate);
-                mDrawCountTextView = (TextView) stub.findViewById(R.id.draw_count);
+        refreshDisplayAndSetNextUpdate();
 
-                refreshDisplayAndSetNextUpdate();
-            }
-        });
     }
 
     /**
diff --git a/Wearable/src/main/res/layout/activity_main.xml b/Wearable/src/main/res/layout/activity_main.xml
index d808e6b..90570c3 100644
--- a/Wearable/src/main/res/layout/activity_main.xml
+++ b/Wearable/src/main/res/layout/activity_main.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- Copyright (C) 2015 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,15 +13,54 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.support.wearable.view.WatchViewStub
+<android.support.wear.widget.BoxInsetLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/watch_view_stub"
+    android:background="@color/dark_grey"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:rectLayout="@layout/rect_activity_main"
-    app:roundLayout="@layout/round_activity_main"
-    tools:context=".MainActivity"
-    tools:deviceIds="wear">
-</android.support.wearable.view.WatchViewStub>
+    tools:context=".MainActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:boxedEdges="all">
+
+        <TextView
+            android:id="@+id/time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            android:text="Hello, time!"/>
+
+        <TextView
+            android:id="@+id/time_stamp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello, timestamp!"/>
+
+        <TextView
+            android:id="@+id/state"
+            android:textColor="@color/green"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello, state!"/>
+
+        <TextView
+            android:id="@+id/update_rate"
+            android:textColor="@color/green"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello, update rate!"/>
+
+        <TextView
+            android:id="@+id/draw_count"
+            android:textColor="@color/green"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Hello, draw count!"/>
+
+    </LinearLayout>
+</android.support.wear.widget.BoxInsetLayout>
diff --git a/Wearable/src/main/res/layout/rect_activity_main.xml b/Wearable/src/main/res/layout/rect_activity_main.xml
deleted file mode 100644
index bfb8147..0000000
--- a/Wearable/src/main/res/layout/rect_activity_main.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="@dimen/square_top_margin"
-    android:paddingLeft="@dimen/square_left_margin"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".MainActivity"
-    tools:deviceIds="wear_square">
-
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:text="Hello, time!"/>
-
-    <TextView
-        android:id="@+id/time_stamp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, timestamp!"/>
-
-    <TextView
-        android:id="@+id/state"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, state!"/>
-
-    <TextView
-        android:id="@+id/update_rate"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, update rate!"/>
-
-    <TextView
-        android:id="@+id/draw_count"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, draw count!"/>
-</LinearLayout>
diff --git a/Wearable/src/main/res/layout/round_activity_main.xml b/Wearable/src/main/res/layout/round_activity_main.xml
deleted file mode 100644
index 8fa7a2d..0000000
--- a/Wearable/src/main/res/layout/round_activity_main.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="@dimen/round_top_margin"
-    android:paddingLeft="@dimen/round_left_margin"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    tools:deviceIds="wear_round">
-
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:text="Hello, time!"/>
-
-    <TextView
-        android:id="@+id/time_stamp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, timestamp!"/>
-
-    <TextView
-        android:id="@+id/state"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, state!"/>
-
-    <TextView
-        android:id="@+id/update_rate"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, update rate!"/>
-
-    <TextView
-        android:id="@+id/draw_count"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Hello, draw count!"/>
-</LinearLayout>
diff --git a/Wearable/src/main/res/values/dimens.xml b/Wearable/src/main/res/values/dimens.xml
deleted file mode 100644
index d44096a..0000000
--- a/Wearable/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="square_top_margin">24dp</dimen>
-    <dimen name="square_left_margin">16dp</dimen>
-
-    <dimen name="round_top_margin">34dp</dimen>
-    <dimen name="round_left_margin">34dp</dimen>
-</resources>