diff --git a/app/build.gradle b/app/build.gradle
index c4616f9b..9bebfc8b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,16 +62,6 @@ android {
             versionName defaultConfig.versionName + "_" + getDate()
             dimension "default"
         }
-        font {
-            versionCode defaultConfig.versionCode + 10000
-            versionName defaultConfig.versionName + "_" + getDate()
-            dimension "default"
-        }
-        nofont {
-            versionCode defaultConfig.versionCode + 10000
-            versionName defaultConfig.versionName + "_" + getDate()
-            dimension "default"
-        }
     }
 
     packagingOptions {
@@ -123,7 +113,6 @@ static def getDate() {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':appthemehelper')
-    implementation project(':fonts')
     implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation "androidx.gridlayout:gridlayout:1.0.0"
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
index 0f0c3f87..88b12c90 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
@@ -39,14 +39,13 @@ class ColorFragment : AbsPlayerFragment() {
         callbacks?.onPaletteColorChanged()
         colorGradientBackground?.setBackgroundColor(color.backgroundColor)
         playerActivity?.setLightNavigationBar(ColorUtil.isColorLight(color.backgroundColor))
-        Handler().postDelayed(Runnable {
+        Handler().post {
             ToolbarContentTintHelper.colorizeToolbar(
                 playerToolbar,
                 color.secondaryTextColor,
                 requireActivity()
             )
-        }, 100)
-
+        }
     }
 
     override fun onFavoriteToggled() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
index 528ca7e9..9ee3fae7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
@@ -25,6 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import code.name.monkey.retromusic.loaders.SongLoader;
 import code.name.monkey.retromusic.model.Song;
@@ -100,8 +101,8 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
         onCreate(db);
     }
 
