diff --git a/QSthemes/QStileSquaremedo/Android.mk b/QSthemes/QSTileCircleDualTone/Android.mk
similarity index 82%
copy from QSthemes/QStileSquaremedo/Android.mk
copy to QSthemes/QSTileCircleDualTone/Android.mk
index 93bad32..7c5299e 100644
--- a/QSthemes/QStileSquaremedo/Android.mk
+++ b/QSthemes/QSTileCircleDualTone/Android.mk
@@ -3,7 +3,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileSquaremedo
+LOCAL_PACKAGE_NAME := QSTileCircleDualTone
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileCircleDualTone/AndroidManifest.xml b/QSthemes/QSTileCircleDualTone/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileCircleDualTone/AndroidManifest.xml
rename to QSthemes/QSTileCircleDualTone/AndroidManifest.xml
diff --git a/QSthemes/QStileCircleDualTone/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleDualTone/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileCircleDualTone/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileCircleDualTone/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QStileSquaremedo/Android.mk b/QSthemes/QSTileCircleGradient/Android.mk
similarity index 82%
copy from QSthemes/QStileSquaremedo/Android.mk
copy to QSthemes/QSTileCircleGradient/Android.mk
index 93bad32..7a9efaf 100644
--- a/QSthemes/QStileSquaremedo/Android.mk
+++ b/QSthemes/QSTileCircleGradient/Android.mk
@@ -3,7 +3,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileSquaremedo
+LOCAL_PACKAGE_NAME := QSTileCircleGradient
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileCircleGradient/AndroidManifest.xml b/QSthemes/QSTileCircleGradient/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileCircleGradient/AndroidManifest.xml
rename to QSthemes/QSTileCircleGradient/AndroidManifest.xml
diff --git a/QSthemes/QStileCircleGradient/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleGradient/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileCircleGradient/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileCircleGradient/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileCircleTrim/Android.mk
similarity index 83%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileCircleTrim/Android.mk
index 3801ec8..606d954 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileCircleTrim/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileCircleTrim
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileCircleTrim/AndroidManifest.xml b/QSthemes/QSTileCircleTrim/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileCircleTrim/AndroidManifest.xml
rename to QSthemes/QSTileCircleTrim/AndroidManifest.xml
diff --git a/QSthemes/QStileCircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCircleTrim/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileCircleTrim/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileCircleTrim/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QStileCircleTrim/res/values/strings.xml b/QSthemes/QSTileCircleTrim/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileCircleTrim/res/values/strings.xml
rename to QSthemes/QSTileCircleTrim/res/values/strings.xml
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileCookie/Android.mk
similarity index 84%
rename from QSthemes/QStileDefault/Android.mk
rename to QSthemes/QSTileCookie/Android.mk
index 3801ec8..a957e55 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileCookie/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileCookie
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileCookie/AndroidManifest.xml
similarity index 62%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileCookie/AndroidManifest.xml
index 0f62c1a..1dc6e6f 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileCookie/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.cookie"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
-</manifest>
-
+    <application android:label="@string/qstile_cookie" android:hasCode="false"/>
+</manifest>
\ No newline at end of file
diff --git a/QSthemes/QSTileCookie/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileCookie/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..9e1c2ed
--- /dev/null
+++ b/QSthemes/QSTileCookie/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,35 @@
+<!--
+    Copyright (C) 2015 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <group>
+        <path
+            android:fillColor="#ffffff"
+            android:fillAlpha="0.6"
+            android:pathData="M 24.000000000000004 0 C 37.2548339959 0 48 10.7451660041 48 24.000000000000004 C 48 37.2548339959 37.2548339959 48 24.000000000000004 48 C 10.7451660041 48 0 37.2548339959 0 24.000000000000004 C 0 10.7451660041 10.7451660041 0 24.000000000000004 0 Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:fillAlpha="0.8"
+            android:pathData="M 24.000000000000004 4.8 C 34.6038671968 4.8 43.2 13.3961328032 43.2 24.000000000000004 C 43.2 34.6038671968 34.6038671968 43.2 24.000000000000004 43.2 C 13.3961328032 43.2 4.8 34.6038671968 4.8 24.000000000000004 C 4.8 13.3961328032 13.3961328032 4.8 24.000000000000004 4.8 Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M 24.00000000000001 9.6 C 31.9529003976 9.6 38.4 16.0470996024 38.4 24.00000000000001 C 38.4 31.9529003976 31.9529003976 38.4 24.00000000000001 38.4 C 16.0470996024 38.4 9.6 31.9529003976 9.6 24.00000000000001 C 9.6 16.0470996024 16.0470996024 9.6 24.00000000000001 9.6 Z" />
+    </group>
+</vector>
diff --git a/QSthemes/QSTileCookie/res/values/strings.xml b/QSthemes/QSTileCookie/res/values/strings.xml
new file mode 100644
index 0000000..35423d3
--- /dev/null
+++ b/QSthemes/QSTileCookie/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2017, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="qstile_cookie">Cookie</string>
+
+</resources>
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileDefault/Android.mk
similarity index 84%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileDefault/Android.mk
index 3801ec8..e6a5952 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileDefault/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileDefault
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileDefault/AndroidManifest.xml b/QSthemes/QSTileDefault/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileDefault/AndroidManifest.xml
rename to QSthemes/QSTileDefault/AndroidManifest.xml
diff --git a/QSthemes/QStileDefault/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileDefault/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileDefault/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileDefault/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QStileDefault/res/values/strings.xml b/QSthemes/QSTileDefault/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileDefault/res/values/strings.xml
rename to QSthemes/QSTileDefault/res/values/strings.xml
diff --git a/QSthemes/QStileSquaremedo/Android.mk b/QSthemes/QSTileDottedCircle/Android.mk
similarity index 82%
copy from QSthemes/QStileSquaremedo/Android.mk
copy to QSthemes/QSTileDottedCircle/Android.mk
index 93bad32..62bb256 100644
--- a/QSthemes/QStileSquaremedo/Android.mk
+++ b/QSthemes/QSTileDottedCircle/Android.mk
@@ -3,7 +3,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileSquaremedo
+LOCAL_PACKAGE_NAME := QSTileDottedCircle
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileDottedCircle/AndroidManifest.xml b/QSthemes/QSTileDottedCircle/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileDottedCircle/AndroidManifest.xml
rename to QSthemes/QSTileDottedCircle/AndroidManifest.xml
diff --git a/QSthemes/QStileDottedCircle/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileDottedCircle/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileDottedCircle/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileDottedCircle/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QSTileDottedCircle/res/values/colors.xml b/QSthemes/QSTileDottedCircle/res/values/colors.xml
new file mode 100644
index 0000000..2eaae4c
--- /dev/null
+++ b/QSthemes/QSTileDottedCircle/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+
+    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
+
+    <!-- QS tiles expand, underline and label colors -->
+    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
+    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
+    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/QSthemes/QSTileDottedCircle/res/values/config.xml b/QSthemes/QSTileDottedCircle/res/values/config.xml
new file mode 100644
index 0000000..e23e4b0
--- /dev/null
+++ b/QSthemes/QSTileDottedCircle/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017-2018 Projekt Substratum
+      Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+     <!-- Config to enable/diaable qs tile tinting -->
+    <bool name="config_enable_qs_tile_tinting">true</bool>
+ </resources>
\ No newline at end of file
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileDualToneCircle/Android.mk
similarity index 81%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileDualToneCircle/Android.mk
index 3801ec8..8f61dfa 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileDualToneCircle/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileDualToneCircle
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileDualToneCircle/AndroidManifest.xml b/QSthemes/QSTileDualToneCircle/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileDualToneCircle/AndroidManifest.xml
rename to QSthemes/QSTileDualToneCircle/AndroidManifest.xml
diff --git a/QSthemes/QStileDualToneCircle/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileDualToneCircle/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileDualToneCircle/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileDualToneCircle/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QStileDualToneCircle/res/values/strings.xml b/QSthemes/QSTileDualToneCircle/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileDualToneCircle/res/values/strings.xml
rename to QSthemes/QSTileDualToneCircle/res/values/strings.xml
diff --git a/QSthemes/QStileInkDrop/Android.mk b/QSthemes/QSTileInk/Android.mk
similarity index 84%
rename from QSthemes/QStileInkDrop/Android.mk
rename to QSthemes/QSTileInk/Android.mk
index 5cee5cd..3521deb 100644
--- a/QSthemes/QStileInkDrop/Android.mk
+++ b/QSthemes/QSTileInk/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileInkDrop
+LOCAL_PACKAGE_NAME := QSTileInk
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileInk/AndroidManifest.xml
similarity index 65%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileInk/AndroidManifest.xml
index 0f62c1a..7dba4c1 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileInk/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.ink"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Ink" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QStileInkDrop/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileInk/res/drawable/ic_qs_circle.xml
similarity index 99%
rename from QSthemes/QStileInkDrop/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileInk/res/drawable/ic_qs_circle.xml
index d44c758..a84b19f 100644
--- a/QSthemes/QStileInkDrop/res/drawable/ic_qs_circle.xml
+++ b/QSthemes/QSTileInk/res/drawable/ic_qs_circle.xml
@@ -2,4 +2,3 @@
     android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#fff" android:fillType="evenOdd" android:pathData="M21.19,44.39c-1.38,-0.51 -2.76,-1 -4.12,-1.54c-0.25,-0.1 -0.8,-0.15 -0.63,-0.54c0.17,-0.38 0.56,-0.04 0.83,0.08c2.2,0.96 4.46,1.61 6.9,1.5c1.14,-0.05 2.19,-0.44 3.29,-0.67c2.47,-0.5 4.88,-1.24 7.07,-2.5c1.97,-1.14 3.67,-2.65 5.09,-4.46c1.16,-1.48 2.09,-3.09 3.11,-4.65c1.15,-1.76 1.52,-3.71 1.76,-5.72c0.03,-0.23 0.06,-0.53 0.21,-0.68c0.74,-0.73 0.5,-1.58 0.35,-2.41c-0.15,-0.79 -0.38,-1.55 -0.6,-2.33c-0.3,-1.08 -0.63,-2.16 -0.75,-3.29c-0.04,-0.41 -0.14,-0.79 -0.46,-1.08c-0.3,-0.27 -0.56,-0.58 -0.76,-0.92c-0.15,-0.25 -0.27,-0.45 -0.58,-0.09c-0.31,0.37 -0.49,0.05 -0.49,-0.24c0.01,-0.79 -0.57,-1.31 -0.8,-1.97c-0.49,-1.39 -1.64,-2.26 -2.43,-3.42c-0.24,-0.35 -0.56,-0.66 -0.96,-0.83c-1.62,-0.7 -3.07,-1.72 -4.72,-2.36c-1.9,-0.74 -3.77,-1.52 -5.89,-1.15c-0.25,0.04 -0.54,-0.02 -0.79,-0.09c-1.11,-0.35 -2.16,-0.17 -3.21,0.23c-0.87,0.33 -1.7,0.69 -2.68,0.69c-0.8,0 -1.5,0.55 -2.18,0.95c-1.75,1.04 -3.31,2.33 -4.72,3.8c-1.22,1.27 -2.36,2.62 -3.61,3.85c-0.56,0.56 -0.86,1.3 -1.36,1.78c-1.14,1.1 -1.06,2.69 -1.89,3.88c-0.32,0.45 -0.35,1 -0.39,1.54c-0.02,0.37 -0.02,0.75 0.15,1.1c0.18,0.37 0.17,0.73 -0.03,1.07c-0.58,1.03 -0.14,1.98 0.29,2.89c0.27,0.56 0.49,1.07 0.28,1.67c-0.09,0.25 -0.05,0.47 0.19,0.52c1.03,0.21 0.88,1.09 0.96,1.77c0.06,0.52 0.03,1.27 -0.38,1.5c-0.69,0.38 -1.09,0.64 -0.6,1.43c0.06,0.09 -0.12,0.23 -0.27,0.18c-0.09,-0.03 -0.17,-0.12 -0.25,-0.19c-0.23,-0.24 -0.41,-0.77 -0.7,-0.65c-0.31,0.13 -0.33,0.67 -0.44,1.05c-0.06,0.21 0.06,0.55 -0.28,0.57c-0.32,0.02 -0.35,-0.29 -0.39,-0.52c-0.13,-0.86 -0.99,-0.89 -1.5,-1.13c-0.78,-0.35 -1.16,-0.98 -1.4,-1.61c-0.49,-1.28 -0.99,-2.59 -1.07,-3.99c-0.01,-0.17 -0.13,-0.34 -0.2,-0.52c0,-0.05 0,-0.11 0,-0.16c0.37,-0.72 0.37,-1.49 0.32,-2.27c-0.16,-2.56 0.06,-5.04 1.33,-7.36c0.79,-1.44 1.5,-2.94 1.82,-4.59c0.1,-0.53 0.4,-1.03 0.73,-1.5c1.24,-1.69 2.64,-3.19 4.44,-4.31c1.76,-1.1 3.35,-2.46 5.22,-3.39c3.15,-1.55 6.49,-2.39 10,-2.57c0.5,-0.03 1.02,0.08 1.5,-0.17c1.12,0 2.25,0 3.37,0c0.16,0.12 0.32,0.12 0.48,0c0.11,0 0.21,0 0.32,0c0.34,0.18 0.71,0.23 1.07,0.31c1.59,0.36 3.15,0.71 4.58,1.59c2.12,1.3 3.9,2.98 5.66,4.69c2.77,2.69 4.68,5.9 5.87,9.6c1.47,4.56 1.17,9.05 -0.13,13.56c-0.23,0.79 -0.63,1.52 -0.96,2.28c-0.08,0.19 -0.17,0.47 -0.44,0.27c-0.33,-0.25 -0.42,0 -0.54,0.2c-0.42,0.71 -0.78,1.46 -1.24,2.15c-1.96,2.91 -4.33,5.38 -7.43,7.14c-2.64,1.5 -5.4,2.52 -8.41,2.88c-0.69,0.08 -1.39,0.02 -2.05,0.28c-0.05,0 -0.11,0 -0.16,0c-0.16,-0.11 -0.32,-0.12 -0.48,0c-0.11,0 -0.21,0 -0.32,0c-0.16,-0.12 -0.32,-0.12 -0.48,0c-0.05,0 -0.11,0 -0.16,0c-0.21,-0.14 -0.43,-0.15 -0.64,0c-0.05,0 -0.11,0 -0.16,0c-1.33,-0.26 -2.66,-0.53 -3.99,-0.79c-2.31,-0.46 -4.33,-1.49 -6.08,-3.05c-0.12,-0.11 -0.25,-0.21 -0.34,-0.34c-0.05,-0.08 -0.09,-0.22 -0.06,-0.29c0.08,-0.16 0.23,-0.1 0.34,-0.03c0.34,0.21 0.67,0.45 1,0.66c2.17,1.36 4.51,2.29 7.04,2.72c0.46,0.25 0.96,0.09 1.44,0.16c1.72,0.34 3.43,0.21 5.14,-0.04c0.13,-0.02 0.34,-0.02 0.33,-0.15c-0.02,-0.21 -0.25,-0.13 -0.39,-0.12c-1.03,0.05 -2.07,0.1 -3.1,0.2c-0.66,0.07 -1.33,-0.15 -1.98,0.1C22.17,44.35 21.7,44.15 21.19,44.39zM32.91,43.1c0.11,-0.05 0.21,-0.11 0.32,-0.16c0.03,-0.02 0.06,-0.03 0.1,-0.05c-0.03,0.02 -0.06,0.03 -0.1,0.05c-0.11,0.05 -0.22,0.11 -0.32,0.16c-0.03,0.02 -0.06,0.04 -0.09,0.05C32.85,43.14 32.88,43.12 32.91,43.1zM34.67,42.3c0.03,-0.02 0.06,-0.03 0.1,-0.05c-0.03,0.02 -0.06,0.04 -0.09,0.05c-0.03,0.02 -0.06,0.03 -0.09,0.05C34.61,42.33 34.64,42.31 34.67,42.3zM24.88,1.68c0.11,0 0.21,-0 0.32,-0c0.07,0.02 0.11,0.16 0.21,0.04c-0.07,-0.01 -0.14,-0.03 -0.21,-0.04C25.1,1.6 24.99,1.6 24.88,1.68c-0.11,0 -0.22,0 -0.32,0c-0.11,-0.09 -0.21,-0.08 -0.32,-0c-0.05,0.05 -0.18,-0.05 -0.19,0.09c0.06,-0.03 0.13,-0.06 0.19,-0.09c0.11,-0 0.21,-0 0.32,-0C24.67,1.77 24.78,1.77 24.88,1.68zM13.32,4.57c0.08,-0.01 0.16,-0.01 0.23,-0.04c0.08,-0.03 0.23,-0 0.16,-0.17c-0,-0.01 -0.14,0.03 -0.21,0.06c-0.07,0.04 -0.12,0.1 -0.18,0.14c-0.03,0.02 -0.06,0.03 -0.1,0.05C13.26,4.61 13.29,4.59 13.32,4.57zM27.45,1.84c0.07,0.03 0.14,0.09 0.21,0.1c0.08,0.01 0.19,0.09 0.25,-0.04c-0.08,-0.01 -0.16,-0.03 -0.23,-0.04c-0.08,-0.01 -0.16,-0.01 -0.24,-0.01c-0.05,-0.02 -0.09,-0.05 -0.14,-0.07c-0.31,-0.1 -0.62,-0.09 -0.93,-0.04c-0.01,0 -0.01,0.03 -0.02,0.05c0.28,0.02 0.57,0.03 0.86,0.05C27.3,1.84 27.37,1.84 27.45,1.84zM22.03,1.88c-0.04,-0.19 -0.16,-0.1 -0.23,-0.09c-2.48,0.31 -4.86,0.97 -7.1,2.1c-0.11,0.06 -0.34,0.01 -0.31,0.25c0.13,-0.03 0.26,-0.03 0.38,-0.08c2.25,-0.92 4.56,-1.68 6.96,-2.08C21.83,1.95 21.93,1.91 22.03,1.88zM22.97,1.83c0.09,-0.01 0.25,0 0.28,-0.05C23.3,1.69 23.17,1.7 23.11,1.7c-0.1,0 -0.26,-0.01 -0.29,0.05C22.77,1.84 22.91,1.8 22.97,1.83z"/>
 </vector>
