From 20f0a92afb58ed17115c7a9b307cf4c318f3270b Mon Sep 17 00:00:00 2001
From: Caden <jiangshen@users.noreply.github.com>
Date: Sat, 28 Apr 2018 16:33:23 -0400
Subject: [PATCH] Release Version 1.09

- Updated Achievements scoring
- Updated LeaderBoard submissions
- User can now draw in different colors
- Added color wheel type in settings
- Added Wurm-o-Meter screen with user scores
- Added Colorful Wurms achievement that unlocks color annotation
---
 README.md                                     |   8 +
 app/.idea/assetWizardSettings.xml             |   4 +-
 app/.idea/caches/build_file_checksums.ser     | Bin 542 -> 542 bytes
 app/.idea/workspace.xml                       | 629 ++++++++++--------
 app/build.gradle                              |   2 +
 app/src/main/AndroidManifest.xml              |  13 +-
 .../AppCompatPreferenceActivity.java          |   6 +-
 .../caden/drawingtest/DrawRenderer.java       |   2 +-
 .../caden/drawingtest/DrawingActivity.java    | 137 ++--
 .../example/caden/drawingtest/FCMService.java |  42 +-
 .../example/caden/drawingtest/FIDService.java |  18 +-
 .../caden/drawingtest/LoginActivity.java      |   2 +-
 .../drawingtest/PasswordResetActivity.java    |   4 +-
 .../caden/drawingtest/SettingsActivity.java   |  68 +-
 .../example/caden/drawingtest/SharedData.java |   3 +
 .../com/example/caden/drawingtest/Util.java   |  33 +-
 .../caden/drawingtest/WurmMeterActivity.java  |  76 +++
 app/src/main/res/drawable/ic_color_lens.xml   |   5 +
 app/src/main/res/drawable/ic_lightbulb.xml    |   5 +
 app/src/main/res/drawable/ic_quote.xml        |   5 +
 app/src/main/res/drawable/ic_wurm_meter.xml   |   5 +
 app/src/main/res/layout/activity_drawing.xml  | 159 ++---
 .../main/res/layout/activity_wurm_meter.xml   | 127 ++++
 app/src/main/res/menu/menu_nav_drawer.xml     |  23 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  22 +-
 app/src/main/res/values/strings.xml           |  52 +-
 app/src/main/res/values/styles.xml            |   7 +
 app/src/main/res/xml/pref_wurm.xml            |  40 +-
 28 files changed, 901 insertions(+), 596 deletions(-)
 create mode 100644 app/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java
 create mode 100644 app/src/main/res/drawable/ic_color_lens.xml
 create mode 100644 app/src/main/res/drawable/ic_lightbulb.xml
 create mode 100644 app/src/main/res/drawable/ic_quote.xml
 create mode 100644 app/src/main/res/drawable/ic_wurm_meter.xml
 create mode 100644 app/src/main/res/layout/activity_wurm_meter.xml

diff --git a/README.md b/README.md
index c501f56..a8aad4b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,14 @@ Android drawing application for annotating the backbone of worms.
 
 ## Releases
 
+### 1.09 (2018-4-28)
+- Updated Achievements scoring
+- Updated LeaderBoard submissions
+- User can now draw in different colors
+- Added color wheel type in settings
+- Added Wurm-o-Meter screen with user scores
+- Added Colorful Wurms achievement that unlocks color annotation
+
 ### 1.08 (2018-04-23)
 - Added about screen
 - Redesigned navigation drawer layout
diff --git a/app/.idea/assetWizardSettings.xml b/app/.idea/assetWizardSettings.xml
index b126989..e3965c9 100644
--- a/app/.idea/assetWizardSettings.xml
+++ b/app/.idea/assetWizardSettings.xml
@@ -18,7 +18,7 @@
                                 <PersistentState>
                                   <option name="values">
                                     <map>
-                                      <entry key="url" value="jar:file:/Applications/Android%20Studio.app/Contents/plugins/android/lib/android.jar!/images/material_design_icons/av/ic_games_black_24dp.xml" />
+                                      <entry key="url" value="jar:file:/Applications/Android%20Studio.app/Contents/plugins/android/lib/android.jar!/images/material_design_icons/editor/ic_format_quote_black_24dp.xml" />
                                     </map>
                                   </option>
                                 </PersistentState>
@@ -29,7 +29,7 @@
                         <option name="values">
                           <map>
                             <entry key="color" value="ffffff" />
-                            <entry key="outputName" value="ic_games" />
+                            <entry key="outputName" value="ic_quote" />
                             <entry key="sourceFile" value="$USER_HOME$" />
                           </map>
                         </option>
