diff --git a/docs/Gemfile b/docs/Gemfile
deleted file mode 100644
index 37f5eaa..0000000
--- a/docs/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
diff --git a/docs/_includes/api_ref.md b/docs/_includes/api_ref.md
new file mode 100644
index 0000000..dcce1ff
--- /dev/null
+++ b/docs/_includes/api_ref.md
@@ -0,0 +1,112 @@
+## Modules
+{% for item in site.data.api %}
+### <code>{{ item.name }}</code>
+{{ item.desc }}
+{% endfor %}
+
+## Enums
+<table>
+    <tbody>
+{% for module in site.data.api %}
+    {% for item in module.members %}
+        {% if item.type contains 'number' %}
+        <tr>
+            <td><strong>{{ module.name }}.{{ item.name }}</strong></td>
+            <td>{{ item.desc | markdownify | replace: "[icon:attention]","<br><br>⚠️"}}</td>
+        </tr>
+
+        {% endif %}
+    {% endfor %}
+{% endfor %}
+    </tbody>
+</table>
+
+<hr>
+
+## Functions
+<table>
+    <tbody>
+{% for module in site.data.api %}
+    {% for item in module.members %}
+        {% if item.type contains 'function' %}
+        <tr>
+            <td><a href="#{{ item.name | url_encode }}"><strong>{{ module.name }}.{{ item.name }}()</strong></a></td>
+            <td>{{ item.desc | truncate: 80 }}</td>
+        </tr>
+        {% endif %}
+    {% endfor %}
+{% endfor %}
+    </tbody>
+</table>
+
+{% for module in site.data.api %}
+    {% for function in module.members %}
+        {% if function.type contains 'function' %}
+<div class="function-wrap">
+<h3 class="function-header"><a href="#{{ function.name | url_encode }}" id="{{ function.name | url_encode }}"><code>{{ module.name }}.{{ function.name }}({% for param in function.parameters %}{{param.name}}{% unless forloop.last %}, {% endunless %}{% endfor %})</code></a></h3>
+{% if function.parameters %}
+<table>
+    <thead>
+        <tr>
+            <th>Parameter</th>
+            <th>Type</th>
+            <th>Description</th>
+        </tr>
+    </thead>
+    <tbody>
+    {% for param in function.parameters %}
+        <tr>
+            <td style="text-align: right;">
+                <strong>{{ param.name }}</strong>
+                {% if param.optional %}
+                    (optional)
+                {% endif %}
+            </td>
+            <td><code>{{ param.type }}</code></td>
+            <td>{{ param.desc | markdownify }}
+                {% if param.type == "function" %}
+                {% include type-function.md params=param.parameters %}
+                {% endif %}
+                {% if param.type == "table" %}
+                {% include type-table.md fields=param.members %}
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endif %}
+{% if function.returns %}
+    <table>
+        <thead>
+            <tr>
+                <th>Return value</th>
+                <th>Type</th>
+                <th>Description</th>
+            </tr>
+        </thead>
+        <tbody>
+            <h4>Returns</h4>
+            {% for return in function.returns %}
+                <tr>
+                    <td>{{ return.name }}</td>
+                    <td><code class="inline-code-block">{{ return.type }}</code></td>
+                    <td>{{ return.desc | markdownify }}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% endif %}
+{{ function.desc | markdownify | replace: "[icon:attention]","<br><br>⚠️" | replace: "[type:string]","<code class='inline-code-block'>string</code>" | replace: "[type:number]","<code class='inline-code-block'>number</code>" | replace: "[type:table]","<code class='inline-code-block'>table</code>" | markdownify}}
+
+{% if function.examples %}
+<h4>Examples</h4>
+{% for example in function.examples %}
+{{ example.desc | markdownify }}
+{% endfor %}
+{% endif %}
+</div>
+
+        {% endif %}
+    {% endfor %}
+{% endfor %}
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 4b09cee..0255072 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -4,62 +4,18 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="style.css">
-    <link rel="stylesheet" href="rouge.css">
-    <link rel="stylesheet" href="fonts.css">
+    <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" href="css/rouge.css">
+    <link rel="stylesheet" href="css/fonts.css">
     <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
     <![endif]-->
     <title>{{ site.title }}</title>
   </head>
-    <body>
+  <body>
     <div class="wrapper">