-
diff --git a/QSthemes/QSTileInk/res/values/colors.xml b/QSthemes/QSTileInk/res/values/colors.xml
new file mode 100644
index 0000000..2eaae4c
--- /dev/null
+++ b/QSthemes/QSTileInk/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+
+    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
+
+    <!-- QS tiles expand, underline and label colors -->
+    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
+    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
+    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/QSthemes/QSTileInk/res/values/config.xml b/QSthemes/QSTileInk/res/values/config.xml
new file mode 100644
index 0000000..e23e4b0
--- /dev/null
+++ b/QSthemes/QSTileInk/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017-2018 Projekt Substratum
+      Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+     <!-- Config to enable/diaable qs tile tinting -->
+    <bool name="config_enable_qs_tile_tinting">true</bool>
+ </resources>
\ No newline at end of file
diff --git a/QSthemes/QStileInkDrop/Android.mk b/QSthemes/QSTileInkDrop/Android.mk
similarity index 84%
copy from QSthemes/QStileInkDrop/Android.mk
copy to QSthemes/QSTileInkDrop/Android.mk
index 5cee5cd..014d9ab 100644
--- a/QSthemes/QStileInkDrop/Android.mk
+++ b/QSthemes/QSTileInkDrop/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileInkDrop
+LOCAL_PACKAGE_NAME := QSTileInkdrop
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileInkDrop/AndroidManifest.xml
similarity index 80%
rename from QSthemes/QStileInkDrop/AndroidManifest.xml
rename to QSthemes/QSTileInkDrop/AndroidManifest.xml
index 0f62c1a..c2ac853 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileInkDrop/AndroidManifest.xml
@@ -4,6 +4,5 @@
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Inkdrop" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QSTileInkDrop/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileInkDrop/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..19c0227
--- /dev/null
+++ b/QSthemes/QSTileInkDrop/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,431 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="40dp"
+        android:height="40dp"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M13.09,13.07c0.18,-0.19 0.27,-0.46 0.54,-0.56c0.15,-0.44 0.61,0.01 0.81,-0.28l-0,0c0.2,-0.22 -0.07,-0.68 0.39,-0.78c0.85,0.03 1.35,-0.51 1.75,-1.15c0.18,-0.28 0.24,-0.59 0.7,-0.56c0.29,0.02 0.27,-0.22 0.09,-0.41c-0.09,-0.09 -0.18,-0.18 -0.24,-0.29c-0.12,-0.6 0.42,-0.68 0.75,-0.89c0.29,-0.19 0.62,-0.05 0.84,0.22c0.25,0.31 0.39,0.23 0.6,-0.08c0.39,-0.59 1.59,-0.76 2.19,-0.33c0.22,0.16 0.44,0.21 0.6,0.01c0.55,-0.68 1.36,-0.57 2.08,-0.74c0.45,-0.11 0.99,-0.06 1.2,-0.63c0.12,-0.01 0.25,-0.03 0.37,-0.04c0.61,0.25 1.18,-0.04 1.76,-0.1c0.32,-0.04 0.67,-0.02 0.96,0.18c0.43,0.16 0.9,0.21 1.21,0.6c0.07,0.09 0.21,0 0.31,-0.04c0.43,-0.24 0.76,-0.22 0.92,0.32c0.04,0.13 0.15,0.21 0.23,0.32c0.07,0.38 0.33,0.59 0.65,0.76c0.15,0.13 0.19,0.33 0.32,0.47c0.31,0.56 0.78,0.88 1.41,1.01c0.85,0.18 0.94,0.39 0.61,1.26c-0.05,0.13 -0.06,0.26 0.03,0.37c0.5,0.31 1.04,0.45 1.63,0.34c0.95,-0.89 2.13,-0.46 3.22,-0.53c0.26,-0.02 0.53,0.01 0.8,0.02c0.21,0.01 0.4,0.06 0.5,0.27c0.55,1.15 0.87,1.31 2.37,1.18c0.1,-0 0.19,-0.01 0.28,0.03c0.6,0.2 1.2,0.1 1.8,0c0.54,-0.09 0.69,0.05 0.69,0.63c-0.04,0.05 -0.09,0.09 -0.15,0.12c-0.71,0.16 -1.28,0.61 -1.95,0.85c-0.14,0.05 -0.28,0.19 -0.27,0.36c0.01,0.25 0.23,0.14 0.37,0.16c0.56,0.08 0.54,0.61 0.71,0.97c0.14,0.3 -0.09,0.54 -0.35,0.72c-0.26,0.18 -0.48,0.39 -0.45,0.85c0.59,-0.46 0.99,-0.19 1.35,0.26c0.14,0.18 0.2,0.39 0.07,0.56c-0.24,0.32 -0.32,0.67 -0.41,1.05c-0.07,0.28 -0.31,0.4 -0.6,0.4c0.29,0.12 0.39,0.32 0.33,0.63c-0.11,0.53 -0.29,1.03 -0.5,1.52c-0.05,0.05 -0.13,0.12 -0.11,0.16c0.35,0.76 0.09,1.58 0.23,2.35c0.06,0.35 -0.59,0.99 -1.07,1.06c-0.42,-0.09 -0.42,-0.09 -0.68,-0.49c0.18,0.2 0.32,0.48 0.15,0.73c-0.63,0.91 -1.02,1.95 -1.71,2.83c-0.51,0.65 -1.2,1.23 -1.39,2.11c-0.02,0.09 -0.06,0.19 -0.14,0.23c-0.67,0.36 -1.21,0.88 -1.78,1.37c-0.36,0.31 -0.68,0.48 -0.53,1c0.09,0.29 -0.05,0.48 -0.29,0.61c-0.5,0.29 -0.96,0.66 -1.51,0.88c-0.35,0.15 -0.69,0.3 -0.85,0.7c-0.08,0.2 -0.31,0.27 -0.51,0.29c-0.66,0.07 -1.3,0.28 -1.96,0.26c-0.15,-0 -0.32,-0.11 -0.37,0.13c-0.14,0.65 -0.64,0.66 -1.15,0.67c-0.32,0.01 -0.62,-0.06 -0.93,-0.13c-0.44,-0.1 -0.78,0.01 -0.97,0.46c-0.14,0.33 -0.34,0.62 -0.75,0.55c-0.45,-0.08 -0.52,-0.42 -0.52,-0.82c0,-0.15 0,-0.32 -0.2,-0.46c-0.2,0.58 -0.86,0.74 -1.13,1.27c-0.05,0.1 -0.15,0.18 -0.26,0.19c-0.78,0.09 -1.44,0.47 -2.1,0.84c-0.27,0.16 -0.62,0.14 -0.88,-0.12c-0.25,-0.25 -0.18,-0.52 -0.03,-0.74c-0.46,0.77 -0.67,0.8 -1.44,0.13c-0.3,-0.26 -0.69,-0.32 -1.07,-0.38c-0.28,-0.05 -0.55,-0.09 -0.65,-0.39c-0.12,-0.33 -0.33,-0.3 -0.59,-0.2c-0.81,0.31 -1,0.24 -1.28,-0.55c-0.08,-0.23 -0.2,-0.26 -0.4,-0.23c-0.22,0.04 -0.42,0.16 -0.64,0.21c-0.31,0.06 -0.59,0.01 -0.76,-0.29c-0.16,-0.29 -0.04,-0.51 0.22,-0.69c0.23,-0.16 0.29,-0.34 0.2,-0.63c-0.2,-0.64 -0.1,-0.78 0.59,-1.02c-0.55,0.06 -1.01,-0.13 -1.41,-0.49c-0.47,-0.41 -0.64,-1.05 -0.42,-1.63c0.15,-0.4 0.32,-0.79 0.49,-1.18c0.09,-0.2 0.09,-0.4 -0.08,-0.56c-0.21,-0.19 -0.41,-0.1 -0.61,0.03c-0.23,0.15 -0.38,0.38 -0.6,0.54c-0.38,0.28 -0.83,0.12 -0.87,-0.3c-0.08,-0.73 0.61,-1.96 1.3,-2.32c-1.37,-0.51 -1.37,-0.51 -1.17,-1.27c-0.07,0.27 -0.15,0.55 -0.51,0.49c-0.28,-0.05 -0.35,-0.27 -0.44,-0.52c-0.32,-0.91 -0.16,-1.75 0.28,-2.56c0.14,-0.25 0.15,-0.45 -0.08,-0.66c-0.29,-0.28 -0.31,-0.62 -0.04,-0.9c0.38,-0.4 0.19,-0.67 -0.11,-0.97c-0.54,-0.53 -0.63,-0.93 -0.24,-1.6c0.13,-0.22 -0,-0.17 -0.09,-0.23c-0.39,-0.27 -0.36,-0.58 -0.08,-0.92c0.14,-0.17 0.31,-0.33 0.42,-0.53c0.21,-0.39 0.28,-0.76 -0.12,-1.09c-0.25,-0.21 -0.38,-0.51 -0.51,-0.79c-0.16,-0.36 -0.27,-0.86 0.11,-1.08c0.51,-0.31 0.68,-0.84 1.04,-1.24c0.15,-0.17 0.18,-0.37 0.21,-0.58C12.82,13.45 12.86,13.21 13.09,13.07z"/>
+    <path
+        android:pathData="M13.09,13.07c0.09,0.37 0.05,0.7 -0.18,1.02c-0.2,0.28 -0.31,0.58 -0.31,0.94c-0.01,0.28 -0.14,0.48 -0.48,0.56c-0.57,0.14 -0.7,0.66 -0.32,1.11c0.07,0.09 0.14,0.19 0.24,0.24c0.92,0.52 0.73,1.2 0.14,1.96c-0.11,0.14 -0.25,0.26 -0.36,0.4c-0.09,0.11 -0.13,0.25 0,0.36c0.11,0.09 0.21,0.01 0.3,-0.06c0.19,-0.15 0.41,-0.44 0.61,-0.14c0.23,0.33 -0.14,0.43 -0.36,0.57c-0.5,0.32 -0.55,1 -0.13,1.44c0.16,0.16 0.32,0.31 0.47,0.48c0.29,0.35 0.7,0.72 -0.14,0.89c-0.16,0.03 -0.28,0.17 -0.25,0.35c0.03,0.19 0.2,0.23 0.36,0.25c0.51,0.05 0.6,0.26 0.25,0.63c-0.86,0.91 -0.81,1.95 -0.44,3.12c0.32,-0.35 0.05,-0.65 0.1,-0.93c0.03,-0.16 0.03,-0.34 0.22,-0.38c0.2,-0.04 0.26,0.14 0.3,0.29c0.05,0.17 0.07,0.35 0.12,0.53c0.06,0.24 -0.26,0.52 -0.02,0.69c0.28,0.21 0.64,0.34 1.01,0.33c0.31,-0.01 0.53,0.07 0.68,0.34c0.11,0.19 0.12,0.39 -0.01,0.57c-0.15,0.22 -0.31,0.09 -0.47,-0.01c-0.29,-0.17 -0.57,-0.1 -0.66,0.2c-0.16,0.6 -0.63,1.09 -0.57,1.79c0.47,-0.05 0.65,-0.53 0.97,-0.79c0.28,-0.22 0.42,-0.49 0.81,-0.17c0.38,0.32 0.73,0.64 0.47,1.19c-0.17,0.36 -0.39,0.7 -0.56,1.07c-0.37,0.82 0.33,1.88 1.21,1.74c0.78,-0.13 0.91,0.32 1.09,0.85c-0.2,0.13 -0.33,-0.03 -0.48,-0.05c-0.24,-0.04 -0.54,-0.15 -0.69,0.09c-0.17,0.27 0.16,0.35 0.3,0.51c0.42,0.46 -0.14,0.57 -0.31,0.81c-0.1,0.14 -0.5,0.09 -0.39,0.35c0.12,0.29 0.42,0.13 0.66,0.06c0.32,-0.1 0.64,-0.2 0.97,-0.29c0.19,-0.05 0.36,-0.02 0.48,0.15c0.13,0.17 0.1,0.34 -0.05,0.48c-0.41,0.38 -0.04,0.47 0.22,0.48c0.5,0.03 0.99,-0.04 1.1,-0.69c0.27,0.12 0.44,0.34 0.39,0.54c-0.13,0.51 0.14,0.56 0.52,0.58c0.38,0.03 0.72,0.25 1.12,0.22c0.15,-0.01 0.26,0.05 0.28,0.22c0.02,0.14 -0.21,0.4 0.12,0.4c0.23,0.01 0.43,-0.16 0.52,-0.38c0.08,-0.18 0.08,-0.39 0.14,-0.59c0.08,-0.3 0.3,-0.3 0.54,-0.22c0.3,0.1 0.29,0.31 0.15,0.53c-0.17,0.28 -0.67,0.55 -0.26,0.89c0.34,0.29 0.7,-0.1 1.02,-0.29c0.25,-0.15 0.45,-0.37 0.77,-0.4c0.46,-0.04 1.08,0.13 0.96,-0.71c0.7,-0.07 0.86,-0.83 1.4,-1.09c0.2,-0.1 0.47,-0.04 0.88,-0.07c-0.5,0.36 -0.43,0.76 -0.38,1.15c0.02,0.18 -0.03,0.4 0.22,0.43c0.22,0.03 0.32,-0.17 0.37,-0.33c0.22,-0.66 0.72,-0.72 1.3,-0.65c0.31,0.04 0.63,0.04 0.94,0.05c0.49,0.01 0.96,-0.01 0.69,-0.74c-0.1,-0.25 0.08,-0.37 0.29,-0.44c0.19,-0.06 0.39,-0.15 0.51,0.12c0.23,0.51 0.52,0.38 0.71,0.01c0.18,-0.33 0.34,-0.28 0.59,-0.13c0.54,0.31 0.77,0.24 0.91,-0.34c0.05,-0.21 0.15,-0.33 0.35,-0.34c0.86,-0.05 1.43,-0.72 2.15,-1.05c0.27,-0.12 0.21,-0.4 0.12,-0.59c-0.28,-0.62 0.17,-0.79 0.57,-0.99c0.04,-0.02 0.12,0 0.13,-0.02c0.44,-0.74 1.55,-0.77 1.83,-1.72c0.25,-0.83 1.02,-1.33 1.4,-2.08c0.33,-0.67 1.1,-1.06 1.15,-1.9c0.01,-0.19 0.16,-0.31 0.31,-0.41c0.17,-0.12 0.35,-0.26 0.25,-0.49c-0.12,-0.28 -0.37,-0.18 -0.59,-0.14c-0.1,0.02 -0.2,0.03 -0.4,0.05c0.28,-0.43 0.68,-0.49 0.99,-0.68c0.17,-0.1 0.29,0.08 0.32,0.24c0.06,0.24 0.16,0.42 0.43,0.44c0.2,0.17 0.24,0.37 0.13,0.6c-0.3,0.63 -0.44,1.31 -0.43,2.01c0,0.81 -0.37,1.36 -1.12,1.67c-0.11,0.04 -0.19,0.12 -0.28,0.19c-0.15,0.1 -0.31,0.19 -0.44,0.31c-0.2,0.19 -0.05,0.44 -0.12,0.66c-0.14,0.21 -0.06,0.52 -0.32,0.67c-0.46,0.07 -0.79,0.32 -1,0.73c-0.17,0.07 -0.33,0.21 -0.53,0.12c-0.2,0.07 -0.33,-0.14 -0.52,-0.17c-0.01,0.19 0.11,0.34 0.08,0.51c-0.06,0.35 0.05,0.74 -0.19,1.06c-0.14,0.2 -0.08,0.5 -0.31,0.67c-0.05,0.03 -0.11,0.05 -0.17,0.06c-0.29,0.08 -0.75,-0.2 -0.83,0.36c-0.12,0.16 -0.28,0.31 -0.21,0.55c-0.13,0.47 -0.44,0.62 -0.9,0.54c-0.08,-0.02 -0.17,-0.12 -0.25,-0.06c-0.54,0.44 -1.35,0.56 -1.74,1.02c-0.54,0.64 -1.26,1 -1.79,1.6c-0.05,0.08 -0.1,0.17 -0.15,0.25c-0.37,0.2 -0.74,0.4 -1.17,0.13c-0.11,-0.07 -0.28,-0.07 -0.39,-0.01c-0.65,0.33 -1.35,0.47 -2.07,0.44l0.01,-0c-0.4,0.72 -1.15,0.67 -1.81,0.83c-0.34,0.19 -0.74,0.19 -1.11,0.31c-0.41,0.14 -0.51,-0.22 -0.56,-0.5c-0.12,0.31 -0.43,0.32 -0.74,0.29c-0.49,-0.05 -0.91,0.07 -1.27,0.43c-0.28,0.28 -0.59,0.28 -0.9,0.02c-0.51,-0.43 -1.07,-0.38 -1.64,-0.16c-0.52,0.2 -1.04,0.4 -1.61,0.4c-0.06,0.02 -0.13,0.03 -0.19,0.03c-0.88,-0.35 -0.88,-0.35 -1.25,0.25c-0.04,0.06 -0.09,0.1 -0.16,0.14c-0.62,0.06 -0.52,-0.34 -0.46,-0.72c0.02,-0.21 0.21,-0.33 0.28,-0.58c-0.55,-0.11 -0.64,0.53 -1.04,0.61c-0.1,0.01 -0.19,-0.02 -0.27,-0.09c-0.04,-0.05 -0.07,-0.1 -0.1,-0.16c0.02,-0.58 -0.3,-0.98 -0.88,-1.07c-0.23,-0.04 -0.44,-0.16 -0.39,-0.37c0.14,-0.67 -0.54,-1.13 -0.42,-1.78c0,-0.03 -0.05,-0.06 -0.09,-0.09c-0.62,0.26 -1.12,-0.25 -1.71,-0.26c-0.35,-0.01 -0.53,-0.51 -0.24,-0.78c0.39,-0.37 -0.03,-0.84 0.28,-1.17c-0.1,0.04 -0.19,0.14 -0.31,0.13c-0.73,-0.18 -0.49,-0.79 -0.57,-1.26c-0.17,-0.35 -0.06,-0.57 0.27,-0.78c0.4,-0.24 0.38,-0.27 0.1,-0.71c0.3,0.44 0.06,0.88 -0.58,0.98c-0.32,0.05 -0.67,0.05 -0.96,-0.19c-0.5,-0.42 -1.09,-0.68 -1.68,-0.94c-0.42,-0.18 -0.47,-0.32 -0.32,-0.85c-0.11,0.15 -0.22,0.29 -0.42,0.31c-0.51,0.05 -0.83,-0.42 -1.37,-0.45c-0.47,-0.02 -0.74,-0.57 -0.77,-1.11c-0.03,-0.53 -0.51,-0.53 -0.86,-0.69c-0.8,-0.33 -1.05,-1.81 -0.52,-2.42c0.1,-0.12 0.22,-0.28 0.36,-0.29c0.91,-0.06 0.83,-0.78 0.9,-1.36c0.05,-0.4 0.2,-0.64 0.54,-0.86c0.49,-0.31 1.06,-0.55 1.28,-1.16c0.21,-0.81 0.51,-1.1 1.06,-1.02c0.22,0.19 0.31,0.05 0.4,-0.14c0.74,-0.08 1.1,-0.63 1.48,-1.17c-0,-0.04 0.01,-0.07 0.04,-0.1c0.07,-0.07 0.15,-0.1 0.24,-0.14c0.25,0.02 0.49,0.04 0.69,-0.15c0.13,-0.07 0.2,-0.17 0.21,-0.31c0.02,-0.35 -0.03,-0.72 0.21,-1.04c0.08,-0.1 -0.07,-0.19 -0.16,-0.25c-0.15,-0.21 -0.57,-0.17 -0.54,-0.55c0.32,-0.23 0.55,-0.52 0.55,-0.94c0.34,-0.32 0.49,-0.61 0.24,-1.14c-0.2,-0.45 -0.49,-1.06 0.05,-1.55c0.43,-0.04 0.62,-0.44 0.92,-0.66c0.3,0 0.48,-0.12 0.39,-0.45C12.32,12.95 12.32,12.95 13.09,13.07z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M7.15,23.46c-0.61,0.43 -0.88,1.25 -1.7,1.44c-0.19,0.05 -0.29,0.27 -0.04,0.39c0.5,0.23 0.18,0.36 -0.04,0.53c-0.15,0.11 -0.34,0.28 -0.28,0.43c0.3,0.76 -0.5,0.84 -0.67,1.36c-0.28,-0.32 0.19,-0.46 -0.04,-0.71c-0.27,0.12 -0.64,0.23 -0.47,0.61c0.15,0.35 -0.05,0.41 -0.43,0.53c0.5,0.16 0.85,0.26 0.55,0.75c-0.14,0.22 0.08,0.3 0.27,0.33c0.13,0.18 0.07,0.32 -0.08,0.45c-0.18,0.1 -0.48,0.12 -0.45,0.42c0.1,0.83 -0.39,1.26 -1.04,1.6c-0.66,-0.05 -0.74,-0.24 -0.47,-1.1c-0.12,0.2 -0.29,0.28 -0.5,0.31c-0.73,-0.14 -0.82,-0.58 -0.3,-1.4c0.04,-0.05 0.08,-0.09 0.12,-0.14c0.12,-0.16 0.16,-0.34 0.11,-0.55c-0.12,-0.49 0.1,-0.74 0.57,-0.81c0.05,-0.13 0.09,-0.26 0.13,-0.39c0.06,-0.3 0.48,-0.25 0.54,-0.55c-0.03,-0.34 -0.08,-0.67 -0.08,-1.01c-0,-0.22 0.13,-0.42 0.37,-0.29c0.53,0.29 0.47,-0.05 0.4,-0.36c-0.13,-0.62 0.49,-0.58 0.73,-0.87c0.27,-0.32 0.3,0.12 0.46,0.1C5,24.32 5.05,24 5.4,24c0.1,-0.66 0.67,-0.2 0.96,-0.41C6.6,23.39 6.8,23.01 7.15,23.46z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M25.37,6.6c-0.04,0.59 -0.55,0.72 -0.96,0.88c-0.37,0.15 -0.79,0.21 -1.18,0.22c-0.39,0.01 -0.61,0.19 -0.82,0.48c-0.4,0.55 -0.79,0.55 -1.22,0.03c-0.07,-0.08 -0.14,-0.19 -0.23,-0.22c-0.18,-0.08 -1.33,0.49 -1.41,0.68c-0.13,0.3 -0.29,0.61 -0.63,0.62c-0.31,0.01 -0.3,-0.34 -0.4,-0.55c-0.13,-0.3 -0.31,-0.45 -0.62,-0.22c-0.21,0.16 -0.51,0.2 -0.62,0.49c-0.02,0.49 -0.33,0.51 -0.7,0.42c-0.29,-0.44 -0.81,-0.94 0.28,-0.99c0.4,-0.74 1.35,-0.51 1.85,-1.07c0.14,-0.16 0.33,-0.11 0.51,-0.1c0.21,0.01 0.5,0.01 0.56,-0.15c0.16,-0.47 0.68,-0.42 0.95,-0.75c0.16,-0.2 0.58,-0.71 0.75,0.1c0.05,0.23 0.28,0.39 0.45,0.02c0.06,-0.13 0.17,-0.21 0.32,-0.2c0.36,-0 0.73,-0.39 1.09,0.01c-0,0.05 -0,0.09 -0.01,0.14c-0.14,0.31 -0.19,0.55 0.29,0.43c0.05,-0.05 0.1,-0.1 0.16,-0.15c0.31,-0.25 0.54,0.03 0.79,0.13C24.94,7.12 25.15,6.82 25.37,6.6z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M42.65,13.19c-0.62,0.4 -1.82,0.2 -2.13,-0.36c-0.11,-0.19 -0.25,-0.15 -0.4,-0.11c-0.17,0.05 -0.34,0.13 -0.52,0.06c-0.19,-0.07 -0.41,-0.16 -0.38,-0.4c0.02,-0.27 0.24,-0.2 0.42,-0.19c0.16,0.01 0.32,0.02 0.41,-0.15c-0.75,-0.39 -2.96,-0.58 -4.28,0.2c-0.15,-0.2 -0.02,-0.3 0.14,-0.39c0.3,-0.72 0.81,-1.08 1.62,-0.96c0.17,0.37 0.99,0.6 1.13,0.29c0.25,-0.56 0.62,-0.45 1.04,-0.37c0.11,0.02 0.22,-0.02 0.33,-0.06c0.21,-0.2 0.48,-0.2 0.74,-0.23c0.52,0.02 0.92,-0.42 1.44,-0.38c0.18,0 0.38,0.01 0.47,0.19c0.17,0.31 0.34,0.49 0.74,0.34c0.23,-0.08 0.46,0.21 0.35,0.34c-0.29,0.34 0,0.75 -0.2,1.08c-0.14,0.09 -0.29,0.13 -0.43,0.19c-0.12,0.02 -0.24,0.01 -0.35,0.03c-0.09,0.02 -0.1,0.09 -0.02,0.03c0.07,-0.05 -0.01,0.13 0.04,0.05C43.06,12.73 42.86,12.96 42.65,13.19z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M18.22,40.73c0.83,-0.05 1.51,-0.58 2.34,-0.67c0.39,-0.04 0.67,-0.07 0.96,0.22c0.29,0.3 0.61,0.5 1,0.05c0.24,-0.27 0.65,-0.37 1,-0.33c0.54,0.05 0.83,-0.19 1.05,-0.62c0.06,-0.12 0.03,-0.38 0.27,-0.3c0.19,0.06 0.21,0.28 0.19,0.46c-0.03,0.25 -0.44,0.49 -0.14,0.71c0.28,0.2 0.57,-0.13 0.86,-0.22c0.11,-0.03 0.21,-0.08 0.31,-0.12c0.16,0.18 0.41,0.35 0.08,0.6c-0.38,0.24 -0.9,-0.03 -1.27,0.39c-0.17,0.19 -0.33,-0.18 -0.49,-0.29c-0.59,0.57 -1.43,0.64 -2.09,1.06l0.01,0.01c-0.11,0.14 -0.09,0.43 -0.34,0.41c-0.23,-0.02 -0.06,-0.31 -0.21,-0.42l0.01,-0c-0.07,-0.06 -0.16,-0.12 -0.24,-0.1c-0.48,0.13 -0.93,0.04 -1.38,-0.15l0.01,-0.01c-0.29,0.31 -0.6,0.51 -0.95,0.07c-0.09,-0.11 -0.22,-0.15 -0.36,-0.14C18.36,41.38 18.21,41.13 18.22,40.73z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M9.19,33.98c0.02,0.16 -0,0.3 -0.15,0.4c-0.08,0.08 -0.12,0.22 -0.28,0.14c-0.41,-0.38 -0.47,-0.37 -0.72,0.13c-0.11,0.21 -0.2,0.08 -0.35,0.01c-0.35,-0.15 -0.68,-0.11 -0.69,0.4c-0.35,0.26 -0.49,-0.12 -0.66,-0.27c-0.3,0.18 -0.19,0.69 -0.65,0.63c-0.37,-0.15 -0.71,0.21 -1.08,0.05c-0.08,-0.04 -0.14,-0.1 -0.21,-0.16c-0.81,-0.72 -0.81,-0.72 -0.17,-1.58c0.68,-0.43 1.3,-1.03 2.21,-0.85c0.45,0.09 0.78,-0.27 1.21,-0.31c0.66,-0.06 1.17,0.05 1.44,0.72C9.4,33.48 9.1,33.76 9.19,33.98z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M40.76,29.79c0.09,-0.16 0.19,-0.29 0.36,-0.38c0.8,-0.45 1.25,-1.57 1,-2.44c-0.09,-0.33 0.1,-0.81 0.4,-1c0.18,-0.12 0.11,-0.32 0.14,-0.49c0.82,-0.44 1.04,-1.14 0.6,-1.92c-0.04,-0.08 -0.12,-0.19 -0.09,-0.23c0.54,-0.85 -0.26,-0.45 -0.76,-0.58c0.39,-0.32 0.66,-0.55 0.93,-0.77c0.16,-0.19 0.26,-0.44 0.54,-0.49c0.14,0.02 0.28,0.11 0.27,0.24c-0.06,0.51 0.28,0.59 0.65,0.66c-0.01,0.25 0.51,0.69 -0.24,0.67c-0.3,0.22 -0.31,0.68 -0.65,0.86c-0.03,0.03 -0.1,0.08 -0.09,0.09c0.44,0.78 -0.38,1.25 -0.45,1.91c-0.33,0.39 -0.33,0.91 -0.54,1.35c-0.28,0.24 -0.33,0.55 -0.22,0.87c0.4,1.18 0.05,1.75 -1.24,1.97C41.07,30.15 40.63,30.57 40.76,29.79z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M11.47,34.92c0.29,-0.2 0.59,-0.4 0.95,-0.64c0.03,0.37 -0.21,0.5 -0.37,0.65c-0.19,0.18 -0.32,0.37 -0.05,0.54c0.47,0.29 0.21,0.48 -0.06,0.68c-0.15,0.11 -0.45,0.13 -0.34,0.41c0.1,0.28 0.38,0.04 0.52,0.1c0.45,0.21 0.89,0.34 1.38,0.14c0.14,-0.06 0.26,0.03 0.23,0.13c-0.19,0.64 0.03,1.42 -0.64,1.9c-0.08,0.05 -0.17,0.08 -0.26,0.11c-0.36,-0.13 -0.61,0.38 -0.99,0.17c0.24,-0.38 -0.26,-0.47 -0.3,-0.74c0.03,-0.22 -0.17,-0.34 -0.26,-0.51c-0.01,-0.09 -0.01,-0.18 0.03,-0.27l-0,0.01c0.14,-0.24 -0.06,-0.31 -0.2,-0.41c-0.02,-0.06 -0.08,-0.13 -0.06,-0.19c0.21,-0.9 -0.6,-1.04 -1.06,-1.45c-0.06,-0.5 0.39,-0.81 1.02,-0.65C11.16,34.95 11.3,35.11 11.47,34.92z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M30.91,8.06c-0.18,-0.09 -0.33,-0.2 -0.32,-0.44c0.01,-0.42 -0.24,-0.33 -0.49,-0.23c-0.35,-0.02 -0.32,-0.24 -0.2,-0.45c0.1,-0.17 0.13,-0.32 0.07,-0.5c0.29,-0.22 0.51,-1 0.92,-0.08c0.12,0.26 0.45,-0 0.69,0.1c-0.08,0.31 -0.29,0.53 -0.49,0.79c0.61,0.08 1.21,0.27 1.81,-0c0.09,0.23 0.84,-0.08 0.44,0.55c-0.09,0.05 -0.07,0.1 -0.01,0.16c0.45,-0.03 0.68,0.35 0.98,0.56c0.23,0.16 0.27,0.48 -0.08,0.61c-0.24,0.09 -0.22,0.24 -0.2,0.42c-0.29,0.23 -0.56,-0 -0.7,-0.16c-0.31,-0.34 -0.61,-0.37 -0.99,-0.19c-0.17,0.09 -0.34,0.08 -0.5,-0.05c-0.09,-0.14 -0.18,-0.27 -0.27,-0.41C31.48,8.39 31.21,8.2 30.91,8.06z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M31.85,9.14c0.4,-0.4 1.02,-0.33 1.44,-0.7c0.14,-0.12 0.31,-0.04 0.4,0.12c0.17,0.31 -0.2,0.28 -0.3,0.45c0.21,0.17 0.43,0.35 0.64,0.53c0.17,0.18 0.42,0.12 0.62,0.19c-0.17,0.41 -0.26,0.81 0.09,1.18c0.31,0.33 -0.16,0.43 -0.18,0.66c-0.01,0.54 -0.59,0.39 -0.81,0.68c-0.19,-0.44 -0.43,-0.88 0.14,-1.24c0.12,-0.07 0.22,-0.19 0.15,-0.33c-0.1,-0.22 -0.33,-0.24 -0.52,-0.23c-0.73,0.02 -1.18,-0.41 -1.61,-0.91C31.82,9.41 31.84,9.27 31.85,9.14z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M31.73,38.59c0.05,-0.37 0.2,-0.7 0.55,-0.88c0.44,-0.23 0.78,-0.52 0.82,-1.05c0.02,-0.17 0.13,-0.32 0.31,-0.29c1.01,0.17 1.55,-0.54 2.15,-1.13c0.06,-0.06 0.08,-0.16 0.17,-0.33c0.08,0.21 0.11,0.27 0.11,0.32c0,0.22 -0.46,0.44 -0.13,0.6c0.31,0.15 0.39,-0.26 0.47,-0.5c0.14,-0.11 0.27,-0.14 0.41,-0c0.3,0.19 0.33,0.44 0.15,0.71c-0.22,0.33 -0.45,0.06 -0.67,-0.03c-0.14,0.22 -0.08,0.67 -0.56,0.53c-0.14,-0.09 -0.2,-0.34 -0.43,-0.25c-0.25,0.1 -0.03,0.27 -0,0.39c0.08,0.45 -0.51,0.6 -0.56,0.6c-0.75,0.03 -1.21,0.64 -1.85,0.87c0.07,0.49 -0.16,0.57 -0.56,0.43C31.98,38.58 31.85,38.59 31.73,38.59z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M2.41,33.72c-0.09,-0.1 -0.26,-0.23 -0.24,-0.3c0.15,-0.51 -0.25,-0.61 -0.55,-0.79c-0.1,-0.3 0.08,-0.44 0.31,-0.56c0.34,-0.19 0.69,-0.38 0.97,-0.65c0.23,-0.06 0.4,-0.25 0.63,-0.3c0.17,0.02 0.34,0.03 0.47,0.17c0,0.74 0.51,1.01 1.1,1.26c0.33,0.15 0.42,0.45 0.07,0.74c-0.22,0.18 -0.38,0.44 -0.69,0.49c-0.37,0.29 -0.73,0.43 -1.18,0.09C3.05,33.68 2.67,33.99 2.41,33.72z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M2.96,31.55c0.03,0.71 -0.58,0.73 -1.02,0.9c-0.12,0.05 -0.25,0.06 -0.33,0.18c-0.32,-0.19 -0.8,-0.08 -0.98,-0.53c0.03,-0.11 0.17,-0.19 0.17,-0.27c-0.05,-0.71 0.41,-0.99 0.95,-1.22c0.45,-0.14 0.39,-0.75 0.86,-0.95c0.09,0.39 -0,0.72 -0.06,1.06c-0.03,0.2 -0.37,0.58 0.15,0.7C2.84,31.35 2.91,31.43 2.96,31.55z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M27.94,39.39c0.88,-0.23 1.62,-0.89 2.61,-0.8c0.36,0.04 0.62,0.46 1.02,0.25c-0.19,0.18 -0.35,0.38 -0.56,0.52c-0.21,0.14 -0.4,0.67 -0.73,0.08c-0.1,-0.19 -0.35,-0 -0.48,0.08c-0.39,0.26 -0.81,0.16 -1.23,0.2C28.29,39.74 28.32,39.17 27.94,39.39z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M2.41,33.72c0.38,-0.22 0.77,-0.43 1.23,-0.23c0.06,0.02 0.18,0.02 0.18,0.03c-0.04,0.84 0.43,0.09 0.62,0.2c0.05,0.03 0.07,0.06 0.05,0.09c-0.02,0.03 -0.03,0.05 -0.05,0.05c-0.56,0.73 -0.54,0.78 0.41,1.35c-0.14,0.29 -0.14,0.29 -0.67,0.13c-0.57,0.07 -0.86,-0.29 -1.05,-0.73c-0.13,-0.3 -0.3,-0.48 -0.64,-0.48C1.84,34.11 2.32,33.87 2.41,33.72z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M17.54,9.14c0.22,0.03 0.4,0.12 0.35,0.39c-0.05,0.3 -0.24,0.51 -0.54,0.5c-0.31,-0.01 -0.44,0.12 -0.5,0.39c-0.25,1.09 -1.16,1.13 -2.01,1.29c-0.14,-0.39 0.21,-0.39 0.4,-0.52c0.24,-0.07 0.44,-0.2 0.56,-0.43c0.03,-0.05 0.03,-0.09 -0,-0.14c0.05,-0.23 -0.12,-0.63 0.39,-0.52c0.1,0.05 0.28,0.09 0.28,-0.03C16.53,9.4 17.14,9.39 17.54,9.14z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M43.46,11.96c-0.16,-0.54 -0.57,-0.02 -0.89,-0.23c0.32,-0.26 0.84,-0.25 0.97,-0.7c-0.16,-0.14 -0.25,0.04 -0.37,0.06c-0.37,0.07 -0.94,0.48 -0.71,-0.43c0.04,-0.15 -0.08,-0.24 -0.22,-0.3c-0.05,-0.06 -0.06,-0.12 -0.03,-0.19c0.16,-0.19 0.34,-0.21 0.54,-0.07c0.26,0.56 0.55,-0.21 0.82,0.01c0.27,0.05 0.42,0.31 0.68,0.38c0.05,0.18 0.19,0.33 0.14,0.54c-0.14,0.21 -0.17,0.46 -0.28,0.68C43.99,11.98 43.82,12.23 43.46,11.96z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M29.97,6.44c0.18,-0.04 0.36,-0.09 0.56,-0.14c-0.01,0.46 -0.55,0.63 -0.43,1.08c-0.09,0.18 -0.17,0.37 -0.28,0.53c-0.09,0.14 -0.26,0.19 -0.42,0.15c-0.23,-0.06 -0.1,-0.23 -0.1,-0.38c-0,-0.4 -0.01,-0.83 -0.63,-0.52c-0.2,0.1 -0.43,0.12 -0.69,-0c0.07,-0.26 0.45,-0.19 0.5,-0.45c0.44,-0.15 0.89,-0.23 1.36,-0.14C29.88,6.53 29.92,6.48 29.97,6.44z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M11.47,34.92c0.05,0.25 -0.07,0.37 -0.28,0.27c-0.29,-0.14 -0.55,0.09 -0.84,-0.01c-0.34,-0.11 -0.34,0.16 -0.36,0.38c-0.35,-0.46 -0.04,-0.59 0.33,-0.71c0.16,-0.05 0.38,-0.14 0.22,-0.37c-0.11,-0.17 -0.32,-0.15 -0.48,-0.07c-0.34,0.17 -0.36,0.18 -0.35,-0.21c0,-0.16 -0.1,-0.23 -0.13,-0.36c-0.05,-0.11 -0.01,-0.2 0.06,-0.28c0.51,-0.32 0.96,-0.05 1.43,0.13C11.25,34.09 10.78,34.7 11.47,34.92z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M45.22,13.59c0.04,-0 0.09,-0 0.13,-0.01c0.14,-0.45 0.47,-0.81 0.65,-1.24c0.06,-0.03 0.12,-0.02 0.16,0.03c0.24,-0.05 0.48,-0.14 0.71,-0.14c0.2,0 0.48,-0.09 0.6,0.17c0.12,0.25 0,0.46 -0.21,0.63c-0.08,0.07 -0.13,0.18 -0.19,0.28c-0.07,0.17 -0.17,0.3 -0.36,0.33c-0.25,-0.02 -0.5,-0.14 -0.69,0.2c-0.2,0.35 -0.5,0.15 -0.76,0.01C45.21,13.78 45.17,13.7 45.22,13.59z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M26.13,40.52c-0.03,-0.2 -0.05,-0.4 -0.08,-0.6c0.73,0.14 1.28,-0.31 1.9,-0.54c0.05,0.19 0.12,0.38 0.14,0.57c0.04,0.4 -0.24,0.51 -0.5,0.34c-0.53,-0.37 -0.69,0 -0.92,0.35c-0.1,0.16 -0.21,0.39 -0.44,0.33C26,40.9 26.09,40.69 26.13,40.52z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M43.46,11.96c0.5,-0.12 0.37,-0.89 0.94,-0.94c0.32,0.28 0.66,0.53 1.08,0.63c0.1,0.43 -0.3,0.36 -0.49,0.49c-0.39,0.03 -0.68,0.31 -1.05,0.39c-0.25,0.05 -0.52,0.16 -0.77,-0.01c-0.13,-0.11 -0.19,-0.24 -0.11,-0.41C43.2,12.06 43.33,12.01 43.46,11.96z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M9.7,20.99c0.12,0.87 -0.45,1.36 -1.46,1.25c0.14,-0.3 0.28,-0.6 0.25,-0.95l0,-0c0.29,-0.16 0.36,-0.82 0.91,-0.4C9.47,21.02 9.58,21.01 9.7,20.99z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M40.1,11.03c-0.31,0.1 -0.61,0.32 -0.91,-0.01c-0.11,-0.12 -0.17,-0.06 -0.25,0.06c-0.25,0.38 -1.03,0.5 -1.42,0.28c-0.34,-0.19 -0.03,-0.32 0.01,-0.48c0.4,0.49 0.99,0.44 1.22,-0.14c0.14,-0.34 0.38,-0.45 0.68,-0.54C39.59,10.53 40.15,10.53 40.1,11.03z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M1.75,30.6C1.66,30.88 0.82,32 0.63,32.1c-0.04,-0.04 -0.07,-0.08 -0.11,-0.13c-0.19,-0.37 -0.02,-0.7 0.14,-1c0.18,-0.34 0.59,-0.56 0.25,-1.06c-0.13,-0.19 0.24,-0.3 0.44,-0.38c0.05,-0.05 0.09,-0.09 0.14,-0.14c0.04,0.18 0,0.34 -0.05,0.52C1.34,30.22 1.46,30.45 1.75,30.6z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M18.22,40.73c0.5,0.59 1.13,0.85 1.9,0.68c-0,0.34 -0.23,0.48 -0.52,0.55c-0.31,0.14 -0.38,-0.05 -0.43,-0.29c-0.45,-0.38 -0.91,-0.37 -1.37,-0.01c-0.03,-0.01 -0.06,-0.02 -0.09,-0.03c-0.28,-0.24 -0.74,-0.02 -0.98,-0.37c0,-0.05 0,-0.09 0,-0.13C17.14,40.67 17.72,40.84 18.22,40.73L18.22,40.73z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M12.82,38.95c0.05,-0.04 0.09,-0.08 0.14,-0.11c0.09,-0.06 0.19,-0.12 0.3,-0.15c0.14,-0.03 0.31,-0.02 0.37,0.1c0.33,0.69 1.49,0.49 1.54,1.45c0,0.06 -0.03,0.13 -0.06,0.19c-0.03,0.07 -0.07,0.13 -0.12,0.18c-0.6,0.56 -0.38,-0.41 -0.74,-0.41c-0.15,-0 -0.19,-0.56 -0.61,-0.31c-0.1,0.06 -0.13,-0.09 -0.11,-0.17C13.68,39.1 13.24,39.03 12.82,38.95z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M14.98,40.61c-0,-0.05 -0,-0.1 -0,-0.15c0.09,-0.08 0.18,-0.07 0.27,-0c0,0.04 0,0.09 0,0.13c0.06,0.07 0.13,0.14 0.2,0.21c0.65,0.61 1.49,0.69 2.3,0.83l0.05,0.04c-0.46,0.14 -0.8,0.38 -1.4,0.33C15.33,41.93 15.13,41.4 14.98,40.61z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M40.76,29.79c0.07,0.36 0.34,0.31 0.59,0.29c-0.56,0.53 -0.94,1.16 -1.02,1.94c-0.01,0.1 -0.02,0.24 -0.19,0.2c-0.2,-0.05 -0.18,-0.23 -0.2,-0.37c-0.14,-0.15 -0.09,-0.29 0.01,-0.44c0.06,-0.2 0.03,-0.44 0.26,-0.55c0.12,-0.25 -0.04,-0.56 0.13,-0.8C40.49,29.98 40.63,29.89 40.76,29.79z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M22.27,41.68c0.24,-0.7 0.68,-1.07 1.47,-0.87c0.23,0.06 0.41,-0.14 0.62,-0.19C23.86,41.35 23.16,41.71 22.27,41.68z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M46.69,13.44c0.13,-0.04 0.26,-0.08 0.39,-0.13c0.28,0.15 0.41,0.32 0.08,0.55c-0.24,0.17 -0.35,0.4 -0.37,0.68c-0.15,0.23 -0.38,0.19 -0.6,0.19c-0.22,-0 -0.48,0.05 -0.59,-0.2c-0.12,-0.26 0.13,-0.38 0.26,-0.55C46.08,13.7 46.27,13.41 46.69,13.44z"
+        android:fillColor="#2E3192"/>
+    <path
+        android:pathData="M5.66,35.33c0.24,-0.12 0.31,-0.32 0.19,-0.55c-0.1,-0.19 -0.24,-0.34 0.05,-0.48c0.19,-0.09 0.33,-0.31 0.59,-0.2c0.25,0.11 0.19,0.29 0.17,0.5c-0.03,0.24 0.04,0.45 0.35,0.46c-0.45,0.14 -0.9,0.29 -1.35,0.43C5.58,35.43 5.58,35.38 5.66,35.33z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M7.15,23.46c-0.29,-0.1 -0.54,0.04 -0.79,0.13c0.11,-0.31 0.06,-0.64 -0.03,-0.91c-0.09,-0.25 0.13,-0.34 0.15,-0.32c0.51,0.43 0.81,-0.38 1.27,-0.21c0.03,0.01 0.05,0.07 0.07,0.1c0.04,0.04 0.05,0.07 0.04,0.1c-0.02,0.03 -0.03,0.05 -0.05,0.05C7.22,22.52 7.1,22.94 7.15,23.46z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M29.83,6.58c-0.45,0.05 -0.9,0.09 -1.35,0.14c-0.64,-0.17 -1.29,-0.1 -1.91,0.04c-0.34,0.08 -0.56,-0.09 -0.82,-0.2c0.04,-0.14 0.18,-0.32 0.25,-0.21c0.31,0.49 0.64,0.16 0.95,0.07c0.53,-0.16 1.05,-0.21 1.54,0.12c0.22,0.15 0.42,-0.04 0.63,-0.06C29.36,6.45 29.61,6.43 29.83,6.58z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M46.69,13.44c-0.35,0.27 -0.68,0.55 -0.95,1.02c0.39,0.03 0.72,0.05 1.06,0.08c0.06,0.13 0.29,0.23 0.07,0.41c-0.03,-0 -0.06,-0 -0.09,-0.01c-0.6,-0.04 -1.24,0.19 -1.77,-0.32c-0.15,-0.14 -0.44,-0.15 -0.41,-0.44c0.03,-0.3 0.29,-0.31 0.51,-0.37c0.09,-0.02 0.17,-0.04 0.25,-0.09c0.22,0.05 0.42,0.09 0.58,-0.15C46.13,13.29 46.4,13.29 46.69,13.44z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M38.11,32.79c-0.23,-0.04 -0.55,0.01 -0.62,-0.28c-0.08,-0.34 0.27,-0.41 0.47,-0.55c0.05,-0.04 0.11,-0.07 0.17,-0.1c0.18,-0.1 0.39,-0.38 0.57,-0.15c0.24,0.3 -0.18,0.3 -0.3,0.44c-0.08,0.09 0.01,0.16 0.07,0.22c0.07,0.05 0.08,0.11 0.01,0.18C38.49,32.82 38.29,32.79 38.11,32.79z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M1.34,29.53c-0.09,0.13 -0.27,0.27 -0.25,0.37c0.19,0.81 -0.51,1.36 -0.57,2.08c-0.64,-0.31 -0.1,-0.64 -0.01,-0.95c0.1,-0.34 0.63,-0.52 0.19,-1.06C0.45,29.64 0.86,29.35 1.34,29.53z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M33.75,12.24c0.27,-0.22 0.54,-0.45 0.81,-0.67c0.14,-0.03 0.37,-0.16 0.42,0.02c0.18,0.63 0.58,0.33 0.93,0.27c-0.05,0.13 -0.09,0.26 -0.14,0.39C35.09,12.45 34.42,12.05 33.75,12.24z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M44.79,22.37c-0.06,0.01 -0.13,0.03 -0.2,0.04c-0.25,0.02 -0.44,0.42 -0.72,0.17c-0.25,-0.24 0.12,-0.43 0.13,-0.65c0,-0.12 -0.08,-0.24 -0.13,-0.37c0.1,-0.39 0.02,-0.89 0.6,-1c0.03,0.02 0.05,0.05 0.08,0.07c-0.06,0.27 0.05,0.56 -0.12,0.82C44.13,21.91 44.32,22.2 44.79,22.37z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M5.66,35.33c-0,0.05 -0.01,0.1 -0.01,0.16c-0.35,-0.03 -0.54,0.22 -0.77,0.42c-0.11,0.1 -0.09,0.37 -0.37,0.28c-0.3,-0.09 -0.16,-0.31 -0.19,-0.49c-0.03,-0.13 -0.09,-0.25 -0.14,-0.37c0.22,-0.04 0.45,-0.09 0.67,-0.13C5.12,35.27 5.42,35.1 5.66,35.33z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M40.1,11.03c-0.41,-0.11 -0.49,-0.51 -0.68,-0.81c0.52,0.25 1,-0.19 1.52,-0.06c0.14,0.25 0.04,0.43 -0.16,0.59C40.55,10.85 40.32,10.94 40.1,11.03z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M20.11,41.42c0.56,-0.06 1.16,-0.41 1.61,0.25c-0.2,-0.04 -0.31,0.15 -0.47,0.19C20.79,41.96 20.29,42.1 20.11,41.42z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M36.59,35.33c-0.14,0 -0.27,0 -0.41,0c-0.05,-0.23 0.12,-0.31 0.27,-0.42c0.18,-0.42 0.61,-0.39 0.95,-0.52c0.04,0 0.09,-0 0.13,-0c0.37,0.02 0.15,0.25 0.14,0.41c-0.08,0.24 0.08,0.76 -0.5,0.37C36.95,35.02 36.76,35.18 36.59,35.33z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M9.98,20.88c-0.08,0 -0.16,0.01 -0.24,0.01c0.04,-0.1 0.08,-0.21 0.13,-0.31c0.2,-0.38 0.89,0.05 0.9,-0.46c0.01,-0.36 -0.17,-0.7 0.23,-0.95c0,-0 -0.05,-0.11 -0.08,-0.17c0.5,0.38 0.17,0.85 0.13,1.27c-0.01,0.16 -0.16,0.31 -0.25,0.47C10.53,20.84 10.24,20.76 9.98,20.88z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M11.31,37.61c0.01,0.1 0.02,0.19 0.03,0.28c0.11,0.16 0.49,0.06 0.41,0.41c0.09,0.29 0.38,0.25 0.61,0.31c-0.1,0.28 -0.33,0.38 -0.52,0.51c-0.17,-0.07 -0.5,0.11 -0.39,-0.38C11.51,38.41 11.05,38.03 11.31,37.61z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M44.95,11.97c0.18,-0.1 0.36,-0.21 0.54,-0.32c0.22,-0.16 0.46,-0.09 0.71,-0.06c-0.04,0.26 -0.42,0.51 -0.03,0.78c-0.05,0 -0.1,0 -0.14,0.01c-0.39,0.41 -0.75,0.36 -1.11,-0.05C44.85,12.21 44.86,12.09 44.95,11.97z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M40.77,10.75c0.05,-0.2 0.1,-0.39 0.16,-0.59c0.36,0.11 0.67,0.11 0.87,-0.3c0.08,-0.16 0.3,-0.36 0.33,0.06c0.13,0.08 0.23,0.17 0.14,0.34c-0,0.03 -0.01,0.06 -0.01,0.09C41.71,10.3 41.3,10.74 40.77,10.75z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M2.28,27.89c-0.1,0.25 -0.49,0.32 -0.47,0.65c0.26,0.17 0.37,-0.17 0.69,-0.07c-0.33,0.28 -0.62,0.53 -0.91,0.78c0,-0.28 0.02,-0.57 0,-0.86C1.55,27.71 1.58,27.69 2.28,27.89z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M46.71,17.11c-0.23,0.4 -0.59,-0.06 -0.87,0.17c0.35,0.42 0.3,0.79 -0.23,1.04c-0.03,0.01 -0.06,0.02 -0.09,0.03c-0.06,-0.02 -0.11,-0.06 -0.14,-0.12c0.11,-0.37 0.08,-0.74 0.05,-1.11c0.02,-0.07 0.05,-0.13 0.09,-0.19c0.11,-0.16 0.27,-0.25 0.46,-0.29C46.33,16.62 46.72,16.56 46.71,17.11z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M46.86,14.96c-0.05,0.46 -0.35,0.81 -0.56,1.19c0.16,0.33 0.01,0.48 -0.31,0.52c-0.27,-0.08 -0.25,-0.31 -0.29,-0.52c0.14,-1 0.37,-1.26 1.1,-1.23C46.82,14.93 46.84,14.95 46.86,14.96z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M37.66,34.79c-0.05,-0.14 -0.09,-0.27 -0.14,-0.41c0,-0.27 0.11,-0.47 0.4,-0.54C38.51,34.33 38.49,34.4 37.66,34.79z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M45.9,16.58c0.22,-0.07 0.35,-0.21 0.4,-0.43c0.41,0.21 0.86,0.39 0.41,0.96c-0.22,-0.23 -0.5,-0.3 -0.81,-0.3C45.83,16.74 45.83,16.66 45.9,16.58z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M17.54,9.14c-0.2,0.48 -0.99,0.42 -0.99,1.12c0,0.11 -0.25,-0.05 -0.35,-0.15c0.44,-0.05 0.22,-0.48 0.38,-0.69c0.23,-0.14 0.47,-0.28 0.7,-0.42C17.36,9.05 17.45,9.09 17.54,9.14z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M45.22,19.94c0.31,0.33 -0.03,0.63 -0.13,0.87c-0.09,0.22 -0.35,-0.12 -0.54,-0.19l0.02,-0.06c0.03,-0.49 -0.11,-1.07 0.6,-1.24c0.06,0.02 0.11,0.07 0.14,0.13C45.27,19.62 45.33,19.8 45.22,19.94z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M42.81,27.24c0.03,-0.52 0.29,-1.02 0.02,-1.68c0.27,0.17 0.4,0.25 0.52,0.33C43.32,26.41 43.17,26.87 42.81,27.24z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M14.43,12.23c-0.16,0.42 -0.58,0.07 -0.81,0.28c-0.07,-0.18 -0.17,-0.36 -0.2,-0.55c-0.02,-0.12 0.07,-0.25 0.24,-0.26c0.16,-0.01 0.28,0.01 0.25,0.2C13.84,12.4 14.2,12.22 14.43,12.23z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M9.41,20.89c-0.37,-0.02 -0.57,0.35 -0.9,0.4c0.04,-0.15 0.07,-0.3 0.11,-0.45c0.07,-0.25 0.26,-0.34 0.5,-0.37C9.45,20.44 9.27,20.78 9.41,20.89z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M23.33,6.3c-0.36,-0.14 -0.73,0.05 -1.09,-0.01c0.47,-0.29 1.11,-0.14 1.53,-0.58c0.06,-0.06 0.16,-0.09 0.22,0.02c0.06,0.11 0.04,0.23 -0.06,0.29C23.74,6.13 23.53,6.21 23.33,6.3z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M33.33,7.95c-0.09,0.23 -0.24,0.41 -0.5,0.56c-0.14,-0.29 -0.08,-0.58 0.06,-0.8c0.13,-0.2 0.31,0.02 0.46,0.08C33.34,7.84 33.34,7.89 33.33,7.95z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M38.49,32.54c-0,-0.06 -0.01,-0.12 -0.01,-0.18c0.18,-0.05 0.35,-0.09 0.53,-0.14c0.12,-0.25 0.1,-0.79 0.57,-0.25c0.01,0.03 0.02,0.06 0.01,0.1c-0.04,0.18 0.03,0.46 -0.31,0.42c-0.15,0.01 -0.31,-0.01 -0.4,0.16C38.63,33.09 38.6,32.67 38.49,32.54z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M15.24,11.18c-0.13,0.17 -0.27,0.35 -0.4,0.52c-0.29,0.06 -0.16,0.45 -0.41,0.54c0,-0.13 0.03,-0.27 0,-0.4C14.28,11.09 14.75,11.13 15.24,11.18z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M2.95,26.94c0.12,0.47 -0.31,0.41 -0.54,0.55c-0.19,-0.2 -0.48,-0.31 -0.68,-0.75C2.19,27.02 2.56,27.29 2.95,26.94z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M45.49,18.33c0.04,-0 0.09,-0 0.13,-0.01c0.36,0.23 -0.14,0.73 0.28,0.94c-0.17,0.35 -0.43,0.2 -0.68,0.13l-0.01,-0C44.98,18.95 44.98,18.58 45.49,18.33z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M8.76,34.52c0.09,-0.05 0.19,-0.09 0.28,-0.14c0.03,0.32 0.5,0.27 0.52,0.6C8.81,35.17 8.81,35.17 8.76,34.52z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M44.27,10.49c-0.55,0.45 -0.7,0.19 -0.68,-0.38C43.98,9.94 44.2,10.07 44.27,10.49z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M39.58,31.97c-0.27,-0.1 -0.44,0.04 -0.57,0.25c-0.06,-0.72 0.55,-0.64 0.95,-0.81c-0.01,0.15 -0.01,0.29 -0.02,0.44C39.82,31.89 39.7,31.93 39.58,31.97z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M11.1,37.21c0.24,-0.23 0.52,-0.15 0.86,-0.07c-0.14,0.29 -0.42,0.37 -0.65,0.48C11.23,37.48 10.99,37.43 11.1,37.21z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M21.72,41.68c0.18,0.27 0.37,0.06 0.56,0.01c0.13,0.25 0.2,0.57 -0.14,0.63C21.63,42.42 21.83,41.92 21.72,41.68z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M12.14,14.16c-0.19,0.39 -0.3,0.88 -0.92,0.65C11.45,14.48 11.75,14.27 12.14,14.16z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M43.89,23.9c0.21,-0.29 0.08,-0.84 0.65,-0.86C44.58,23.52 44.36,23.81 43.89,23.9z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M24.56,6.84c-0.29,0.11 -0.51,-0.16 -0.79,-0.13c0.04,-0.05 0.09,-0.13 0.13,-0.13c0.28,0.01 0.19,-0.47 0.46,-0.38C24.68,6.3 24.41,6.65 24.56,6.84z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M7.8,22.39c0,-0.05 0.01,-0.1 0.01,-0.15c0.2,-0.03 0.58,-0.47 0.58,-0.67c-0,-0.11 -0.03,-0.22 0.1,-0.27c0.15,0.38 0.09,0.7 -0.25,0.95C8.15,22.45 8.01,22.5 7.8,22.39z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M32.1,38.58c0.26,-0.04 0.47,-0.16 0.56,-0.43c0.19,0.32 0.22,0.62 -0.19,0.78C32.13,39.08 32.15,38.79 32.1,38.58z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M9.71,33.71c-0.05,0.05 -0.09,0.09 -0.14,0.14c-0.19,-0.13 -0.31,-0.07 -0.38,0.13c-0.05,-0.18 -0.1,-0.36 -0.15,-0.54c0.01,-0.31 0.19,-0.45 0.47,-0.36C9.81,33.18 9.84,33.43 9.71,33.71z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M23.62,6.86c-0.23,0.13 -0.51,0.45 -0.71,0.14c-0.15,-0.24 0.2,-0.42 0.42,-0.56C23.35,6.63 23.31,6.86 23.62,6.86z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M35.51,36.54c0.28,-0.08 0.34,-0.39 0.56,-0.53c-0.09,0.28 0.18,0.51 0.11,0.85C35.94,36.75 35.72,36.65 35.51,36.54z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M42.26,10.26c-0.05,-0.11 -0.09,-0.23 -0.14,-0.34c0.31,-0.28 0.6,-0.51 0.65,0.17C42.6,10.15 42.43,10.21 42.26,10.26z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M39.28,32.49c0.1,-0.14 0.2,-0.28 0.31,-0.42c0.25,0.18 0.34,0.44 0.1,0.65C39.51,32.89 39.35,32.71 39.28,32.49z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M19.17,41.67c0.14,0.1 0.28,0.19 0.43,0.29c-0.12,0.4 -0.45,0.26 -0.72,0.31C18.75,41.95 19.16,41.92 19.17,41.67z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M10.93,17.51c-0,0.42 0.04,0.87 -0.55,0.94c0,-0.1 0.01,-0.3 0.01,-0.3C10.82,18.14 10.76,17.73 10.93,17.51z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M5.39,24c-0.15,0.21 -0.32,0.41 -0.55,0.53c0.01,-0.11 0.04,-0.22 0.04,-0.33C4.83,23.54 5.13,23.82 5.39,24z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M45.22,19.4c0.23,-0.02 0.47,0 0.68,-0.13c0.12,0.1 0.41,0.08 0.34,0.31c-0.06,0.18 -0.26,0.07 -0.4,0c-0.4,-0.2 -0.47,0.14 -0.61,0.37C45.22,19.76 45.22,19.58 45.22,19.4z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M45.49,18.33c-0.03,0.37 -0.07,0.74 -0.27,1.07c-0.17,0.14 -0.28,0.31 -0.22,0.53c0.09,0.38 -0.14,0.53 -0.43,0.65c-0.44,0.18 -0.31,0.76 -0.69,0.99c-0.18,0.14 -0.36,0.27 -0.55,0.41c0.17,-0.39 0.36,-0.77 0.5,-1.17c0.07,-0.19 0.06,-0.42 -0.12,-0.56c-0.19,-0.15 -0.33,0.02 -0.47,0.13c-0.14,0.1 -0.3,0.28 -0.44,0.03c-0.11,-0.2 0.06,-0.35 0.22,-0.44c0.15,-0.09 0.33,-0.13 0.5,-0.17c0.44,-0.11 0.67,-0.35 0.54,-0.83c-0.11,-0.4 0.03,-0.61 0.55,-0.56c-0.33,-0.47 -0.56,-0.9 -1.1,-0.36c-0.17,0.17 -0.42,0.17 -0.64,0.09c-0.25,-0.08 -0.39,-0.07 -0.18,-0.47c0.28,-0.52 0.62,-0.89 1.09,-1.2c0.17,-0.11 0.17,-0.3 -0.03,-0.36c-0.39,-0.12 -0.3,-0.36 -0.16,-0.62c-0.07,-0.01 -0.11,-0.03 -0.15,-0.02c-0.4,0.06 -1.04,0.39 -1.12,-0.05c-0.07,-0.4 0.49,-0.95 0.95,-1.15c0.62,-0.27 1.26,-0.57 1.97,-0.66c0.04,0.05 0.09,0.09 0.13,0.14c-0.07,0.26 -0.32,0.34 -0.57,0.48c0.25,0.2 0.83,-0.43 0.76,0.35c-0.01,0.14 0.26,0.1 0.41,0.11c0.3,0.03 0.63,-0.06 0.85,0.25c-0.58,0.21 -0.55,0.86 -0.9,1.23c-0.21,0.28 0.14,0.72 -0.27,0.95v-0c-0.27,0.38 -0.15,0.8 -0.14,1.22L45.49,18.33z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M44.95,12.25c0.36,0.05 0.72,0.09 1.08,0.13c0.61,0.47 0.61,0.52 -0.06,0.83c-0.21,0.1 -0.41,0.25 -0.61,0.37c-0.01,-0.04 -0.02,-0.1 -0.05,-0.12c-0.08,-0.08 -1.75,-0.08 -1.83,-0.02c-0.15,0.1 -0.13,0.48 -0.4,0.36c-0.23,-0.1 -0.13,-0.4 -0.15,-0.61c-0.09,-0.18 -0.01,-0.36 0.13,-0.39C43.7,12.65 44.27,12.29 44.95,12.25z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M44.95,12.25c-0.34,0.4 -0.76,0.61 -1.29,0.63c-0.28,0.01 -0.53,0.12 -0.73,0.31c-0.09,0 -0.18,0 -0.27,0c-0.03,-0.23 0.19,-0.51 -0.14,-0.68c0.16,-0.3 0.16,-0.3 0.68,-0.14c0.62,0.02 1.13,-0.44 1.75,-0.41C44.95,12.06 44.95,12.16 44.95,12.25z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M30.91,8.06c0.44,0 0.8,0.1 0.68,0.67C31.31,8.56 31.05,8.37 30.91,8.06z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M9.71,33.71c-0.14,-0.31 -0.24,-0.71 -0.67,-0.27c-0.8,0.11 -0.8,0.11 -0.52,-0.61c-0.37,0.1 -0.69,0.48 -1.1,0.1c-0.08,-0.07 -0.05,0.41 -0.26,0.54c-0.6,-0.41 -1.46,-0.39 -2.05,0.06c-0.2,0.15 -0.41,0.27 -0.65,0.32c0,-0.05 0,-0.09 -0,-0.13c0.02,-0.01 0.04,-0.02 0.06,-0.03c0.25,-0.22 0.61,-0.36 0.59,-0.78c-0.47,0.07 -0.75,-0.72 -1.31,-0.29c-0.17,0.13 -0.39,0.2 -0.53,-0c-0.15,-0.22 0.05,-0.38 0.2,-0.5c0.23,-0.19 0.47,-0.35 0.46,-0.69c-0.06,-0.44 0.36,-0.49 0.58,-0.7c0.3,-0.29 0.31,-0.54 -0.16,-0.61c-0.52,-0.09 -0.6,-0.3 -0.29,-0.7c0.13,-0.05 0.22,-0.14 0.27,-0.27c0.27,0.11 0.52,0.24 0.77,0.39c0.26,0.15 0.44,0.2 0.29,0.57c-0.19,0.47 0.2,0.71 0.55,0.86c0.4,0.18 0.26,-0.3 0.41,-0.43c0.25,0.06 0.25,0.31 0.36,0.47c0.13,0.19 0.23,0.42 0.5,0.4c0.38,-0.03 0.09,-0.29 0.14,-0.44c0.09,-0.27 0.42,-0.3 0.63,-0.46c0.1,-0.07 0.21,0.01 0.27,0.12c0.1,0.21 0.04,0.38 -0.11,0.55c-0.16,0.18 -0.53,0.34 -0.26,0.65c0.33,0.37 0.54,-0.03 0.77,-0.21c0.07,-0.05 0.14,-0.11 0.25,-0.07C9,31.67 8.86,31.76 8.77,31.85c-0.34,0.36 -0.09,0.44 0.23,0.51c0.29,0.06 0.64,-0.03 0.69,0.45c0.02,0.2 0.26,0.23 0.45,0.16c0.2,-0.07 0.39,-0.31 0.55,0.08c0.04,0.1 0.24,-0.03 0.33,-0.14c0.11,-0.14 0.12,-0.29 -0,-0.43c-0.22,-0.26 -0.4,-0.53 -0.25,-0.99c0.24,0.34 0.46,0.58 0.62,0.86c0.19,0.32 0.8,0.75 -0.17,0.86c-0.28,0.04 -0.21,0.29 -0.14,0.49C10.61,34.04 10.16,33.71 9.71,33.71z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M15.25,40.46c-0.09,0 -0.18,0 -0.27,0c-0.1,-0.54 -0.35,-0.94 -0.93,-1.05c-0.43,-0.08 -0.61,-0.61 -1.09,-0.58c-0.47,-0.62 -0.02,-0.76 0.55,-0.88c-0.22,-0.2 -0.5,-0.07 -0.65,-0.3c0.13,-0.32 0.81,-0.28 0.63,-0.85c0.35,-0.14 0.39,0.08 0.37,0.33c-0.01,0.2 -0.08,0.4 -0.08,0.6c-0.02,0.4 0.13,0.6 0.56,0.47c0.19,-0.06 0.48,-0.28 0.58,0c0.1,0.28 -0.28,0.27 -0.45,0.39c-0.07,0.05 -0.15,0.09 -0.21,0.16c-0.09,0.1 -0.17,0.22 -0.1,0.36c0.07,0.12 0.2,0.08 0.3,0.05c0.47,-0.16 0.68,0.02 0.67,0.5c0.29,0.07 0.48,-0.37 0.84,-0.12C15.73,39.85 15.49,40.15 15.25,40.46z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M17.76,41.63c-0.75,0.15 -1.45,0.01 -2.14,-0.29c-0.23,-0.1 -0.26,-0.29 -0.35,-0.46c0.32,-0.29 0.68,-0.48 1.13,-0.36c0.02,0.03 0.05,0.05 0.07,0.08c0.08,0.23 -0.2,0.6 0.27,0.68C17.1,41.32 17.54,41.14 17.76,41.63z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M15.52,40.59c0.2,-0.21 0.38,-0.44 0.6,-0.61c0.45,-0.35 0.87,-0.39 1.16,0.26c-0.27,0.12 -0.59,0.14 -0.82,0.35l-0,-0C16.15,40.36 15.83,40.82 15.52,40.59z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M18.22,40.73c-0.47,0.23 -0.98,0.32 -1.48,0.41C17.03,40.28 17.66,40.65 18.22,40.73z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M18.03,38.25c0.05,-0.13 0.1,-0.25 0.16,-0.37c0.09,-0.17 0.1,-0.4 0.35,-0.43c0.03,-0 0.09,0.04 0.1,0.07c0.05,0.21 -0.04,0.4 -0.17,0.55C18.38,38.19 18.29,38.4 18.03,38.25z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M37.39,34.39c-0.26,0.28 -0.59,0.43 -0.95,0.52C36.43,34.13 36.94,34.32 37.39,34.39z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M40.36,30.07c0.21,0.31 0.16,0.58 -0.13,0.8C39.91,30.54 39.94,30.27 40.36,30.07z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M25.44,38.58c-0.17,-0.01 -0.27,-0.09 -0.27,-0.25c0,-0.15 0.11,-0.24 0.26,-0.24c0.15,-0 0.26,0.08 0.25,0.23C25.67,38.48 25.56,38.55 25.44,38.58z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M28.73,37.09c0.09,-0.01 0.2,-0.01 0.21,0.1c0.02,0.18 -0.1,0.29 -0.26,0.34c-0.12,0.04 -0.24,0 -0.25,-0.14C28.42,37.21 28.57,37.14 28.73,37.09z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M9.98,20.88c0.22,-0.38 0.52,-0.23 0.81,-0.13C10.55,20.95 10.32,21.25 9.98,20.88z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M15.52,40.59c0.31,0.03 0.63,-0.42 0.94,0c-0.4,0.09 -0.8,0.19 -1.2,0.28c-0,-0.1 -0.01,-0.19 -0.01,-0.29C15.34,40.59 15.43,40.59 15.52,40.59z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M37.2,33.09c-0.04,0.17 -0.16,0.26 -0.32,0.28c-0.1,0.01 -0.17,-0.06 -0.14,-0.16c0.04,-0.16 0.15,-0.27 0.32,-0.29C37.16,32.91 37.21,32.98 37.2,33.09z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M4.04,29.39c-0.01,0.33 0.12,0.46 0.47,0.45c0.47,-0.01 0.45,0.44 0.52,0.72c0.08,0.33 -0.24,0.28 -0.45,0.31C4.22,31.01 3.85,31.13 3.5,31.28c-0.18,0.09 -0.36,0.18 -0.54,0.27c-0.09,-0.05 -0.18,-0.09 -0.27,-0.14c0.47,-0.35 0.92,-0.68 0.74,-1.42C3.35,29.65 3.72,29.48 4.04,29.39z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M43.19,12.38c-0.21,0.14 -0.48,-0.04 -0.68,0.14c-0.19,0.01 -0.38,0.03 -0.77,0.05c0.52,-0.29 0.88,-0.47 1.32,-0.45C43.11,12.2 43.15,12.29 43.19,12.38z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M11.74,38.3c-0.14,-0.14 -0.27,-0.27 -0.41,-0.41c0.09,-0.02 0.17,-0.04 0.26,-0.06c0.2,-0.04 0.45,-0.11 0.51,0.15C12.16,38.22 11.88,38.2 11.74,38.3z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M3.5,31.28c0.2,-0.41 0.47,-0.75 0.86,-0.98c0.31,0.13 -0.34,0.56 0.22,0.58c-0.17,0.25 -0.44,0.37 -0.67,0.54C3.77,31.37 3.63,31.32 3.5,31.28z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M45.48,18.32c-0.21,-0.13 -0.32,-0.28 -0.23,-0.56c0.09,-0.26 -0.04,-0.44 -0.32,-0.47c-0.19,-0.02 -0.4,-0.03 -0.29,-0.3c0.08,-0.22 0.3,-0.3 0.5,-0.23c0.18,0.07 0.33,0.22 0.49,0.34C45.67,17.52 45.96,17.96 45.48,18.32z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M45.63,17.1c0.25,-0.41 0,-0.58 -0.4,-0.67c0.22,-0.22 0.46,-0.21 0.67,-0.28c0,0.14 0.01,0.28 0.01,0.43c0,0.08 0,0.16 0,0.23C45.85,16.95 45.77,17.05 45.63,17.1z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M15.77,18c-0.02,0.6 0.02,1.19 0.11,1.78c0.37,3.12 4.96,3.31 5,0c0.18,-0.9 0.04,-0.98 -0.41,-0.24c0.59,-0.24 1.29,-0.32 1.91,-0.46c0.89,-0.2 3.1,-1.48 3.93,-0.92c0.2,-1.52 0.4,-3.05 0.6,-4.57c-0.44,0.22 -0.9,0.36 -1.38,0.44c-2.96,0.73 -1.95,4.59 0.67,4.91c1.27,0.16 2.56,0.09 3.84,0.11c1.07,0.01 1.71,-0.65 0.21,-0.65c-1,-0.01 -2,-0.23 -2.98,-0.42c-3.21,-0.6 -6.27,-1.1 -9.54,-0.61c-1.27,0.19 -2.18,1.91 -1.75,3.08c2.55,6.91 9.54,5.15 15.39,5.17c-0.22,-1.64 -0.44,-3.27 -0.67,-4.91c-1.89,0.65 -3.71,1.44 -5.74,1.5c-1.55,0.05 -3.02,0.02 -4.54,0.41c-2.12,0.53 -4.15,1.85 -4.68,4.06c-1.16,4.92 5.62,5.05 8.5,3.66c1.79,-0.87 3.6,-2.19 5.65,-2.35c-0.11,-0.36 0.08,-0.65 0.58,-0.89c-0.4,0.14 -0.89,0.07 -1.3,0.07c-0.89,0 -1.77,-0.07 -2.66,-0.06c-5.34,0.03 -6.11,7.01 -0.31,6.96c1.89,-0.02 3.12,-2.11 2.16,-3.76c-2.64,-4.52 -5.28,-9.04 -7.92,-13.56c-1.63,-2.78 -5.95,-0.27 -4.32,2.52c2.64,4.52 5.28,9.04 7.92,13.56c0.72,-1.25 1.44,-2.51 2.16,-3.76c-0.29,-0.06 -0.57,-0.12 -0.86,-0.17c0.5,0.38 1,0.77 1.49,1.15c-0.1,-0.17 -0.19,-0.34 -0.29,-0.5c0,0.84 0,1.68 0,2.52c-0.66,0.08 -0.67,0.1 -0.04,0.05c0.34,-0.01 0.69,-0 1.03,0.01c0.72,0.02 1.44,0.06 2.17,0.05c1.35,-0 2.9,-0.26 3.92,-1.21c2.36,-2.21 1.18,-6.93 -2.02,-7.72c-3.36,-0.83 -6.59,1.04 -9.46,2.57c-0.49,0.26 -0.96,0.35 -1.52,0.41c-1.13,-0.15 -0.96,0.33 0.52,1.43c0.37,-0.14 0.75,-0.25 1.13,-0.33c1.44,-0.36 3.01,0.04 4.48,-0.22c1.83,-0.32 3.53,-0.95 5.28,-1.56c2.62,-0.9 2.25,-4.9 -0.67,-4.91c-2.66,-0.01 -9.34,1.82 -10.56,-1.5c-0.58,1.02 -1.16,2.05 -1.75,3.08c3.8,-0.56 14.52,4.06 16.69,-0.96c0.94,-2.17 0.7,-4.89 -1.63,-6.16c-2.51,-1.37 -5.2,-0.78 -7.92,-1.12c0.22,1.64 0.44,3.27 0.67,4.91c0.48,-0.08 0.94,-0.23 1.38,-0.44c2.01,-0.82 2.51,-3.28 0.6,-4.57c-2.64,-1.79 -5.77,-0.05 -8.51,0.58c-2.95,0.67 -4.41,2.27 -4.44,5.36c1.67,0 3.33,0 5,0c-0.1,-0.59 -0.14,-1.18 -0.11,-1.78C20.73,14.78 15.73,14.77 15.77,18z"
+        android:fillColor="#fff"/>
+</vector>
diff --git a/QSthemes/QStileInkDrop/Android.mk b/QSthemes/QSTileMountain/Android.mk
similarity index 84%
copy from QSthemes/QStileInkDrop/Android.mk
copy to QSthemes/QSTileMountain/Android.mk
index 5cee5cd..8561055 100644
--- a/QSthemes/QStileInkDrop/Android.mk
+++ b/QSthemes/QSTileMountain/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileInkDrop
+LOCAL_PACKAGE_NAME := QSTileMountain
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileMountain/AndroidManifest.xml
similarity index 64%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileMountain/AndroidManifest.xml
index 0f62c1a..9549383 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileMountain/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.mountain"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Mountain" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QSTileMountain/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileMountain/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..0363516
--- /dev/null
+++ b/QSthemes/QSTileMountain/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="40dp"
+        android:height="40dp"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
+    <path
+        android:pathData="M44.27,35.8L36.4,30.73l4,5.54l-6.53,-3.8l2.53,4.09l-6,-3.34l0.67,3.05l-5.07,-2.47l1.53,2.47l-4.8,-2.47l0.67,2.76l-10.27,-5.83l4.93,5.54l-8.53,-4.93l3.93,4.93l-6.7,-3.4l2.17,3.4v0.29l-4.33,-1.96L3.1,35c3.97,7.55 11.86,12.72 20.99,12.72c9.56,0 17.78,-5.67 21.53,-13.83l-6.82,-4.82L44.27,35.8z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.45"/>
+    <path
+        android:pathData="M40.27,26.2l-5.13,1.63l0.67,1.83l-3.73,0.35l-3.53,2.65l-5.8,-0.46l-3.93,-4.38l-6.4,-2.43L11,30.27l-7.27,1.47L2.25,33.22c0.26,0.61 0.55,1.2 0.85,1.78l1.5,-0.4l4.33,1.96v-0.29l-2.17,-3.4l6.7,3.4l-3.93,-4.93l8.53,4.93l-4.93,-5.54l10.27,5.83l-0.67,-2.76l4.8,2.47l-1.53,-2.47l5.07,2.47L30.4,33.22l6,3.34l-2.53,-4.09l6.53,3.8l-4,-5.54l7.87,5.07l-5.47,-6.73l6.82,4.82c0.2,-0.44 0.4,-0.88 0.57,-1.33L40.27,26.2z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.60"/>
+    <path
+        android:pathData="M41.1,24.1l-5.3,-0.7l-4.5,1.4L27.1,22l-5.8,-5.3l-6.5,2.2L1.34,30.73c0.25,0.86 0.57,1.68 0.91,2.49l1.49,-1.49L11,30.27l1.4,-4.87l6.4,2.43l3.93,4.38l5.8,0.46l3.53,-2.65l3.73,-0.35l-0.67,-1.83l5.13,-1.63l5.92,6.36c0.35,-0.89 0.66,-1.81 0.9,-2.75L41.1,24.1z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M24.08,0.28C10.98,0.28 0.36,10.9 0.36,24c0,2.34 0.34,4.59 0.97,6.73L14.8,18.9l6.5,-2.2l5.8,5.3l4.2,2.8l4.5,-1.4l5.3,0.7l5.99,5.71c0.47,-1.86 0.72,-3.81 0.72,-5.81C47.81,10.9 37.19,0.28 24.08,0.28z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.20"/>
+</vector>
diff --git a/QSthemes/QStileInkDrop/Android.mk b/QSthemes/QSTileNinja/Android.mk
similarity index 84%
copy from QSthemes/QStileInkDrop/Android.mk
copy to QSthemes/QSTileNinja/Android.mk
index 5cee5cd..08a2ffc 100644
--- a/QSthemes/QStileInkDrop/Android.mk
+++ b/QSthemes/QSTileNinja/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileInkDrop
+LOCAL_PACKAGE_NAME := QSTileNinja
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileNinja/AndroidManifest.xml
similarity index 65%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileNinja/AndroidManifest.xml
index 0f62c1a..f43459f 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileNinja/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.ninja"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Ninja" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QSTileNinja/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileNinja/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..59786d0
--- /dev/null
+++ b/QSthemes/QSTileNinja/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="48.0"
+    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fff" android:fillAlpha="0.70" android:pathData="M21.47,24c0,-1.36 1.08,-2.46 2.42,-2.52V0.85l-0.17,-0.25l-8.51,13.62L1.55,22.92h0.43l12.73,10l9.19,14.2V26.52C22.55,26.46 21.47,25.36 21.47,24z"/>
+    <path android:fillColor="#fff" android:pathData="M15.02,32.71l-12.59,-9.91l12.99,-8.25l8.32,-13.25l0.15,0.23l0,-1.35l-0.17,-0.26l-8.77,14.04l-14.69,9.33l1.59,0l12.58,9.88l9.47,14.63l0,-1.38z"/>
+    <path android:fillColor="#fff" android:fillAlpha="0.50" android:pathData="M33.09,14.62l-9.19,-13.77v20.63c0.04,-0 0.07,-0.01 0.1,-0.01c1.39,0 2.53,1.13 2.53,2.53S25.4,26.53 24,26.53c-0.04,0 -0.07,-0.01 -0.1,-0.01v20.6L24,47.27l9.68,-15.21l12.56,-9.15L33.09,14.62z"/>
+    <path android:fillColor="#fff" android:pathData="M33.35,14.35l-9.46,-14.17l0,1.35l8.88,13.3l12.81,8.11l-12.12,8.82l-9.47,14.82l-0.1,-0.15l0,1.38l0.11,0.16l9.96,-15.65l12.95,-9.43z"/>
+    <path android:fillColor="#fff" android:pathData="M24,27.28c-1.81,0 -3.28,-1.47 -3.28,-3.28c0,-1.81 1.47,-3.28 3.28,-3.28c1.81,0 3.28,1.47 3.28,3.28C27.28,25.81 25.81,27.28 24,27.28zM24,22.22c-0.98,0 -1.78,0.8 -1.78,1.78c0,0.98 0.8,1.78 1.78,1.78c0.98,0 1.78,-0.8 1.78,-1.78C25.78,23.02 24.98,22.22 24,22.22z"/>
+</vector>
+
diff --git a/QSthemes/QStileOreo/Android.mk b/QSthemes/QSTileOreo/Android.mk
similarity index 85%
rename from QSthemes/QStileOreo/Android.mk
rename to QSthemes/QSTileOreo/Android.mk
index bae27ac..76669bb 100644
--- a/QSthemes/QStileOreo/Android.mk
+++ b/QSthemes/QSTileOreo/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileOreo
+LOCAL_PACKAGE_NAME := QSTileOreo
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileOreo/AndroidManifest.xml b/QSthemes/QSTileOreo/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileOreo/AndroidManifest.xml
rename to QSthemes/QSTileOreo/AndroidManifest.xml
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_brightness_left.xml b/QSthemes/QSTileOreo/res/drawable/ic_brightness_left.xml
new file mode 100644
index 0000000..21042ec
--- /dev/null
+++ b/QSthemes/QSTileOreo/res/drawable/ic_brightness_left.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="m 18,29.073759 v 0 c 2.802161,0 5.07376,-2.271599 5.07376,-5.073759 0,-2.80216 -2.271599,-5.07376 -5.07376,-5.07376 -2.802161,0 -5.07376,2.2716 -5.07376,5.07376 0,2.80216 2.271599,5.073759 5.07376,5.073759 z m 0,3.382507 v 0 c -4.670268,0 -8.4562669,-3.786 -8.4562669,-8.456266 0,-4.670267 3.7859989,-8.456267 8.4562669,-8.456267 4.670267,0 8.456267,3.786 8.456267,8.456267 0,4.670266 -3.786,8.456266 -8.456267,8.456266 z"
+        android:strokeWidth="1.0" />
+
+</vector>
+
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_brightness_right.xml b/QSthemes/QSTileOreo/res/drawable/ic_brightness_right.xml
new file mode 100644
index 0000000..5c47bf6
--- /dev/null
+++ b/QSthemes/QSTileOreo/res/drawable/ic_brightness_right.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="m 18,31.449538 v 0 c 4.114266,0 7.449538,-3.335272 7.449538,-7.449538 0,-4.114267 -3.335272,-7.449538 -7.449538,-7.449538 -4.114266,0 -7.449538,3.335271 -7.449538,7.449538 0,4.114266 3.335272,7.449538 7.449538,7.449538 z m 0,2.979815 C 12.240027,34.429353 7.570646,29.759973 7.570646,24 7.570646,18.240027 12.240027,13.570646 18,13.570646 c 5.759973,0 10.429354,4.669381 10.429354,10.429354 0,5.759973 -4.669381,10.429353 -10.429354,10.429353 z m 0,-5.95963 c 2.46856,0 4.469723,-2.001163 4.469723,-4.469723 0,-2.46856 -2.001163,-4.469723 -4.469723,-4.469723 -2.46856,0 -4.469723,2.001163 -4.469723,4.469723 0,2.46856 2.001163,4.469723 4.469723,4.469723 z"
+        android:strokeWidth="1.0" />
+
+</vector>
+
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreo/res/drawable/ic_brightness_thumb.xml
similarity index 61%
rename from QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml
rename to QSthemes/QSTileOreo/res/drawable/ic_brightness_thumb.xml
index 7950f62..8002d84 100644
--- a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml
+++ b/QSthemes/QSTileOreo/res/drawable/ic_brightness_thumb.xml
@@ -14,15 +14,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:height="15dp"
+        android:width="15dp"
+        android:viewportWidth="42.0"
+        android:viewportHeight="42.0">
 
     <path
