diff --git a/build/tasks/liquid.mk b/build/tasks/liquid.mk
index 2baba8a5..31bd1242 100644
--- a/build/tasks/liquid.mk
+++ b/build/tasks/liquid.mk
@@ -23,5 +23,5 @@ LIQUID_TARGET_PACKAGE := $(PRODUCT_OUT)/liquid_remix-$(LIQUID_VERSION).zip
 liquid: $(INTERNAL_OTA_PACKAGE_TARGET)
 	$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(LIQUID_TARGET_PACKAGE)
 	$(hide) $(MD5SUM) $(LIQUID_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(LIQUID_TARGET_PACKAGE).md5sum
-	$(hide) ./vendor/liquid/tools/generate_json_build_info.sh $(HAVOC_TARGET_PACKAGE)
+	$(hide) ./vendor/liquid/tools/generate_json_build_info.sh $(LIQUID_TARGET_PACKAGE)
 	@echo "Package Complete: $(LIQUID_TARGET_PACKAGE)" >&2
diff --git a/config/common.mk b/config/common.mk
index c084907c..42ae935d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -72,6 +72,10 @@ endif
 PRODUCT_PACKAGES += \
     AmbientPlayHistoryProvider
 
+# Fonts
+PRODUCT_PACKAGES += \
+    Liquid-Fonts
+
 # Subs OMS
 PRODUCT_PACKAGES += \
     SubstratumSignature \
@@ -249,8 +253,6 @@ endif
 # Required packages
 PRODUCT_PACKAGES += \
     Eleven \
-    Email \
-    Jelly \
     Launcher3
 
 # Liquid packages
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index df648eee..8afbc24a 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -114,4 +114,7 @@
          This name is in the ComponentName flattened format (package/class)  -->
     <string name="config_screenshotEditor" translatable="false">com.google.android.markup/com.google.android.markup.AnnotateActivity</string>
 
+    <string-array name="config_fontPackages" translatable="false">
+        <item>com.liquid.fonts</item>
+    </string-array>
 </resources>
diff --git a/prebuilt/common/etc/default-permissions/com.android.providers.weather.xml b/prebuilt/common/etc/default-permissions/com.android.providers.weather.xml
new file mode 100644
index 00000000..992bd213
--- /dev/null
+++ b/prebuilt/common/etc/default-permissions/com.android.providers.weather.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<exceptions>
+
+    <exception package="com.android.providers.weather">
+        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
+        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
+    </exception>
+
+</exceptions>
\ No newline at end of file
diff --git a/prebuilt/common/etc/permissions/com.android.providers.weather.xml b/prebuilt/common/etc/permissions/com.android.providers.weather.xml
new file mode 100644
index 00000000..7486dc87
--- /dev/null
+++ b/prebuilt/common/etc/permissions/com.android.providers.weather.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<permissions>
+    <feature name="com.android.providers.weather.SUPPORTED" />
+</permissions>
\ No newline at end of file
diff --git a/prebuilt/common/prebuilt.mk b/prebuilt/common/prebuilt.mk
index 813edf41..401ce9d4 100644
--- a/prebuilt/common/prebuilt.mk
+++ b/prebuilt/common/prebuilt.mk
@@ -14,7 +14,8 @@
 
 # Prebuilt Packages
 PRODUCT_PACKAGES += \
-    Turbo
+    Turbo \
+     WeatherProvider
 
 # Permissions
 PRODUCT_COPY_FILES += \
@@ -23,3 +24,8 @@ PRODUCT_COPY_FILES += \
 # Sysconfig
 PRODUCT_COPY_FILES += \
     vendor/liquid/prebuilt/common/etc/sysconfig/turbo.xml:system/etc/sysconfig/turbo.xml
+
+# WeatherProvider
+PRODUCT_COPY_FILES += \
+    vendor/liquid/prebuilt/common/etc/permissions/com.android.providers.weather.xml:system/etc/permissions/com.android.providers.weather.xml \
+    vendor/liquid/prebuilt/common/etc/default-permissions/com.android.providers.weather.xml:system/etc/default-permissions/com.android.providers.weather.xml
diff --git a/themes/Fonts/Android.mk b/themes/Fonts/Android.mk
new file mode 100644
index 00000000..867bad4a
--- /dev/null
+++ b/themes/Fonts/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := Liquid-Fonts
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/themes/Fonts/AndroidManifest.xml b/themes/Fonts/AndroidManifest.xml
new file mode 100644
index 00000000..2263a13c
--- /dev/null
+++ b/themes/Fonts/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.liquid.fonts">
+
+    <application android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
+        android:hasCode="false"/>
+
+</manifest>
diff --git a/themes/Fonts/assets/fonts/Alpaca.zip b/themes/Fonts/assets/fonts/Alpaca.zip
new file mode 100644
index 00000000..107ae3af
Binary files /dev/null and b/themes/Fonts/assets/fonts/Alpaca.zip differ
diff --git a/themes/Fonts/assets/fonts/Amarante.zip b/themes/Fonts/assets/fonts/Amarante.zip
new file mode 100644
index 00000000..3ac26b41
Binary files /dev/null and b/themes/Fonts/assets/fonts/Amarante.zip differ
diff --git a/themes/Fonts/assets/fonts/Anaheim.zip b/themes/Fonts/assets/fonts/Anaheim.zip
new file mode 100644
index 00000000..87666c9c
Binary files /dev/null and b/themes/Fonts/assets/fonts/Anaheim.zip differ
diff --git a/themes/Fonts/assets/fonts/Asap.zip b/themes/Fonts/assets/fonts/Asap.zip
new file mode 100644
index 00000000..b614f89e
Binary files /dev/null and b/themes/Fonts/assets/fonts/Asap.zip differ
diff --git a/themes/Fonts/assets/fonts/Assassin.zip b/themes/Fonts/assets/fonts/Assassin.zip
new file mode 100644
index 00000000..5ed6ba8f
Binary files /dev/null and b/themes/Fonts/assets/fonts/Assassin.zip differ
diff --git a/themes/Fonts/assets/fonts/Atma.zip b/themes/Fonts/assets/fonts/Atma.zip
new file mode 100644
index 00000000..be9714b5
Binary files /dev/null and b/themes/Fonts/assets/fonts/Atma.zip differ
diff --git a/themes/Fonts/assets/fonts/Audiowide.zip b/themes/Fonts/assets/fonts/Audiowide.zip
new file mode 100644
index 00000000..a4e14569
Binary files /dev/null and b/themes/Fonts/assets/fonts/Audiowide.zip differ
diff --git a/themes/Fonts/assets/fonts/Bariol.zip b/themes/Fonts/assets/fonts/Bariol.zip
new file mode 100644
index 00000000..2c0ae23e
Binary files /dev/null and b/themes/Fonts/assets/fonts/Bariol.zip differ
diff --git a/themes/Fonts/assets/fonts/Big_River_Script.zip b/themes/Fonts/assets/fonts/Big_River_Script.zip
new file mode 100644
index 00000000..6c7114d6
Binary files /dev/null and b/themes/Fonts/assets/fonts/Big_River_Script.zip differ
diff --git a/themes/Fonts/assets/fonts/Cagliostro.zip b/themes/Fonts/assets/fonts/Cagliostro.zip
new file mode 100644
index 00000000..dc0a7c85
Binary files /dev/null and b/themes/Fonts/assets/fonts/Cagliostro.zip differ
diff --git a/themes/Fonts/assets/fonts/Calibri.zip b/themes/Fonts/assets/fonts/Calibri.zip
new file mode 100644
index 00000000..836ff656
Binary files /dev/null and b/themes/Fonts/assets/fonts/Calibri.zip differ
diff --git a/themes/Fonts/assets/fonts/Caviar_Dreams.zip b/themes/Fonts/assets/fonts/Caviar_Dreams.zip
new file mode 100644
index 00000000..bdf81b2f
Binary files /dev/null and b/themes/Fonts/assets/fonts/Caviar_Dreams.zip differ
diff --git a/themes/Fonts/assets/fonts/Chinacat.zip b/themes/Fonts/assets/fonts/Chinacat.zip
new file mode 100644
index 00000000..5e44e9a5
Binary files /dev/null and b/themes/Fonts/assets/fonts/Chinacat.zip differ
diff --git a/themes/Fonts/assets/fonts/Chococooky.zip b/themes/Fonts/assets/fonts/Chococooky.zip
new file mode 100644
index 00000000..0016d74f
Binary files /dev/null and b/themes/Fonts/assets/fonts/Chococooky.zip differ
diff --git a/themes/Fonts/assets/fonts/Chromia.zip b/themes/Fonts/assets/fonts/Chromia.zip
new file mode 100644
index 00000000..155d3633
Binary files /dev/null and b/themes/Fonts/assets/fonts/Chromia.zip differ
diff --git a/themes/Fonts/assets/fonts/Circular_Std.zip b/themes/Fonts/assets/fonts/Circular_Std.zip
new file mode 100644
index 00000000..67a1a72b
Binary files /dev/null and b/themes/Fonts/assets/fonts/Circular_Std.zip differ
diff --git a/themes/Fonts/assets/fonts/Clear_Sans.zip b/themes/Fonts/assets/fonts/Clear_Sans.zip
new file mode 100644
index 00000000..dedfc406
Binary files /dev/null and b/themes/Fonts/assets/fonts/Clear_Sans.zip differ
diff --git a/themes/Fonts/assets/fonts/Cocon.zip b/themes/Fonts/assets/fonts/Cocon.zip
new file mode 100644
index 00000000..e20db304
Binary files /dev/null and b/themes/Fonts/assets/fonts/Cocon.zip differ
diff --git a/themes/Fonts/assets/fonts/Comfortaa.zip b/themes/Fonts/assets/fonts/Comfortaa.zip
new file mode 100644
index 00000000..ac1690ff
Binary files /dev/null and b/themes/Fonts/assets/fonts/Comfortaa.zip differ
diff --git a/themes/Fonts/assets/fonts/Comic_Sans.zip b/themes/Fonts/assets/fonts/Comic_Sans.zip
new file mode 100644
index 00000000..7363db0c
Binary files /dev/null and b/themes/Fonts/assets/fonts/Comic_Sans.zip differ
diff --git a/themes/Fonts/assets/fonts/Comicneuesansid.zip b/themes/Fonts/assets/fonts/Comicneuesansid.zip
new file mode 100644
index 00000000..37129372
Binary files /dev/null and b/themes/Fonts/assets/fonts/Comicneuesansid.zip differ
diff --git a/themes/Fonts/assets/fonts/Coolstory.zip b/themes/Fonts/assets/fonts/Coolstory.zip
new file mode 100644
index 00000000..c8e38c70
Binary files /dev/null and b/themes/Fonts/assets/fonts/Coolstory.zip differ
diff --git a/themes/Fonts/assets/fonts/Exo_2.zip b/themes/Fonts/assets/fonts/Exo_2.zip
new file mode 100644
index 00000000..87033e43
Binary files /dev/null and b/themes/Fonts/assets/fonts/Exo_2.zip differ
diff --git a/themes/Fonts/assets/fonts/Filth_Of_Icarus.zip b/themes/Fonts/assets/fonts/Filth_Of_Icarus.zip
new file mode 100644
index 00000000..71b8ec13
Binary files /dev/null and b/themes/Fonts/assets/fonts/Filth_Of_Icarus.zip differ
diff --git a/themes/Fonts/assets/fonts/Fira_Sans.zip b/themes/Fonts/assets/fonts/Fira_Sans.zip
new file mode 100644
index 00000000..da0739b4
Binary files /dev/null and b/themes/Fonts/assets/fonts/Fira_Sans.zip differ
diff --git a/themes/Fonts/assets/fonts/FoxAndCat.zip b/themes/Fonts/assets/fonts/FoxAndCat.zip
new file mode 100644
index 00000000..726da56d
Binary files /dev/null and b/themes/Fonts/assets/fonts/FoxAndCat.zip differ
diff --git a/themes/Fonts/assets/fonts/GinoraSans.zip b/themes/Fonts/assets/fonts/GinoraSans.zip
new file mode 100644
index 00000000..8ac4740b
Binary files /dev/null and b/themes/Fonts/assets/fonts/GinoraSans.zip differ
diff --git a/themes/Fonts/assets/fonts/Gotham_Nights.zip b/themes/Fonts/assets/fonts/Gotham_Nights.zip
new file mode 100644
index 00000000..0989524a
Binary files /dev/null and b/themes/Fonts/assets/fonts/Gotham_Nights.zip differ
diff --git a/themes/Fonts/assets/fonts/HYCoffee.zip b/themes/Fonts/assets/fonts/HYCoffee.zip
new file mode 100644
index 00000000..14af9668
Binary files /dev/null and b/themes/Fonts/assets/fonts/HYCoffee.zip differ
diff --git a/themes/Fonts/assets/fonts/HappyTime.zip b/themes/Fonts/assets/fonts/HappyTime.zip
new file mode 100644
index 00000000..5c05bc8c
Binary files /dev/null and b/themes/Fonts/assets/fonts/HappyTime.zip differ
diff --git a/themes/Fonts/assets/fonts/Helvetica_Neue.zip b/themes/Fonts/assets/fonts/Helvetica_Neue.zip
new file mode 100644
index 00000000..accc4c48
Binary files /dev/null and b/themes/Fonts/assets/fonts/Helvetica_Neue.zip differ
diff --git a/themes/Fonts/assets/fonts/I_Hate_Comic_Sans.zip b/themes/Fonts/assets/fonts/I_Hate_Comic_Sans.zip
new file mode 100644
index 00000000..7e735237
Binary files /dev/null and b/themes/Fonts/assets/fonts/I_Hate_Comic_Sans.zip differ
diff --git a/themes/Fonts/assets/fonts/Imaki.zip b/themes/Fonts/assets/fonts/Imaki.zip
new file mode 100644
index 00000000..c2606559
Binary files /dev/null and b/themes/Fonts/assets/fonts/Imaki.zip differ
diff --git a/themes/Fonts/assets/fonts/Inkferno.zip b/themes/Fonts/assets/fonts/Inkferno.zip
new file mode 100644
index 00000000..42ef9301
Binary files /dev/null and b/themes/Fonts/assets/fonts/Inkferno.zip differ
diff --git a/themes/Fonts/assets/fonts/Kenyan_Coffee.zip b/themes/Fonts/assets/fonts/Kenyan_Coffee.zip
new file mode 100644
index 00000000..b5ba1447
Binary files /dev/null and b/themes/Fonts/assets/fonts/Kenyan_Coffee.zip differ
diff --git a/themes/Fonts/assets/fonts/LG_Smart_Gothic.zip b/themes/Fonts/assets/fonts/LG_Smart_Gothic.zip
new file mode 100644
index 00000000..7f781849
Binary files /dev/null and b/themes/Fonts/assets/fonts/LG_Smart_Gothic.zip differ
diff --git a/themes/Fonts/assets/fonts/Liberation_Serif.zip b/themes/Fonts/assets/fonts/Liberation_Serif.zip
new file mode 100644
index 00000000..8cb8e56c
Binary files /dev/null and b/themes/Fonts/assets/fonts/Liberation_Serif.zip differ
diff --git a/themes/Fonts/assets/fonts/Lovelyn.zip b/themes/Fonts/assets/fonts/Lovelyn.zip
new file mode 100644
index 00000000..bf715875
Binary files /dev/null and b/themes/Fonts/assets/fonts/Lovelyn.zip differ
diff --git a/themes/Fonts/assets/fonts/Malgun_Gothic.zip b/themes/Fonts/assets/fonts/Malgun_Gothic.zip
new file mode 100644
index 00000000..008ba855
Binary files /dev/null and b/themes/Fonts/assets/fonts/Malgun_Gothic.zip differ
diff --git a/themes/Fonts/assets/fonts/NK57.zip b/themes/Fonts/assets/fonts/NK57.zip
new file mode 100644
index 00000000..2dadc633
Binary files /dev/null and b/themes/Fonts/assets/fonts/NK57.zip differ
diff --git a/themes/Fonts/assets/fonts/Neoneon.zip b/themes/Fonts/assets/fonts/Neoneon.zip
new file mode 100644
index 00000000..c3c7acc8
Binary files /dev/null and b/themes/Fonts/assets/fonts/Neoneon.zip differ
diff --git a/themes/Fonts/assets/fonts/Noir.zip b/themes/Fonts/assets/fonts/Noir.zip
new file mode 100644
index 00000000..a539d9fa
Binary files /dev/null and b/themes/Fonts/assets/fonts/Noir.zip differ
diff --git a/themes/Fonts/assets/fonts/Nokia_Pure.zip b/themes/Fonts/assets/fonts/Nokia_Pure.zip
new file mode 100644
index 00000000..9835ae61
Binary files /dev/null and b/themes/Fonts/assets/fonts/Nokia_Pure.zip differ
diff --git a/themes/Fonts/assets/fonts/Nunito.zip b/themes/Fonts/assets/fonts/Nunito.zip
new file mode 100644
index 00000000..9ed3c65d
Binary files /dev/null and b/themes/Fonts/assets/fonts/Nunito.zip differ
diff --git a/themes/Fonts/assets/fonts/Ohd5.zip b/themes/Fonts/assets/fonts/Ohd5.zip
new file mode 100644
index 00000000..f8abdfeb
Binary files /dev/null and b/themes/Fonts/assets/fonts/Ohd5.zip differ
diff --git a/themes/Fonts/assets/fonts/Poppins.zip b/themes/Fonts/assets/fonts/Poppins.zip
new file mode 100644
index 00000000..c7f7fed4
Binary files /dev/null and b/themes/Fonts/assets/fonts/Poppins.zip differ
diff --git a/themes/Fonts/assets/fonts/Qontra.zip b/themes/Fonts/assets/fonts/Qontra.zip
new file mode 100644
index 00000000..e6d3b4f3
Binary files /dev/null and b/themes/Fonts/assets/fonts/Qontra.zip differ
diff --git a/themes/Fonts/assets/fonts/Quick.zip b/themes/Fonts/assets/fonts/Quick.zip
new file mode 100644
index 00000000..a4104e01
Binary files /dev/null and b/themes/Fonts/assets/fonts/Quick.zip differ
diff --git a/themes/Fonts/assets/fonts/Quicksand.zip b/themes/Fonts/assets/fonts/Quicksand.zip
new file mode 100644
index 00000000..b5cb4b4a
Binary files /dev/null and b/themes/Fonts/assets/fonts/Quicksand.zip differ
diff --git a/themes/Fonts/assets/fonts/Roboto.zip b/themes/Fonts/assets/fonts/Roboto.zip
new file mode 100644
index 00000000..10c9c2e1
Binary files /dev/null and b/themes/Fonts/assets/fonts/Roboto.zip differ
diff --git a/themes/Fonts/assets/fonts/Rosemary.zip b/themes/Fonts/assets/fonts/Rosemary.zip
new file mode 100644
index 00000000..949ac008
Binary files /dev/null and b/themes/Fonts/assets/fonts/Rosemary.zip differ
diff --git a/themes/Fonts/assets/fonts/Rosemary_Roman.zip b/themes/Fonts/assets/fonts/Rosemary_Roman.zip
new file mode 100644
index 00000000..75c0764d
Binary files /dev/null and b/themes/Fonts/assets/fonts/Rosemary_Roman.zip differ
diff --git a/themes/Fonts/assets/fonts/Rounded_Elegance.zip b/themes/Fonts/assets/fonts/Rounded_Elegance.zip
new file mode 100644
index 00000000..bf3b22be
Binary files /dev/null and b/themes/Fonts/assets/fonts/Rounded_Elegance.zip differ
diff --git a/themes/Fonts/assets/fonts/Samarkan.zip b/themes/Fonts/assets/fonts/Samarkan.zip
new file mode 100644
index 00000000..8af56075
Binary files /dev/null and b/themes/Fonts/assets/fonts/Samarkan.zip differ
diff --git a/themes/Fonts/assets/fonts/SamsungOne.zip b/themes/Fonts/assets/fonts/SamsungOne.zip
new file mode 100644
index 00000000..a65e2065
Binary files /dev/null and b/themes/Fonts/assets/fonts/SamsungOne.zip differ
diff --git a/themes/Fonts/assets/fonts/San_Francisco_Pro.zip b/themes/Fonts/assets/fonts/San_Francisco_Pro.zip
new file mode 100644
index 00000000..68c9718b
Binary files /dev/null and b/themes/Fonts/assets/fonts/San_Francisco_Pro.zip differ
diff --git a/themes/Fonts/assets/fonts/Sertig.zip b/themes/Fonts/assets/fonts/Sertig.zip
new file mode 100644
index 00000000..9e262187
Binary files /dev/null and b/themes/Fonts/assets/fonts/Sertig.zip differ
diff --git a/themes/Fonts/assets/fonts/SlateFromOnePlus.zip b/themes/Fonts/assets/fonts/SlateFromOnePlus.zip
new file mode 100644
index 00000000..4d0fd741
Binary files /dev/null and b/themes/Fonts/assets/fonts/SlateFromOnePlus.zip differ
diff --git a/themes/Fonts/assets/fonts/Sony_Sketch.zip b/themes/Fonts/assets/fonts/Sony_Sketch.zip
new file mode 100644
index 00000000..221e7e68
Binary files /dev/null and b/themes/Fonts/assets/fonts/Sony_Sketch.zip differ
diff --git a/themes/Fonts/assets/fonts/Squared.zip b/themes/Fonts/assets/fonts/Squared.zip
new file mode 100644
index 00000000..01fcf7b5
Binary files /dev/null and b/themes/Fonts/assets/fonts/Squared.zip differ
diff --git a/themes/Fonts/assets/fonts/Storopia.zip b/themes/Fonts/assets/fonts/Storopia.zip
new file mode 100644
index 00000000..9764a5bb
Binary files /dev/null and b/themes/Fonts/assets/fonts/Storopia.zip differ
diff --git a/themes/Fonts/assets/fonts/Techno_At_Dusk.zip b/themes/Fonts/assets/fonts/Techno_At_Dusk.zip
new file mode 100644
index 00000000..001bd71e
Binary files /dev/null and b/themes/Fonts/assets/fonts/Techno_At_Dusk.zip differ
diff --git a/themes/Fonts/assets/fonts/Timeless.zip b/themes/Fonts/assets/fonts/Timeless.zip
new file mode 100644
index 00000000..1a63ba58
Binary files /dev/null and b/themes/Fonts/assets/fonts/Timeless.zip differ
diff --git a/themes/Fonts/assets/fonts/Titillium_Web.zip b/themes/Fonts/assets/fonts/Titillium_Web.zip
new file mode 100644
index 00000000..77d2572e
Binary files /dev/null and b/themes/Fonts/assets/fonts/Titillium_Web.zip differ
diff --git a/themes/Fonts/assets/fonts/Typography.zip b/themes/Fonts/assets/fonts/Typography.zip
new file mode 100644
index 00000000..6ba7fbf6
Binary files /dev/null and b/themes/Fonts/assets/fonts/Typography.zip differ
diff --git a/themes/Fonts/assets/fonts/Ubuntu.zip b/themes/Fonts/assets/fonts/Ubuntu.zip
new file mode 100644
index 00000000..289aad3f
Binary files /dev/null and b/themes/Fonts/assets/fonts/Ubuntu.zip differ
diff --git a/themes/Fonts/assets/fonts/Unicorn.zip b/themes/Fonts/assets/fonts/Unicorn.zip
new file mode 100644
index 00000000..06f275f2
Binary files /dev/null and b/themes/Fonts/assets/fonts/Unicorn.zip differ
diff --git a/themes/Fonts/assets/fonts/Voces.zip b/themes/Fonts/assets/fonts/Voces.zip
new file mode 100644
index 00000000..9dd2c4ce
Binary files /dev/null and b/themes/Fonts/assets/fonts/Voces.zip differ
diff --git a/themes/Fonts/assets/fonts/Walkway.zip b/themes/Fonts/assets/fonts/Walkway.zip
new file mode 100644
index 00000000..4e325593
Binary files /dev/null and b/themes/Fonts/assets/fonts/Walkway.zip differ
diff --git a/themes/Fonts/assets/fonts/Xolonium.zip b/themes/Fonts/assets/fonts/Xolonium.zip
new file mode 100644
index 00000000..32f59719
Binary files /dev/null and b/themes/Fonts/assets/fonts/Xolonium.zip differ
diff --git a/themes/Fonts/assets/fonts/Xperia_Z3.zip b/themes/Fonts/assets/fonts/Xperia_Z3.zip
new file mode 100644
index 00000000..3d375e12
Binary files /dev/null and b/themes/Fonts/assets/fonts/Xperia_Z3.zip differ
diff --git a/themes/Fonts/res/mipmap-hdpi/ic_launcher.png b/themes/Fonts/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..102d6d3d
Binary files /dev/null and b/themes/Fonts/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/themes/Fonts/res/mipmap-mdpi/ic_launcher.png b/themes/Fonts/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..24802c26
Binary files /dev/null and b/themes/Fonts/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/themes/Fonts/res/mipmap-xhdpi/ic_launcher.png b/themes/Fonts/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..dd7bdd94
Binary files /dev/null and b/themes/Fonts/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/themes/Fonts/res/mipmap-xxhdpi/ic_launcher.png b/themes/Fonts/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..bcf7e2fe
Binary files /dev/null and b/themes/Fonts/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/themes/Fonts/res/mipmap-xxxhdpi/ic_launcher.png b/themes/Fonts/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..3bbe2203
Binary files /dev/null and b/themes/Fonts/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/themes/Fonts/res/values/bools.xml b/themes/Fonts/res/values/bools.xml
new file mode 100644
index 00000000..e098a066
--- /dev/null
+++ b/themes/Fonts/res/values/bools.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>
+
+    <bool name="custom_rom_font_provider">true</bool>
+
+</resources>
diff --git a/themes/Fonts/res/values/strings.xml b/themes/Fonts/res/values/strings.xml
new file mode 100644
index 00000000..5d62d14b
--- /dev/null
+++ b/themes/Fonts/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="app_name">Liquid Fonts</string>
+
+</resources>
diff --git a/tools/changelog.sh b/tools/changelog.sh
index bc84bbd4..433fd012 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -2,7 +2,18 @@
 
 export Changelog=$PWD/Changelog.txt
 
-if [ -f $Changelog ];
+if [ -z $CHGLOGDUR ];
+then
+    CHGLOGDUR="10"
+fi
+
+if [ $CHGLOGDUR -gt 30 ];
+then
+    echo "Duration greater than 30 is not allowed, resetting to 10"
+    CHGLOGDUR="10"
+fi
+
+if [ -f $Changelog ]; 
 then
 	rm -f $Changelog
 fi
@@ -11,7 +22,7 @@ touch $Changelog
 
 echo "Generating changelog..."
 
-for i in $(seq 10);
+for i in $(seq $CHGLOGDUR);
 do
 export After_Date=`date --date="$i days ago" +%m-%d-%Y`
 k=$(expr $i - 1)