diff --git a/app/.idea/caches/build_file_checksums.ser b/app/.idea/caches/build_file_checksums.ser
index 68169805eeb9bc119536a92f2ec67e0f2f98641e..27752f96be5d21bc03dfe03eaa433259ac8452e9 100644
GIT binary patch
delta 35
tcmV+;0Nnqc1fB$tm<0P4U4oIE(-7;G%;y@sLey(2H%ugHDgKjx0iPlD5DowU

delta 35
tcmV+;0Nnqc1fB$tm<07{wUCjV(-2446t2&|MLjV@PUY7v1E!OI0iPw!5F7vi

diff --git a/app/.idea/workspace.xml b/app/.idea/workspace.xml
index cec141d..c571b9b 100644
--- a/app/.idea/workspace.xml
+++ b/app/.idea/workspace.xml
@@ -10,24 +10,37 @@
     </shared>
   </component>
   <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="YAYA" />
     <option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="433bb62b-5131-430b-9957-9abf0072ebc5" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/../.gitignore" afterPath="$PROJECT_DIR$/../.gitignore" />
-      <change beforePath="$PROJECT_DIR$/../README.md" afterPath="$PROJECT_DIR$/../README.md" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/res/drawable/ic_color_lens.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/res/drawable/ic_lightbulb.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/res/drawable/ic_quote.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/res/drawable/ic_wurm_meter.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_wurm_meter.xml" />
+      <change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
       <change beforePath="$PROJECT_DIR$/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
-      <change beforePath="$PROJECT_DIR$/src/main/ic_launcher-web.png" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawRenderer.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawRenderer.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FCMService.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FCMService.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FIDService.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FIDService.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/LoginActivity.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/LoginActivity.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SettingsActivity.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SettingsActivity.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SharedData.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SharedData.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/Util.java" afterPath="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/Util.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/res/layout/activity_drawing.xml" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_drawing.xml" />
+      <change beforePath="$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml" afterPath="$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml" />
       <change beforePath="$PROJECT_DIR$/src/main/res/values-zh-rCN/strings.xml" afterPath="$PROJECT_DIR$/src/main/res/values-zh-rCN/strings.xml" />
       <change beforePath="$PROJECT_DIR$/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/src/main/res/values/strings.xml" />
+      <change beforePath="$PROJECT_DIR$/src/main/res/values/styles.xml" afterPath="$PROJECT_DIR$/src/main/res/values/styles.xml" />
       <change beforePath="$PROJECT_DIR$/src/main/res/xml/pref_wurm.xml" afterPath="$PROJECT_DIR$/src/main/res/xml/pref_wurm.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/build/classes/" />
@@ -62,68 +75,51 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="DrawingActivity.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="338" column="28" lean-forward="false" selection-start-line="338" selection-start-column="28" selection-end-line="338" selection-end-column="28" />
-              <folding>
-                <element signature="e#20146#20175#0" expanded="true" />
-                <element signature="e#20203#20220#0" expanded="true" />
-                <element signature="e#21325#21368#0" expanded="true" />
-                <element signature="e#21407#21450#0" expanded="true" />
-                <element signature="e#21489#21533#0" expanded="true" />
-                <element signature="e#21572#21616#0" expanded="true" />
-                <element signature="e#21655#21696#0" expanded="true" />
-                <element signature="e#21735#21774#0" expanded="true" />
-                <element signature="e#21813#21855#0" expanded="true" />
-                <element signature="e#21894#21937#0" expanded="true" />
-                <element signature="e#21976#22024#0" expanded="true" />
-                <element signature="e#22158#22203#0" expanded="true" />
-                <element signature="e#22242#22287#0" expanded="true" />
-                <element signature="e#22326#22373#0" expanded="true" />
-                <element signature="e#22412#22459#0" expanded="true" />
-                <element signature="e#22604#22650#0" expanded="true" />
-              </folding>
+      <file leaf-file-name="activity_wurm_meter.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_wurm_meter.xml">
+          <provider editor-type-id="text-editor">
+            <state relative-caret-position="2091">
+              <caret line="123" column="57" lean-forward="false" selection-start-line="123" selection-start-column="57" selection-end-line="123" selection-end-column="57" />
+              <folding />
             </state>
           </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
-          <provider editor-type-id="android-manifest">
+          <provider selected="true" editor-type-id="android-designer2">
             <state />
           </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DrawingActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
-              <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
+            <state relative-caret-position="1366">
+              <caret line="335" column="13" lean-forward="true" selection-start-line="335" selection-start-column="13" selection-end-line="335" selection-end-column="13" />
               <folding>
-                <element signature="e#454#472#0" expanded="true" />
-                <element signature="e#1053#1094#0" expanded="true" />
-                <element signature="e#1250#1266#0" expanded="true" />
-                <element signature="e#1373#1412#0" expanded="true" />
-                <element signature="e#2965#2998#0" expanded="true" />
-                <element signature="e#3427#3457#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../build.gradle">
+      <file leaf-file-name="menu_nav_drawer.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="21" column="18" lean-forward="false" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
-              <folding />
+            <state relative-caret-position="255">
+              <caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
+              <folding>
+                <element signature="e#776#801#0" expanded="true" />
+              </folding>
             </state>
           </provider>
+          <provider editor-type-id="android-designer2">
+            <state />
+          </provider>
         </entry>
       </file>
       <file leaf-file-name="pref_wurm.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/res/xml/pref_wurm.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="26" column="36" lean-forward="false" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
+            <state relative-caret-position="272">
+              <caret line="16" column="32" lean-forward="false" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
               <folding />
             </state>
           </provider>
@@ -135,13 +131,39 @@
       <file leaf-file-name="strings.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/res/values/strings.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="34" column="18" lean-forward="false" selection-start-line="34" selection-start-column="18" selection-end-line="34" selection-end-column="18" />
+            <state relative-caret-position="326">
+              <caret line="74" column="50" lean-forward="true" selection-start-line="74" selection-start-column="50" selection-end-line="74" selection-end-column="50" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="SettingsActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SettingsActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="266">
+              <caret line="137" column="54" lean-forward="false" selection-start-line="137" selection-start-column="41" selection-end-line="137" selection-end-column="54" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#3865#3866#0" expanded="true" />
+                <element signature="e#3908#3909#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="WurmMeterActivity.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="986">
+              <caret line="58" column="42" lean-forward="false" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -154,36 +176,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>log.d</find>
-      <find>done</find>
-      <find>boolean</find>
-      <find>user is veri</find>
-      <find>submi</find>
-      <find>ontouch</find>
-      <find>GoogleSignInOptions</find>
-      <find>cl_draw_main</find>
-      <find>root</find>
-      <find>closeDrawer</find>
-      <find>example_text</find>
-      <find>pref_general</find>
-      <find>pref_title</find>
-      <find>R.id.home</find>
-      <find>addOnSuccessListener</find>
-      <find>acct</find>
-      <find>account</find>
-      <find>nav</find>
       <find>gacct</find>
       <find>onresum</find>
       <find>popu</find>
       <find>popup</find>
       <find>google pla</find>
       <find>newbie</find>
-      <find>userScore</find>
       <find>bad</find>
       <find>pro</find>
       <find>leaderboard</find>
       <find>oncre</find>
       <find>onre</find>
+      <find>tvuser</find>
+      <find>sign out</find>
+      <find>sign_out</find>
+      <find>score</find>
+      <find>userscore</find>
+      <find>is</find>
+      <find>isGoogleSignIn</find>
+      <find>userScore</find>
+      <find>\u</find>
+      <find>color</find>
+      <find>whee</find>
+      <find>leaderbo</find>
+      <find>appapp_id</find>
+      <find>app_id</find>
+      <find>achieve</find>
+      <find>unlock</find>
+      <find>onres</find>
+      <find>draw_color</find>
+      <find>draw_in_color</find>
     </findStrings>
   </component>
   <component name="GenerateSignedApkSettings">
@@ -2205,7 +2227,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/MainActivity.java" />
         <option value="$PROJECT_DIR$/src/main/res/layout/image_comments_dialog.xml" />
         <option value="$PROJECT_DIR$/src/main/res/drawable/color_nav_background.xml" />
         <option value="$PROJECT_DIR$/src/main/res/values/dimens.xml" />
@@ -2215,23 +2236,16 @@
         <option value="$PROJECT_DIR$/src/main/res/drawable/ic_person.xml" />
         <option value="$PROJECT_DIR$/src/main/res/drawable/ic_lock_outline.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/MyFirebaseMessagingService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FCMService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/MyFirebaseInstanceIDService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FIDService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawView.java" />
         <option value="$PROJECT_DIR$/proguard-rules.pro" />
         <option value="$PROJECT_DIR$/src/main/res/layout/activity_registration.xml" />
         <option value="$PROJECT_DIR$/src/main/res/layout/activity_login.xml" />
         <option value="$PROJECT_DIR$/src/main/res/values/colors.xml" />
         <option value="$PROJECT_DIR$/src/main/res/layout/activity_password_reset.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java" />
         <option value="$PROJECT_DIR$/../build.gradle" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/Util.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawModel.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawRenderer.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/ImageManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SharedData.java" />
-        <option value="$PROJECT_DIR$/src/main/res/values/styles.xml" />
         <option value="$PROJECT_DIR$/src/main/res/xml/pref_data_sync.xml" />
         <option value="$PROJECT_DIR$/src/main/res/xml/pref_headers.xml" />
         <option value="$PROJECT_DIR$/src/main/res/xml/pref_general.xml" />
@@ -2239,19 +2253,31 @@
         <option value="$PROJECT_DIR$/src/main/res/menu/nav_drawer_menu.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/RegistrationActivity.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/HTMLTextView.java" />
-        <option value="$PROJECT_DIR$/src/main/res/layout/activity_drawing.xml" />
-        <option value="$PROJECT_DIR$/src/main/res/values-zh-rCN/strings.xml" />
-        <option value="$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AboutActivity.java" />
         <option value="$PROJECT_DIR$/src/main/res/layout/activity_about.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/LoginActivity.java" />
-        <option value="$PROJECT_DIR$/build.gradle" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmApplication.java" />
+        <option value="$PROJECT_DIR$/build.gradle" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawRenderer.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/Util.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/LoginActivity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FIDService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FCMService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java" />
+        <option value="$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml" />
+        <option value="$PROJECT_DIR$/src/main/res/layout/activity_drawing.xml" />
         <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/main/res/drawable/ic_lightbulb.xml" />
+        <option value="$PROJECT_DIR$/src/main/res/values/styles.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SharedData.java" />
+        <option value="$PROJECT_DIR$/src/main/res/drawable/ic_quote.xml" />
+        <option value="$PROJECT_DIR$/src/main/res/layout/activity_wurm_meter.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java" />
         <option value="$PROJECT_DIR$/src/main/res/xml/pref_wurm.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SettingsActivity.java" />
-        <option value="$PROJECT_DIR$/src/main/res/values/strings.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java" />
+        <option value="$PROJECT_DIR$/src/main/res/values-zh-rCN/strings.xml" />
+        <option value="$PROJECT_DIR$/src/main/res/values/strings.xml" />
       </list>
     </option>
   </component>
@@ -2334,6 +2360,9 @@
     </navigator>
     <panes>
       <pane id="ProjectPane" />
+      <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView">
         <subPane>
           <expand>
@@ -2341,6 +2370,11 @@
               <item name="app" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
             </path>
+            <path>
+              <item name="app" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="manifests" type="f94875db:AndroidManifestsGroupNode" />
+            </path>
             <path>
               <item name="app" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
@@ -2357,12 +2391,25 @@
               <item name="app" type="feadf853:AndroidModuleNode" />
               <item name="res" type="d4f16f75:AndroidResFolderNode" />
             </path>
+            <path>
+              <item name="app" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="res" type="d4f16f75:AndroidResFolderNode" />
+              <item name="menu" type="ddeffd01:AndroidResFolderTypeNode" />
+            </path>
             <path>
               <item name="app" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
               <item name="res" type="d4f16f75:AndroidResFolderNode" />
               <item name="values" type="ddeffd01:AndroidResFolderTypeNode" />
             </path>
+            <path>
+              <item name="app" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="res" type="d4f16f75:AndroidResFolderNode" />
+              <item name="values" type="ddeffd01:AndroidResFolderTypeNode" />
+              <item name="strings" type="c431d0b8:AndroidResGroupNode" />
+            </path>
             <path>
               <item name="app" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
@@ -2377,9 +2424,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -2394,9 +2438,10 @@
     <property name="extract.method.default.visibility" value="private" />
     <property name="VectorAssetImportPath" value="$PROJECT_DIR$/.." />
     <property name="AnalyzeApkAction.lastApkPath" value="$PROJECT_DIR$/build/outputs/apk/debug/app-debug.apk" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1524542902838" />
-    <property name="sync.plugin.last.upgrade.timestamp" value="1524462555149" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1524947525766" />
+    <property name="sync.plugin.last.upgrade.timestamp" value="1524937248263" />
     <property name="android.profiler.active" value="true" />
+    <property name="SearchEverywhereHistoryKey" value="app_id&#9;PSI&#9;JAVA://com.example.caden.drawingtest.R.string#app_id&#10; {&#9;null&#9;null" />
   </component>
   <component name="RecentsManager">
     <key name="android.template.packageName">
@@ -2754,17 +2799,17 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3283582" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34701493" sideWeight="0.49713877" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43283582" sideWeight="0.49713877" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19098713" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19098713" sideWeight="0.4950249" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19098713" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19098713" sideWeight="0.50497514" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39925373" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39925373" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -2851,326 +2896,340 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="android-dummy:///Users/caden/Documents/AndroidStudioProjects/WurmPaint/app//Theme Editor">
-      <provider selected="true" editor-type-id="themeEditor">
-        <state theme-name="AppTheme" module-name="app" proportion="0.67" />
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/jshell/jshell_console.snippet">
+    <entry file="file://$USER_HOME$/Library/Android/sdk/platforms/android-26/data/res/values/ids.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="258">
+          <caret line="75" column="24" lean-forward="false" selection-start-line="75" selection-start-column="24" selection-end-line="75" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/firebase-auth-11.8.0.aar/db53309c1e088471db4766da73bc37d1/jars/classes.jar!/com/google/firebase/auth/GoogleAuthProvider.class">
+    <entry file="file://$PROJECT_DIR$/src/main/res/menu/menu_standard.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+        <state relative-caret-position="170">
+          <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
         </state>
       </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-games-11.8.0.aar/deb0e854c8266583ae2d6f97fe762597/jars/classes.jar!/com/google/android/gms/games/Games.class">
+    <entry file="file://$PROJECT_DIR$/src/main/res/values/dimens.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="211" column="36" lean-forward="false" selection-start-line="211" selection-start-column="18" selection-end-line="211" selection-end-column="36" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/annotation/SuppressLint.class">
+    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_registration.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="14" column="18" lean-forward="false" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+        <state relative-caret-position="306">
+          <caret line="18" column="55" lean-forward="true" selection-start-line="18" selection-start-column="55" selection-end-line="18" selection-end-column="55" />
         </state>
       </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/view/View.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/HTMLTextView.java" />
+    <entry file="file://$PROJECT_DIR$/../../MovieSelector/Correct firebase structure.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../settings.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="2888" column="16" lean-forward="false" selection-start-line="2888" selection-start-column="16" selection-end-line="2888" selection-end-column="16" />
+        <state relative-caret-position="17">
+          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java">
+    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/java/util/Objects.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="83" column="12" lean-forward="false" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="35" />
+        <state relative-caret-position="165">
+          <caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/drawable/ic_casino.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/res/layout/header_nav.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="408">
+          <caret line="24" column="41" lean-forward="false" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
         </state>
       </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/drawable/ic_info.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_login.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="34" />
+        <state relative-caret-position="816">
+          <caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
         </state>
       </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/values/styles.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmApplication.java" />
+    <entry file="file://$PROJECT_DIR$/../build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="22" column="47" lean-forward="false" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
+        <state relative-caret-position="357">
+          <caret line="21" column="18" lean-forward="false" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/preference/EditTextPreference.class">
+    <entry file="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-15.0.0.aar/1647f0f30f257f1f25db192fdd575139/res/values/values.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="136">
+          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/xml/pref_notification.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/res/xml/pref_data_sync.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/res/xml/pref_headers.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/res/layout/dialog_feedback.xml">
-      <provider editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/appcompat-v7/26.1.0/2b34456c30d6b6e5db5fa3e8fa02f6cebd5531fd/appcompat-v7-26.1.0-sources.jar!/android/support/v7/app/ActionBarDrawerToggle.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="180" column="11" lean-forward="false" selection-start-line="180" selection-start-column="11" selection-end-line="180" selection-end-column="11" />
         </state>
       </provider>
-      <provider selected="true" editor-type-id="android-designer2">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/menu/menu_drawing.xml" />
-    <entry file="file://$USER_HOME$/Library/Android/sdk/platforms/android-26/data/res/values/ids.xml">
+    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/view/View.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
-          <caret line="75" column="24" lean-forward="false" selection-start-line="75" selection-start-column="24" selection-end-line="75" selection-end-column="24" />
+          <caret line="2888" column="16" lean-forward="false" selection-start-line="2888" selection-start-column="16" selection-end-line="2888" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/menu/menu_standard.xml">
+    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/graphics/PointF.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+        <state relative-caret-position="187">
+          <caret line="16" column="11" lean-forward="false" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
         </state>
       </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/values/dimens.xml">
+    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/content/res/Resources.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="258">
+          <caret line="195" column="25" lean-forward="false" selection-start-line="195" selection-start-column="11" selection-end-line="195" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_registration.xml">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/26.1.0/29ca6aaf2d4976c13dd7c836e91bd2a61b697bf3/support-annotations-26.1.0-sources.jar!/android/support/annotation/NonNull.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="55" lean-forward="true" selection-start-line="18" selection-start-column="55" selection-end-line="18" selection-end-column="55" />
+        <state relative-caret-position="221">
+          <caret line="37" column="18" lean-forward="false" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" />
         </state>
       </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/RegistrationActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="44" column="24" lean-forward="false" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+        <state relative-caret-position="-895">
+          <caret line="32" column="37" lean-forward="true" selection-start-line="32" selection-start-column="37" selection-end-line="32" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/HTMLTextView.java" />
-    <entry file="file://$PROJECT_DIR$/../../MovieSelector/Correct firebase structure.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../settings.gradle">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FIDService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="238">
+          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawRenderer.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FCMService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="22" column="25" lean-forward="false" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+        <state relative-caret-position="357">
+          <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawView.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawModel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="39" column="88" lean-forward="false" selection-start-line="39" selection-start-column="86" selection-end-line="39" selection-end-column="88" />
+        <state relative-caret-position="374">
+          <caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/java/util/Objects.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawRenderer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
+        <state relative-caret-position="408">
+          <caret line="26" column="19" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/layout/header_nav.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_drawing.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="24" column="41" lean-forward="false" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+        <state relative-caret-position="343">
+          <caret line="62" column="40" lean-forward="false" selection-start-line="62" selection-start-column="40" selection-end-line="62" selection-end-column="40" />
         </state>
       </provider>
       <provider editor-type-id="android-designer2">
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml">
+    <entry file="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/9d644398302c8b9650d266c4a2406baa/res/values/values.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="56" lean-forward="false" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="56" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="7" lean-forward="false" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build/generated/source/r/debug/com/example/caden/drawingtest/R.java">
+    <entry file="file://$PROJECT_DIR$/src/main/res/drawable/ic_lightbulb.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2063">
-          <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
-          <folding />
+        <state relative-caret-position="85">
+          <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/LoginActivity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="569">
-          <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
+        <state relative-caret-position="742">
+          <caret line="96" column="9" lean-forward="false" selection-start-line="96" selection-start-column="9" selection-end-line="96" selection-end-column="9" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_about.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="52" column="51" lean-forward="false" selection-start-line="52" selection-start-column="51" selection-end-line="52" selection-end-column="51" />
-          <folding />
+        <state relative-caret-position="187">
+          <caret line="11" column="35" lean-forward="true" selection-start-line="11" selection-start-column="35" selection-end-line="11" selection-end-column="35" />
         </state>
       </provider>
       <provider editor-type-id="android-designer2">
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_drawing.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AboutActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3043">
-          <caret line="179" column="16" lean-forward="false" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
-          <folding />
+        <state relative-caret-position="527">
+          <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
         </state>
       </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_login.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/res/values/styles.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="816">
-          <caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
+        <state relative-caret-position="408">
+          <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
           <folding />
         </state>
       </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FIDService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/Util.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="380">
+          <caret line="42" column="27" lean-forward="false" selection-start-line="42" selection-start-column="27" selection-end-line="42" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SharedData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="41" column="5" lean-forward="false" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+        <state relative-caret-position="204">
+          <caret line="12" column="15" lean-forward="false" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SharedData.java">
+    <entry file="file://$PROJECT_DIR$/src/main/res/drawable/ic_quote.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
-          <folding />
+        <state relative-caret-position="34">
+          <caret line="2" column="21" lean-forward="false" selection-start-line="2" selection-start-column="21" selection-end-line="2" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/Util.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/LoginActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="23" column="7" lean-forward="true" selection-start-line="23" selection-start-column="7" selection-end-line="23" selection-end-column="7" />
-          <folding />
+        <state relative-caret-position="292">
+          <caret line="162" column="17" lean-forward="true" selection-start-line="162" selection-start-column="17" selection-end-line="162" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawModel.java">
+    <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="40" column="19" lean-forward="false" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="19" />
+        <state relative-caret-position="682">
+          <caret line="48" column="54" lean-forward="true" selection-start-line="48" selection-start-column="54" selection-end-line="48" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/FCMService.java">
+    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/AboutActivity.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/colorpicker-0.0.13.aar/99154a483992db4df4d28ae183ada240/jars/classes.jar!/com/flask/colorpicker/ColorPickerView.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="165">
+          <caret line="561" column="15" lean-forward="true" selection-start-line="561" selection-start-column="15" selection-end-line="561" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/generated/source/r/debug/com/example/caden/drawingtest/R.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="73593">
+          <caret line="4329" column="71" lean-forward="false" selection-start-line="4329" selection-start-column="71" selection-end-line="4329" selection-end-column="71" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
+    <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
+      <provider editor-type-id="android-manifest">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-147">
-          <caret line="12" column="25" lean-forward="false" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+        <state relative-caret-position="589">
+          <caret line="94" column="9" lean-forward="false" selection-start-line="94" selection-start-column="9" selection-end-line="94" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/values-zh-rCN/strings.xml">
+    <entry file="jar://$USER_HOME$/Library/Android/sdk/platforms/android-26/android.jar!/android/content/SharedPreferences.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="27" column="18" lean-forward="false" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
+        <state relative-caret-position="419">
+          <caret line="44" column="33" lean-forward="false" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmApplication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/res/xml/pref_wurm.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="373">
-          <caret line="24" column="1" lean-forward="true" selection-start-line="24" selection-start-column="1" selection-end-line="24" selection-end-column="1" />
+        <state relative-caret-position="272">
+          <caret line="16" column="32" lean-forward="false" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SettingsActivity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="159" column="29" lean-forward="false" selection-start-line="159" selection-start-column="29" selection-end-line="159" selection-end-column="29" />
+        <state relative-caret-position="258">
+          <caret line="143" column="16" lean-forward="false" selection-start-line="143" selection-start-column="16" selection-end-line="143" selection-end-column="16" />
           <folding>
-            <element signature="e#5129#5130#0" expanded="false" />
-            <element signature="e#5172#5173#0" expanded="false" />
+            <element signature="e#4610#4611#0" expanded="true" />
+            <element signature="e#4640#4641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1366">
+          <caret line="335" column="13" lean-forward="true" selection-start-line="335" selection-start-column="13" selection-end-line="335" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -3180,75 +3239,67 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/values/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="34" column="18" lean-forward="false" selection-start-line="34" selection-start-column="18" selection-end-line="34" selection-end-column="18" />
+    <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_wurm_meter.xml">
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="2091">
+          <caret line="123" column="57" lean-forward="false" selection-start-line="123" selection-start-column="57" selection-end-line="123" selection-end-column="57" />
           <folding />
         </state>
       </provider>
+      <provider selected="true" editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../build.gradle">
+    <entry file="file://$PROJECT_DIR$/src/main/res/values-zh-rCN/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="18" lean-forward="false" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
+        <state relative-caret-position="438">
+          <caret line="28" column="50" lean-forward="true" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest">
-        <state />
+    <entry file="file://$PROJECT_DIR$/src/main/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="74" column="50" lean-forward="true" selection-start-line="74" selection-start-column="50" selection-end-line="74" selection-end-column="50" />
+          <folding />
+        </state>
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
+        <state relative-caret-position="986">
+          <caret line="58" column="42" lean-forward="false" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
           <folding>
-            <element signature="e#454#472#0" expanded="true" />
-            <element signature="e#1053#1094#0" expanded="true" />
-            <element signature="e#1250#1266#0" expanded="true" />
-            <element signature="e#1373#1412#0" expanded="true" />
-            <element signature="e#2965#2998#0" expanded="true" />
-            <element signature="e#3427#3457#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/res/xml/pref_wurm.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/SettingsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="26" column="36" lean-forward="false" selection-start-line="26" selection-start-column="36" selection-end-line="26" selection-end-column="36" />
-          <folding />
+        <state relative-caret-position="266">
+          <caret line="137" column="54" lean-forward="false" selection-start-line="137" selection-start-column="41" selection-end-line="137" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#3865#3866#0" expanded="true" />
+            <element signature="e#3908#3909#0" expanded="true" />
+          </folding>
         </state>
       </provider>
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/caden/drawingtest/DrawingActivity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/res/menu/menu_nav_drawer.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="338" column="28" lean-forward="false" selection-start-line="338" selection-start-column="28" selection-end-line="338" selection-end-column="28" />
+        <state relative-caret-position="255">
+          <caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
           <folding>
-            <element signature="e#20146#20175#0" expanded="true" />
-            <element signature="e#20203#20220#0" expanded="true" />
-            <element signature="e#21325#21368#0" expanded="true" />
-            <element signature="e#21407#21450#0" expanded="true" />
-            <element signature="e#21489#21533#0" expanded="true" />
-            <element signature="e#21572#21616#0" expanded="true" />
-            <element signature="e#21655#21696#0" expanded="true" />
-            <element signature="e#21735#21774#0" expanded="true" />
-            <element signature="e#21813#21855#0" expanded="true" />
-            <element signature="e#21894#21937#0" expanded="true" />
-            <element signature="e#21976#22024#0" expanded="true" />
-            <element signature="e#22158#22203#0" expanded="true" />
-            <element signature="e#22242#22287#0" expanded="true" />
-            <element signature="e#22326#22373#0" expanded="true" />
-            <element signature="e#22412#22459#0" expanded="true" />
-            <element signature="e#22604#22650#0" expanded="true" />
+            <element signature="e#776#801#0" expanded="true" />
           </folding>
         </state>
       </provider>
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
     </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9508d49..88ea9d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,8 @@ dependencies {
     testCompile 'junit:junit:4.12'
     implementation 'com.android.support:design:26.1.0'
 
+    compile 'com.github.QuadFlask:colorpicker:0.0.13'
+
     compile 'com.google.firebase:firebase-storage:15.0.0'
     compile 'com.google.firebase:firebase-auth:15.0.0'
     compile 'com.google.android.gms:play-services-auth:15.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c3ab94b..24827c5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,6 +56,7 @@
             android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -73,11 +74,11 @@
             android:theme="@style/AppTheme" />
         <activity
             android:name=".SettingsActivity"
-            android:screenOrientation="portrait"
+            android:configChanges="locale"
             android:label="@string/title_activity_settings"
             android:parentActivityName=".DrawingActivity"
-            android:theme="@style/AppTheme.Settings"
-            android:configChanges="locale">
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Settings">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.example.caden.drawingtest.DrawingActivity" />
@@ -86,7 +87,11 @@
             android:name=".AboutActivity"
             android:label="@string/title_activity_about"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.Settings"/>
+            android:theme="@style/AppTheme.Settings" />
+        <activity android:name=".WurmMeterActivity"
+            android:label="@string/menu_wurm_meter"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.WurmMeter"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java b/app/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java
index 8d9a7dc..b41137d 100644
--- a/app/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/com/example/caden/drawingtest/AppCompatPreferenceActivity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
@@ -12,10 +13,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-/**
- * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
- * to be used with AppCompat.
- */
 public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
 
     private AppCompatDelegate mDelegate;
@@ -41,6 +38,7 @@ public void setSupportActionBar(@Nullable Toolbar toolbar) {
         getDelegate().setSupportActionBar(toolbar);
     }
 
+    @NonNull
     @Override
     public MenuInflater getMenuInflater() {
         return getDelegate().getMenuInflater();
diff --git a/app/src/main/java/com/example/caden/drawingtest/DrawRenderer.java b/app/src/main/java/com/example/caden/drawingtest/DrawRenderer.java
index 8360462..b10418b 100644
--- a/app/src/main/java/com/example/caden/drawingtest/DrawRenderer.java
+++ b/app/src/main/java/com/example/caden/drawingtest/DrawRenderer.java
@@ -25,7 +25,7 @@ public static void renderModel(Canvas canvas, DrawModel model, Paint paint, int
             //get the whole line from the model object
             DrawModel.Line line = model.getLine(i);
             //set its color
-            paint.setColor(Color.parseColor("#FF2646"));
+            paint.setColor(SharedData.lineColor);
             //get the first of many lines that make up the overall line
             int elemSize = line.getElemSize();
             //if its empty, skip
diff --git a/app/src/main/java/com/example/caden/drawingtest/DrawingActivity.java b/app/src/main/java/com/example/caden/drawingtest/DrawingActivity.java
index 095c676..9a5ed67 100644
--- a/app/src/main/java/com/example/caden/drawingtest/DrawingActivity.java
+++ b/app/src/main/java/com/example/caden/drawingtest/DrawingActivity.java
@@ -1,10 +1,14 @@
 package com.example.caden.drawingtest;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.constraint.ConstraintLayout;
 import android.support.constraint.ConstraintSet;
@@ -18,7 +22,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.transition.TransitionManager;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -30,6 +33,8 @@
 import android.widget.RatingBar;
 import android.widget.TextView;
 
+import com.flask.colorpicker.ColorPickerView;
+import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.games.AchievementsClient;
@@ -71,7 +76,6 @@ public class DrawingActivity extends AppCompatActivity
     private static final int RC_ACHIEVEMENT_UI = 9003;
     private static final int RC_LEADERBOARD_UI = 9004;
     private static final int RC_SETTING_UI = 9005;
-    private static final int RC_LEADERBOARD_SCORE = 1337;
 
     /* Variables */
     String currBatchName;
@@ -83,12 +87,13 @@ public class DrawingActivity extends AppCompatActivity
     /* Views */
     private DrawModel drawModel;
     private DrawView drawView;
-    private PointF mTmpPoint = new PointF();
+    private PointF mTmpPt = new PointF();
 
     private float mLastX;
     private float mLastY;
 
     Button btnMarkBad;
+    Button btnColor;
 
     /* FireBase */
     private FirebaseStorage mStorage;
@@ -101,13 +106,15 @@ public class DrawingActivity extends AppCompatActivity
     AchievementsClient mAchClient;
     LeaderboardsClient mLeadClient;
 
+    /* Settings */
+    SharedPreferences sharedPref;
+
     Toolbar toolbar;
     ProgressBar barSend;
     FloatingActionButton fabSend;
     TextView navUserEmail;
     TextView navUserName;
     TextView tvImageName;
-    TextView tvUserScore;
 
     String userUID;
     String userEmail;
@@ -121,7 +128,6 @@ public class DrawingActivity extends AppCompatActivity
 
     boolean isGoogleSignIn = false;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -150,8 +156,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 isGoogleSignIn = true;
             }
         }
+        SharedData.isGoogleSignIn = isGoogleSignIn;
 
-        // get drawing view from XML (where the finger writes the number)
         drawView = findViewById(R.id.draw);
 
         /* Get Wurm image from FireBase */
@@ -159,13 +165,10 @@ protected void onCreate(Bundle savedInstanceState) {
         fireBaseRetrieveUserScore();
         updateLeaderBoard();
 
-        tvUserScore = findViewById(R.id.tv_user_score);
-        tvUserScore.setText(String.valueOf(userScore));
-
-
         /* Get the Draw Model Object */
         drawModel = new DrawModel(PIXEL_WIDTH, PIXEL_HEIGHT);
         btnMarkBad = findViewById(R.id.btn_mark_bad);
+        btnColor = findViewById(R.id.btn_color);
         clDrawMain = findViewById(R.id.cl_draw_main);
         navView = findViewById(R.id.nav_view);
         navView.setNavigationItemSelectedListener(this);
@@ -209,13 +212,11 @@ protected void onCreate(Bundle savedInstanceState) {
 //        }
 
         constraintSet.clone(clDrawMain);
-        dp56 = dpToPx(56);
+        dp56 = Util.dpToPx(56, getResources().getDisplayMetrics());
         fabSend = findViewById(R.id.fab_send);
         barSend = findViewById(R.id.pbar_send);
 
-        // init the view with the model object
         drawView.setModel(drawModel);
-        // give it a touch listener to activate when the user taps
         drawView.setOnTouchListener(this);
 
         /* Re-adjust the height to be almost the same as screen width */
@@ -229,13 +230,19 @@ protected void onCreate(Bundle savedInstanceState) {
 
         /* Google Play Game */
         gAcct = GoogleSignIn.getLastSignedInAccount(this);
-        if (gAcct != null) {
+        if (gAcct != null && isGoogleSignIn) {
             Games.getGamesClient(this, gAcct).setViewForPopups(clDrawMain);
-        }
-        if (isGoogleSignIn) {
             mAchClient = Games.getAchievementsClient(this, gAcct);
             mLeadClient = Games.getLeaderboardsClient(this, gAcct);
         }
+
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        btnColor.setVisibility(sharedPref.getBoolean("draw_in_color", false) ?
+                View.VISIBLE : View.INVISIBLE);
+
+        SharedData.lineColor =
+                sharedPref.getInt("line_color", Color.parseColor("#FF2646"));
+        btnColor.setBackgroundTintList(ColorStateList.valueOf(SharedData.lineColor));
     }
 
     @Override
@@ -245,6 +252,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             showAchievements();
         } else if (id == R.id.nav_leaderboard && isGoogleSignIn) {
             showLeaderBoard();
+        } else if (id == R.id.nav_wurm_meter) {
+            showWurmMeter();
         } else if (id == R.id.nav_gplay_setting && isGoogleSignIn) {
             showGPlaySettings();
         } else if (id == R.id.nav_logout) {
@@ -260,6 +269,11 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         return true;
     }
 
+    private void showWurmMeter() {
+        Intent intent = new Intent(this, WurmMeterActivity.class);
+        startActivity(intent);
+    }
+
 
     private void showAchievements() {
         mAchClient.getAchievementsIntent()
@@ -306,17 +320,15 @@ private void feedbackScreen() {
     }
 
     @Override
-    // OnResume() is called when the user resumes his Activity which he left a while ago,
-    // say he presses home button and then comes back to app, onResume() is called.
     protected void onResume() {
         drawView.onResume();
-        updateLeaderBoard();
-
         if (GoogleSignIn.getLastSignedInAccount(this) == null) {
             FirebaseAuth.getInstance().signOut();
             Intent i = new Intent(this, LoginActivity.class);
             startActivity(i);
         }
+        btnColor.setVisibility(sharedPref.getBoolean("draw_in_color", false) ?
+                View.VISIBLE : View.INVISIBLE);
         mUser.reload().addOnCompleteListener(task -> {
             if (task.isSuccessful()) {
                 navUserName.setText(mUser.getDisplayName());
@@ -327,19 +339,11 @@ protected void onResume() {
     }
 
     @Override
-    // OnPause() is called when the user receives an event like a call or a text message,
-    // when onPause() is called the Activity may be partially or completely hidden.
     protected void onPause() {
         drawView.onPause();
         super.onPause();
     }
 
-    @Override
-    protected void onStop() {
-        updateLeaderBoard();
-        super.onStop();
-    }
-
     @Override
     public void onBackPressed() {
         if (drawer.isDrawerOpen(GravityCompat.START)) {
@@ -367,6 +371,27 @@ private void showAbout() {
         startActivity(intent);
     }
 
+    public void changeColor(View v) {
+        ColorPickerView.WHEEL_TYPE wheelType = sharedPref.getInt("wheel_type", 0) == 0 ?
+                ColorPickerView.WHEEL_TYPE.FLOWER : ColorPickerView.WHEEL_TYPE.CIRCLE;
+        ColorPickerDialogBuilder
+                .with(this)
+                .setTitle("Pick Color")
+                .initialColor(SharedData.lineColor)
+                .wheelType(wheelType)
+                .lightnessSliderOnly()
+                .density(16)
+                .setOnColorSelectedListener(selectedColor -> {})
+                .setPositiveButton("ok", (dialog, selectedColor, allColors) -> {
+                    SharedData.lineColor = selectedColor;
+                    sharedPref.edit().putInt("line_color", selectedColor).apply();
+                    btnColor.setBackgroundTintList(ColorStateList.valueOf(selectedColor));
+                })
+                .setNegativeButton("cancel", (dialog, which) -> {})
+                .build()
+                .show();
+    }
+
     @Override
     public boolean onTouch(View v, MotionEvent event) {
         int action = event.getAction() & MotionEvent.ACTION_MASK;
@@ -378,6 +403,7 @@ public boolean onTouch(View v, MotionEvent event) {
             return true;
         } else if (action == MotionEvent.ACTION_UP) {
             processTouchUp();
+            v.performClick();
             return true;
         }
         return false;
@@ -387,28 +413,25 @@ private void processTouchDown(MotionEvent event) {
         if (!alreadyDrawn) {
             mLastX = event.getX();
             mLastY = event.getY();
-            drawView.calcPos(mLastX, mLastY, mTmpPoint);
-            float lastConvX = mTmpPoint.x;
-            float lastConvY = mTmpPoint.y;
-            drawModel.startLine(lastConvX, lastConvY);
+            drawView.calcPos(mLastX, mLastY, mTmpPt);
+            float lastX = mTmpPt.x;
+            float lastY = mTmpPt.y;
+            drawModel.startLine(lastX, lastY);
         }
     }
 
     /**
-     * The main drawing function
-     * it actually stores all the drawing positions
-     * into the drawModel object
-     * we actually render the drawing from that object
-     * in the drawRenderer class
+     * The main drawing function, stores all the drawing positions into the drawModel object
+     * Render the drawing from that object in the drawRenderer class
      * @param event motion event
      */
     private void processTouchMove(MotionEvent event) {
         float x = event.getX();
         float y = event.getY();
 
-        drawView.calcPos(x, y, mTmpPoint);
-        float newConvX = mTmpPoint.x;
-        float newConvY = mTmpPoint.y;
+        drawView.calcPos(x, y, mTmpPt);
+        float newConvX = mTmpPt.x;
+        float newConvY = mTmpPt.y;
         drawModel.addLineElem(newConvX, newConvY);
 
         mLastX = x;
@@ -491,9 +514,10 @@ public void sendImage(View v) {
 
         /* Update User Score internally, with FireBase and with Google Play Games */
         userScore++;
+        SharedData.userScore = userScore;
         updateWurmsAchievements();
+        updateLeaderBoard();
 
-        tvUserScore.setText(String.valueOf(userScore));
         mDatabase.child("user_scores").child(mUser.getUid()).setValue(userScore);
         mFirebaseAnalytics.setUserProperty("user_score", String.valueOf(userScore));
 
@@ -556,6 +580,10 @@ private void updateWurmsAchievements() {
         if (isGoogleSignIn) {
             mAchClient.increment(getString(R.string.achievement_newbie_1_id), 1);
             mAchClient.increment(getString(R.string.achievement_newbie_2_id), 1);
+            if (userScore == 125) {
+                mAchClient.unlock(getString(R.string.achievement_colorful_id));
+                btnColor.setVisibility(View.VISIBLE);
+            }
             mAchClient.increment(getString(R.string.achievement_growing_1_id), 1);
             mAchClient.increment(getString(R.string.achievement_growing_2_id), 1);
             mAchClient.increment(getString(R.string.achievement_silver_id), 1);
@@ -577,7 +605,7 @@ private void updateReporterAchievements() {
 
     private void updateLeaderBoard() {
         if (isGoogleSignIn && userScore > 0) {
-            mLeadClient.submitScore(getString(R.string.leaderboard_wurm_scores_id), RC_LEADERBOARD_SCORE);
+            mLeadClient.submitScore(getString(R.string.leaderboard_wurm_scores_id), userScore);
         }
 
     }
@@ -600,7 +628,6 @@ private void fireBaseRetrieveUserScore() {
             public void onDataChange(DataSnapshot dataSnapshot) {
                 readUserScore((HashMap)dataSnapshot.getValue());
             }
-
             @Override
             public void onCancelled(DatabaseError databaseError) {
             }
@@ -618,11 +645,11 @@ private void readUserScore(HashMap dict) {
                 Long score = (Long)dict.get(mUser.getUid());
                 userScore = score.intValue();
                 mFirebaseAnalytics.setUserProperty("user_score", String.valueOf(userScore));
-                tvUserScore.setText(String.valueOf(userScore));
             } else {
                 /* First time again */
                 mDatabase.child("user_scores").child(mUser.getUid()).setValue(userScore);
             }
+            SharedData.userScore = userScore;
         }
     }
 
@@ -636,7 +663,7 @@ private void initWithImage(HashMap dict) {
             int randKey = rand.nextInt(keyLen);
 
             currBatchName = keyArray[randKey];
-            currBatchSize = longToInt((Long) dict.get(currBatchName));
+            currBatchSize = Util.longToInt((Long) dict.get(currBatchName));
             currImgNo = rand.nextInt(currBatchSize) + 1;
             tvImageName.setText(String.format(Locale.getDefault(), "%s / %d.png", currBatchName, currImgNo));
 
@@ -662,7 +689,7 @@ public void nextImage(View v) {
             Random rand = new Random();
             int randKey = rand.nextInt(keyLen);
             currBatchName = keyArray[randKey];
-            currBatchSize = longToInt((Long) uploadsDict.get(currBatchName));
+            currBatchSize = Util.longToInt((Long) uploadsDict.get(currBatchName));
             currImgNo = rand.nextInt(currBatchSize) + 1;
             tvImageName.setText(String.format(Locale.getDefault(),"%s / %d.png", currBatchName, currImgNo));
 
@@ -679,22 +706,4 @@ public void nextImage(View v) {
         }
 
     }
-
-    /**
-     * Converts dp into pixel values
-     * @param dp    display pixels
-     * @return      pixel values
-     */
-    private int dpToPx(int dp) {
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                dp, getResources().getDisplayMetrics());
-    }
-
-    private int longToInt(long l) {
-        if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
-            throw new IllegalArgumentException
-                    (l + " cannot be cast to int without changing its value.");
-        }
-        return (int) l;
-    }
 }
diff --git a/app/src/main/java/com/example/caden/drawingtest/FCMService.java b/app/src/main/java/com/example/caden/drawingtest/FCMService.java
index ffdc39a..b4bc3ae 100644
--- a/app/src/main/java/com/example/caden/drawingtest/FCMService.java
+++ b/app/src/main/java/com/example/caden/drawingtest/FCMService.java
@@ -15,39 +15,14 @@ public class FCMService extends FirebaseMessagingService {
 
     final int RC_Notify_ID = 1733;
 
-    /**
-     * Called when message is received.
-     *
-     * @param remoteMessage Object representing the message received from Firebase Cloud Messaging.
-     */
+
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
-        /*
-         There are two types of messages data messages and notification messages. Data messages are handled
-         here in onMessageReceived whether the app is in the foreground or background. Data messages are the type
-         traditionally used with GCM. Notification messages are only received here in onMessageReceived when the app
-         is in the foreground. When the app is in the background an automatically generated notification is displayed.
-         When the user taps on the notification they are returned to the app. Messages containing both notification
-         and data payloads are treated as notification messages. The Firebase console always sends notification
-         messages. For more see: https://firebase.google.com/docs/cloud-messaging/concept-options
-        */
-
-        /* Not getting messages here? See why this may be: https://goo.gl/39bRN */
-        /* Messages are from:  remoteMessage.getFrom()) */
-
-        /* Check if message contains a data payload. */
-
-        /* Check if message contains a notification payload. */
         if (remoteMessage.getNotification() != null) {
             sendNotification(remoteMessage.getNotification().getBody());
         }
     }
 
-    /**
-     * Create and show a simple notification containing the received FCM message.
-     *
-     * @param messageBody FCM message body received.
-     */
     private void sendNotification(String messageBody) {
         Intent intent = new Intent(this, DrawingActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -56,14 +31,13 @@ private void sendNotification(String messageBody) {
 
         String channelId = getString(R.string.default_notification_channel_id);
         Uri defaultSoundUri= RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-        NotificationCompat.Builder notificationBuilder =
-                new NotificationCompat.Builder(this, channelId)
-                        .setSmallIcon(R.mipmap.ic_launcher)
-                        .setContentTitle(getString(R.string.app_name))
-                        .setContentText(messageBody)
-                        .setAutoCancel(true)
-                        .setSound(defaultSoundUri)
-                        .setContentIntent(pendingIntent);
+        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, channelId)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle(getString(R.string.app_name))
+            .setContentText(messageBody)
+            .setAutoCancel(true)
+            .setSound(defaultSoundUri)
+            .setContentIntent(pendingIntent);
 
         NotificationManager notificationManager =
                 (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
diff --git a/app/src/main/java/com/example/caden/drawingtest/FIDService.java b/app/src/main/java/com/example/caden/drawingtest/FIDService.java
index 8f0c295..26a7ebd 100644
--- a/app/src/main/java/com/example/caden/drawingtest/FIDService.java
+++ b/app/src/main/java/com/example/caden/drawingtest/FIDService.java
@@ -4,28 +4,12 @@
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
 public class FIDService extends FirebaseInstanceIdService {
-    /**
-     * Called if InstanceID token is updated. This may occur if the security of
-     * the previous token had been compromised. Note that this is called when the InstanceID token
-     * is initially generated so this is where you would retrieve the token.
-     */
+
     @Override
     public void onTokenRefresh() {
-        // If you want to send messages to this application instance or
-        // manage this apps subscriptions on the server side, send the
-        // Instance ID token to your app server.
         sendRegistrationToServer(FirebaseInstanceId.getInstance().getToken());
     }
 
-    /**
-     * Persist token to third-party servers.
-     *
-     * Modify this method to associate the user's FCM InstanceID token with any server-side account
-     * maintained by your application.
-     *
-     * @param token The new token.
-     */
     private void sendRegistrationToServer(String token) {
-        // Send token to app server.
     }
 }
diff --git a/app/src/main/java/com/example/caden/drawingtest/LoginActivity.java b/app/src/main/java/com/example/caden/drawingtest/LoginActivity.java
index 9ea73ab..af2acb7 100644
--- a/app/src/main/java/com/example/caden/drawingtest/LoginActivity.java
+++ b/app/src/main/java/com/example/caden/drawingtest/LoginActivity.java
@@ -112,7 +112,7 @@ public void updateUI(boolean delay) {
                         Intent i = new Intent(this, DrawingActivity.class);
                         startActivity(i);
                     },
-                    300);
+                    250);
         } else {
             Intent i = new Intent(this, DrawingActivity.class);
             startActivity(i);
diff --git a/app/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java b/app/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java
index f85ad61..ff1f296 100644
--- a/app/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java
+++ b/app/src/main/java/com/example/caden/drawingtest/PasswordResetActivity.java
@@ -86,9 +86,7 @@ public void resetPassword(View v) {
                     .addOnCompleteListener(this, task -> {
                         if (task.isSuccessful()) {
                             Snackbar.make(v, "Reset email sent", Snackbar.LENGTH_LONG)
-                                    .setAction("Back to login", view -> {
-                                        backToLogin(v);
-                                    })
+                                    .setAction("Back to login", view -> backToLogin(v))
                                     .show();
                         } else {
                             Snackbar.make(v, "User may not exist, please enter correct email",
diff --git a/app/src/main/java/com/example/caden/drawingtest/SettingsActivity.java b/app/src/main/java/com/example/caden/drawingtest/SettingsActivity.java
index d7e3a31..a2e75d7 100644
--- a/app/src/main/java/com/example/caden/drawingtest/SettingsActivity.java
+++ b/app/src/main/java/com/example/caden/drawingtest/SettingsActivity.java
@@ -4,47 +4,35 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.preference.SwitchPreference;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
-import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.MenuItem;
+import android.view.View;
 
-import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.UserInfo;
 import com.google.firebase.auth.UserProfileChangeRequest;
 
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
 public class SettingsActivity extends AppCompatPreferenceActivity {
 
     private static FirebaseUser user;
     private static String userName;
     private static SharedPreferences sharedPrefs;
 
-    /**
-     * A preference value change listener that updates the preference's summary
-     * to reflect its new value.
-     */
     private static Preference.OnPreferenceChangeListener sBindPrefSummaryToValListener = (pref, val) -> {
         String strVal = val.toString();
         if (pref instanceof ListPreference) {
-            // For list preferences, look up the correct display value in
-            // the preference's 'entries' list.
             ListPreference listPreference = (ListPreference) pref;
             int index = listPreference.findIndexOfValue(strVal);
-            // Set the summary to reflect the new value.
+            sharedPrefs.edit().putInt("wheel_type", index).apply();
             pref.setSummary(index >= 0 ? listPreference.getEntries()[index] : null);
         } else if (pref instanceof EditTextPreference) {
             if (pref.getKey().equals("user_name")) {
@@ -56,42 +44,22 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             }
             pref.setSummary(strVal);
         } else {
-            // For all other preferences, set the summary to the value's
-            // simple string representation.
             pref.setSummary(strVal);
         }
         return true;
     };
 
 
-    /**
-     * Helper method to determine if the device has an extra-large screen. For
-     * example, 10" tablets are extra-large.
-     */
     private static boolean isXLargeTablet(Context context) {
         return (context.getResources().getConfiguration().screenLayout
                 & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
     }
 
-    /**
-     * Binds a preference's summary to its value. More specifically, when the
-     * preference's value is changed, its summary (line of text below the
-     * preference title) is updated to reflect the value. The summary is also
-     * immediately updated upon calling this method. The exact display format is
-     * dependent on the type of preference.
-     *
-     * @see #sBindPrefSummaryToValListener
-     */
     private static void bindPreferenceSummaryToValue(Preference preference) {
-        // Set the listener to watch for value changes.
         preference.setOnPreferenceChangeListener(sBindPrefSummaryToValListener);
-
-        // Trigger the listener immediately with the preference's
-        // current value.
-        sBindPrefSummaryToValListener.onPreferenceChange(preference,
-                PreferenceManager
-                        .getDefaultSharedPreferences(preference.getContext())
-                        .getString(preference.getKey(), ""));
+        sBindPrefSummaryToValListener.onPreferenceChange(preference, PreferenceManager
+                .getDefaultSharedPreferences(preference.getContext())
+                .getString(preference.getKey(), ""));
     }
 
     @Override
@@ -135,10 +103,6 @@ public boolean onIsMultiPane() {
         return isXLargeTablet(this);
     }
 
-    /**
-     * This method stops fragment injection in malicious applications.
-     * Make sure to deny any unknown fragments here.
-     */
     protected boolean isValidFragment(String fragmentName) {
         return PreferenceFragment.class.getName().equals(fragmentName)
                 || WurmPrefFragment.class.getName().equals(fragmentName);
@@ -159,6 +123,26 @@ public void onCreate(Bundle savedInstanceState) {
             }
             bindPreferenceSummaryToValue(findPreference("user_name"));
             bindPreferenceSummaryToValue(findPreference("user_email"));
+            bindPreferenceSummaryToValue(findPreference("draw_color_type"));
+
+            SwitchPreference colorPref = (SwitchPreference) findPreference("draw_color");
+            if (SharedData.userScore < 125) {
+                colorPref.setEnabled(false);
+            } else {
+                colorPref.setEnabled(true);
+                /* Set true to it only one time */
+                if(sharedPrefs.getBoolean("color_enabled_first_time", false)) {
+                    colorPref.setChecked(true);
+                    sharedPrefs.edit()
+                            .putBoolean("color_enabled_first_time", true)
+                            .putBoolean("draw_in_color", true).apply();
+                }
+                /* Set Listener for further changes */
+                colorPref.setOnPreferenceChangeListener(((p, o) -> {
+                    sharedPrefs.edit().putBoolean("draw_in_color", (boolean) o).apply();
+                    return true;
+                }));
+            }
         }
 
         @Override
diff --git a/app/src/main/java/com/example/caden/drawingtest/SharedData.java b/app/src/main/java/com/example/caden/drawingtest/SharedData.java
index 075d8e7..7178bf7 100644
--- a/app/src/main/java/com/example/caden/drawingtest/SharedData.java
+++ b/app/src/main/java/com/example/caden/drawingtest/SharedData.java
@@ -9,4 +9,7 @@
 class SharedData {
     static byte[] imgData;
     static List lineData;
+    static int lineColor;
+    static int userScore;
+    static boolean isGoogleSignIn;
 }
diff --git a/app/src/main/java/com/example/caden/drawingtest/Util.java b/app/src/main/java/com/example/caden/drawingtest/Util.java
index 56e1964..fc47a0b 100644
--- a/app/src/main/java/com/example/caden/drawingtest/Util.java
+++ b/app/src/main/java/com/example/caden/drawingtest/Util.java
@@ -1,5 +1,8 @@
 package com.example.caden.drawingtest;
 
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+
 import java.util.regex.Pattern;
 
 /**
@@ -14,8 +17,8 @@ class Util {
     /**
      * RFC822 Compliant Email Validation
      *
-     * @param s email string
-     * @return  whether email is valid
+     * @param s     email string
+     * @return      whether email is valid
      */
     static boolean isEmailValid(String s) {
         return emailPtr.matcher(s).matches();
@@ -24,10 +27,32 @@ static boolean isEmailValid(String s) {
     /**
      * Checks if password is at least 8 characters
      *
-     * @param s password string
-     * @return  whether password is valid
+     * @param s     password string
+     * @return      whether password is valid
      */
     static boolean isPasswordValid(String s) {
         return passwordPtr.matcher(s).matches();
     }
+
+    /**
+     * Converts dp into pixel values
+     * @param dp    display pixels
+     * @param dm    display metrics
+     * @return      pixel values
+     */
+    static int dpToPx(int dp, DisplayMetrics dm) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, dm);
+    }
+
+    /**
+     * Safely converts long to ints
+     * @param l     long
+     * @return      ints
+     */
+    static int longToInt(long l) {
+        if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException(l + " cannot cast to int");
+        }
+        return (int) l;
+    }
 }
diff --git a/app/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java b/app/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java
new file mode 100644
index 0000000..2594f48
--- /dev/null
+++ b/app/src/main/java/com/example/caden/drawingtest/WurmMeterActivity.java
@@ -0,0 +1,76 @@
+package com.example.caden.drawingtest;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.TextView;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+
+import java.util.HashMap;
+import java.util.Locale;
+
+public class WurmMeterActivity extends AppCompatActivity {
+
+    DatabaseReference mDatabase;
+    TextView tvInfo;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_wurm_meter);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setElevation(0);
+        }
+
+        TextView tvScore = findViewById(R.id.tv_score);
+        tvScore.setText(String.valueOf(SharedData.userScore));
+        TextView tvHours = findViewById(R.id.tv_hours);
+        float hr = (float) SharedData.userScore / 15;
+        tvHours.setText(String.format(Locale.getDefault(), "%.1f", hr));
+        tvInfo = findViewById(R.id.tv_info);
+
+        if (SharedData.isGoogleSignIn) {
+            findViewById(R.id.iv_tip).setVisibility(View.INVISIBLE);
+            findViewById(R.id.tv_tip).setVisibility(View.INVISIBLE);
+        }
+
+        mDatabase = FirebaseDatabase.getInstance().getReference();
+        mDatabase.child("user_scores").addValueEventListener(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                updateTotal((HashMap) dataSnapshot.getValue());
+            }
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+            }
+        });
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+
+    private void updateTotal(HashMap dict) {
+        int total = 0;
+        if (dict != null) {
+            for (Object i : dict.values()) {
+                total += Util.longToInt((Long) i);
+            }
+        }
+        float contribution = (float) SharedData.userScore / total;
+        tvInfo.setText(String.format(Locale.getDefault(),
+                "%d Wurms annotated so far, you have contributed %.2f%% to the Wurm Community!",
+                total, contribution * 100));
+    }
+}
diff --git a/app/src/main/res/drawable/ic_color_lens.xml b/app/src/main/res/drawable/ic_color_lens.xml
new file mode 100644
index 0000000..4abeea5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lightbulb.xml b/app/src/main/res/drawable/ic_lightbulb.xml
new file mode 100644
index 0000000..6c22586
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lightbulb.xml
@@ -0,0 +1,5 @@
+<vector android:height="36dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2 5,5.14 5,9c0,2.38 1.19,4.47 3,5.74L8,17c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1v-2.26c1.81,-1.27 3,-3.36 3,-5.74 0,-3.86 -3.14,-7 -7,-7zM14.85,13.1l-0.85,0.6L14,16h-4v-2.3l-0.85,-0.6C7.8,12.16 7,10.63 7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,1.63 -0.8,3.16 -2.15,4.1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_quote.xml b/app/src/main/res/drawable/ic_quote.xml
new file mode 100644
index 0000000..ee70715
--- /dev/null
+++ b/app/src/main/res/drawable/ic_quote.xml
@@ -0,0 +1,5 @@
+<vector android:height="36dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,17h3l2,-4L11,7L5,7v6h3zM14,17h3l2,-4L19,7h-6v6h3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_wurm_meter.xml b/app/src/main/res/drawable/ic_wurm_meter.xml
new file mode 100644
index 0000000..9aa2124
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wurm_meter.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13.5,0.67s0.74,2.65 0.74,4.8c0,2.06 -1.35,3.73 -3.41,3.73 -2.07,0 -3.63,-1.67 -3.63,-3.73l0.03,-0.36C5.21,7.51 4,10.62 4,14c0,4.42 3.58,8 8,8s8,-3.58 8,-8C20,8.61 17.41,3.8 13.5,0.67zM11.71,19c-1.78,0 -3.22,-1.4 -3.22,-3.14 0,-1.62 1.05,-2.76 2.81,-3.12 1.77,-0.36 3.6,-1.21 4.62,-2.58 0.39,1.29 0.59,2.65 0.59,4.04 0,2.65 -2.15,4.8 -4.8,4.8z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index 004f898..983dd44 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -18,7 +18,7 @@
     tools:context="com.example.caden.drawingtest.DrawingActivity"
     tools:layout_editor_absoluteY="81dp">
 
-    <LinearLayout
+        <LinearLayout
         android:id="@+id/drawing_ll"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -69,19 +69,7 @@
 
     </android.support.v7.widget.CardView>
 
-    <TextView
-        android:id="@+id/tv_user_score"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="16dp"
-        android:fontFamily="monospace"
-        android:text="@string/placeholder_email"
-        android:textSize="12sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cv_drawview" />
-
-    <TextView
+        <TextView
         android:id="@+id/tv_img_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -94,71 +82,90 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cv_drawview" />
 
-    <android.support.constraint.ConstraintLayout
-        android:id="@+id/constraintLayout"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="36dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_user_score">
-
-        <Button
-            android:id="@+id/btn_mark_bad"
-            style="@style/Widget.AppCompat.Button.Colored"
+        <android.support.constraint.ConstraintLayout
+            android:id="@+id/constraintLayout"
             android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:drawableStart="@drawable/ic_thumb_down"
-            android:text="@string/mark_as_bad"
-            android:onClick="markAsBad"
-            app:layout_constraintEnd_toStartOf="@+id/guideline"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/btn_clear"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:backgroundTint="#795548"
-            android:drawableStart="@drawable/ic_layers_clear"
-            android:onClick="clear"
-            android:text="@string/clear_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/guideline"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_mark_bad" />
-
-        <android.support.constraint.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.5" />
-
-        <Button
-            android:id="@+id/btn_next"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="0dp"
-            android:layout_height="52dp"
-            android:layout_marginEnd="4dp"
-            android:layout_marginStart="4dp"
-            android:backgroundTint="#009688"
-            android:drawableStart="@drawable/ic_casino"
-            android:onClick="nextImage"
-            android:text="@string/next_random_text"
+            android:layout_marginEnd="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="60dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/btn_clear" />
-
-    </android.support.constraint.ConstraintLayout>
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cv_drawview">
+
+            <Button
+                android:id="@+id/btn_mark_bad"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_marginEnd="6dp"
+                android:layout_marginStart="8dp"
+                android:drawableStart="@drawable/ic_thumb_down"
+                android:onClick="markAsBad"
+                android:text="@string/mark_as_bad"
+                app:layout_constraintEnd_toStartOf="@+id/guideline"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <Button
+                android:id="@+id/btn_clear"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="6dp"
+                android:layout_marginStart="8dp"
+                android:backgroundTint="#795548"
+                android:drawableStart="@drawable/ic_layers_clear"
+                android:onClick="clear"
+                android:text="@string/clear_text"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/guideline"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/btn_mark_bad" />
+
+            <android.support.constraint.Guideline
+                android:id="@+id/guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5" />
+
+            <Button
+                android:id="@+id/btn_next"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="6dp"
+                android:backgroundTint="#009688"
+                android:drawableStart="@drawable/ic_casino"
+                android:onClick="nextImage"
+                android:text="@string/next_random_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/btn_clear"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <Button
+                android:id="@+id/btn_color"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="0dp"
+                android:layout_height="52dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="6dp"
+                android:backgroundTint="#9C27B0"
+                android:drawableStart="@drawable/ic_color_lens"
+                android:onClick="changeColor"
+                android:text="@string/color_text"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toEndOf="@+id/btn_clear"
+                app:layout_constraintTop_toBottomOf="@+id/btn_next" />
+
+        </android.support.constraint.ConstraintLayout>
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/fab_send"
diff --git a/app/src/main/res/layout/activity_wurm_meter.xml b/app/src/main/res/layout/activity_wurm_meter.xml
new file mode 100644
index 0000000..1db0f15
--- /dev/null
+++ b/app/src/main/res/layout/activity_wurm_meter.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#607D8B"
+    tools:context=".WurmMeterActivity">
+
+
+    <TextView
+        android:id="@+id/tv_score"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textColor="#FFF"
+        android:textSize="112sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_label_score"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Wurms Annotated"
+        android:shadowColor="#7F000000"
+        android:shadowDy="1"
+        android:shadowRadius="5"
+        android:textColor="#F0FFFF8D"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:typeface="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_score" />
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="64dp"
+        android:layout_height="2dp"
+        android:layout_marginTop="24dp"
+        android:background="#8affffff"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_label_score" />
+
+    <TextView
+        android:id="@+id/tv_hours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#fff"
+        android:textSize="112sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view" />
+
+    <TextView
+        android:id="@+id/tv_label_hours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hours Saved"
+        android:textColor="#F0FFFF8D"
+        android:shadowColor="#7F000000"
+        android:shadowDy="1"
+        android:shadowRadius="5"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_hours" />
+
+    <ImageView
+        android:id="@+id/iv_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_label_hours"
+        app:srcCompat="@drawable/ic_quote" />
+
+    <TextView
+        android:id="@+id/tv_info"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="32dp"
+        android:textColor="#FFF"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_info"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/iv_info"
+        app:layout_constraintTop_toTopOf="@+id/iv_info" />
+
+    <ImageView
+        android:id="@+id/iv_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/content_desc_iv_tip"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:srcCompat="@drawable/ic_lightbulb" />
+
+    <TextView
+        android:id="@+id/tv_tip"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="@string/text_tip"
+        android:textAlignment="viewStart"
+        android:textAllCaps="false"
+        android:textColor="#fff"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_tip"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/iv_tip"
+        app:layout_constraintTop_toTopOf="@+id/iv_tip" />
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_nav_drawer.xml b/app/src/main/res/menu/menu_nav_drawer.xml
index 8425dca..68dd3d5 100644
--- a/app/src/main/res/menu/menu_nav_drawer.xml
+++ b/app/src/main/res/menu/menu_nav_drawer.xml
@@ -3,38 +3,41 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="navigation_view">
     <group>
-        <item android:title="Player">
+        <item android:title="@string/cat_menu_player">
             <menu>
                 <item android:id="@+id/nav_achievements"
                     android:icon="@drawable/ic_stars"
-                    android:title="Achievements" />
+                    android:title="@string/menu_achievements" />
                 <item android:id="@+id/nav_leaderboard"
                     android:icon="@drawable/ic_people"
-                    android:title="Leaderboard" />
+                    android:title="@string/menu_leaderboard" />
+                <item android:id="@+id/nav_wurm_meter"
+                    android:icon="@drawable/ic_wurm_meter"
+                    android:title="@string/menu_wurm_meter" />
                 <item android:id="@+id/nav_gplay_setting"
                     android:icon="@drawable/ic_games"
-                    android:title="Google Play Settings" />
+                    android:title="@string/menu_gplay_settings" />
                 <item android:id="@+id/nav_logout"
                     android:icon="@drawable/ic_exit_to_app"
-                    android:title="Log out" />
+                    android:title="@string/menu_log_out" />
             </menu>
         </item>
     </group>
     <group>
-        <item android:title="Manage">
+        <item android:title="@string/cat_menu_manage">
             <menu>
                 <item android:id="@+id/nav_settings"
                     android:icon="@drawable/ic_settings"
-                    android:title="Settings" />
+                    android:title="@string/menu_settings" />
                 <item android:id="@+id/nav_send_feedback"
                     android:icon="@drawable/ic_feedback"
-                    android:title="Send Feedback" />
+                    android:title="@string/menu_send_feedback" />
                 <item android:id="@+id/nav_help"
                     android:icon="@drawable/ic_help"
-                    android:title="Help" />
+                    android:title="@string/menu_help" />
                 <item android:id="@+id/nav_about"
                     android:icon="@drawable/ic_info"
-                    android:title="About" />
+                    android:title="@string/menu_about" />
             </menu>
         </item>
     </group>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9986c18..2ec7fe4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,20 +10,32 @@
     <string name="or_text">或</string>
     <string name="no_account_text">没账号？注册吧！</string>
     <string name="placeholder_email">用户@wurmpaint.co</string>
-    <string name="sign_out_text">注销</string>
     <string name="next_random_text">随机下图</string>
-    <string name="mark_as_bad">Mark as bad</string>
+    <string name="mark_as_bad">坏图标注</string>
     <string name="reason_marking_image">Any reasons for marking this image?</string>
-    <string name="img_name_placeholder">###/###.png</string>
     <string name="default_email_name">wurm.painter@gmail.com</string>
-    <string name="default_notification_channel_id">my_channel_01</string>
     <string name="reset_psw_text">重设密码</string>
     <string name="reenter_email_text">重新输入您的电邮</string>
     <string name="clear_text">清除</string>
     <string name="color_text">颜色</string>
-    <string name="reset_text">Reset</string>
+    <string name="reset_text">重设</string>
     <string name="default_user_name">虫涂涂 用户</string>
     <string name="title_activity_settings">虫涂涂 设置</string>
     <string name="title_activity_about">关于 虫涂涂</string>
     <string name="pref_change_language_title">更改语言</string>
+    <string name="cat_menu_player">玩家</string>
+    <string name="menu_achievements">我的成就</string>
+    <string name="menu_leaderboard">我的排名</string>
+    <string name="manu_wurm_history">虫的记录</string>
+    <string name="menu_gplay_settings">Google Play 设置</string>
+    <string name="menu_log_out">注销</string>
+    <string name="cat_menu_manage">管理</string>
+    <string name="menu_settings">设置</string>
+    <string name="menu_send_feedback">意见回馈</string>
+    <string name="menu_help">帮助</string>
+    <string name="menu_about">关于</string>
+    <string name="menu_wurm_meter">Wurm-o-Meter</string>
+    <string name="text_tip"><![CDATA[Switch to a <b>Google</b> account for more achievement and compete with your friends on the leaderboard!]]></string>
+    <string name="content_desc_iv_tip">Light bulb graphic</string>
+    <string name="pref_color_wheel_title">颜色圈类型</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b7241f..01ad3f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,16 +15,15 @@
     <string name="clear_text">Clear</string>
 
     <string name="placeholder_email">user@wurmpaint.co</string>
-    <string name="sign_out_text">Sign Out</string>
     <string name="next_random_text">Next Random</string>
-    <string name="mark_as_bad">Mark as bad</string>
+    <string name="mark_as_bad">Mark As Bad</string>
     <string name="reason_marking_image">Any reasons for marking this image?</string>
-    <string name="img_name_placeholder">###/###.png</string>
+    <string name="img_name_placeholder" translatable="false">###/###.png</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="default_email_name">wurm.painter@gmail.com</string>
-    <string name="default_notification_channel_id">my_channel_01</string>
+    <string name="default_notification_channel_id" translatable="false">my_channel_01</string>
     <string name="reset_psw_text">Reset Password</string>
     <string name="reenter_email_text">Re-enter your email</string>
     <string name="reset_text">Reset</string>
@@ -34,6 +33,7 @@
 
     <string name="achievement_newbie_1_id" translatable="false">CgkI75C0pcMBEAIQAQ</string>
     <string name="achievement_newbie_2_id" translatable="false">CgkI75C0pcMBEAIQBA</string>
+    <string name="achievement_colorful_id" translatable="false">CgkI75C0pcMBEAIQDw</string>
     <string name="achievement_growing_1_id" translatable="false">CgkI75C0pcMBEAIQBQ</string>
     <string name="achievement_growing_2_id" translatable="false">CgkI75C0pcMBEAIQBg</string>
     <string name="achievement_silver_id" translatable="false">CgkI75C0pcMBEAIQBw</string>
@@ -49,20 +49,49 @@
 
     <string name="leaderboard_wurm_scores_id" translatable="false">CgkI75C0pcMBEAIQAw</string>
 
-
     <string name="default_user_name">Wurm Painter</string>
 
     <!-- Settings -->
     <string name="title_activity_settings">Wurm Settings</string>
+    <string name="pref_change_language_title">Change Language</string>
+    <string name="pref_color_wheel_title">Color Wheel Type</string>
+    <string-array name="pref_color_wheel_list_titles">
+        <item>Flower</item>
+        <item>Circle</item>
+    </string-array>
+    <string-array name="pref_color_wheel_list_indices">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
 
-    <string name="pref_title_system_sync_settings">System sync settings</string>
-    <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
-
+    <!-- Navigation Drawer -->
+    <string name="cat_menu_player">Player</string>
+    <string name="menu_achievements">Achievements</string>
+    <string name="menu_leaderboard">Leaderboard</string>
+    <string name="menu_wurm_meter">Wurm-o-Meter</string>
+    <string name="manu_wurm_history">Wurm Logbook</string>
+    <string name="menu_gplay_settings">Google Play Settings</string>
+    <string name="menu_log_out">Log Out</string>
+    <string name="cat_menu_manage">Manage</string>
+    <string name="menu_settings">Settings</string>
+    <string name="menu_send_feedback">Send Feedback</string>
+    <string name="menu_help">Help</string>
+    <string name="menu_about">About</string>
 
     <!-- About -->
     <string name="change_log_text" translatable="false">
         <![CDATA[
             <h1>Changelog</h1>
+                <h3>1.08 (2018-04-24)</h3>
+                    <span>
+                        - Added about screen <br />
+                        - Redesigned navigation drawer layout <br />
+                        - Added user preferences <br />
+                        - Update navigation drawer based on whether user is signed in via Google or otherwise <br />
+                        - App automatically signs out if Google Account is signed out. <br />
+                        - Added more Google Play Achievements <br />
+                    </span>
+
                 <h3>1.07 (2018-04-14)</h3>
                     <span>
                         - Added user scores in FireBase <br />
@@ -109,7 +138,7 @@
                         - Removed brush color functionality <br />
                         - Images expanded to fill the screen <br />
                         - User restricted to drawing single strokes <br />
-                        - User can mark images as bad and provide a reason <br />
+                        - User can mark images as bad and provide a reason <br />v
                         - Optimized for tablet displays <br />
                     </span>
                 <h3>1.01 (2017-12-01)</h3>
@@ -136,5 +165,8 @@
 
         ]]>
     </string>
-
+    <string name="text_tip">
+        Switch to a <b>Google</b> account for more achievement and compete with your friends on the leaderboard!
+    </string>
+    <string name="content_desc_iv_tip">Light bulb graphic</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4f0f319..02e6c3d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,13 @@
         <item name="windowNoTitle">false</item>
     </style>
 
+    <style name="AppTheme.WurmMeter">
+        <item name="colorPrimary">#607D8B</item>
+        <item name="colorPrimaryDark">#607D8B</item>
+        <item name="windowActionBar">true</item>
+        <item name="windowNoTitle">false</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
diff --git a/app/src/main/res/xml/pref_wurm.xml b/app/src/main/res/xml/pref_wurm.xml
index 48329c4..23c10c9 100644
--- a/app/src/main/res/xml/pref_wurm.xml
+++ b/app/src/main/res/xml/pref_wurm.xml
@@ -1,9 +1,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
     <PreferenceCategory
         android:title="Personal Information"
         android:key="user_category">
-
         <EditTextPreference
             android:title="Display name"
             android:defaultValue="@string/default_user_name"
@@ -11,7 +9,6 @@
             android:key="user_name"
             android:maxLines="1"
             android:selectAllOnFocus="true" />
-
         <EditTextPreference
             android:title="Email"
             android:defaultValue="@string/placeholder_email"
@@ -19,40 +16,23 @@
             android:key="user_email"
             android:maxLines="1"
             android:selectAllOnFocus="true" />
-
     </PreferenceCategory>
-
     <PreferenceCategory
         android:title="Application Settings"
         android:key="game_category">
-
         <SwitchPreference
-            android:defaultValue="true"
+            android:defaultValue="false"
             android:key="draw_color"
             android:title="Enable color"
             android:summary="Allows drawing in different colors" />
-
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_color_wheel_list_titles"
+            android:entryValues="@array/pref_color_wheel_list_indices"
+            android:key="draw_color_type"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:dependency="draw_color"
+            android:title="@string/pref_color_wheel_title" />
     </PreferenceCategory>
-
-
-    <!-- NOTE: EditTextPreference accepts EditText attributes. -->
-    <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
-
-    <!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
-         dismiss it. -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-
-    <!--<ListPreference-->
-        <!--android:defaultValue="-1"-->
-        <!--android:entries="@array/pref_example_list_titles"-->
-        <!--android:entryValues="@array/pref_example_list_values"-->
-        <!--android:key="example_list"-->
-        <!--android:negativeButtonText="@null"-->
-        <!--android:positiveButtonText="@null"-->
-        <!--android:title="@string/pref_title_add_friends_to_messages" />-->
-
-    <!--<Preference android:title="@string/pref_title_system_sync_settings">-->
-        <!--<intent android:action="android.settings.SYNC_SETTINGS" />-->
-    <!--</Preference>-->
-
 </PreferenceScreen>