-        android:pathData="M0 0h24v24H0V0z" />
-    <path
         android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11 7l-3.2 9h1.9l0.7-2h3.2l0.7 2h1.9L13 7h-2zm-0.15 5.65L12 9l1.15 3.65h-2.3zM20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zm-2 5.79V18h-3.52L12 20.48 9.52 18H6v-3.52L3.52 12 6 9.52V6h3.52L12 3.52 14.48 6H18v3.52L20.48 12 18 14.48z" />
+        android:pathData="M 21 0 C 32.5979797464 0 42 9.40202025355 42 21 C 42 32.5979797464 32.5979797464 42 21 42 C 9.40202025355 42 0 32.5979797464 0 21 C 0 9.40202025355 9.40202025355 0 21 0 Z"
+        android:strokeWidth="1.0" />
 </vector>
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_off.xml
similarity index 64%
rename from QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml
rename to QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_off.xml
index 6c3064a..a557f53 100644
--- a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml
+++ b/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_off.xml
@@ -15,16 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
+        android:fillColor="?android:attr/colorBackground"
+        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
     <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z" />
 </vector>
diff --git a/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_on.xml
new file mode 100644
index 0000000..8d3d625
--- /dev/null
+++ b/QSthemes/QSTileOreo/res/drawable/ic_qs_brightness_auto_on.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 Havoc-OS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="?android:attr/colorPrimary"
+        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M11,7l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L13,7H11zM10.85,12.65L12,9l1.15,3.65H10.85z" />
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
+</vector>
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileOreo/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileOreo/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileOreo/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QSTileOreo/res/values/colors.xml b/QSthemes/QSTileOreo/res/values/colors.xml
new file mode 100644
index 0000000..2eaae4c
--- /dev/null
+++ b/QSthemes/QSTileOreo/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+
+    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
+
+    <!-- QS tiles expand, underline and label colors -->
+    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
+    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
+    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/QSthemes/QSTileOreo/res/values/config.xml b/QSthemes/QSTileOreo/res/values/config.xml
new file mode 100644
index 0000000..e23e4b0
--- /dev/null
+++ b/QSthemes/QSTileOreo/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017-2018 Projekt Substratum
+      Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+     <!-- Config to enable/diaable qs tile tinting -->
+    <bool name="config_enable_qs_tile_tinting">true</bool>
+ </resources>
\ No newline at end of file
diff --git a/QSthemes/QStileOreo/res/values/strings.xml b/QSthemes/QSTileOreo/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileOreo/res/values/strings.xml
rename to QSthemes/QSTileOreo/res/values/strings.xml
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileOreoCircleTrim/Android.mk
similarity index 81%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileOreoCircleTrim/Android.mk
index 3801ec8..66971d6 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileOreoCircleTrim/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileOreoCircleTrim
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileOreoCircleTrim/AndroidManifest.xml b/QSthemes/QSTileOreoCircleTrim/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileOreoCircleTrim/AndroidManifest.xml
rename to QSthemes/QSTileOreoCircleTrim/AndroidManifest.xml
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_left.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_left.xml
new file mode 100644
index 0000000..21042ec
--- /dev/null
+++ b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_left.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="m 18,29.073759 v 0 c 2.802161,0 5.07376,-2.271599 5.07376,-5.073759 0,-2.80216 -2.271599,-5.07376 -5.07376,-5.07376 -2.802161,0 -5.07376,2.2716 -5.07376,5.07376 0,2.80216 2.271599,5.073759 5.07376,5.073759 z m 0,3.382507 v 0 c -4.670268,0 -8.4562669,-3.786 -8.4562669,-8.456266 0,-4.670267 3.7859989,-8.456267 8.4562669,-8.456267 4.670267,0 8.456267,3.786 8.456267,8.456267 0,4.670266 -3.786,8.456266 -8.456267,8.456266 z"
+        android:strokeWidth="1.0" />
+
+</vector>
+
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_right.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_right.xml
new file mode 100644
index 0000000..5c47bf6
--- /dev/null
+++ b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_right.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="m 18,31.449538 v 0 c 4.114266,0 7.449538,-3.335272 7.449538,-7.449538 0,-4.114267 -3.335272,-7.449538 -7.449538,-7.449538 -4.114266,0 -7.449538,3.335271 -7.449538,7.449538 0,4.114266 3.335272,7.449538 7.449538,7.449538 z m 0,2.979815 C 12.240027,34.429353 7.570646,29.759973 7.570646,24 7.570646,18.240027 12.240027,13.570646 18,13.570646 c 5.759973,0 10.429354,4.669381 10.429354,10.429354 0,5.759973 -4.669381,10.429353 -10.429354,10.429353 z m 0,-5.95963 c 2.46856,0 4.469723,-2.001163 4.469723,-4.469723 0,-2.46856 -2.001163,-4.469723 -4.469723,-4.469723 -2.46856,0 -4.469723,2.001163 -4.469723,4.469723 0,2.46856 2.001163,4.469723 4.469723,4.469723 z"
+        android:strokeWidth="1.0" />
+
+</vector>
+
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
similarity index 61%
copy from QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml
copy to QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
index 7950f62..8002d84 100644
--- a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml
+++ b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
@@ -14,15 +14,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:height="15dp"
+        android:width="15dp"
+        android:viewportWidth="42.0"
+        android:viewportHeight="42.0">
 
     <path
