diff --git a/Android.mk b/Android.mk
index a3c8c7a..39fa0b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -290,7 +290,7 @@ LOCAL_SRC_FILES := $(cmplat_docs_src_files)
 LOCAL_ADDITONAL_JAVA_DIR := $(intermediates.COMMON)/src
 
 LOCAL_IS_HOST_MODULE := false
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := vendor/cm/build/tools/droiddoc/templates-cmsdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := vendor/replicant/build/tools/droiddoc/templates-cmsdk
 LOCAL_ADDITIONAL_DEPENDENCIES := \
     services \
     org.cyanogenmod.hardware
diff --git a/cm/res/res/drawable/dexopt_brand_logo.xml b/cm/res/res/drawable/dexopt_brand_logo.xml
index 3c0f748..30ce38a 100644
--- a/cm/res/res/drawable/dexopt_brand_logo.xml
+++ b/cm/res/res/drawable/dexopt_brand_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2016 The CyanogenMod Project
-    Copyright (c) 2017 The LineageOS Project
+    Copyright (c) 2011 Mirella Vedovetto
+    Copyright (c) 2012 Paul Kocialkowski
+    Copyright (c) 2017 Wolfgang Wiedmeyer
 
-    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
+    This work is licensed under the Creative Commons Attribution-ShareAlike
+    3.0 Unported License. To view a copy of this license, visit
+    http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
+    Creative Commons, 444 Castro Street, Suite 900, Mountain View,
+    California, 94041, USA.
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,45 +17,150 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="96dp"
-    android:height="90dp"
-    android:viewportWidth="96"
-    android:viewportHeight="90">
+    android:width="150.00008dp"
+    android:height="199.99631dp"
+    android:viewportWidth="150.00008"
+    android:viewportHeight="199.99631">
 
     <path