-        <header>
-        <h1>Defold Google Play Game Services API documentation</h1>
-        <p>This extension provides functions for interacting with Google Play Game Services.</p>
-
-        <h2>Platforms</h2>
-        <p>The extension is only supported for Android.</p>
-
-        <h2>Source code</h2>
-        <p>The source code can be viewed at: <a href="https://github.com/defold/extension-gpgs"> https://github.com/defold/extension-gpgs </a></p>
-
-        <h2>Google App Setup</h2>
-        <p>In order to use Google Play Game Services your application needs to be added to the Google Play store. It doesn't have to be published but it must be registered. Read more about how to sign up for and use the Google Play store in <a href="https://support.google.com/googleplay/android-developer/answer/6112435">the official documentation</a>.</p>
-
-        <p>Once the application is registered you also need to enable Google Play Game Services for the application. Follow the official documentation to <a href="https://developers.google.com/games/services/console/enabling">enable Google Play Game Services</a>.</p>
-
-        <h2>Defold setup</h2>
-        <p>To use this library in your Defold project, add the following URL to your <code class="inline-code-block">game.project</code> dependencies:
-          <pre>https://github.com/defold/extension-gpgs/archive/master.zip</pre>
-        </p>
-
-        <p>We recommend using a link to a <code class="inline-code-block">zip</code> file of a <a href="https://github.com/defold/extension-gpgs/releases">specific release</a>.</p>
-
-        <p>
-          Starting Defold 1.2.162 this extension has one more dependency:
-          <pre>https://github.com/defold/extension-gps</pre>
-          Check `game.project` of the release you are using to figure out the appropriate release of `extension-gps`.
-        </p>
-
-        <h3>game.project</h3>
-        <p>Add the following section into your game.project file:
-        <p>
-        <code class="inline-code-block">
-        [gpgs]
-        <br>app_id = 1234567890
-        <br>use_saved_games = 1
-        </code>
-        <p>Where <kbd>app_id</kbd> is the 12 or 13 digit Application ID from the Google Play Console, found under <kbd>Development Tools > Services & APIs and Google Play game services</kbd>.</p>
-        <p>Where <kbd>use_saved_games</kbd> indicates if the <a href="https://developers.google.com/games/services/common/concepts/savedgames">Game Saves service</a> should be used (0 is disabled, 1 is enabled).</p>
-
-    </header>
-        <hr>
-        <section>
-        <h1>API</h1>
-        </br>
+      <section>
       {{ content }}
-
       </section>
     </div>
   </body>
diff --git a/docs/fonts.css b/docs/css/fonts.css
similarity index 100%
rename from docs/fonts.css
rename to docs/css/fonts.css
diff --git a/docs/rouge.css b/docs/css/rouge.css
similarity index 100%
rename from docs/rouge.css
rename to docs/css/rouge.css
diff --git a/docs/style.css b/docs/css/style.css
similarity index 100%
rename from docs/style.css
rename to docs/css/style.css
diff --git a/docs/fonts/Noto-Sans-700/Noto-Sans-700.eot b/docs/fonts/Noto-Sans-700/Noto-Sans-700.eot
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700/Noto-Sans-700.svg b/docs/fonts/Noto-Sans-700/Noto-Sans-700.svg
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700/Noto-Sans-700.ttf b/docs/fonts/Noto-Sans-700/Noto-Sans-700.ttf
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700/Noto-Sans-700.woff b/docs/fonts/Noto-Sans-700/Noto-Sans-700.woff
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700/Noto-Sans-700.woff2 b/docs/fonts/Noto-Sans-700/Noto-Sans-700.woff2
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.eot b/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.eot
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.svg b/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.svg
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.ttf b/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.ttf
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.woff b/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.woff
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.woff2 b/docs/fonts/Noto-Sans-700italic/Noto-Sans-700italic.woff2
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.eot b/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.eot
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.svg b/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.svg
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.ttf b/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.ttf
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.woff b/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.woff
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.woff2 b/docs/fonts/Noto-Sans-italic/Noto-Sans-italic.woff2
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.eot b/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.eot
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.svg b/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.svg
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.ttf b/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.ttf
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.woff b/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.woff
old mode 100755
new mode 100644
diff --git a/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.woff2 b/docs/fonts/Noto-Sans-regular/Noto-Sans-regular.woff2
old mode 100755
new mode 100644
diff --git a/docs/index.md b/docs/index.md
index d40d62a..cff5c54 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,115 +1,50 @@
 ---
 layout: default
 ---