-        android:pathData="M0 0h24v24H0V0z" />
-    <path
         android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11 7l-3.2 9h1.9l0.7-2h3.2l0.7 2h1.9L13 7h-2zm-0.15 5.65L12 9l1.15 3.65h-2.3zM20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zm-2 5.79V18h-3.52L12 20.48 9.52 18H6v-3.52L3.52 12 6 9.52V6h3.52L12 3.52 14.48 6H18v3.52L20.48 12 18 14.48z" />
+        android:pathData="M 21 0 C 32.5979797464 0 42 9.40202025355 42 21 C 42 32.5979797464 32.5979797464 42 21 42 C 9.40202025355 42 0 32.5979797464 0 21 C 0 9.40202025355 9.40202025355 0 21 0 Z"
+        android:strokeWidth="1.0" />
 </vector>
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
similarity index 64%
copy from QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml
copy to QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
index 6c3064a..a557f53 100644
--- a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml
+++ b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
@@ -15,16 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
+        android:fillColor="?android:attr/colorBackground"
+        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
     <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z" />
 </vector>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
new file mode 100644
index 0000000..8d3d625
--- /dev/null
+++ b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 Havoc-OS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="?android:attr/colorPrimary"
+        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M11,7l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L13,7H11zM10.85,12.65L12,9l1.15,3.65H10.85z" />
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
+</vector>
diff --git a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileOreoCircleTrim/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QSTileOreoCircleTrim/res/values/colors.xml b/QSthemes/QSTileOreoCircleTrim/res/values/colors.xml
new file mode 100644
index 0000000..2eaae4c
--- /dev/null
+++ b/QSthemes/QSTileOreoCircleTrim/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+
+    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
+
+    <!-- QS tiles expand, underline and label colors -->
+    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
+    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
+    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/QSthemes/QSTileOreoCircleTrim/res/values/config.xml b/QSthemes/QSTileOreoCircleTrim/res/values/config.xml
new file mode 100644
index 0000000..e23e4b0
--- /dev/null
+++ b/QSthemes/QSTileOreoCircleTrim/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017-2018 Projekt Substratum
+      Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+     <!-- Config to enable/diaable qs tile tinting -->
+    <bool name="config_enable_qs_tile_tinting">true</bool>
+ </resources>
\ No newline at end of file
diff --git a/QSthemes/QStileOreoCircleTrim/res/values/strings.xml b/QSthemes/QSTileOreoCircleTrim/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileOreoCircleTrim/res/values/strings.xml
rename to QSthemes/QSTileOreoCircleTrim/res/values/strings.xml
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileOreoSquircleTrim/Android.mk
similarity index 81%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileOreoSquircleTrim/Android.mk
index 3801ec8..300210a 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileOreoSquircleTrim/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileOreoSquircleTrim
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileOreoSquircleTrim/AndroidManifest.xml b/QSthemes/QSTileOreoSquircleTrim/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileOreoSquircleTrim/AndroidManifest.xml
rename to QSthemes/QSTileOreoSquircleTrim/AndroidManifest.xml
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_left.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_left.xml
new file mode 100644
index 0000000..21042ec
--- /dev/null
+++ b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_left.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="m 18,29.073759 v 0 c 2.802161,0 5.07376,-2.271599 5.07376,-5.073759 0,-2.80216 -2.271599,-5.07376 -5.07376,-5.07376 -2.802161,0 -5.07376,2.2716 -5.07376,5.07376 0,2.80216 2.271599,5.073759 5.07376,5.073759 z m 0,3.382507 v 0 c -4.670268,0 -8.4562669,-3.786 -8.4562669,-8.456266 0,-4.670267 3.7859989,-8.456267 8.4562669,-8.456267 4.670267,0 8.456267,3.786 8.456267,8.456267 0,4.670266 -3.786,8.456266 -8.456267,8.456266 z"
+        android:strokeWidth="1.0" />
+
+</vector>
+
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_right.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_right.xml
new file mode 100644
index 0000000..5c47bf6
--- /dev/null
+++ b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_right.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2014 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="m 18,31.449538 v 0 c 4.114266,0 7.449538,-3.335272 7.449538,-7.449538 0,-4.114267 -3.335272,-7.449538 -7.449538,-7.449538 -4.114266,0 -7.449538,3.335271 -7.449538,7.449538 0,4.114266 3.335272,7.449538 7.449538,7.449538 z m 0,2.979815 C 12.240027,34.429353 7.570646,29.759973 7.570646,24 7.570646,18.240027 12.240027,13.570646 18,13.570646 c 5.759973,0 10.429354,4.669381 10.429354,10.429354 0,5.759973 -4.669381,10.429353 -10.429354,10.429353 z m 0,-5.95963 c 2.46856,0 4.469723,-2.001163 4.469723,-4.469723 0,-2.46856 -2.001163,-4.469723 -4.469723,-4.469723 -2.46856,0 -4.469723,2.001163 -4.469723,4.469723 0,2.46856 2.001163,4.469723 4.469723,4.469723 z"
+        android:strokeWidth="1.0" />
+
+</vector>
+
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
similarity index 61%
copy from QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml
copy to QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
index 7950f62..8002d84 100644
--- a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_on.xml
+++ b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
@@ -14,15 +14,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:height="15dp"
+        android:width="15dp"
+        android:viewportWidth="42.0"
+        android:viewportHeight="42.0">
 
     <path