-    public synchronized void saveQueues(@NonNull final ArrayList<Song> playingQueue,
-                                        @NonNull final ArrayList<Song> originalPlayingQueue) {
+    public synchronized void saveQueues(@NonNull final List<Song> playingQueue,
+                                        @NonNull final List<Song> originalPlayingQueue) {
         saveQueue(PLAYING_QUEUE_TABLE_NAME, playingQueue);
         saveQueue(ORIGINAL_PLAYING_QUEUE_TABLE_NAME, originalPlayingQueue);
     }
@@ -165,7 +166,7 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
      *
      * @param queue the queue to save
      */
-    private synchronized void saveQueue(final String tableName, @NonNull final ArrayList<Song> queue) {
+    private synchronized void saveQueue(final String tableName, @NonNull final List<Song> queue) {
         final SQLiteDatabase database = getWritableDatabase();
         database.beginTransaction();
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
index c5a4a93e..a8dac80b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
@@ -74,8 +74,8 @@ import code.name.monkey.retromusic.helper.ShuffleHelper;
 import code.name.monkey.retromusic.model.Playlist;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.providers.HistoryStore;
+import code.name.monkey.retromusic.providers.MusicPlaybackQueueStore;
 import code.name.monkey.retromusic.providers.SongPlayCountStore;
-import code.name.monkey.retromusic.room.NowPlayingQueue;
 import code.name.monkey.retromusic.service.notification.PlayingNotification;
 import code.name.monkey.retromusic.service.notification.PlayingNotificationImpl;
 import code.name.monkey.retromusic.service.notification.PlayingNotificationOreo;
@@ -304,7 +304,6 @@ public class MusicService extends Service implements
     private ThrottledSeekHandler throttledSeekHandler;
     private Handler uiThreadHandler;
     private PowerManager.WakeLock wakeLock;
-    private NowPlayingQueue nowPlayingQueue;
 
     private static Bitmap copy(Bitmap bitmap) {
         Bitmap.Config config = bitmap.getConfig();
@@ -326,9 +325,6 @@ public class MusicService extends Service implements
     @Override
     public void onCreate() {
         super.onCreate();
-
-        nowPlayingQueue = new NowPlayingQueue(this);
-
         final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
         if (telephonyManager != null) {
             telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE);
@@ -983,10 +979,8 @@ public class MusicService extends Service implements
 
     public synchronized void restoreQueuesAndPositionIfNecessary() {
         if (!queuesRestored && playingQueue.isEmpty()) {
-
-
-            List<Song> restoredQueue = nowPlayingQueue.getQueue();//MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
-            List<Song> restoredOriginalQueue = nowPlayingQueue.getOriginalQueue();//MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
+            List<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
+            List<Song> restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
             int restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION, -1);
             int restoredPositionInTrack = PreferenceManager.getDefaultSharedPreferences(this)
                     .getInt(SAVED_POSITION_IN_TRACK, -1);
@@ -1022,9 +1016,7 @@ public class MusicService extends Service implements
     }
 
     public void saveQueuesImpl() {
-        //MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
-        nowPlayingQueue.saveQueue(new ArrayList<>(playingQueue));
-        nowPlayingQueue.saveOriginalQueue(new ArrayList<>(originalPlayingQueue));
+        MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
     }
 
     public void saveState() {
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index ba94dab7..70132899 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -15,13 +15,11 @@
 <resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
+
         <item name="md_background_color">?attr/colorSurface</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
+
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="windowActionBarOverlay">true</item>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index e53f21ee..5313087d 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -15,13 +15,11 @@
 <resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
+
         <item name="md_background_color">?attr/colorSurface</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
+
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="windowActionBarOverlay">true</item>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 5b291830..dee5c9fd 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -21,7 +21,7 @@
     <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
         <item name="android:breakStrategy">simple</item>
         <item name="android:hyphenationFrequency">none</item>
-        <item name="android:fontFamily">@font/circular</item>
+
         <item name="android:textSize">13sp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index 09520f40..a6fca6f5 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -15,13 +15,11 @@
 <resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
+
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="android:fontFamily">@font/circular</item>
+
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -34,14 +32,10 @@
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
         <item name="md_color_button_text">@color/md_white_1000</item>
         <item name="md_background_color">@color/darkColorPrimary</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -59,9 +53,6 @@
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
         <item name="md_color_button_text">@color/md_black_1000</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
@@ -72,7 +63,6 @@
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
         <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 780ee2c7..5694df42 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,7 +44,7 @@
         <item name="contentInsetStartWithNavigation">0dp</item>
         <item name="contentInsetStart">0dp</item>
         <item name="titleMarginStart">16dp</item>
-        <item name="android:fontFamily">@font/circular</item>
+
     </style>
 
 
@@ -58,18 +58,14 @@
         <item name="android:textSize">20sp</item>
         <item name="android:letterSpacing">0.0125</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:fontFamily">@font/circular</item>
     </style>
 
     <style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
-        </item>
+        <item name="android:textAppearance">@style/TextViewHeadline6</item>
     </style>
 
     <style name="BigTitleTextAppearanceToolbar">
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
-        </item>
-        <item name="android:fontFamily">@font/circular_std_medium</item>
+        <item name="android:textAppearance">@style/TextViewHeadline6</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center</item>
@@ -85,11 +81,9 @@
     </style>
 
     <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
-        <item name="android:fontFamily">@font/circular</item>
         <item name="android:textSize">13sp</item>
     </style>
 
-
     <style name="Fab" parent="FabParent" />
 
     <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
@@ -110,59 +104,38 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-
-    </style>
+    <style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar" />
 
     <style name="TextViewNormal">
-        <item name="android:fontFamily">@font/circular</item>
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4" />
 
-    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5" />
 
-    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption" />
 
-    <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6" />
 
-    <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3" />
 
-    <style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2" />
 
-    <style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" />
 
-    <style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
-        <item name="android:fontFamily">@font/circular</item>
-    </style>
+    <style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2" />
 
     <style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="android:fontFamily">@font/circular</item>
         <item name="lineHeightHint">24sp</item>
     </style>
 
     <style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
-        <item name="android:fontFamily">@font/circular</item>
         <item name="lineHeightHint">24sp</item>
     </style>
 
     <style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
-        <item name="android:fontFamily">@font/circular</item>
+
     </style>
 
     <style name="TopCornerCardView">
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 9df8b168..60393c8e 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -2,13 +2,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="android:fontFamily">@font/circular</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -20,14 +16,10 @@
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
         <item name="md_color_button_text">@color/md_white_1000</item>
         <item name="md_background_color">@color/darkColorSurface</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
@@ -46,15 +38,11 @@
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
         <item name="md_background_color">@color/blackColorSurface</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
         <item name="windowActionBarOverlay">true</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
@@ -66,9 +54,6 @@
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="md_font_title">@font/circular</item>
-        <item name="md_font_body">@font/circular</item>
-        <item name="md_font_button">@font/circular</item>
         <item name="md_color_button_text">@color/md_black_1000</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
@@ -79,7 +64,6 @@
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="android:windowActivityTransitions">true</item>
-        <item name="android:fontFamily">@font/circular</item>
         <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 73b3c40b..3b2a99a9 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -26,7 +26,6 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':fonts')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation 'androidx.preference:preference:1.1.0'
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom.xml b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
index 684f1af7..f4363ee4 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_custom.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
@@ -42,7 +42,6 @@
             android:layout_alignParentLeft="true"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-            android:fontFamily="@font/circular"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorPrimary"
@@ -56,7 +55,6 @@
             android:layout_alignStart="@android:id/title"
             android:layout_alignLeft="@android:id/title"
             android:layout_marginTop="2dp"
-            android:fontFamily="@font/circular"
             android:maxLines="4"
             tools:text="@tools:sample/lorem/random" />
 
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
index d2f22e30..d502c7b0 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
@@ -42,7 +42,7 @@
             android:layout_alignParentLeft="true"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-            android:fontFamily="@font/circular"
+
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorPrimary"
@@ -57,7 +57,7 @@
             android:layout_alignStart="@android:id/title"
             android:layout_alignLeft="@android:id/title"
             android:layout_marginTop="2dp"
-            android:fontFamily="@font/circular"
+
             android:maxLines="4"
             android:textColor="?android:attr/textColorSecondary"
             tools:text="I have one solution for you.you can change font size for specific preference by managing layout file." />
diff --git a/fonts/.gitignore b/fonts/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/fonts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/fonts/build.gradle b/fonts/build.gradle
deleted file mode 100644
index e8096ab5..00000000
--- a/fonts/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala. 
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under 
- * the terms of the GNU General Public License as published by 
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version. 
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
- * See the GNU General Public License for more details.
- */
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-android {
-    compileSdkVersion 29
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
diff --git a/fonts/consumer-rules.pro b/fonts/consumer-rules.pro
deleted file mode 100644
index e69de29b..00000000
diff --git a/fonts/proguard-rules.pro b/fonts/proguard-rules.pro
deleted file mode 100644
index f1b42451..00000000
--- a/fonts/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt b/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt
deleted file mode 100644
index a4828cdc..00000000
--- a/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package dev.hemanths.fonts
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("dev.hemanths.fonts.test", appContext.packageName)
-    }
-}
diff --git a/fonts/src/main/AndroidManifest.xml b/fonts/src/main/AndroidManifest.xml
deleted file mode 100644
index 24cb0fe3..00000000
--- a/fonts/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.hemanths.fonts" />
diff --git a/fonts/src/main/java/dev/hemanths/fonts/CommonAttrs.kt b/fonts/src/main/java/dev/hemanths/fonts/CommonAttrs.kt
deleted file mode 100644
index eb368fcc..00000000
--- a/fonts/src/main/java/dev/hemanths/fonts/CommonAttrs.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.hemanths.fonts
-
-/**
- * Created by hemanths on 2020-02-22.
- */
\ No newline at end of file
diff --git a/fonts/src/main/res/font/circular.xml b/fonts/src/main/res/font/circular.xml
deleted file mode 100644
index 264d363c..00000000
--- a/fonts/src/main/res/font/circular.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font
-        app:font="@font/circular_std_book"
-        app:fontStyle="normal"
-        app:fontWeight="400" />
-    <font
-        app:font="@font/circular_std_medium"
-        app:fontStyle="normal"
-        app:fontWeight="600" />
-
-    <font
-        app:font="@font/circular_std_black"
-        app:fontWeight="900" />
-
-</font-family>
\ No newline at end of file
diff --git a/fonts/src/main/res/font/circular_std_black.otf b/fonts/src/main/res/font/circular_std_black.otf
deleted file mode 100644
index c62b210c..00000000
Binary files a/fonts/src/main/res/font/circular_std_black.otf and /dev/null differ
diff --git a/fonts/src/main/res/font/circular_std_book.otf b/fonts/src/main/res/font/circular_std_book.otf
deleted file mode 100644
index 3a1f1ad8..00000000
Binary files a/fonts/src/main/res/font/circular_std_book.otf and /dev/null differ
diff --git a/fonts/src/main/res/font/circular_std_medium.otf b/fonts/src/main/res/font/circular_std_medium.otf
deleted file mode 100644
index 931f4159..00000000
Binary files a/fonts/src/main/res/font/circular_std_medium.otf and /dev/null differ
diff --git a/fonts/src/main/res/values/strings.xml b/fonts/src/main/res/values/strings.xml
deleted file mode 100644
index 57547e09..00000000
--- a/fonts/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<resources>
-    <string name="app_name">fonts</string>
-</resources>
diff --git a/fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt b/fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt
deleted file mode 100644
index c8173709..00000000
--- a/fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package dev.hemanths.fonts
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index ee7c27a7..91441848 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':appthemehelper', ':fonts'
\ No newline at end of file
+include ':app', ':appthemehelper'
\ No newline at end of file