-## Modules
-{% for item in site.data.api %}
-### <code>{{ item.name }}</code>
-{{ item.desc }}
-{% endfor %}
-
-## Enums
-<table>
-    <tbody>
-{% for module in site.data.api %}
-    {% for item in module.members %}
-        {% if item.type contains 'number' %}
-        <tr>
-            <td><strong>{{ module.name }}.{{ item.name }}</strong></td>
-            <td>{{ item.desc | markdownify | replace: "[icon:attention]","<br><br>⚠️"}}</td>
-        </tr>
-
-        {% endif %}
-    {% endfor %}
-{% endfor %}
-    </tbody>
-</table>
-
-<hr>
-
-## Functions
-<table>
-    <tbody>
-{% for module in site.data.api %}
-    {% for item in module.members %}
-        {% if item.type contains 'function' %}
-        <tr>
-            <td><a href="#{{ item.name | url_encode }}"><strong>{{ module.name }}.{{ item.name }}()</strong></a></td>
-            <td>{{ item.desc | truncate: 80 }}</td>
-        </tr>
-        {% endif %}
-    {% endfor %}
-{% endfor %}
-    </tbody>
-</table>
-
-{% for module in site.data.api %}
-    {% for function in module.members %}
-        {% if function.type contains 'function' %}
-<div class="function-wrap">
-<h3 class="function-header"><a href="#{{ function.name | url_encode }}" id="{{ function.name | url_encode }}"><code>{{ module.name }}.{{ function.name }}({% for param in function.parameters %}{{param.name}}{% unless forloop.last %}, {% endunless %}{% endfor %})</code></a></h3>
-{% if function.parameters %}
-<table>
-    <thead>
-        <tr>
-            <th>Parameter</th>
-            <th>Type</th>
-            <th>Description</th>
-        </tr>
-    </thead>
-    <tbody>
-    {% for param in function.parameters %}
-        <tr>
-            <td style="text-align: right;">
-                <strong>{{ param.name }}</strong>
-                {% if param.optional %}
-                    (optional)
-                {% endif %}
-            </td>
-            <td><code>{{ param.type }}</code></td>
-            <td>{{ param.desc | markdownify }}
-                {% if param.type == "function" %}
-                {% include type-function.md params=param.parameters %}
-                {% endif %}
-                {% if param.type == "table" %}
-                {% include type-table.md fields=param.members %}
-                {% endif %}
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
-{% endif %}
-{% if function.returns %}
-    <table>
-        <thead>
-            <tr>
-                <th>Return value</th>
-                <th>Type</th>
-                <th>Description</th>
-            </tr>
-        </thead>
-        <tbody>
-            <h4>Returns</h4>
-            {% for return in function.returns %}
-                <tr>
-                    <td>{{ return.name }}</td>
-                    <td><code class="inline-code-block">{{ return.type }}</code></td>
-                    <td>{{ return.desc | markdownify }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-{% endif %}
-{{ function.desc | markdownify | replace: "[icon:attention]","<br><br>⚠️" | replace: "[type:string]","<code class='inline-code-block'>string</code>" | replace: "[type:number]","<code class='inline-code-block'>number</code>" | replace: "[type:table]","<code class='inline-code-block'>table</code>" | markdownify}}
-
-{% if function.examples %}
-<h4>Examples</h4>
-{% for example in function.examples %}
-{{ example.desc | markdownify }}
-{% endfor %}
-{% endif %}
-</div>
-
-        {% endif %}
-    {% endfor %}
-{% endfor %}
+
+# Defold Google Play Game Services API documentation
+
+This extension provides functions for interacting with Google Play Game Services. Supported on Android.
+
+# Usage
+To use this library in your Defold project, add the following URL to your <code class="inline-code-block">game.project</code> dependencies:
+
+    https://github.com/defold/extension-gpgs/archive/master.zip
+
+We recommend using a link to a zip file of a [https://github.com/defold/extension-gpgs/releases](specific release).
+
+# Dependencies
+
+The extension has the following dependencies:
+
+    https://github.com/defold/android-base-extensions/releases/download/1.0.0/gps-games-17.0.0.zip
+    https://github.com/defold/android-base-extensions/releases/download/1.0.0/gps-base-16.1.0.zip
+    https://github.com/defold/android-base-extensions/releases/download/1.0.0/support-v4-27.0.2.zip
+
+## Google App Setup
+In order to use Google Play Game Services your application needs to be added to the Google Play store. It doesn't have to be published but it must be registered. Read more about how to sign up for and use the Google Play store in [https://support.google.com/googleplay/android-developer/answer/6112435](the official documentation).
+
+Once the application is registered you also need to enable Google Play Game Services for the application. Follow the official documentation to [https://developers.google.com/games/services/console/enabling](enable Google Play Game Services).
+
+## Defold Setup
+
+### game.project
+Add the following section into your game.project file:
+
+    [gpgs]
+    app_id = 1234567890
+    use_saved_games = 1
+
+Where `app_id` is the 12 or 13 digit Application ID from the Google Play Console, found under Development Tools > Services & APIs and Google Play game services.</p>
+
+Where `use_saved_games` indicates if the [https://developers.google.com/games/services/common/concepts/savedgames](Game Saves service) should be used (0 is disabled, 1 is enabled).</p>
+
+
+## Source code
+
+The source code is available on [GitHub](https://github.com/defold/extension-gpgs)
+
+
+# API reference
+
+{% include api_ref.md %}
diff --git a/game.project b/game.project
index 072a467..09ce5a3 100644
--- a/game.project
+++ b/game.project
@@ -1,7 +1,7 @@
 [project]
 title = GPGS
 version = 0.2
-dependencies = https://github.com/andsve/dirtylarry/archive/master.zip,https://github.com/britzl/defold-screenshot/archive/master.zip,https://github.com/defold/extension-gps/archive/master.zip
+dependencies = https://github.com/andsve/dirtylarry/archive/master.zip,https://github.com/britzl/defold-screenshot/archive/master.zip,https://github.com/defold/android-base-extensions/releases/download/1.0.0/gps-base-16.1.0.zip,https://github.com/defold/android-base-extensions/releases/download/1.0.0/support-v4-27.0.2.zip,https://github.com/defold/android-base-extensions/releases/download/1.0.0/gps-games-17.0.0.zip
 
 [bootstrap]
 main_collection = /main/main.collectionc
@@ -36,3 +36,4 @@ request_id_token = 0
 
 [library]
 include_dirs = gpgs
+
diff --git a/gpgs/lib/android/com-google-android-gms-play-services-auth-16.0.0.jar b/gpgs/lib/android/com-google-android-gms-play-services-auth-16.0.0.jar
deleted file mode 100644
index ecf1f6e..0000000
Binary files a/gpgs/lib/android/com-google-android-gms-play-services-auth-16.0.0.jar and /dev/null differ
diff --git a/gpgs/lib/android/com-google-android-gms-play-services-auth-api-phone-15.0.1.jar b/gpgs/lib/android/com-google-android-gms-play-services-auth-api-phone-15.0.1.jar
deleted file mode 100644
index f34a79c..0000000
Binary files a/gpgs/lib/android/com-google-android-gms-play-services-auth-api-phone-15.0.1.jar and /dev/null differ
diff --git a/gpgs/lib/android/com-google-android-gms-play-services-auth-base-15.1.0.jar b/gpgs/lib/android/com-google-android-gms-play-services-auth-base-15.1.0.jar
deleted file mode 100644
index 7adf1a4..0000000
Binary files a/gpgs/lib/android/com-google-android-gms-play-services-auth-base-15.1.0.jar and /dev/null differ
diff --git a/gpgs/lib/android/com-google-android-gms-play-services-drive-16.0.0.jar b/gpgs/lib/android/com-google-android-gms-play-services-drive-16.0.0.jar
deleted file mode 100644
index a12224b..0000000
Binary files a/gpgs/lib/android/com-google-android-gms-play-services-drive-16.0.0.jar and /dev/null differ
diff --git a/gpgs/lib/android/com-google-android-gms-play-services-games-17.0.0.jar b/gpgs/lib/android/com-google-android-gms-play-services-games-17.0.0.jar
deleted file mode 100644
index 48c375c..0000000
Binary files a/gpgs/lib/android/com-google-android-gms-play-services-games-17.0.0.jar and /dev/null differ
diff --git a/gpgs/manifests/android/AndroidManifest.xml b/gpgs/manifests/android/AndroidManifest.xml
index fb78f9a..3d6c18e 100644
--- a/gpgs/manifests/android/AndroidManifest.xml
+++ b/gpgs/manifests/android/AndroidManifest.xml
@@ -3,11 +3,6 @@
 	package="{{android.package}}">
 	<uses-sdk android:minSdkVersion="{{android.minimum_sdk_version}}" android:targetSdkVersion="{{android.target_sdk_version}}" />
 	<application>
-		<!-- GPGS -->
-		<meta-data android:name="com.google.android.gms.games.APP_ID"
-		android:value="\ {{gpgs.app_id}}" />
-		<!--com.google.android.gms.auth.api-->
-		<activity android:excludeFromRecents="true" android:exported="false" android:name="com.google.android.gms.auth.api.signin.internal.SignInHubActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
-		<!--com.google.android.gms.auth.api-->
-		<service android:exported="true" android:name="com.google.android.gms.auth.api.signin.RevocationBoundService" android:permission="com.google.android.gms.auth.api.signin.permission.REVOCATION_NOTIFICATION"/>
-	</application></manifest>
+		<meta-data android:name="com.google.android.gms.games.APP_ID" android:value="\ {{gpgs.app_id}}" />
+	</application>
+</manifest>
diff --git a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_dark_normal.xml b/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_dark_normal.xml
deleted file mode 100644
index 1bcab73..0000000
--- a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_dark_normal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:width="40dp" android:height="40dp" android:left="4dp" android:gravity="center_vertical">
-        <shape android:shape="oval">
-          <solid android:color="@android:color/white" />
-        </shape>
-    </item>
-    <item android:left="15dp" android:top="1dp">
-        <bitmap android:src="@drawable/googleg_standard_color_18"
-                android:gravity="left|center_vertical" />
-    </item>
-</layer-list>
diff --git a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_disabled.xml b/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_disabled.xml
deleted file mode 100644
index 806781f..0000000
--- a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_disabled.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:left="3dp"
-          android:top="3dp"
-          android:right="3dp"
-          android:bottom="3dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#18FFFFFF" />
-            <padding android:left="50dp"
-                     android:top="8dp"
-                     android:right="11dp"
-                     android:bottom="7dp" />
-        </shape>
-    </item>
-    <item android:left="-36dp">
-        <bitmap android:src="@drawable/googleg_disabled_color_18"
-                android:gravity="left|center_vertical" />
-    </item>
-</layer-list>
diff --git a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_light_normal.xml b/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_light_normal.xml
deleted file mode 100644
index 6fc4061..0000000
--- a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/drawable-watch-v20/common_google_signin_btn_text_light_normal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:width="40dp" android:height="40dp" android:left="4dp" android:gravity="center_vertical">
-        <shape android:shape="oval">
-          <solid android:color="@android:color/white" />
-        </shape>
-    </item>
-    <item android:left="15dp">
-        <bitmap android:src="@drawable/googleg_standard_color_18"
-                android:gravity="left|center_vertical" />
-    </item>
-</layer-list>
diff --git a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/values-watch-v20/com-google-android-gms-values.xml b/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/values-watch-v20/com-google-android-gms-values.xml
deleted file mode 100644
index 6a65c5a..0000000
--- a/gpgs/res/android/res/com-google-android-gms-play-services-auth-16.0.0/values-watch-v20/com-google-android-gms-values.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding='utf-8' standalone='no'?>
-<resources>
-<!-- java/com/google/android/gmscore/dev/client/auth-api/res/values-watch/colors.xml -->
-<eat-comment/>
-<color name="common_google_signin_btn_text_dark_default">#90000000</color>
-<color name="common_google_signin_btn_text_dark_disabled">#1F000000</color>
-<color name="common_google_signin_btn_text_dark_focused">#90000000</color>
-<color name="common_google_signin_btn_text_dark_pressed">#DE000000</color>
-<color name="common_google_signin_btn_text_light_default">@android:color/white</color>
-<color name="common_google_signin_btn_text_light_disabled">#DEFFFFFF</color>
-<color name="common_google_signin_btn_text_light_focused">@android:color/black</color>
-<color name="common_google_signin_btn_text_light_pressed">#DEFFFFFF</color>
-</resources>
\ No newline at end of file