-        android:pathData="M0 0h24v24H0V0z" />
-    <path
         android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11 7l-3.2 9h1.9l0.7-2h3.2l0.7 2h1.9L13 7h-2zm-0.15 5.65L12 9l1.15 3.65h-2.3zM20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zm-2 5.79V18h-3.52L12 20.48 9.52 18H6v-3.52L3.52 12 6 9.52V6h3.52L12 3.52 14.48 6H18v3.52L20.48 12 18 14.48z" />
+        android:pathData="M 21 0 C 32.5979797464 0 42 9.40202025355 42 21 C 42 32.5979797464 32.5979797464 42 21 42 C 9.40202025355 42 0 32.5979797464 0 21 C 0 9.40202025355 9.40202025355 0 21 0 Z"
+        android:strokeWidth="1.0" />
 </vector>
diff --git a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
similarity index 64%
copy from QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml
copy to QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
index 6c3064a..a557f53 100644
--- a/QSthemes/QStileOreo/res/drawable/ic_qs_brightness_auto_off.xml
+++ b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
@@ -15,16 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
+        android:fillColor="?android:attr/colorBackground"
+        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
     <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z" />
 </vector>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
new file mode 100644
index 0000000..8d3d625
--- /dev/null
+++ b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 Havoc-OS
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="?android:attr/colorPrimary"
+        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M11,7l-3.2,9h1.9l0.7,-2h3.2l0.7,2h1.9L13,7H11zM10.85,12.65L12,9l1.15,3.65H10.85z" />
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z" />
+</vector>
diff --git a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileOreoSquircleTrim/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/values/colors.xml b/QSthemes/QSTileOreoSquircleTrim/res/values/colors.xml
new file mode 100644
index 0000000..2eaae4c
--- /dev/null
+++ b/QSthemes/QSTileOreoSquircleTrim/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+
+    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
+
+    <!-- QS tiles expand, underline and label colors -->
+    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
+    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
+    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/QSthemes/QSTileOreoSquircleTrim/res/values/config.xml b/QSthemes/QSTileOreoSquircleTrim/res/values/config.xml
new file mode 100644
index 0000000..e23e4b0
--- /dev/null
+++ b/QSthemes/QSTileOreoSquircleTrim/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017-2018 Projekt Substratum
+      Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+     <!-- Config to enable/diaable qs tile tinting -->
+    <bool name="config_enable_qs_tile_tinting">true</bool>
+ </resources>
\ No newline at end of file
diff --git a/QSthemes/QStileOreoSquircleTrim/res/values/strings.xml b/QSthemes/QSTileOreoSquircleTrim/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileOreoSquircleTrim/res/values/strings.xml
rename to QSthemes/QSTileOreoSquircleTrim/res/values/strings.xml
diff --git a/QSthemes/QStileInkDrop/Android.mk b/QSthemes/QSTilePokesign/Android.mk
similarity index 84%
copy from QSthemes/QStileInkDrop/Android.mk
copy to QSthemes/QSTilePokesign/Android.mk
index 5cee5cd..86c1d4a 100644
--- a/QSthemes/QStileInkDrop/Android.mk
+++ b/QSthemes/QSTilePokesign/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileInkDrop
+LOCAL_PACKAGE_NAME := QSTilePokesign
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTilePokesign/AndroidManifest.xml
similarity index 64%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTilePokesign/AndroidManifest.xml
index 0f62c1a..79f6a57 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTilePokesign/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.pokesign"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Pokesign" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QSTilePokesign/res/drawable/ic_qs_circle.xml b/QSthemes/QSTilePokesign/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..b5e85fd
--- /dev/null
+++ b/QSthemes/QSTilePokesign/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="48.0"
+    android:viewportWidth="48.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fff" android:pathData="M24,0C10.95,0 0.36,10.58 0.36,23.64c0,13.06 10.58,23.64 23.64,23.64c13.05,0 23.64,-10.58 23.64,-23.64C47.64,10.58 37.05,0 24,0zM24,42.64c-10.49,0 -19,-8.51 -19,-19C5,13.14 13.51,4.63 24,4.63c10.49,0 19,8.51 19,19C43,34.13 34.49,42.64 24,42.64z"/>
+    <path android:fillColor="#fff" android:pathData="M23.91,18.65c2.54,0 4.62,1.9 4.95,4.35h9.72C38.24,15.23 31.85,9.03 24,9.03S9.76,15.23 9.42,23h9.54C19.29,20.55 21.37,18.65 23.91,18.65z"/>
+    <path android:fillColor="#fff" android:pathData="M23.91,28.68c-2.3,0 -4.22,-1.56 -4.81,-3.68H9.46C10.15,32.43 16.39,38.25 24,38.25c7.61,0 13.85,-5.82 14.54,-13.25h-9.82C28.13,27.12 26.21,28.68 23.91,28.68z"/>
+</vector>
+
diff --git a/QSthemes/QStileSquaremedo/Android.mk b/QSthemes/QSTileSquaremedo/Android.mk
similarity index 83%
rename from QSthemes/QStileSquaremedo/Android.mk
rename to QSthemes/QSTileSquaremedo/Android.mk
index 93bad32..ef21e6f 100644
--- a/QSthemes/QStileSquaremedo/Android.mk
+++ b/QSthemes/QSTileSquaremedo/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileSquaremedo
+LOCAL_PACKAGE_NAME := QSTileSquaremedo
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileSquaremedo/AndroidManifest.xml b/QSthemes/QSTileSquaremedo/AndroidManifest.xml
similarity index 78%
rename from QSthemes/QStileSquaremedo/AndroidManifest.xml
rename to QSthemes/QSTileSquaremedo/AndroidManifest.xml
index 9e9d8ff..aa42db7 100644
--- a/QSthemes/QStileSquaremedo/AndroidManifest.xml
+++ b/QSthemes/QSTileSquaremedo/AndroidManifest.xml
@@ -4,6 +4,5 @@
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="The Squaremedo" android:hasCode="false" />
+    <application android:label="Squaremedo" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QStileSquaremedo/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileSquaremedo/res/drawable/ic_qs_circle.xml
similarity index 99%
rename from QSthemes/QStileSquaremedo/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileSquaremedo/res/drawable/ic_qs_circle.xml
index 1ec8b32..cd79220 100644
--- a/QSthemes/QStileSquaremedo/res/drawable/ic_qs_circle.xml
+++ b/QSthemes/QSTileSquaremedo/res/drawable/ic_qs_circle.xml
@@ -212,4 +212,3 @@
         android:pathData="M20.54,7.17l-0.43,0l-0.75,0.75l0.43,0z"
         android:fillColor="#fff"/>
 </vector>