-        android:fillColor="@color/dexopt_logo"
-        android:pathData="M86.416,36.173c-2.901-0.002-5.647,1.311-7.468,3.569l-0.36-0.144c-3.69-1.447-7.496-2.582-11.376-3.392
-c0,0,0-0.022,0-0.034c0-10.606-8.598-19.204-19.204-19.204s-19.204,8.598-19.204,19.204c0,0,0,0.022,0,0.031l-0.413,0.091
-c-3.738,0.802-7.404,1.906-10.963,3.303l-0.36,0.144c-3.334-4.124-9.38-4.764-13.504-1.43c-4.124,3.334-4.764,9.38-1.43,13.504
-c3.334,4.124,9.38,4.764,13.504,1.43c2.987-2.415,4.247-6.379,3.204-10.076l0,0c3.358-1.319,6.818-2.362,10.346-3.121
-c2.133,10.389,12.285,17.082,22.674,14.949c7.524-1.545,13.404-7.425,14.949-14.949c3.528,0.758,6.989,1.802,10.348,3.121l0,0
-c-1.438,5.104,1.533,10.408,6.637,11.846c5.104,1.438,10.408-1.533,11.846-6.637c1.438-5.104-1.533-10.408-6.637-11.846
-C88.163,36.295,87.292,36.174,86.416,36.173z
-M9.601,51.536c-3.182,0-5.761-2.579-5.761-5.761s2.579-5.761,5.761-5.761
-s5.761,2.579,5.761,5.761S12.783,51.536,9.601,51.536z
-M48.009,51.536c-8.485,0-15.363-6.878-15.363-15.363
-S39.524,20.81,48.009,20.81s15.363,6.878,15.363,15.363C63.362,44.653,56.489,51.526,48.009,51.536z
-M86.416,51.536
-c-3.182,0-5.761-2.579-5.761-5.761s2.579-5.761,5.761-5.761c3.182,0,5.761,2.579,5.761,5.761S89.598,51.536,86.416,51.536z
-M55.69,36.173c0,4.242-3.439,7.682-7.682,7.682s-7.682-3.439-7.682-7.682s3.439-7.682,7.682-7.682S55.69,31.93,55.69,36.173z
-M72.013,66.025h-2.569v1.32h2.312v0.943h-2.312v1.414h2.499v0.96h-3.622v-5.13c-0.005-0.125,0.047-0.246,0.142-0.329
-c0.092-0.083,0.212-0.128,0.336-0.125h3.214V66.025L72.013,66.025z
-M62.01,70.739c-0.747,0.041-1.477-0.238-2.007-0.766
-c-0.51-0.565-0.774-1.309-0.735-2.069c-0.04-0.788,0.242-1.558,0.78-2.134c0.55-0.54,1.299-0.827,2.069-0.792
-c0.504-0.014,1.002,0.11,1.44,0.36c0.379,0.219,0.683,0.548,0.871,0.943l-0.898,0.48c-0.27-0.546-0.751-0.819-1.44-0.819
-c-0.468-0.02-0.921,0.17-1.234,0.519c-0.325,0.398-0.489,0.903-0.461,1.416c-0.029,0.501,0.123,0.995,0.43,1.392
-c0.295,0.34,0.729,0.526,1.179,0.504c0.402,0.015,0.796-0.12,1.104-0.379c0.283-0.239,0.447-0.59,0.449-0.96h-1.414v-0.881h2.52
-v0.617c0.026,0.696-0.247,1.37-0.749,1.853C63.401,70.505,62.715,70.762,62.01,70.739z
-M55.301,70.653l-0.48-1.383h-2.038
-l-0.48,1.383h-1.164l1.889-5.161c0.109-0.296,0.361-0.444,0.756-0.444s0.651,0.151,0.766,0.454l1.889,5.151H55.301z
-M53.114,68.339 h1.397l-0.703-2.069L53.114,68.339z
-M48.225,66.025h-2.569v1.32h2.312v0.943h-2.312v1.414h2.496v0.96H44.53v-5.13
-c-0.005-0.125,0.047-0.246,0.142-0.329c0.092-0.083,0.212-0.128,0.336-0.125h3.217L48.225,66.025L48.225,66.025z
-M39.648,65.079
-h1.023v5.281c0,0.11-0.063,0.211-0.161,0.262c-0.122,0.069-0.261,0.103-0.401,0.098c-0.14,0.007-0.28-0.017-0.41-0.07
-c-0.108-0.057-0.2-0.139-0.269-0.24l-2.463-3.512v3.747h-1.037v-5.161c-0.009-0.133,0.053-0.261,0.163-0.336
-c0.129-0.079,0.279-0.117,0.43-0.11c0.158-0.011,0.316,0.021,0.456,0.094c0.134,0.104,0.249,0.23,0.338,0.374l2.333,3.262
-L39.648,65.079L39.648,65.079z M30.965,70.653v-5.574h1.123v5.574H30.965z
-M24.458,70.653c-0.242,0.008-0.446-0.182-0.454-0.424
-c0-0.01,0-0.02,0-0.029v-5.12h1.116v4.638h2.484v0.936H24.458z" />
+        android:fillColor="#ff0000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M67.5306,0.107464 C66.9169,0.150676,66.325,0.562181,66.0152,1.76939
+C65.3798,4.24633,67.9936,13.5225,69.2533,17.7342
+C67.1407,17.8758,65.1248,18.0922,63.2024,18.3887 L50.7376,8.84288
+C50.7376,8.84288,47.0448,8.52579,48.2676,11.6163
+C48.9425,13.3224,53.0648,16.8879,56.6434,19.77
+C22.4932,29.0483,23.5241,64.2133,23.7011,64.2472 L127.395,64.2472
+C127.395,64.2472,127.395,17.5471,74.7752,17.5471
+C74.7054,17.5471,74.637,17.5471,74.5676,17.5471 L69.6482,0.9903
+C69.6482,0.9903,68.5542,0.035038,67.531,0.107483 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="0.23714574"
+        android:pathData="M105.642,29.3188 C105.642,29.3188,110.555,29.3188,110.555,34.3063
+C110.555,39.2937,105.642,39.2937,105.642,39.2937
+C105.642,39.2937,100.729,39.2937,100.729,34.3063
+C100.729,29.3188,105.903,29.4843,105.642,29.3188 Z" />
+    <path
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M80.136,41.8494 C100.063,61.7925,126.633,61.7925,126.633,61.7925
+L126.633,61.7925" />
+    <path
+        android:fillColor="#ff0000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M15.3132,111.71 L67.6625,90.5425
+C67.6625,90.5425,75.6563,83.7253,71.9239,74.4797
+C68.1916,65.234,57.7095,66.283,57.7095,66.283 L5.3601,87.0551
+C5.3601,87.0551,-2.63388,93.8724,1.09856,103.118
+C4.831,112.364,15.588,111.887,15.3133,111.71 Z" />
+    <path
+        android:fillColor="#ff0000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M67.6449,124.389 L28.6373,165.24 C28.6373,165.24,24.1547,174.746,31.358,181.635
+C38.5614,188.524,47.8462,183.611,47.8462,183.611 L86.8538,142.76
+C86.8538,142.76,91.3364,133.254,84.133,126.365
+C76.9297,119.476,67.3217,124.34,67.6449,124.389 Z" />
+    <path
+        android:fillColor="#000000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="0.63669622"
+        android:pathData="M26.109,164.929 C22.4405,164.929,19.4666,167.905,19.4666,171.577
+C19.4666,175.248,22.4405,178.224,26.109,178.224
+C26.109,181.896,29.083,184.872,32.7513,184.872
+C32.7513,188.544,35.7251,191.52,39.3937,191.52
+C43.0623,191.52,46.0361,188.544,46.0361,184.872
+C46.0361,181.201,43.0623,178.224,39.3937,178.224
+C39.3937,174.553,36.4199,171.577,32.7513,171.577
+C32.7513,167.905,29.7774,164.929,26.1088,164.929 Z" />
+    <path
+        android:fillColor="#ff0000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M23.5312,65.9427 C23.514,66.0809,23.531,132.794,23.531,146.089
+C23.531,159.384,43.4582,159.384,43.4582,159.384
+C43.4582,159.384,76.6703,159.384,76.6703,159.384 L76.6703,159
+C83.2752,159,107.692,159,107.692,159
+C107.692,159,127.395,158.999,127.395,145.705
+C127.395,132.411,127.413,66.0813,127.395,65.9427
+C91.5596,65.9427,56.0104,65.9427,23.531,65.9427 Z" />
+    <path
+        android:fillColor="#ff0000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M74.6696,128.663 L74.6696,185.169 C74.6696,185.169,77.9908,195.14,87.9544,195.14
+C97.918,195.14,101.239,185.169,101.239,185.169 L101.239,128.663
+C101.239,128.663,97.918,118.692,87.9544,118.692
+C77.9908,118.692,74.4022,128.852,74.6696,128.663 Z" />
+    <path
+        android:fillColor="#000000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="0.63669622"
+        android:pathData="M77.9612,186.596 C74.2926,186.596,71.3188,189.572,71.3188,193.244
+C71.3188,196.915,74.2926,199.892,77.9612,199.892
+C80.1369,199.892,82.0533,198.84,83.2649,197.222
+C84.4761,198.843,86.4114,199.892,88.5891,199.892
+C90.5762,199.892,92.3434,199.011,93.5606,197.627
+C94.7778,199.014,96.563,199.892,98.5527,199.892
+C102.221,199.892,105.195,196.916,105.195,193.244
+C105.195,189.573,102.221,186.597,98.5527,186.597
+C96.564,186.597,94.7778,187.475,93.5606,188.861
+C92.3434,187.478,90.5755,186.597,88.5891,186.597
+C86.4114,186.597,84.4761,187.646,83.2649,189.266
+C82.0533,187.648,80.1369,186.597,77.9612,186.597 Z" />
+    <path
+        android:fillColor="#ff0000"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1.504877"
+        android:pathData="M82.3376,96.6262 L134.687,117.793
+C134.687,117.793,145.169,118.447,148.902,109.202
+C152.634,99.956,144.64,93.1388,144.64,93.1388 L92.2909,71.9715
+C92.2909,71.9715,81.8085,71.318,78.0761,80.5633
+C74.3438,89.8089,82.412,96.9446,82.3376,96.6262 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"
+        android:pathData="M27.2059,171.633 C27.2059,172.551,26.4625,173.295,25.5454,173.295
+C24.6283,173.295,23.8848,172.551,23.8848,171.633
+C23.8848,170.715,24.6283,169.971,25.5454,169.971
+C26.4625,169.971,27.2059,170.715,27.2059,171.633 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"
+        android:pathData="M34.3888,178.868 C34.3888,179.786,33.6453,180.53,32.7282,180.53
+C31.8111,180.53,31.0676,179.786,31.0676,178.868
+C31.0676,177.95,31.8111,177.206,32.7282,177.206
+C33.6453,177.206,34.3888,177.95,34.3888,178.868 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"
+        android:pathData="M79.0877,192.827 C79.0877,193.745,78.3442,194.489,77.4272,194.489
+C76.5101,194.489,75.7666,193.745,75.7666,192.827
+C75.7666,191.909,76.5101,191.165,77.4272,191.165
+C78.3442,191.165,79.0877,191.909,79.0877,192.827 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"
+        android:pathData="M90.5117,193.392 C90.5117,194.31,89.7682,195.054,88.8511,195.054
+C87.934,195.054,87.1905,194.31,87.1905,193.392
+C87.1905,192.474,87.934,191.73,88.8511,191.73
+C89.7682,191.73,90.5117,192.474,90.5117,193.392 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"
+        android:pathData="M99.8099,192.76 C99.8099,193.678,99.0664,194.422,98.1493,194.422
+C97.2322,194.422,96.4887,193.678,96.4887,192.76
+C96.4887,191.843,97.2322,191.098,98.1493,191.098
+C99.0664,191.098,99.8099,191.843,99.8099,192.76 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"
+        android:pathData="M41.9604,185.183 C41.9604,186.101,41.2169,186.845,40.2998,186.845
+C39.3828,186.845,38.6393,186.101,38.6393,185.183
+C38.6393,184.265,39.3828,183.521,40.2998,183.521
+C41.2169,183.521,41.9604,184.265,41.9604,185.183 Z" />
 </vector>