-
diff --git a/QSthemes/QSTileSquaremedo/res/values/colors.xml b/QSthemes/QSTileSquaremedo/res/values/colors.xml
new file mode 100644
index 0000000..2eaae4c
--- /dev/null
+++ b/QSthemes/QSTileSquaremedo/res/values/colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 Project Substratum
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<resources>
+    <!-- QS tiles Active, Inactive and Unavailable tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_inactive_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_unavailable_tint">@*android:color/omni_text2</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+
+    <!-- QS tiles background Active, Disable, and Inactive tint (Requires config_enable_qs_tile_tinting bool set to true) -->
+    <color name="qs_tiles_background_active_tint">@*android:color/accent_device_default_light</color>
+    <color name="qs_tiles_background_disabled_tint">@*android:color/omni_text1</color> <!-- keep in mind that the code adds 0.26 (light) or 0.30 (dark) alpha to this color. -->
+    <color name="qs_tiles_background_inactive_tint">@*android:color/omni_text2</color>
+
+    <!-- QS tiles expand, underline and label colors -->
+    <color name="qs_tiles_expand_tint">@*android:color/omni_text1</color>
+    <color name="qs_tiles_label_color">@*android:color/omni_text1</color>
+    <color name="qs_tiles_secondary_label_color">@*android:color/omni_text2</color>
+    <color name="qs_tiles_underline_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/QSthemes/QSTileSquaremedo/res/values/config.xml b/QSthemes/QSTileSquaremedo/res/values/config.xml
new file mode 100644
index 0000000..e23e4b0
--- /dev/null
+++ b/QSthemes/QSTileSquaremedo/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017-2018 Projekt Substratum
+      Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+           http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+     <!-- Config to enable/diaable qs tile tinting -->
+    <bool name="config_enable_qs_tile_tinting">true</bool>
+ </resources>
\ No newline at end of file
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileSquircle/Android.mk
similarity index 83%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileSquircle/Android.mk
index 3801ec8..46511ab 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileSquircle/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileSquircle
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileSquircle/AndroidManifest.xml
similarity index 65%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileSquircle/AndroidManifest.xml
index 0f62c1a..b8d3764 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileSquircle/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.squircle"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Squircle" android:hasCode="false"/>
 </manifest>
-
diff --git a/QSthemes/QSTileSquircle/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileSquircle/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..3601b48
--- /dev/null
+++ b/QSthemes/QSTileSquircle/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z" />
+</vector>
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileSquircleTrim/Android.mk
similarity index 82%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileSquircleTrim/Android.mk
index 3801ec8..26b2a42 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileSquircleTrim/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileSquircleTrim
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileSquircleTrim/AndroidManifest.xml b/QSthemes/QSTileSquircleTrim/AndroidManifest.xml
similarity index 100%
rename from QSthemes/QStileSquircleTrim/AndroidManifest.xml
rename to QSthemes/QSTileSquircleTrim/AndroidManifest.xml
diff --git a/QSthemes/QStileSquircleTrim/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileSquircleTrim/res/drawable/ic_qs_circle.xml
similarity index 100%
rename from QSthemes/QStileSquircleTrim/res/drawable/ic_qs_circle.xml
rename to QSthemes/QSTileSquircleTrim/res/drawable/ic_qs_circle.xml
diff --git a/QSthemes/QStileSquircleTrim/res/values/strings.xml b/QSthemes/QSTileSquircleTrim/res/values/strings.xml
similarity index 100%
rename from QSthemes/QStileSquircleTrim/res/values/strings.xml
rename to QSthemes/QSTileSquircleTrim/res/values/strings.xml
diff --git a/QSthemes/QStileDefault/Android.mk b/QSthemes/QSTileTearDrop/Android.mk
similarity index 83%
copy from QSthemes/QStileDefault/Android.mk
copy to QSthemes/QSTileTearDrop/Android.mk
index 3801ec8..f62c18c 100644
--- a/QSthemes/QStileDefault/Android.mk
+++ b/QSthemes/QSTileTearDrop/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 CAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileDefault
+LOCAL_PACKAGE_NAME := QSTileTeardrop
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileTearDrop/AndroidManifest.xml
similarity index 65%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileTearDrop/AndroidManifest.xml
index 0f62c1a..e7f83f0 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileTearDrop/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.teardrop"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="TearDrop" android:hasCode="false"/>
 </manifest>
-
diff --git a/QSthemes/QSTileTearDrop/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileTearDrop/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..b84c998
--- /dev/null
+++ b/QSthemes/QSTileTearDrop/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z" />
+</vector>
diff --git a/QSthemes/QStileInkDrop/Android.mk b/QSthemes/QSTileWavey/Android.mk
similarity index 84%
copy from QSthemes/QStileInkDrop/Android.mk
copy to QSthemes/QSTileWavey/Android.mk
index 5cee5cd..82b30e6 100644
--- a/QSthemes/QStileInkDrop/Android.mk
+++ b/QSthemes/QSTileWavey/Android.mk
@@ -3,9 +3,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_PACKAGE_NAME := QStileInkDrop
+LOCAL_PACKAGE_NAME := QSTileWavey
 LOCAL_SDK_VERSION := current
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := false
 include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileInkDrop/AndroidManifest.xml b/QSthemes/QSTileWavey/AndroidManifest.xml
similarity index 65%
copy from QSthemes/QStileInkDrop/AndroidManifest.xml
copy to QSthemes/QSTileWavey/AndroidManifest.xml
index 0f62c1a..d649789 100644
--- a/QSthemes/QStileInkDrop/AndroidManifest.xml
+++ b/QSthemes/QSTileWavey/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.qstile.inkdrop"
+    package="com.android.systemui.qstile.wavey"
     android:versionCode="1"
     android:versionName="1.0">
     <overlay android:targetPackage="com.android.systemui" android:priority="1"/>
 
-    <application android:label="InkDrop" android:hasCode="false" />
+    <application android:label="Wavey" android:hasCode="false" />
 </manifest>
-
diff --git a/QSthemes/QSTileWavey/res/drawable/ic_qs_circle.xml b/QSthemes/QSTileWavey/res/drawable/ic_qs_circle.xml
new file mode 100644
index 0000000..ee7c73f
--- /dev/null
+++ b/QSthemes/QSTileWavey/res/drawable/ic_qs_circle.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--suppress AndroidUnknownAttribute -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="40dp"
+        android:height="40dp"
+        android:viewportWidth="48.0"
+        android:viewportHeight="48.0">
+    <path
+        android:pathData="M19.37,44.11c-2.6,-1 -5.59,-1 -8.52,-0.51c3.76,2.54 8.29,4.02 13.17,4.02c5.97,0 11.41,-2.22 15.56,-5.88C33.66,45.52 26.74,46.93 19.37,44.11z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.25"/>
+    <path
+        android:pathData="M47.1,28.81c-1.97,0.59 -3.98,1.55 -5.77,3.11c-6.64,5.78 -14.97,8.62 -23.95,5.18c-3.84,-1.47 -8.53,-0.79 -12.64,0.48c1.66,2.36 3.73,4.4 6.12,6.01c2.93,-0.49 5.92,-0.48 8.52,0.51c7.37,2.82 14.29,1.41 20.2,-2.37C43.35,38.42 46.05,33.92 47.1,28.81z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.40"/>
+    <path
+        android:pathData="M17.37,37.11c8.99,3.44 17.31,0.6 23.95,-5.18c1.8,-1.56 3.8,-2.53 5.77,-3.11c0.31,-1.54 0.48,-3.13 0.48,-4.76c0,-1.21 -0.09,-2.4 -0.27,-3.56c-2.35,0.53 -4.82,1.55 -6.99,3.43c-6.64,5.78 -14.97,8.62 -23.95,5.18c-4.62,-1.77 -10.46,-0.42 -15.05,1.3c0.73,2.6 1.89,5.02 3.4,7.18C8.84,36.32 13.53,35.64 17.37,37.11z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.55"/>
+    <path
+        android:pathData="M16.37,29.11c8.99,3.44 17.31,0.6 23.95,-5.18c2.17,-1.89 4.64,-2.91 6.99,-3.43c-0.48,-3.14 -1.58,-6.09 -3.17,-8.69c-1.99,0.59 -4.01,1.55 -5.82,3.13c-6.64,5.78 -14.97,8.62 -23.95,5.18c-4.18,-1.6 -9.36,-0.65 -13.71,0.82c-0.14,1.02 -0.21,2.06 -0.21,3.12c0,2.2 0.31,4.33 0.87,6.35C5.91,28.68 11.75,27.34 16.37,29.11z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.70"/>
+    <path
+        android:pathData="M14.37,20.11c8.99,3.44 17.31,0.6 23.95,-5.18c1.81,-1.58 3.83,-2.54 5.82,-3.13c-1.86,-3.05 -4.4,-5.64 -7.4,-7.57c-0.83,0.47 -1.65,1.02 -2.42,1.7c-6.64,5.78 -14.97,8.62 -23.95,5.18c-1.7,-0.65 -3.57,-0.88 -5.48,-0.82c-2.22,3.08 -3.71,6.7 -4.23,10.64C5.01,19.46 10.19,18.51 14.37,20.11z"
+        android:fillColor="#fff"
+        android:fillAlpha="0.85"/>
+    <path
+        android:pathData="M10.37,11.11c8.99,3.44 17.31,0.6 23.95,-5.18c0.77,-0.67 1.59,-1.23 2.42,-1.7c-3.67,-2.36 -8.04,-3.74 -12.73,-3.74c-7.87,0 -14.84,3.87 -19.12,9.8C6.8,10.23 8.67,10.46 10.37,11.11z"
+        android:fillColor="#fff"/>
+</vector>
+
diff --git a/QSthemes/QStileCircleDualTone/Android.mk b/QSthemes/QStileCircleDualTone/Android.mk
deleted file mode 100644
index 17d3307..0000000
--- a/QSthemes/QStileCircleDualTone/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileCircleDualTone
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileCircleGradient/Android.mk b/QSthemes/QStileCircleGradient/Android.mk
deleted file mode 100644
index 82306a0..0000000
--- a/QSthemes/QStileCircleGradient/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileCircleGradient
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileCircleTrim/Android.mk b/QSthemes/QStileCircleTrim/Android.mk
deleted file mode 100644
index 8952f15..0000000
--- a/QSthemes/QStileCircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileCircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QStileDottedCircle/Android.mk b/QSthemes/QStileDottedCircle/Android.mk
deleted file mode 100644
index 5131bee..0000000
--- a/QSthemes/QStileDottedCircle/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileDottedCircle
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-include $(BUILD_PACKAGE)
-
diff --git a/QSthemes/QStileDottedCircle/res/values/colors.xml b/QSthemes/QStileDottedCircle/res/values/colors.xml
deleted file mode 100644
index cbf2e47..0000000
--- a/QSthemes/QStileDottedCircle/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources>
-
-    <!-- QS Tiles Colors --> 
-    <color name="qs_active_color">@*android:color/accent_device_default_light</color>
-
-</resources>
diff --git a/QSthemes/QStileDualToneCircle/Android.mk b/QSthemes/QStileDualToneCircle/Android.mk
deleted file mode 100644
index 6358f4a..0000000
--- a/QSthemes/QStileDualToneCircle/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileDualToneCircle
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QStileInkDrop/res/values/colors.xml b/QSthemes/QStileInkDrop/res/values/colors.xml
deleted file mode 100644
index 766e685..0000000
--- a/QSthemes/QStileInkDrop/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- QS Tiles Colors --> 
-    <color name="qs_icon_active_color">@*android:color/accent_device_default_light</color>
-
-</resources>
-
diff --git a/QSthemes/QStileOreo/res/drawable/ic_brightness_thumb.xml b/QSthemes/QStileOreo/res/drawable/ic_brightness_thumb.xml
deleted file mode 100644
index 6c3064a..0000000
--- a/QSthemes/QStileOreo/res/drawable/ic_brightness_thumb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
-    <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
-</vector>
diff --git a/QSthemes/QStileOreo/res/values/colors.xml b/QSthemes/QStileOreo/res/values/colors.xml
deleted file mode 100644
index da76f1e..0000000
--- a/QSthemes/QStileOreo/res/values/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- QS Tiles Colors --> 
-    <color name="qs_icon_active_color">@*android:color/accent_device_default_light</color>
-
-</resources>
diff --git a/QSthemes/QStileOreoCircleTrim/Android.mk b/QSthemes/QStileOreoCircleTrim/Android.mk
deleted file mode 100644
index afad55b..0000000
--- a/QSthemes/QStileOreoCircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileOreoCircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml b/QSthemes/QStileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
deleted file mode 100644
index 6c3064a..0000000
--- a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_brightness_thumb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
-    <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
-</vector>
diff --git a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
deleted file mode 100644
index 6c3064a..0000000
--- a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
-    <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
-</vector>
diff --git a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
deleted file mode 100644
index 7950f62..0000000
--- a/QSthemes/QStileOreoCircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0 0h24v24H0V0z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11 7l-3.2 9h1.9l0.7-2h3.2l0.7 2h1.9L13 7h-2zm-0.15 5.65L12 9l1.15 3.65h-2.3zM20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zm-2 5.79V18h-3.52L12 20.48 9.52 18H6v-3.52L3.52 12 6 9.52V6h3.52L12 3.52 14.48 6H18v3.52L20.48 12 18 14.48z" />
-</vector>
diff --git a/QSthemes/QStileOreoCircleTrim/res/values/colors.xml b/QSthemes/QStileOreoCircleTrim/res/values/colors.xml
deleted file mode 100644
index da76f1e..0000000
--- a/QSthemes/QStileOreoCircleTrim/res/values/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- QS Tiles Colors --> 
-    <color name="qs_icon_active_color">@*android:color/accent_device_default_light</color>
-
-</resources>
diff --git a/QSthemes/QStileOreoSquircleTrim/Android.mk b/QSthemes/QStileOreoSquircleTrim/Android.mk
deleted file mode 100644
index 5d80be4..0000000
--- a/QSthemes/QStileOreoSquircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileOreoSquircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml b/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
deleted file mode 100644
index 6c3064a..0000000
--- a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_brightness_thumb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
-    <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
-</vector>
diff --git a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml b/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
deleted file mode 100644
index 6c3064a..0000000
--- a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_off.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:pathData="M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z"
-        android:fillColor="?android:attr/colorPrimary" />
-
-    <path
-        android:pathData=" M20,8.69 V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69z M18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48z M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7z"
-        android:fillColor="?android:attr/colorControlNormal" />
-</vector>
diff --git a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml b/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
deleted file mode 100644
index 7950f62..0000000
--- a/QSthemes/QStileOreoSquircleTrim/res/drawable/ic_qs_brightness_auto_on.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0 0h24v24H0V0z" />
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M11 7l-3.2 9h1.9l0.7-2h3.2l0.7 2h1.9L13 7h-2zm-0.15 5.65L12 9l1.15 3.65h-2.3zM20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zm-2 5.79V18h-3.52L12 20.48 9.52 18H6v-3.52L3.52 12 6 9.52V6h3.52L12 3.52 14.48 6H18v3.52L20.48 12 18 14.48z" />
-</vector>
diff --git a/QSthemes/QStileOreoSquircleTrim/res/values/colors.xml b/QSthemes/QStileOreoSquircleTrim/res/values/colors.xml
deleted file mode 100644
index da76f1e..0000000
--- a/QSthemes/QStileOreoSquircleTrim/res/values/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 Havoc-OS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- QS Tiles Colors --> 
-    <color name="qs_icon_active_color">@*android:color/accent_device_default_light</color>
-
-</resources>
diff --git a/QSthemes/QStileSquaremedo/res/values/colors.xml b/QSthemes/QStileSquaremedo/res/values/colors.xml
deleted file mode 100644
index 697039d..0000000
--- a/QSthemes/QStileSquaremedo/res/values/colors.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2016 Project Substratum
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<resources>
-    <!-- QS Tiles Colors --> 
-    <color name="qs_icon_active_color">@*android:color/accent_device_default_light</color>
-
-</resources>
-
diff --git a/QSthemes/QStileSquircleTrim/Android.mk b/QSthemes/QStileSquircleTrim/Android.mk
deleted file mode 100644
index 984c9e0..0000000
--- a/QSthemes/QStileSquircleTrim/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-CAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := QStileSquircleTrim
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := false
-
-include $(BUILD_PACKAGE)
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 9b00cb8..a686fd3 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -146,18 +146,26 @@
 
 # QS tile styles
 PRODUCT_PACKAGES += \
-    QStileCircleTrim \
-    QStileDefault \
-    QStileCircleDualTone \
-    QStileDualToneCircle \
-    QStileCircleGradient \
-    QStileDottedCircle \
-    QStileInkDrop \
-    QStileOreo \
-    QStileOreoCircleTrim \
-    QStileOreoSquircleTrim \
-    QStileSquircleTrim \
-    QStileSquaremedo
+    QSTileDefault \
+    QSTileCircleTrim \
+    QSTileCircleDualTone \
+    QSTileCircleGradient \
+    QSTileCookie \
+    QSTileDottedCircle \
+    QSTileDualToneCircle \
+    QSTileInk \
+    QSTileInkdrop \
+    QSTileMountain \
+    QSTileNinja \
+    QSTileOreo \
+    QSTileOreoCircleTrim \
+    QSTileOreoSquircleTrim \
+    QSTilePokesign \
+    QSTileSquaremedo \
+    QSTileSquircle \
+    QSTileSquircleTrim \
+    QSTileTeardrop \
+    QSTileWavey
     
 # Openssh
 PRODUCT_PACKAGES += \