diff --git a/.gitignore b/.gitignore
index 4354eb8..2ad2dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
 /captures
 .externalNativeBuild
 /tasksintegration/build
-apikey.properties
\ No newline at end of file
+apikey.properties
+/app/google-services.json
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2fbd952..15ec0f7 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index de6ffd8..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,8 +11,6 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/googlefit" />
-            <option value="$PROJECT_DIR$/tasksintegration" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index f13a860..e31ade1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,8 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Another Widget.iml" filepath="$PROJECT_DIR$/Another Widget.iml" group="Another Widget" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="Another Widget/app" />
-      <module fileurl="file://$PROJECT_DIR$/googlefit/googlefit.iml" filepath="$PROJECT_DIR$/googlefit/googlefit.iml" group="Another Widget/googlefit" />
-      <module fileurl="file://$PROJECT_DIR$/tasksintegration/tasksintegration.iml" filepath="$PROJECT_DIR$/tasksintegration/tasksintegration.iml" group="Another Widget/tasksintegration" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a60f047..66d5db6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,6 +10,10 @@ apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'realm-android'
 
+def apiKeyPropertiesFile = rootProject.file("apikey.properties")
+def apiKeyProperties = new Properties()
+apiKeyProperties.load(new FileInputStream(apiKeyPropertiesFile))
+
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
@@ -18,10 +22,12 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 83
-        versionName "2.0.6"
+        versionCode 90
+        versionName "2.0.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        manifestPlaceholders = [ "AWARENESS_API_KEY": apiKeyProperties['AWARENESS_API_KEY']]
     }
 
     buildTypes {
@@ -52,10 +58,6 @@ android {
     }
 
     viewBinding.enabled = true
-
-    dynamicFeatures = [":tasksintegration", ":googlefit"]
-
-
 }
 
 dependencies {
@@ -98,6 +100,10 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
+    // Fitness
+    implementation 'com.google.android.gms:play-services-fitness:18.0.0'
+    implementation 'com.google.android.gms:play-services-auth:18.0.0'
+
     //Weather
     implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
     implementation 'com.google.android.gms:play-services-location:17.0.0'
diff --git a/app/google-services.json b/app/google-services.json
deleted file mode 100644
index f4b7f2b..0000000
--- a/app/google-services.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "791844924473",
-    "firebase_url": "https://anotherwidget-182008.firebaseio.com",
-    "project_id": "anotherwidget-182008",
-    "storage_bucket": "anotherwidget-182008.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:791844924473:android:0ad4f6e3890f1ad320b1e8",
-        "android_client_info": {
-          "package_name": "com.tommasoberlose.anotherwidget"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "791844924473-73dh46rorjq8vm97dgbn6can2dcpqlf0.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAeJRXstqnzebibxmm3FRM98nbwE_kC8tA"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "791844924473-73dh46rorjq8vm97dgbn6can2dcpqlf0.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app/release/app-release.aab b/app/release/app-release.aab
index 89f83c8..33949e0 100644
Binary files a/app/release/app-release.aab and b/app/release/app-release.aab differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad71e4d..dfc784b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,10 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="android.gms.permission.ACTIVITY_RECOGNITION"/>
+    <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
+
 
     <application
         android:allowBackup="true"
@@ -21,7 +25,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="LockedOrientationActivity">
-        <activity android:name=".ui.activities.MainActivity" android:launchMode="singleInstance" android:theme="@style/AppTheme.Main" android:screenOrientation="portrait">
+        <activity android:name=".ui.activities.MainActivity" android:launchMode="singleInstance" android:theme="@style/AppTheme.Main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -82,44 +86,16 @@
             android:enabled="true"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="com.tommasoberlose.anotherwidget.action.ACTION_WEATHER_UPDATE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.TIME_SET" />
                 <action android:name="android.intent.action.TIMEZONE_CHANGED" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
         </receiver>
 
-        <receiver
-            android:name=".receivers.PlayerReceiver"
-            android:enabled="true"
-            android:exported="true"
-            tools:ignore="ExportedReceiver">
-            <intent-filter>
-                <action android:name="com.android.music.metachanged" />
-                <action android:name="com.android.music.playstatechanged" />
-                <action android:name="com.android.music.playbackcomplete" />
-                <action android:name="com.android.music.queuechanged" />
-
-                <action android:name="com.htc.music.metachanged" />
-                <action android:name="fm.last.android.metachanged" />
-                <action android:name="com.sec.android.app.music.metachanged" />
-                <action android:name="com.nullsoft.winamp.metachanged" />
-                <action android:name="com.amazon.mp3.metachanged" />
-                <action android:name="com.miui.player.metachanged" />
-                <action android:name="com.real.IMP.metachanged" />
-                <action android:name="com.sonyericsson.music.metachanged" />
-                <action android:name="com.rdio.android.metachanged" />
-                <action android:name="com.samsung.sec.android.MusicPlayer.metachanged" />
-                <action android:name="com.andrew.apollo.metachanged" />
-                <action android:name="com.spotify.music.playbackstatechanged"/>
-                <action android:name="com.spotify.music.metadatachanged"/>
-                <action android:name="com.spotify.music.queuechanged"/>
-            </intent-filter>
-        </receiver>
-
         <receiver
             android:name=".receivers.WidgetClickListenerReceiver"
             android:enabled="true"
@@ -157,6 +133,16 @@
                 <action android:name="android.intent.action.BATTERY_OKAY"/>
             </intent-filter>
         </receiver>
+
+        <receiver android:name=".receivers.ActivityDetectionReceiver"
+            android:exported="false"
+            android:permission="com.google.android.gms.permission.ACTIVITY_RECOGNITION">
+            <intent-filter>
+                <action android:name="com.mypackage.ACTION_PROCESS_ACTIVITY_TRANSITIONS" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt
index fe85be9..f91dd54 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt
@@ -1,6 +1,7 @@
 package com.tommasoberlose.anotherwidget
 
 import android.app.Application
+import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.chibatching.kotpref.Kotpref
 import com.google.firebase.crashlytics.FirebaseCrashlytics
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceProviderSortMenu.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceProviderSortMenu.kt
index ecb8c74..27a431c 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceProviderSortMenu.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceProviderSortMenu.kt
@@ -16,6 +16,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.card.MaterialCardView
 import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.isColorDark
 import com.tommasoberlose.anotherwidget.helpers.GlanceProviderHelper
 import com.tommasoberlose.anotherwidget.models.GlanceProvider
@@ -69,7 +70,7 @@ class GlanceProviderSortMenu(
                     // move item in `fromPos` to `toPos` in adapter.
                     adapter.notifyItemMoved(fromPos, toPos)
 
-                    val list = GlanceProviderHelper.getGlanceProviders()
+                    val list = GlanceProviderHelper.getGlanceProviders(context)
                     Collections.swap(list, fromPos, toPos)
                     GlanceProviderHelper.saveGlanceProviderOrder(list)
                     return true
@@ -86,7 +87,7 @@ class GlanceProviderSortMenu(
         mIth.attachToRecyclerView(view.menu)
 
         adapter.updateData(
-            GlanceProviderHelper.getGlanceProviders()
+            GlanceProviderHelper.getGlanceProviders(context)
                 .mapNotNull { GlanceProviderHelper.getGlanceProviderById(context, it) }
         )
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt
index 282a04b..55c1a31 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt
@@ -16,17 +16,13 @@ class EventRepository(val context: Context) {
     private val realm by lazy { Realm.getDefaultInstance() }
 
     fun saveEvents(eventList: ArrayList<Event>) {
-        realm.executeTransactionAsync { realm ->
+        realm.executeTransaction { realm ->
             realm.where(Event::class.java).findAll().deleteAllFromRealm()
             realm.copyToRealm(eventList)
         }
     }
 
     fun resetNextEventData() {
-        realm.executeTransactionAsync {
-            it.where(Event::class.java).findAll().deleteAllFromRealm()
-        }
-
         Preferences.bulk {
             remove(Preferences::nextEventId)
             remove(Preferences::nextEventName)
@@ -44,7 +40,7 @@ class EventRepository(val context: Context) {
 
     fun getNextEvent(): Event? {
         val nextEvent = getEventByEventId(Preferences.nextEventId)
-        return if (nextEvent != null && nextEvent.endDate > Calendar.getInstance().timeInMillis) {
+        val event = if (nextEvent != null && nextEvent.endDate > Calendar.getInstance().timeInMillis) {
             nextEvent
         } else {
             val events = getEvents()
@@ -57,9 +53,21 @@ class EventRepository(val context: Context) {
                 null
             }
         }
+        return try {
+            realm.copyFromRealm(event!!)
+        } catch (ex: Exception) {
+            event
+        }
     }
 
-    fun getEventByEventId(id: Long): Event? = realm.where(Event::class.java).equalTo("eventID", id).findFirst()
+    fun getEventByEventId(id: Long): Event? {
+        val event = realm.where(Event::class.java).equalTo("eventID", id).findFirst()
+        return try {
+            realm.copyFromRealm(event!!)
+        } catch (ex: Exception) {
+            event
+        }
+    }
 
     fun goToNextEvent() {
         val eventList = getEvents()
@@ -95,8 +103,13 @@ class EventRepository(val context: Context) {
 
     fun getEvents(): RealmResults<Event> {
         val now = Calendar.getInstance().timeInMillis
+        realm.refresh()
         return realm.where(Event::class.java).greaterThan("endDate", now).findAll()
     }
 
     fun getEventsCount(): Int = getEvents().size
+
+    fun close() {
+        realm.close()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt
index 409479a..61013cc 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt
@@ -18,8 +18,19 @@ object Constants {
     enum class GlanceProviderId(val id: String) {
         PLAYING_SONG("PLAYING_SONG"),
         NEXT_CLOCK_ALARM("NEXT_CLOCK_ALARM"),
-//        BATTERY_LEVEL_LOW("BATTERY_LEVEL_LOW"),
+        BATTERY_LEVEL_LOW("BATTERY_LEVEL_LOW"),
         CUSTOM_INFO("CUSTOM_INFO"),
-//        GOOGLE_FIT_STEPS("GOOGLE_FIT_STEPS")
+        GOOGLE_FIT_STEPS("GOOGLE_FIT_STEPS")
+    }
+
+    enum class WidgetUpdateFrequency(val value: Int) {
+        LOW(0),
+        DEFAULT(1),
+        HIGH(2)
+    }
+
+    enum class WeatherIconPack(val value: Int) {
+        DEFAULT(0),
+        MINIMAL(1)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
index 8f503e9..e2a8182 100755
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
@@ -30,6 +30,7 @@ object Preferences : KotprefModel() {
     var customLocationLon by stringPref(key = "PREF_CUSTOM_LOCATION_LON", default = "")
     var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "")
     var dateFormat by stringPref(default = "")
+    var isDateCapitalize by booleanPref(default = true)
     var weatherRefreshPeriod by intPref(key = "PREF_WEATHER_REFRESH_PERIOD", default = 1)
     var showUntil by intPref(key = "PREF_SHOW_UNTIL", default = 1)
     var calendarAppName by stringPref(key = "PREF_CALENDAR_APP_NAME", default = "")
@@ -40,9 +41,15 @@ object Preferences : KotprefModel() {
     var eventAppName by stringPref(key = "PREF_EVENT_APP_NAME", default = "")
     var eventAppPackage by stringPref(key = "PREF_EVENT_APP_PACKAGE", default = "")
     var openEventDetails by booleanPref(default = true)
+
+    var widgetUpdateFrequency by intPref(default = Constants.WidgetUpdateFrequency.DEFAULT.value)
+
     var textGlobalColor by stringPref(key = "PREF_TEXT_COLOR", default = "#FFFFFF")
     var textGlobalAlpha by stringPref(default = "FF")
 
+    var textSecondaryColor by stringPref(default = "#FFFFFF")
+    var textSecondaryAlpha by stringPref(default = "FF")
+
     var backgroundCardColor by stringPref(default = "#000000")
     var backgroundCardAlpha by stringPref(default = "00")
 
@@ -50,6 +57,8 @@ object Preferences : KotprefModel() {
     var clockTextAlpha by stringPref(default = "FF")
     var showAMPMIndicator by booleanPref(default = true)
 
+    var weatherIconPack by intPref(default = Constants.WeatherIconPack.DEFAULT.value)
+
     // Global
     var textMainSize by floatPref(key = "PREF_TEXT_MAIN_SIZE", default = 26f)
     var textSecondSize by floatPref(key = "PREF_TEXT_SECOND_SIZE", default = 18f)
@@ -83,6 +92,7 @@ object Preferences : KotprefModel() {
     var showBatteryCharging by booleanPref(default = false)
     var isBatteryLevelLow by booleanPref(default = false)
     var googleFitSteps by longPref(default = -1)
+    var showDailySteps by booleanPref(default = false)
 
     var showMusic by booleanPref(default = false)
     var mediaInfoFormat by stringPref(default = "")
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt
index b30b6bc..b96f456 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.ContentUris
 import android.content.Context
 import android.provider.CalendarContract
+import android.util.Log
 import com.tommasoberlose.anotherwidget.services.EventListenerJob
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.models.Event
@@ -30,6 +31,12 @@ object CalendarHelper {
             val eventList = ArrayList<Event>()
 
             val now = Calendar.getInstance()
+            val begin = Calendar.getInstance().apply {
+                set(Calendar.MILLISECOND, 0)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MINUTE, 0)
+                set(Calendar.HOUR_OF_DAY, 0)
+            }
             val limit = Calendar.getInstance()
             when (Preferences.showUntil) {
                 0 -> limit.add(Calendar.HOUR, 3)
@@ -44,7 +51,7 @@ object CalendarHelper {
             }
 
             val builder = CalendarContract.Instances.CONTENT_URI.buildUpon()
-            ContentUris.appendId(builder, now.timeInMillis)
+            ContentUris.appendId(builder, begin.timeInMillis)
             ContentUris.appendId(builder, limit.timeInMillis)
 
             if (!context.checkGrantedPermission(
@@ -55,13 +62,13 @@ object CalendarHelper {
             } else {
                 try {
                     val provider = CalendarProvider(context)
-                    val data = provider.getInstances(now.timeInMillis, limit.timeInMillis)
+                    val data = provider.getInstances(begin.timeInMillis, limit.timeInMillis)
                     if (data != null) {
                         val instances = data.list
                         for (instance in instances) {
                             try {
                                 val e = provider.getEvent(instance.eventId)
-                                if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && (Preferences.calendarAllDay || !e.allDay) && !getFilteredCalendarIdList().contains(
+                                if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && now.timeInMillis < instance.end && (Preferences.calendarAllDay || !e.allDay) && !getFilteredCalendarIdList().contains(
                                         e.calendarId
                                     ) && (Preferences.showDeclinedEvents || e.selfAttendeeStatus.toInt() != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)
                                 ) {
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ColorHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ColorHelper.kt
index 0a8ef67..e8b9a54 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ColorHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/ColorHelper.kt
@@ -30,6 +30,31 @@ object ColorHelper {
             Color.parseColor("#000000")
         }
     }
+
+    fun getSecondaryFontColor(): Int {
+        return try {
+            Color.parseColor("#%s%s".format(Preferences.textSecondaryAlpha, Preferences.textSecondaryColor.replace("#", "")))
+        } catch (e: Exception) {
+            Color.parseColor("#FFFFFFFF")
+        }
+    }
+
+    fun getSecondaryFontColorAlpha(): Int {
+        return try {
+            Preferences.textSecondaryAlpha.toIntValue().toDouble() * 255 / 100
+        } catch (e: Exception) {
+            "FF".toIntValue().toDouble() * 255 / 100
+        }.roundToInt()
+    }
+
+    fun getSecondaryFontColorRgb(): Int {
+        return try {
+            Color.parseColor(Preferences.textSecondaryColor)
+        } catch (e: Exception) {
+            Color.parseColor("#000000")
+        }
+    }
+
     fun getClockFontColor(): Int {
         return try {
             Color.parseColor("#%s%s".format(Preferences.clockTextAlpha, Preferences.clockTextColor.replace("#", "")))
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt
index a435f70..1539736 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt
@@ -12,27 +12,30 @@ import java.util.*
 object DateHelper {
     fun getDateText(context: Context, date: Calendar): String {
         return if (Preferences.dateFormat != "") {
-            try {
+            val text = try {
                 SimpleDateFormat(Preferences.dateFormat, Locale.getDefault()).format(date.time)
             } catch (e: Exception) {
                 getDefaultDateText(context, date)
             }
+            if (Preferences.isDateCapitalize) text.getCapWordString() else text
         } else {
             val flags: Int =
                 DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-            "%s, %s".format(
+            val text = "%s, %s".format(
                 SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
                 DateUtils.formatDateTime(context, date.timeInMillis, flags)
-            ).getCapWordString()
+            )
+            if (Preferences.isDateCapitalize) text.getCapWordString() else text
         }
     }
 
     fun getDefaultDateText(context: Context, date: Calendar): String {
         val flags: Int =
             DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-        return "%s, %s".format(
+        val text = "%s, %s".format(
             SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time),
             DateUtils.formatDateTime(context, date.timeInMillis, flags)
-        ).getCapWordString()
+        )
+        return if (Preferences.isDateCapitalize) text.getCapWordString() else text
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt
index 37f6aac..84bbe2a 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt
@@ -6,12 +6,18 @@ import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.models.GlanceProvider
+import com.tommasoberlose.anotherwidget.utils.checkIfFitInstalled
 import java.util.ArrayList
 
 object GlanceProviderHelper {
-    fun getGlanceProviders(): ArrayList<Constants.GlanceProviderId> {
+    fun getGlanceProviders(context: Context): ArrayList<Constants.GlanceProviderId> {
         val enabledProviders = Preferences.enabledGlanceProviderOrder.split(",").filter { it != "" }
+
         val providers = Constants.GlanceProviderId.values()
+            .filter { it != Constants.GlanceProviderId.BATTERY_LEVEL_LOW }
+            .filter {
+                context.checkIfFitInstalled() || it != Constants.GlanceProviderId.GOOGLE_FIT_STEPS
+            }.toTypedArray()
 
         providers.sortWith(Comparator { p1, p2 ->
             when {
@@ -53,18 +59,18 @@ object GlanceProviderHelper {
                    R.drawable.round_notes
                )
             }
-//            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
-//               GlanceProvider(providerId.id,
-//                   context.getString(R.string.settings_low_battery_level_title),
-//                   R.drawable.round_battery_charging_full
-//               )
-//            }
-//            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-//               GlanceProvider(providerId.id,
-//                   context.getString(R.string.settings_daily_steps_title),
-//                   R.drawable.round_directions_walk
-//               )
-//            }
+            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+               GlanceProvider(providerId.id,
+                   context.getString(R.string.settings_low_battery_level_title),
+                   R.drawable.round_battery_charging_full
+               )
+            }
+            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+               GlanceProvider(providerId.id,
+                   context.getString(R.string.settings_daily_steps_title),
+                   R.drawable.round_steps
+               )
+            }
         }
     }
 
@@ -72,13 +78,13 @@ object GlanceProviderHelper {
         Preferences.enabledGlanceProviderOrder = list.joinToString(separator = ",")
     }
 
-    fun showSpecialWeather(context: Context): Boolean {
-        return EventRepository(context).getEventsCount() == 0 && (
+    fun showGlanceProviders(context: Context): Boolean {
+        return Preferences.showGlance && EventRepository(context).getEventsCount() == 0 && (
                 (Preferences.showNextAlarm && AlarmHelper.getNextAlarm(context) != "") ||
                         (MediaPlayerHelper.isSomeonePlaying(context)) ||
                         (Preferences.isBatteryLevelLow) ||
                         (Preferences.customNotes.isNotEmpty()) ||
-                        (Preferences.googleFitSteps > 0)
+                        (Preferences.showDailySteps && Preferences.googleFitSteps > 0)
                 )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
index 0822ea1..d122242 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt
@@ -114,19 +114,40 @@ object IntentHelper {
                 if (Preferences.calendarAppPackage == "") {
                     Intent(Intent.ACTION_VIEW).apply {
                         data = uri
-                        putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
-                        putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
-//                        putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, if (e.allDay) 1 else 0)
-//                        type = "vnd.android.cursor.item/event"
+                        if (!e.allDay) {
+                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
+                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+                        } else {
+                            val start = Calendar.getInstance().apply {
+                                timeInMillis = e.startDate
+                            }
+                            val end = Calendar.getInstance().apply {
+                                timeInMillis = e.endDate
+                            }
+
+                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate + start.timeZone.getOffset(start.timeInMillis))
+                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate + end.timeZone.getOffset(end.timeInMillis))
+                            putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
+                        }
                     }
                 } else {
                     getCalendarIntent(context).apply {
                         action = Intent.ACTION_VIEW
                         data = uri
-                        putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
-                        putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
-//                        putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, if (e.allDay) 1 else 0)
-//                        type = "vnd.android.cursor.item/event"
+                        if (!e.allDay) {
+                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
+                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+                        } else {
+                            val start = Calendar.getInstance().apply {
+                                timeInMillis = e.startDate
+                            }
+                            val end = Calendar.getInstance().apply {
+                                timeInMillis = e.endDate
+                            }
+                            putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, start.timeInMillis + start.timeZone.getOffset(start.timeInMillis))
+                            putExtra(CalendarContract.EXTRA_EVENT_END_TIME, end.timeInMillis + end.timeZone.getOffset(end.timeInMillis))
+                            putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1)
+                        }
                     }
                 }
             }
@@ -178,4 +199,15 @@ object IntentHelper {
             }
         }
     }
+
+    fun getFitIntent(context: Context): Intent {
+        val pm: PackageManager = context.packageManager
+        return try {
+            pm.getLaunchIntentForPackage("com.google.android.apps.fitness")!!.apply {
+                addCategory(Intent.CATEGORY_LAUNCHER)
+            }
+        } catch (e: Exception) {
+            Intent()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
index 2d64cbf..130060d 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
@@ -3,6 +3,8 @@ package com.tommasoberlose.anotherwidget.helpers
 import android.content.Context
 import android.text.format.DateUtils
 import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
 import org.joda.time.DateTime
 import java.util.concurrent.TimeUnit
 
@@ -68,9 +70,21 @@ object SettingsStringHelper {
         difference += 60 * 1000 - (difference % (60 * 1000))
 
         when {
-            difference <= 0 || TimeUnit.MILLISECONDS.toHours(difference) < 1 -> {
+            difference <= 0 -> {
                 return ""
             }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.HIGH.value && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
+                return DateUtils.getRelativeTimeSpanString(start, start - 1000 * 60 * (TimeUnit.MILLISECONDS.toMinutes(difference) - 1 - (TimeUnit.MILLISECONDS.toMinutes(difference) - 1) % 5), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.DEFAULT.value && TimeUnit.MILLISECONDS.toMinutes(difference) > 5 -> {
+                return DateUtils.getRelativeTimeSpanString(start, start - 1000 * 60 * (TimeUnit.MILLISECONDS.toMinutes(difference) - 1 - (TimeUnit.MILLISECONDS.toMinutes(difference) - 1) % 15), DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 && Preferences.widgetUpdateFrequency == Constants.WidgetUpdateFrequency.LOW.value -> {
+                return context.getString(R.string.soon)
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 1 -> {
+                return context.getString(R.string.now)
+            }
             TimeUnit.MILLISECONDS.toHours(difference) < 12 -> {
                 return DateUtils.getRelativeTimeSpanString(start, now, DateUtils.HOUR_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString()
             }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
index 7e82590..dcbbe3d 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
@@ -6,6 +6,7 @@ import android.os.Build
 import com.google.android.gms.location.LocationServices
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
+import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
@@ -49,79 +50,79 @@ object WeatherHelper {
     fun getWeatherIconResource(icon: String): Int {
         when (icon) {
             "01d" -> {
-                return R.drawable.clear_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.clear_day else R.drawable.clear_day_2
             }
             "02d" -> {
-                return R.drawable.partly_cloudy
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.partly_cloudy else R.drawable.partly_cloudy_2
             }
             "03d" -> {
-                return R.drawable.mostly_cloudy
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.mostly_cloudy else R.drawable.mostly_cloudy_2
             }
             "04d" -> {
-                return R.drawable.cloudy_weather
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.cloudy_weather else R.drawable.cloudy_weather_2
             }
             "09d" -> {
-                return R.drawable.storm_weather_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.storm_weather_day else R.drawable.storm_weather_day_2
             }
             "10d" -> {
-                return R.drawable.rainy_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rainy_day else R.drawable.rainy_day_2
             }
             "11d" -> {
-                return R.drawable.thunder_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.thunder_day else R.drawable.thunder_day_2
             }
             "13d" -> {
-                return R.drawable.snow_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.snow_day else R.drawable.snow_day_2
             }
             "50d" -> {
-                return R.drawable.haze_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_day else R.drawable.haze_day_2
             }
             "80d" -> {
-                return R.drawable.windy_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.windy_day else R.drawable.windy_day_2
             }
             "81d" -> {
-                return R.drawable.rain_snow_day
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rain_snow_day else R.drawable.rain_snow_day_2
             }
             "82d" -> {
-                return R.drawable.haze_weather
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_weather else R.drawable.haze_weather_2
             }
 
 
 
             "01n" -> {
-                return R.drawable.clear_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.clear_night else R.drawable.clear_night_2
             }
             "02n" -> {
-                return R.drawable.partly_cloudy_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.partly_cloudy_night else R.drawable.partly_cloudy_night_2
             }
             "03n" -> {
-                return R.drawable.mostly_cloudy_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.mostly_cloudy_night else R.drawable.mostly_cloudy_night_2
             }
             "04n" -> {
-                return R.drawable.cloudy_weather
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.cloudy_weather else R.drawable.cloudy_weather_2
             }
             "09n" -> {
-                return R.drawable.storm_weather_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.storm_weather_night else R.drawable.storm_weather_night_2
             }
             "10n" -> {
-                return R.drawable.rainy_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rainy_night else R.drawable.rainy_night_2
             }
             "11n" -> {
-                return R.drawable.thunder_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.thunder_night else R.drawable.thunder_night_2
             }
             "13n" -> {
-                return R.drawable.snow_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.snow_night else R.drawable.snow_night_2
             }
             "50n" -> {
-                return R.drawable.haze_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_night else R.drawable.haze_night_2
             }
             "80n" -> {
-                return R.drawable.windy_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.windy_night else R.drawable.windy_night_2
             }
             "81n" -> {
-                return R.drawable.rain_snow_night
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rain_snow_night else R.drawable.rain_snow_night_2
             }
             "82n" -> {
-                return R.drawable.haze_weather
+                return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_weather else R.drawable.haze_weather_2
             }
             else -> {
                 return R.drawable.unknown
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt
index de30152..728b92e 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt
@@ -3,6 +3,7 @@ package com.tommasoberlose.anotherwidget.helpers
 import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.res.Configuration.ORIENTATION_PORTRAIT
+import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Preferences
@@ -24,19 +25,9 @@ object WidgetHelper {
             return widthInPx to heightInPx
         }
 
-        private fun getWidgetWidth(isPortrait: Boolean, widgetId: Int): Int =
-            if (isPortrait) {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
-            } else {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH)
-            }
+        private fun getWidgetWidth(isPortrait: Boolean, widgetId: Int): Int = getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH)
 
-        private fun getWidgetHeight(isPortrait: Boolean, widgetId: Int): Int =
-            if (isPortrait) {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT)
-            } else {
-                getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
-            }
+        private fun getWidgetHeight(isPortrait: Boolean, widgetId: Int): Int = getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT)
 
         private fun getWidgetSizeInDp(widgetId: Int, key: String): Int =
             appWidgetManager.getAppWidgetOptions(widgetId).getInt(key, 0)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt
new file mode 100644
index 0000000..eac6de1
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt
@@ -0,0 +1,176 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.Manifest
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.fitness.Fitness
+import com.google.android.gms.fitness.FitnessOptions
+import com.google.android.gms.fitness.data.DataType
+import com.google.android.gms.fitness.data.Field.FIELD_STEPS
+import com.google.android.gms.fitness.request.DataReadRequest
+import com.google.android.gms.location.*
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+
+class ActivityDetectionReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (ActivityTransitionResult.hasResult(intent)) {
+            val result = ActivityTransitionResult.extractResult(intent)!!
+            val lastEvent = result.transitionEvents.last()
+
+            if (lastEvent.activityType == DetectedActivity.WALKING || lastEvent.activityType == DetectedActivity.RUNNING && lastEvent.transitionType == ActivityTransition.ACTIVITY_TRANSITION_EXIT) {
+                requestDailySteps(context)
+            }
+        } else {
+            if (intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == Intent.ACTION_MY_PACKAGE_REPLACED && Preferences.showDailySteps && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION)) {
+                resetDailySteps()
+                registerFence(context)
+            } else {
+                resetDailySteps()
+            }
+        }
+    }
+
+    private fun resetDailySteps() {
+        Preferences.googleFitSteps = -1
+    }
+
+    companion object {
+        val FITNESS_OPTIONS: FitnessOptions = FitnessOptions.builder()
+            .addDataType(DataType.TYPE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+            .addDataType(DataType.AGGREGATE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
+            .build()
+
+        fun registerFence(context: Context) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(
+                    Manifest.permission.ACTIVITY_RECOGNITION)) {
+                val transitions = mutableListOf<ActivityTransition>()
+
+                transitions +=
+                    ActivityTransition.Builder()
+                        .setActivityType(DetectedActivity.WALKING)
+                        .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
+                        .build()
+
+                transitions +=
+                    ActivityTransition.Builder()
+                        .setActivityType(DetectedActivity.RUNNING)
+                        .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
+                        .build()
+
+                val request = ActivityTransitionRequest(transitions)
+
+                // myPendingIntent is the instance of PendingIntent where the app receives callbacks.
+                val task = ActivityRecognition.getClient(context)
+                    .requestActivityTransitionUpdates(
+                        request,
+                        PendingIntent.getBroadcast(
+                            context,
+                            2,
+                            Intent(context, ActivityDetectionReceiver::class.java),
+                            0
+                        )
+                    )
+
+                task.addOnFailureListener { e: Exception ->
+                    e.printStackTrace()
+                    Preferences.showDailySteps = false
+                }
+
+            }
+        }
+
+        fun unregisterFence(context: Context) {
+            val task = ActivityRecognition.getClient(context)
+                .removeActivityTransitionUpdates(
+                    PendingIntent.getBroadcast(
+                        context,
+                        2,
+                        Intent(context, ActivityDetectionReceiver::class.java),
+                        0
+                    )
+                )
+
+            task.addOnCompleteListener {
+                if (it.isSuccessful) {
+                    PendingIntent.getBroadcast(
+                        context,
+                        2,
+                        Intent(context, ActivityDetectionReceiver::class.java),
+                        0
+                    ).cancel()
+                }
+            }
+        }
+
+        fun requestDailySteps(context: Context) {
+
+            val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
+            if (account != null && GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
+
+                val cal: Calendar = Calendar.getInstance()
+                cal.set(Calendar.HOUR_OF_DAY, 0)
+                cal.set(Calendar.MINUTE, 0)
+                cal.set(Calendar.SECOND, 0)
+                cal.set(Calendar.MILLISECOND, 0)
+                val startTime: Long = cal.timeInMillis
+
+                cal.add(Calendar.DAY_OF_YEAR, 1)
+                val endTime: Long = cal.timeInMillis
+                
+                val readRequest = DataReadRequest.Builder()
+                    .aggregate(
+                        DataType.TYPE_STEP_COUNT_DELTA,
+                        DataType.AGGREGATE_STEP_COUNT_DELTA
+                    )
+                    .setTimeRange(startTime, endTime, TimeUnit.MILLISECONDS)
+                    .bucketByTime(1, TimeUnit.DAYS)
+                    .build()
+
+                Fitness.getHistoryClient(context, account)
+                    .readData(readRequest)
+                    .addOnSuccessListener { response ->
+                        Preferences.googleFitSteps = response.buckets.sumBy {
+                            try {
+                                it.getDataSet(DataType.AGGREGATE_STEP_COUNT_DELTA)?.dataPoints?.get(
+                                    0
+                                )?.getValue(FIELD_STEPS)?.asInt() ?: 0
+                            } catch (ex: Exception) {
+                                0
+                            }
+                        }.toLong()
+                        MainWidget.updateWidget(context)
+                        setTimeout(context)
+                    }
+            }
+        }
+
+        private fun setTimeout(context: Context) {
+            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                cancel(PendingIntent.getBroadcast(context, 5, Intent(context, ActivityDetectionReceiver::class.java), 0))
+                setExactAndAllowWhileIdle(
+                    AlarmManager.RTC,
+                    Calendar.getInstance().timeInMillis + 5 * 60 * 1000,
+                    PendingIntent.getBroadcast(
+                        context,
+                        5,
+                        Intent(context, ActivityDetectionReceiver::class.java),
+                        0
+                    )
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt
index 20c39df..9acba62 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt
@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.BatteryManager
+import android.util.Log
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/PlayerReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/PlayerReceiver.kt
deleted file mode 100644
index 2d74792..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/PlayerReceiver.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.tommasoberlose.anotherwidget.receivers
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-
-
-class PlayerReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        Log.d("ciao", "player ok")
-
-//        val cmd = intent.getStringExtra("command")
-//        Log.v("tag ", "$action / $cmd")
-//        val artist = intent.getStringExtra("artist")
-//        val album = intent.getStringExtra("album")
-//        val track = intent.getStringExtra("track")
-//        Log.v("tag", "$artist:$album:$track")
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
index 6ee60df..e6577b4 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
@@ -10,6 +10,8 @@ import androidx.core.app.AlarmManagerCompat
 import androidx.core.content.ContextCompat.getSystemService
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
@@ -68,24 +70,54 @@ class UpdatesReceiver : BroadcastReceiver() {
                 val diff = Period(now.timeInMillis, event.startDate)
                 if (event.startDate > now.timeInMillis) {
                     // Update the widget every hour till the event
-                    setExactAndAllowWhileIdle(
-                        AlarmManager.RTC,
-                        if (event.startDate - diff.hours * 1000 * 60 * 60 > (now.timeInMillis + 120 * 1000)) event.startDate - diff.hours * 1000 * 60 * 60 else now.timeInMillis + 120000,
-                        PendingIntent.getBroadcast(
-                            context,
-                            event.eventID.toInt(),
-                            Intent(context, UpdatesReceiver::class.java).apply {
-                                action = Actions.ACTION_TIME_UPDATE
-                                putExtra(EVENT_ID, event.eventID)
-                            },
-                            0
+                    if (diff.hours == 0) {
+                        var minutes = 0
+                        when (Preferences.widgetUpdateFrequency) {
+                            Constants.WidgetUpdateFrequency.DEFAULT.value -> {
+                                minutes = when {
+                                    diff.minutes > 50 -> 50
+                                    diff.minutes > 30 -> 30
+                                    diff.minutes > 15 -> 15
+                                    else -> 0
+                                }
+                            }
+                            Constants.WidgetUpdateFrequency.HIGH.value -> {
+                                minutes = diff.minutes - (diff.minutes % 5)
+                            }
+                        }
+                        setExact(
+                            AlarmManager.RTC,
+                            if (event.startDate - minutes * 1000 * 60 > (now.timeInMillis + 120 * 1000)) event.startDate - 60 * 1000 * minutes else now.timeInMillis + 120000,
+                            PendingIntent.getBroadcast(
+                                context,
+                                event.eventID.toInt(),
+                                Intent(context, UpdatesReceiver::class.java).apply {
+                                    action = Actions.ACTION_TIME_UPDATE
+                                    putExtra(EVENT_ID, event.eventID)
+                                },
+                                0
+                            )
                         )
-                    )
+                    } else {
+                        setExact(
+                            AlarmManager.RTC,
+                            event.startDate - diff.hours * 1000 * 60 * 60,
+                            PendingIntent.getBroadcast(
+                                context,
+                                event.eventID.toInt(),
+                                Intent(context, UpdatesReceiver::class.java).apply {
+                                    action = Actions.ACTION_TIME_UPDATE
+                                    putExtra(EVENT_ID, event.eventID)
+                                },
+                                0
+                            )
+                        )
+                    }
                 } else {
                     // Update the widget one second after the event is finished
                     val fireTime =
                         if (event.endDate > now.timeInMillis + 120 * 1000) event.endDate else now.timeInMillis + 120000
-                    setExactAndAllowWhileIdle(
+                    setExact(
                         AlarmManager.RTC,
                         fireTime,
                         PendingIntent.getBroadcast(
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt
index db536f1..a643052 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt
@@ -18,7 +18,9 @@ import com.tommasoberlose.anotherwidget.databinding.ActivityCustomDateBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.DateHelper
 import com.tommasoberlose.anotherwidget.ui.viewmodels.CustomDateViewModel
+import com.tommasoberlose.anotherwidget.utils.getCapWordString
 import com.tommasoberlose.anotherwidget.utils.openURI
+import com.tommasoberlose.anotherwidget.utils.toast
 import kotlinx.android.synthetic.main.activity_custom_date.*
 import kotlinx.android.synthetic.main.activity_custom_location.action_back
 import kotlinx.android.synthetic.main.activity_custom_location.list_view
@@ -78,7 +80,7 @@ class CustomDateActivity  : AppCompatActivity() {
                 }
 
                 delay(200)
-                val text = if (dateFormat != "") {
+                var text = if (dateFormat != "") {
                     try {
                         SimpleDateFormat(dateFormat, Locale.getDefault()).format(DATE.time)
                     } catch (e: Exception) {
@@ -88,6 +90,10 @@ class CustomDateActivity  : AppCompatActivity() {
                     "__"
                 }
 
+                if (Preferences.isDateCapitalize) {
+                    text = text.getCapWordString()
+                }
+
                 withContext(Dispatchers.Main) {
                     action_save.isVisible = text != ERROR_STRING
                     loader.visibility = View.INVISIBLE
@@ -96,6 +102,11 @@ class CustomDateActivity  : AppCompatActivity() {
 
             }
         })
+
+        viewModel.isDateCapitalize.observe(this, Observer {
+            viewModel.dateInput.value = viewModel.dateInput.value
+            binding.isdCapitalizeEnabled = it
+        })
     }
 
     private fun setupListener() {
@@ -108,6 +119,15 @@ class CustomDateActivity  : AppCompatActivity() {
             finish()
         }
 
+        action_capitalize.setOnClickListener {
+            Preferences.isDateCapitalize = !Preferences.isDateCapitalize
+        }
+
+        action_capitalize.setOnLongClickListener {
+            toast(getString(R.string.action_capitalize_the_date))
+            true
+        }
+
         action_date_format_info.setOnClickListener {
             openURI("https://developer.android.com/reference/java/text/SimpleDateFormat")
         }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt
index 33e0875..66ecb7f 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt
@@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
+import com.chibatching.kotpref.Kotpref
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.tabs.TabLayoutMediator
 import com.karumi.dexter.Dexter
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt
index 1b254c3..8fb7c8e 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt
@@ -81,6 +81,8 @@ class CalendarTabFragment : Fragment() {
         binding: FragmentCalendarSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isCalendarEnabled = Preferences.showEvents
+
         viewModel.showEvents.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 binding.isCalendarEnabled = it
@@ -121,6 +123,17 @@ class CalendarTabFragment : Fragment() {
             }
         })
 
+        viewModel.widgetUpdateFrequency.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                widget_update_frequency_label?.text = when (it) {
+                    Constants.WidgetUpdateFrequency.HIGH.value -> getString(R.string.settings_widget_update_frequency_high)
+                    Constants.WidgetUpdateFrequency.DEFAULT.value -> getString(R.string.settings_widget_update_frequency_default)
+                    Constants.WidgetUpdateFrequency.LOW.value -> getString(R.string.settings_widget_update_frequency_low)
+                    else -> ""
+                }
+            }
+        })
+
         viewModel.showUntil.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_until_label?.text = getString(SettingsStringHelper.getShowUntilString(it))
@@ -135,12 +148,6 @@ class CalendarTabFragment : Fragment() {
             }
         })
 
-        viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
-            maintainScrollPosition {
-                date_format_label?.text = DateHelper.getDateText(requireContext(), Calendar.getInstance())
-            }
-        })
-
         viewModel.calendarAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 calendar_app_label?.text = if (it != "") it else getString(R.string.default_calendar_app)
@@ -266,6 +273,18 @@ class CalendarTabFragment : Fragment() {
             }
         }
 
+        action_widget_update_frequency.setOnClickListener {
+            if (Preferences.showEvents) {
+                BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_widget_update_frequency_title), message = getString(R.string.settings_widget_update_frequency_subtitle)).setSelectedValue(Preferences.widgetUpdateFrequency)
+                    .addItem(getString(R.string.settings_widget_update_frequency_high), Constants.WidgetUpdateFrequency.HIGH.value)
+                    .addItem(getString(R.string.settings_widget_update_frequency_default), Constants.WidgetUpdateFrequency.DEFAULT.value)
+                    .addItem(getString(R.string.settings_widget_update_frequency_low), Constants.WidgetUpdateFrequency.LOW.value)
+                    .addOnSelectItemListener { value ->
+                        Preferences.widgetUpdateFrequency = value
+                    }.show()
+            }
+        }
+
         action_second_row_info.setOnClickListener {
             if (Preferences.showEvents) {
                 val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_second_row_info_title)).setSelectedValue(Preferences.secondRowInformation)
@@ -290,27 +309,6 @@ class CalendarTabFragment : Fragment() {
             }
         }
 
-        action_date_format.setOnClickListener {
-            if (Preferences.showEvents) {
-                val now = Calendar.getInstance()
-                val dialog = BottomSheetMenu<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
-
-                dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "")
-                if (Preferences.dateFormat != "") {
-                    dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat)
-                }
-                dialog.addItem(getString(R.string.custom_date_format), "-")
-
-                dialog.addOnSelectItemListener { value ->
-                        if (value == "-") {
-                            startActivity(Intent(requireContext(), CustomDateActivity::class.java))
-                        } else {
-                            Preferences.dateFormat = value
-                        }
-                }.show()
-            }
-        }
-
         action_open_event_details.setOnClickListener {
             if (Preferences.showEvents) {
                 BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_event_app_title)).setSelectedValue(Preferences.openEventDetails)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt
index d6b42b4..ed5adb8 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockTabFragment.kt
@@ -85,6 +85,8 @@ class ClockTabFragment : Fragment() {
         binding: FragmentClockSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isClockVisible = Preferences.showClock
+
         viewModel.showBigClockWarning.observe(viewLifecycleOwner, Observer {
             large_clock_warning?.isVisible = it
             small_clock_warning?.isVisible = !it
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt
index 11ec99a..319382d 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt
@@ -21,7 +21,9 @@ import com.tommasoberlose.anotherwidget.global.RequestCode
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toHexValue
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper.toIntValue
+import com.tommasoberlose.anotherwidget.helpers.DateHelper
 import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper
+import com.tommasoberlose.anotherwidget.ui.activities.CustomDateActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import kotlinx.android.synthetic.main.fragment_general_settings.*
@@ -29,6 +31,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.*
 
 
 class GeneralTabFragment : Fragment() {
@@ -113,6 +116,28 @@ class GeneralTabFragment : Fragment() {
             }
         })
 
+        viewModel.textSecondaryColor.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlpha == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor())).toUpperCase()
+                }
+            }
+        })
+
+        viewModel.textSecondaryAlpha.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                if (Preferences.textSecondaryAlpha == "00") {
+                    secondary_font_color_label?.text = getString(R.string.transparent)
+                } else {
+                    secondary_font_color_label?.text =
+                        "#%s".format(Integer.toHexString(ColorHelper.getSecondaryFontColor())).toUpperCase()
+                }
+            }
+        })
+
         viewModel.backgroundCardColor.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 if (Preferences.backgroundCardAlpha == "00") {
@@ -141,6 +166,12 @@ class GeneralTabFragment : Fragment() {
             }
         })
 
+        viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                date_format_label?.text = DateHelper.getDateText(requireContext(), Calendar.getInstance())
+            }
+        })
+
         viewModel.customFont.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 custom_font_label?.text = getString(SettingsStringHelper.getCustomFontLabel(it))
@@ -167,7 +198,7 @@ class GeneralTabFragment : Fragment() {
     private fun setupListener() {
         action_main_text_size.setOnClickListener {
             val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.title_main_text_size)).setSelectedValue(Preferences.textMainSize)
-            (32 downTo 10).filter { it % 2 == 0 }.forEach {
+            (40 downTo 10).filter { it % 2 == 0 }.forEach {
                 dialog.addItem("${it}sp", it.toFloat())
             }
             dialog.addOnSelectItemListener { value ->
@@ -177,7 +208,7 @@ class GeneralTabFragment : Fragment() {
 
         action_second_text_size.setOnClickListener {
             val dialog = BottomSheetMenu<Float>(requireContext(), header = getString(R.string.title_second_text_size)).setSelectedValue(Preferences.textSecondSize)
-            (28 downTo 10).filter { it % 2 == 0 }.forEach {
+            (40 downTo 10).filter { it % 2 == 0 }.forEach {
                 dialog.addItem("${it}sp", it.toFloat())
             }
             dialog.addOnSelectItemListener { value ->
@@ -202,6 +233,44 @@ class GeneralTabFragment : Fragment() {
             ).show()
         }
 
+        action_secondary_font_color.setOnClickListener {
+            BottomSheetColorPicker(requireContext(),
+                colors = colors,
+                header = getString(R.string.settings_secondary_font_color_title),
+                getSelected = ColorHelper::getSecondaryFontColorRgb,
+                onColorSelected = { color: Int ->
+                    val colorString = Integer.toHexString(color)
+                    Preferences.textSecondaryColor = "#" + if (colorString.length > 6) colorString.substring(2) else colorString
+                },
+                showAlphaSelector = true,
+                alpha = Preferences.textSecondaryAlpha.toIntValue(),
+                onAlphaChangeListener = { alpha ->
+                    Preferences.textSecondaryAlpha = alpha.toHexValue()
+                }
+            ).show()
+        }
+
+        action_date_format.setOnClickListener {
+            if (Preferences.showEvents) {
+                val now = Calendar.getInstance()
+                val dialog = BottomSheetMenu<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
+
+                dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "")
+                if (Preferences.dateFormat != "") {
+                    dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat)
+                }
+                dialog.addItem(getString(R.string.custom_date_format), "-")
+
+                dialog.addOnSelectItemListener { value ->
+                    if (value == "-") {
+                        startActivity(Intent(requireContext(), CustomDateActivity::class.java))
+                    } else {
+                        Preferences.dateFormat = value
+                    }
+                }.show()
+            }
+        }
+
         action_background_color.setOnClickListener {
             BottomSheetColorPicker(requireContext(),
                 colors = colors,
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt
index c1d81d6..e17612f 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GlanceTabFragment.kt
@@ -1,31 +1,35 @@
 package com.tommasoberlose.anotherwidget.ui.fragments
 
+import android.Manifest
+import android.app.Activity
 import android.app.AlarmManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.ApiException
+import com.karumi.dexter.Dexter
+import com.karumi.dexter.MultiplePermissionsReport
+import com.karumi.dexter.PermissionToken
+import com.karumi.dexter.listener.PermissionRequest
+import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
 import com.tommasoberlose.anotherwidget.components.CustomNotesDialog
@@ -33,16 +37,18 @@ import com.tommasoberlose.anotherwidget.components.GlanceProviderSortMenu
 import com.tommasoberlose.anotherwidget.databinding.FragmentGlanceSettingsBinding
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
-import com.tommasoberlose.anotherwidget.helpers.GlanceProviderHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
-import com.tommasoberlose.anotherwidget.models.GlanceProvider
+import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
+import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver.Companion.FITNESS_OPTIONS
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.checkIfFitInstalled
+import kotlinx.android.synthetic.main.fragment_calendar_settings.*
 import kotlinx.android.synthetic.main.fragment_glance_settings.*
+import kotlinx.android.synthetic.main.fragment_glance_settings.scrollView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import net.idik.lib.slimadapter.SlimAdapter
-import java.util.*
 
 
 class GlanceTabFragment : Fragment() {
@@ -76,6 +82,8 @@ class GlanceTabFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        action_show_steps.isVisible = requireContext().checkIfFitInstalled()
+
         setupListener()
         updateNextAlarmWarningUi()
     }
@@ -84,6 +92,7 @@ class GlanceTabFragment : Fragment() {
         binding: FragmentGlanceSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isGlanceVisible = Preferences.showGlance
 
         viewModel.showGlance.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
@@ -109,6 +118,13 @@ class GlanceTabFragment : Fragment() {
             }
         })
 
+        viewModel.showDailySteps.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_steps_label?.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+            checkFitnessPermission()
+        })
+
         viewModel.customInfo.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_custom_notes_label?.text = if (it == "") getString(R.string.settings_not_visible) else it
@@ -174,6 +190,30 @@ class GlanceTabFragment : Fragment() {
             }
         }
 
+        action_show_steps.setOnClickListener {
+            if (Preferences.showGlance) {
+                BottomSheetMenu<Boolean>(
+                    requireContext(),
+                    header = getString(R.string.settings_daily_steps_title)
+                ).setSelectedValue(Preferences.showDailySteps)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        if (value) {
+                            val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(requireContext())
+                            if (!GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
+                                val mGoogleSignInClient = GoogleSignIn.getClient(requireActivity(), GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).addExtension(FITNESS_OPTIONS).build())
+                                startActivityForResult(mGoogleSignInClient.signInIntent, 2)
+                            } else {
+                                Preferences.showDailySteps = true
+                            }
+                        } else {
+                            Preferences.showDailySteps = false
+                        }
+                    }.show()
+            }
+        }
+
         action_show_custom_notes.setOnClickListener {
             if (Preferences.showGlance) {
                 CustomNotesDialog(requireContext()).show()
@@ -228,11 +268,93 @@ class GlanceTabFragment : Fragment() {
                 activity?.startActivity(Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"))
             }
         } else {
-            show_music_label?.text = getString(R.string.settings_show_music_disabled_subtitle)
+            show_music_label?.text = getString(R.string.settings_not_visible)
             notification_permission_alert?.isVisible = false
         }
     }
 
+    private fun checkFitnessPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || activity?.checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION) == true) {
+            fitness_permission_alert?.isVisible = false
+            if (Preferences.showDailySteps) {
+                ActivityDetectionReceiver.registerFence(requireContext())
+            } else {
+                ActivityDetectionReceiver.unregisterFence(requireContext())
+            }
+            show_steps_label?.text = if (Preferences.showDailySteps) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+        } else if (Preferences.showDailySteps) {
+            ActivityDetectionReceiver.unregisterFence(requireContext())
+            fitness_permission_alert?.isVisible = true
+            show_steps_label?.text = getString(R.string.settings_request_fitness_access)
+            fitness_permission_alert?.setOnClickListener {
+                requireFitnessPermission()
+            }
+        } else {
+            ActivityDetectionReceiver.unregisterFence(requireContext())
+            show_steps_label?.text = getString(R.string.settings_not_visible)
+            fitness_permission_alert?.isVisible = false
+        }
+    }
+
+    override fun onActivityResult(
+        requestCode: Int,
+        resultCode: Int,
+        data: Intent?
+    ) {
+        when (requestCode) {
+            1 -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    checkFitnessPermission()
+                } else {
+                    Preferences.showDailySteps = false
+                }
+            }
+            2-> {
+                try {
+                    val account: GoogleSignInAccount? = GoogleSignIn.getSignedInAccountFromIntent(data).getResult(ApiException::class.java)
+                    if (!GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
+                        GoogleSignIn.requestPermissions(
+                            requireActivity(),
+                            1,
+                            account,
+                            FITNESS_OPTIONS)
+                    } else {
+                        checkFitnessPermission()
+                    }
+                } catch (e: ApiException) {
+                    e.printStackTrace()
+                    Preferences.showDailySteps = false
+                }
+            }
+        }
+    }
+
+    private fun requireFitnessPermission() {
+        Dexter.withContext(requireContext())
+            .withPermissions(
+                "com.google.android.gms.permission.ACTIVITY_RECOGNITION",
+                "android.gms.permission.ACTIVITY_RECOGNITION",
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACTIVITY_RECOGNITION else "com.google.android.gms.permission.ACTIVITY_RECOGNITION"
+            ).withListener(object: MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        if (report.areAllPermissionsGranted()){
+                            checkFitnessPermission()
+                        }
+                    }
+                }
+                override fun onPermissionRationaleShouldBeShown(
+                    permissions: MutableList<PermissionRequest>?,
+                    token: PermissionToken?
+                ) {
+                    // Remember to invoke this method when the custom rationale is closed
+                    // or just by default if you don't want to use any custom rationale.
+                    token?.continuePermissionRequest()
+                }
+            })
+            .check()
+    }
+
     private fun maintainScrollPosition(callback: () -> Unit) {
         val scrollPosition = scrollView.scrollY
         callback.invoke()
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
index 56c963e..05b0f0c 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
@@ -14,6 +14,7 @@ import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.core.animation.addListener
 import androidx.core.app.NotificationManagerCompat
@@ -125,8 +126,11 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
     private fun updateUI() {
         uiJob?.cancel()
 
+        preview?.clearAnimation()
+        time_container?.clearAnimation()
+
         if (Preferences.showPreview) {
-            preview.setCardBackgroundColor(
+            preview?.setCardBackgroundColor(
                 ContextCompat.getColor(
                     requireContext(),
                     if (ColorHelper.getFontColor()
@@ -134,52 +138,62 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                     ) android.R.color.white else R.color.colorAccent
                 )
             )
-            widget_shape_background.setImageDrawable(BitmapHelper.getTintedDrawable(requireContext(), R.drawable.card_background, ColorHelper.getBackgroundColor()))
+            widget_shape_background?.setImageDrawable(
+                BitmapHelper.getTintedDrawable(
+                    requireContext(),
+                    R.drawable.card_background,
+                    ColorHelper.getBackgroundColor()
+                )
+            )
             uiJob = viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) {
                 val generatedView = MainWidget.generateWidgetView(requireContext())
 
                 withContext(Dispatchers.Main) {
                     generatedView.measure(0, 0)
-                    preview.measure(0, 0)
+                    preview?.measure(0, 0)
                 }
 
-                val bitmap = BitmapHelper.getBitmapFromView(
-                    generatedView,
-                    if (preview.width > 0) preview.width else generatedView.measuredWidth,
-                    generatedView.measuredHeight
-                )
+                val bitmap = if (preview != null) {
+                    BitmapHelper.getBitmapFromView(
+                        generatedView,
+                        if (preview.width > 0) preview.width else generatedView.measuredWidth,
+                        generatedView.measuredHeight
+                    )
+                } else {
+                    null
+                }
                 withContext(Dispatchers.Main) {
                     // Clock
-                    time.setTextColor(ColorHelper.getClockFontColor())
-                    time_am_pm.setTextColor(ColorHelper.getClockFontColor())
-                    time.setTextSize(
+                    time?.setTextColor(ColorHelper.getClockFontColor())
+                    time_am_pm?.setTextColor(ColorHelper.getClockFontColor())
+                    time?.setTextSize(
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext())
                     )
-                    time_am_pm.setTextSize(
+                    time_am_pm?.setTextSize(
                         TypedValue.COMPLEX_UNIT_SP,
                         Preferences.clockTextSize.toPixel(requireContext()) / 5 * 2
                     )
-                    time_am_pm.isVisible = Preferences.showAMPMIndicator
+                    time_am_pm?.isVisible = Preferences.showAMPMIndicator
 
                     // Clock bottom margin
-                    clock_bottom_margin_none.isVisible =
+                    clock_bottom_margin_none?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.NONE.value
-                    clock_bottom_margin_small.isVisible =
+                    clock_bottom_margin_small?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.SMALL.value
-                    clock_bottom_margin_medium.isVisible =
+                    clock_bottom_margin_medium?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.MEDIUM.value
-                    clock_bottom_margin_large.isVisible =
+                    clock_bottom_margin_large?.isVisible =
                         Preferences.showClock && Preferences.clockBottomMargin == Constants.ClockBottomMargin.LARGE.value
 
-                    if ((Preferences.showClock && !time_container.isVisible) || (!Preferences.showClock && time_container.isVisible)) {
+                    if ((Preferences.showClock && time_container?.isVisible == false) || (!Preferences.showClock && time_container?.isVisible == true)) {
                         if (Preferences.showClock) {
-                            time_container.layoutParams = time_container.layoutParams.apply {
+                            time_container?.layoutParams = time_container.layoutParams.apply {
                                 height = RelativeLayout.LayoutParams.WRAP_CONTENT
                             }
-                            time_container.measure(0, 0)
+                            time_container?.measure(0, 0)
                         }
-                        val initialHeight = time_container.measuredHeight
+                        val initialHeight = time_container?.measuredHeight ?: 0
                         ValueAnimator.ofFloat(
                             if (Preferences.showClock) 0f else 1f,
                             if (Preferences.showClock) 1f else 0f
@@ -187,46 +201,50 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                             duration = 500L
                             addUpdateListener {
                                 val animatedValue = animatedValue as Float
-                                time_container.layoutParams = time_container.layoutParams.apply {
-                                    height = (initialHeight * animatedValue).toInt()
-                                }
+                                time_container?.layoutParams =
+                                    time_container.layoutParams.apply {
+                                        height = (initialHeight * animatedValue).toInt()
+                                    }
+                                time?.alpha = animatedValue
                             }
                             addListener(
                                 onStart = {
                                     if (Preferences.showClock) {
-                                        time_container.isVisible = true
+                                        time_container?.isVisible = true
                                     }
                                 },
                                 onEnd = {
                                     if (!Preferences.showClock) {
-                                        time_container.isVisible = false
+                                        time_container?.isVisible = false
                                     }
                                 }
                             )
                         }.start()
 
-                        ValueAnimator.ofInt(
-                            preview.height,
-                            PREVIEW_BASE_HEIGHT.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
-                                requireContext()
-                            ) else 0
-                        ).apply {
-                            duration = 500L
-                            addUpdateListener {
-                                val animatedValue = animatedValue as Int
-                                val layoutParams = preview.layoutParams
-                                layoutParams.height = animatedValue
-                                preview.layoutParams = layoutParams
-                            }
-                        }.start()
+                        if (preview != null) {
+                            ValueAnimator.ofInt(
+                                preview.height,
+                                PREVIEW_BASE_HEIGHT.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
+                                    requireContext()
+                                ) else 0
+                            ).apply {
+                                duration = 500L
+                                addUpdateListener {
+                                    val animatedValue = animatedValue as Int
+                                    val layoutParams = preview.layoutParams
+                                    layoutParams.height = animatedValue
+                                    preview.layoutParams = layoutParams
+                                }
+                            }.start()
+                        }
                     } else {
-                        time_container.layoutParams = time_container.layoutParams.apply {
+                        time_container?.layoutParams = time_container.layoutParams.apply {
                             height = RelativeLayout.LayoutParams.WRAP_CONTENT
                         }
-                        time_container.measure(0, 0)
+                        time_container?.measure(0, 0)
                     }
 
-                    if (preview.height == 0) {
+                    if (preview != null && preview.height == 0) {
                         ValueAnimator.ofInt(
                             preview.height,
                             PREVIEW_BASE_HEIGHT.toPixel(requireContext()) + if (Preferences.showClock) 100.toPixel(
@@ -238,29 +256,35 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
                                 val animatedValue = animatedValue as Int
                                 val layoutParams = preview.layoutParams
                                 layoutParams.height = animatedValue
-                                preview.layoutParams = layoutParams
+                                preview?.layoutParams = layoutParams
                             }
                         }.start()
                     }
 
-                    widget_loader.animate().scaleX(0f).scaleY(0f).alpha(0f).setDuration(200L).start()
-                    bitmap_container.setImageBitmap(bitmap)
-                    widget.animate().alpha(1f).start()
+                    widget_loader?.animate()?.scaleX(0f)?.scaleY(0f)?.alpha(0f)?.setDuration(200L)?.start()
+                    bitmap_container?.apply {
+                        setImageBitmap(bitmap)
+                        scaleX = 0.9f
+                        scaleY = 0.9f
+                    }
+                    widget?.animate()?.alpha(1f)?.start()
                 }
             }
         } else {
-            ValueAnimator.ofInt(
-                preview.height,
-                0
-            ).apply {
-                duration = 300L
-                addUpdateListener {
-                    val animatedValue = animatedValue as Int
-                    val layoutParams = preview.layoutParams
-                    layoutParams.height = animatedValue
-                    preview.layoutParams = layoutParams
-                }
-            }.start()
+            if (preview != null) {
+                ValueAnimator.ofInt(
+                    preview.height,
+                    0
+                ).apply {
+                    duration = 300L
+                    addUpdateListener {
+                        val animatedValue = animatedValue as Int
+                        val layoutParams = preview.layoutParams
+                        layoutParams.height = animatedValue
+                        preview.layoutParams = layoutParams
+                    }
+                }.start()
+            }
         }
 
         showErrorBadge()
@@ -272,13 +296,27 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
             activity?.let { act ->
                 val wallpaper = act.getCurrentWallpaper()
                 widget_bg.setImageDrawable(if (it) wallpaper else null)
-                widget_bg.layoutParams = widget_bg.layoutParams.apply {
+                if (wallpaper != null) {
+                    widget_bg.layoutParams =
+                        (widget_bg.layoutParams as ViewGroup.MarginLayoutParams).apply {
 
-                    val metrics = DisplayMetrics()
-                    act.windowManager.defaultDisplay.getMetrics(metrics)
+                            val metrics = DisplayMetrics()
+                            act.windowManager.defaultDisplay.getMetrics(metrics)
 
-                    height = metrics.heightPixels
-                    width = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicWidth ?: 1)
+                            val dimensions: Pair<Int, Int> = if (wallpaper.intrinsicWidth >= wallpaper.intrinsicHeight) {
+                                metrics.heightPixels to (wallpaper.intrinsicWidth) * metrics.heightPixels / (wallpaper.intrinsicHeight)
+                            } else {
+                                metrics.widthPixels to (wallpaper.intrinsicHeight) * metrics.widthPixels / (wallpaper.intrinsicWidth)
+                            }
+
+                            setMargins(
+                                if (dimensions.first >= dimensions.second) (-80).toPixel(requireContext()) else 0,
+                                (-80).toPixel(requireContext()), 0, 0
+                            )
+
+                            width = dimensions.first
+                            height = dimensions.second
+                        }
                 }
             }
         })
@@ -313,11 +351,6 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         }?.isVisible = Preferences.showMusic && !NotificationManagerCompat.getEnabledListenerPackages(requireContext()).contains(requireContext().packageName)
     }
 
-    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
-        updateUI()
-        MainWidget.updateWidget(requireContext())
-    }
-
     override fun onResume() {
         super.onResume()
         Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
@@ -332,10 +365,29 @@ class MainFragment  : Fragment(), SharedPreferences.OnSharedPreferenceChangeList
         super.onPause()
     }
 
+    var delayJob: Job? = null
+
+    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
+        delayJob?.cancel()
+        delayJob = lifecycleScope.launch(Dispatchers.IO) {
+            delay(200)
+            withContext(Dispatchers.Main) {
+                updateUI()
+            }
+        }
+        MainWidget.updateWidget(requireContext())
+    }
+
     class UpdateUiMessageEvent
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMessageEvent(ignore: UpdateUiMessageEvent?) {
-        updateUI()
+        delayJob?.cancel()
+        delayJob = lifecycleScope.launch(Dispatchers.IO) {
+            delay(200)
+            withContext(Dispatchers.Main) {
+                updateUI()
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt
index a7e16a2..2c66e95 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt
index 7f027d1..8e10b01 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -79,6 +80,8 @@ class WeatherTabFragment : Fragment() {
         binding: FragmentWeatherSettingsBinding,
         viewModel: MainViewModel
     ) {
+        binding.isWeatherVisible = Preferences.showWeather
+
         viewModel.showWeatherWarning.observe(viewLifecycleOwner, Observer {
             weather_warning?.isVisible = it
             checkLocationPermission()
@@ -124,6 +127,16 @@ class WeatherTabFragment : Fragment() {
             checkLocationPermission()
         })
 
+        viewModel.weatherIconPack.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                label_weather_icon_pack?.text = when (it) {
+                    Constants.WeatherIconPack.MINIMAL.value -> getString(R.string.settings_weather_icon_pack_minimal)
+                    else -> getString(R.string.settings_weather_icon_pack_default)
+                }
+            }
+            checkLocationPermission()
+        })
+
         viewModel.weatherAppName.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 weather_app_label?.text =
@@ -215,6 +228,17 @@ class WeatherTabFragment : Fragment() {
             }
         }
 
+        action_weather_icon_pack.setOnClickListener {
+            if (Preferences.showWeather) {
+                BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_weather_icon_pack_title)).setSelectedValue(Preferences.weatherIconPack)
+                    .addItem(getString(R.string.settings_weather_icon_pack_default), Constants.WeatherIconPack.DEFAULT.value)
+                    .addItem(getString(R.string.settings_weather_icon_pack_minimal), Constants.WeatherIconPack.MINIMAL.value)
+                    .addOnSelectItemListener { value ->
+                        Preferences.weatherIconPack = value
+                    }.show()
+            }
+        }
+
         action_weather_app.setOnClickListener {
             if (Preferences.showWeather) {
                 startActivityForResult(
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt
index 537881e..f116b46 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt
@@ -3,8 +3,10 @@ package com.tommasoberlose.anotherwidget.ui.viewmodels
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
+import com.chibatching.kotpref.livedata.asLiveData
 import com.tommasoberlose.anotherwidget.global.Preferences
 
 class CustomDateViewModel(application: Application) : AndroidViewModel(application) {
     val dateInput: MutableLiveData<String> = MutableLiveData(if (Preferences.dateFormat == "") "EEEE, MMM dd" else Preferences.dateFormat)
+    val isDateCapitalize = Preferences.asLiveData(Preferences::isDateCapitalize)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
index 38578c7..5dd84a0 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
@@ -9,6 +9,8 @@ class MainViewModel : ViewModel() {
     // General Settings
     val textGlobalColor = Preferences.asLiveData(Preferences::textGlobalColor)
     val textGlobalAlpha = Preferences.asLiveData(Preferences::textGlobalAlpha)
+    val textSecondaryColor = Preferences.asLiveData(Preferences::textSecondaryColor)
+    val textSecondaryAlpha = Preferences.asLiveData(Preferences::textSecondaryAlpha)
     val backgroundCardColor = Preferences.asLiveData(Preferences::backgroundCardColor)
     val backgroundCardAlpha = Preferences.asLiveData(Preferences::backgroundCardAlpha)
     val textMainSize = Preferences.asLiveData(Preferences::textMainSize)
@@ -27,6 +29,7 @@ class MainViewModel : ViewModel() {
     val showNextEvent = Preferences.asLiveData(Preferences::showNextEvent)
     val openEventDetails = Preferences.asLiveData(Preferences::openEventDetails)
     val calendarAppName = Preferences.asLiveData(Preferences::calendarAppName)
+    val widgetUpdateFrequency = Preferences.asLiveData(Preferences::widgetUpdateFrequency)
 
     // Clock Settings
     val showClock = Preferences.asLiveData(Preferences::showClock)
@@ -52,12 +55,14 @@ class MainViewModel : ViewModel() {
     val customLocationAdd = Preferences.asLiveData(Preferences::customLocationAdd)
 
     val showWeatherWarning = Preferences.asLiveData(Preferences::showWeatherWarning)
+    val weatherIconPack = Preferences.asLiveData(Preferences::weatherIconPack)
 
     // Glance
     val showGlance = Preferences.asLiveData(Preferences::showGlance)
     val showMusic = Preferences.asLiveData(Preferences::showMusic)
     val showNextAlarm = Preferences.asLiveData(Preferences::showNextAlarm)
     val showBatteryCharging = Preferences.asLiveData(Preferences::showBatteryCharging)
+    val showDailySteps = Preferences.asLiveData(Preferences::showDailySteps)
     val customInfo = Preferences.asLiveData(Preferences::customNotes)
 
     // Advanced Settings
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
index 2f77568..487896f 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
@@ -35,6 +35,7 @@ import java.lang.Exception
 import java.text.DateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit
+import kotlin.math.min
 
 
 class MainWidget : AppWidgetProvider() {
@@ -85,9 +86,10 @@ class MainWidget : AppWidgetProvider() {
                                      appWidgetId: Int) {
             val displayMetrics = Resources.getSystem().displayMetrics
             val width = displayMetrics.widthPixels
+            val height = displayMetrics.heightPixels
 
             val dimensions = WidgetHelper.WidgetSizeProvider(context, appWidgetManager).getWidgetsSize(appWidgetId)
-            generateWidgetView(context, appWidgetId, appWidgetManager, dimensions.first - 8.toPixel(context) /*width - 16.toPixel(context)*/)
+            generateWidgetView(context, appWidgetId, appWidgetManager, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context)))
         }
 
         private fun generateWidgetView(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager, w: Int) {
@@ -261,13 +263,8 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
-                } else if (Preferences.showGlance) {
-
-
-
-
-
-                    loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders()) {
+                } else if (GlanceProviderHelper.showGlanceProviders(context)) {
+                    loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                         when (provider) {
                             Constants.GlanceProviderId.PLAYING_SONG -> {
                                 if (MediaPlayerHelper.isSomeonePlaying(context)) {
@@ -293,28 +290,35 @@ class MainWidget : AppWidgetProvider() {
                                     break@loop
                                 }
                             }
-//                            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
-//                                if (Preferences.isBatteryLevelLow) {
-//                                    val alarmIntent = PendingIntent.getActivity(
-//                                        context,
-//                                        widgetID,
-//                                        IntentHelper.getClockIntent(context),
-//                                        0
-//                                    )
-//                                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
-//                                    break@loop
-//                                }
-//                            }
+                            Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                                if (Preferences.isBatteryLevelLow) {
+                                    val alarmIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getClockIntent(context),
+                                        0
+                                    )
+                                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
+                                    break@loop
+                                }
+                            }
                             Constants.GlanceProviderId.CUSTOM_INFO -> {
                                 if (Preferences.customNotes.isNotEmpty()) {
                                     break@loop
                                 }
                             }
-//                            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-//                                if (Preferences.googleFitSteps > 0) {
-//                                    break@loop
-//                                }
-//                            }
+                            Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                                if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                    val fitIntent = PendingIntent.getActivity(
+                                        context,
+                                        widgetID,
+                                        IntentHelper.getFitIntent(context),
+                                        0
+                                    )
+                                    views.setOnClickPendingIntent(R.id.second_row_rect, fitIntent)
+                                    break@loop
+                                }
+                            }
                         }
                     }
 
@@ -371,7 +375,7 @@ class MainWidget : AppWidgetProvider() {
                         BitmapHelper.getBitmapFromView(v.calendar_weather, draw = false)
                     )
 
-                    if (GlanceProviderHelper.showSpecialWeather(context)) {
+                    if (GlanceProviderHelper.showGlanceProviders(context)) {
                         views.setViewVisibility(R.id.calendar_weather_rect, View.GONE)
                     } else {
                         views.setViewVisibility(R.id.special_weather_rect, View.GONE)
@@ -452,7 +456,10 @@ class MainWidget : AppWidgetProvider() {
             val eventRepository = EventRepository(context)
             val v = View.inflate(context, R.layout.the_widget, null)
 
-            val now = Calendar.getInstance()
+            val now = Calendar.getInstance().apply {
+                set(Calendar.SECOND, 0)
+                set(Calendar.MILLISECOND, 0)
+            }
 
             v.empty_layout.visibility = View.VISIBLE
             v.calendar_layout.visibility = View.GONE
@@ -472,7 +479,7 @@ class MainWidget : AppWidgetProvider() {
 
                 v.next_event.text = nextEvent.title
 
-                if (Preferences.showDiffTime && now.timeInMillis < (nextEvent.startDate - 1000 * 60 * 60)) {
+                if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
                     v.next_event_difference_time.text = if (!nextEvent.allDay) {
                         SettingsStringHelper.getDifferenceText(
                             context,
@@ -494,8 +501,8 @@ class MainWidget : AppWidgetProvider() {
                 } else {
                     v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.round_today))
                     if (!nextEvent.allDay) {
-                        val startHour = DateFormat.getTimeInstance(DateFormat.SHORT).format(nextEvent.startDate)
-                        val endHour = DateFormat.getTimeInstance(DateFormat.SHORT).format(nextEvent.endDate)
+                        val startHour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(nextEvent.startDate)
+                        val endHour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(nextEvent.endDate)
 
                         var dayDiff = TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate)
 
@@ -518,15 +525,15 @@ class MainWidget : AppWidgetProvider() {
 
                     } else {
                         val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
-                        v.next_event_date.text = DateUtils.formatDateTime(context, now.timeInMillis, flags).getCapWordString()
+                        v.next_event_date.text = DateUtils.formatDateTime(context, now.timeInMillis, flags)
                     }
                 }
 
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
-            } else if (Preferences.showGlance) {
+            } else if (GlanceProviderHelper.showGlanceProviders(context)) {
                 v.second_row_icon.isVisible = true
-                loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders()) {
+                loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
                     when (provider) {
                         Constants.GlanceProviderId.PLAYING_SONG -> {
                             if (MediaPlayerHelper.isSomeonePlaying(context)) {
@@ -552,37 +559,38 @@ class MainWidget : AppWidgetProvider() {
                                 break@loop
                             }
                         }
-//                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
-//                            if (Preferences.isBatteryLevelLow) {
-//                                v.second_row_icon.setImageDrawable(
-//                                    ContextCompat.getDrawable(
-//                                        context,
-//                                        R.drawable.round_battery_charging_full
-//                                    )
-//                                )
-//                                v.next_event_date.text = context.getString(R.string.battery_low_warning)
-//                                break@loop
-//                            }
-//                        }
+                        Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> {
+                            if (Preferences.isBatteryLevelLow) {
+                                v.second_row_icon.setImageDrawable(
+                                    ContextCompat.getDrawable(
+                                        context,
+                                        R.drawable.round_battery_charging_full
+                                    )
+                                )
+                                v.next_event_date.text = context.getString(R.string.battery_low_warning)
+                                break@loop
+                            }
+                        }
                         Constants.GlanceProviderId.CUSTOM_INFO -> {
                             if (Preferences.customNotes.isNotEmpty()) {
                                 v.second_row_icon.isVisible = false
                                 v.next_event_date.text = Preferences.customNotes
+                                v.next_event_date.maxLines = 2
+                                break@loop
+                            }
+                        }
+                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
+                            if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
+                                v.second_row_icon.setImageDrawable(
+                                    ContextCompat.getDrawable(
+                                        context,
+                                        R.drawable.round_steps
+                                    )
+                                )
+                                v.next_event_date.text = context.getString(R.string.daily_steps_counter).format(Preferences.googleFitSteps)
                                 break@loop
                             }
                         }
-//                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-//                                if (Preferences.googleFitSteps > 0) {
-//                                    v.second_row_icon.setImageDrawable(
-//                                        ContextCompat.getDrawable(
-//                                            context,
-//                                            R.drawable.round_directions_walk
-//                                        )
-//                                    )
-//                                    v.next_event_date.text = ""
-//                                    break@loop
-//                                }
-//                        }
                     }
                 }
 
@@ -593,14 +601,30 @@ class MainWidget : AppWidgetProvider() {
 
 
             // Color
-            listOf<TextView>(v.empty_date, v.divider1, v.temp, v.next_event, v.next_event_difference_time, v.next_event_date, v.divider2, v.calendar_temp, v.divider3, v.special_temp).forEach {
+            listOf<TextView>(v.empty_date, v.divider1, v.temp, v.next_event, v.next_event_difference_time, v.divider3, v.special_temp).forEach {
                 it.setTextColor(ColorHelper.getFontColor())
             }
 
-            listOf<ImageView>(v.second_row_icon, v.action_next, v.action_previous).forEach {
+            if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) {
+                listOf<ImageView>(v.action_next, v.action_previous)
+            } else {
+                listOf<ImageView>(v.action_next, v.action_previous, v.empty_weather_icon, v.special_weather_icon)
+            }.forEach {
                 it.setColorFilter(ColorHelper.getFontColor())
             }
 
+            listOf<TextView>(v.next_event_date, v.divider2, v.calendar_temp).forEach {
+                it.setTextColor(ColorHelper.getSecondaryFontColor())
+            }
+
+            if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) {
+                listOf<ImageView>(v.second_row_icon)
+            } else {
+                listOf<ImageView>(v.second_row_icon, v.weather_icon)
+            }.forEach {
+                it.setColorFilter(ColorHelper.getSecondaryFontColor())
+            }
+
             // Text Size
             listOf<Pair<TextView, Float>>(
                 v.empty_date to Preferences.textMainSize,
@@ -621,11 +645,11 @@ class MainWidget : AppWidgetProvider() {
             v.second_row_icon.scaleX = Preferences.textSecondSize / 18f
             v.second_row_icon.scaleY = Preferences.textSecondSize / 18f
 
-            v.weather_icon.scaleX = Preferences.textSecondSize / 16f
-            v.weather_icon.scaleY = Preferences.textSecondSize / 16f
+            v.weather_icon.scaleX = Preferences.textSecondSize / 14f
+            v.weather_icon.scaleY = Preferences.textSecondSize / 14f
 
-            v.empty_weather_icon.scaleX = Preferences.textMainSize / 20f
-            v.empty_weather_icon.scaleY = Preferences.textMainSize / 20f
+            v.empty_weather_icon.scaleX = Preferences.textMainSize / 18f
+            v.empty_weather_icon.scaleY = Preferences.textMainSize / 18f
 
             v.action_next.scaleX = Preferences.textMainSize / 28f
             v.action_next.scaleY = Preferences.textMainSize / 28f
@@ -694,7 +718,7 @@ class MainWidget : AppWidgetProvider() {
                 v.calendar_temp.text = currentTemp
                 v.special_temp.text = currentTemp
 
-                if (GlanceProviderHelper.showSpecialWeather(context)) {
+                if (GlanceProviderHelper.showGlanceProviders(context)) {
                     v.calendar_weather.visibility = View.GONE
                 } else {
                     v.special_weather.visibility = View.GONE
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt
index 983b727..12ca1d9 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt
@@ -212,4 +212,13 @@ fun String.getCapWordString(): String {
     } catch (e: Exception) {
         this
     }
+}
+
+fun Context.checkIfFitInstalled(): Boolean {
+    return try {
+        packageManager.getPackageInfo("com.google.android.apps.fitness", PackageManager.GET_ACTIVITIES)
+        true
+    } catch (e: Exception) {
+        false
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/round_access_alarm.png b/app/src/main/res/drawable-hdpi/round_access_alarm.png
new file mode 100644
index 0000000..43c6103
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_access_alarm.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_access_alarm_black_18.png b/app/src/main/res/drawable-hdpi/round_access_alarm_black_18.png
new file mode 100644
index 0000000..124c040
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_access_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_access_alarm_black_24.png b/app/src/main/res/drawable-hdpi/round_access_alarm_black_24.png
new file mode 100644
index 0000000..ea9701c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_access_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_access_alarm_black_48.png b/app/src/main/res/drawable-hdpi/round_access_alarm_black_48.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_access_alarm_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_none_black_18.png b/app/src/main/res/drawable-hdpi/round_filter_none_black_18.png
new file mode 100644
index 0000000..03a1cb1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_none_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_none_black_24.png b/app/src/main/res/drawable-hdpi/round_filter_none_black_24.png
new file mode 100644
index 0000000..a977453
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_none_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_none_black_36.png b/app/src/main/res/drawable-hdpi/round_filter_none_black_36.png
new file mode 100644
index 0000000..611993e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_none_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_none_black_48.png b/app/src/main/res/drawable-hdpi/round_filter_none_black_48.png
new file mode 100644
index 0000000..8ea86b0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_none_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_format_size.png b/app/src/main/res/drawable-hdpi/round_format_size.png
new file mode 100644
index 0000000..77261fe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_format_size_black_24.png b/app/src/main/res/drawable-hdpi/round_format_size_black_24.png
new file mode 100644
index 0000000..d715d5d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_format_size_black_36.png b/app/src/main/res/drawable-hdpi/round_format_size_black_36.png
new file mode 100644
index 0000000..ccbc7b5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_format_size_black_48.png b/app/src/main/res/drawable-hdpi/round_format_size_black_48.png
new file mode 100644
index 0000000..9d5cfae
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock.png
new file mode 100644
index 0000000..e6e2d37
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_18.png
new file mode 100644
index 0000000..37e8d23
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_24.png
new file mode 100644
index 0000000..1354428
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_36.png
new file mode 100644
index 0000000..eaed861
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_alarm.png b/app/src/main/res/drawable-hdpi/round_library_alarm.png
new file mode 100644
index 0000000..7c93ec3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_alarm.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_books_black_18.png b/app/src/main/res/drawable-hdpi/round_library_books_black_18.png
new file mode 100644
index 0000000..bff98b5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_books_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_books_black_24.png b/app/src/main/res/drawable-hdpi/round_library_books_black_24.png
new file mode 100644
index 0000000..326dbef
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_books_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_books_black_36.png b/app/src/main/res/drawable-hdpi/round_library_books_black_36.png
new file mode 100644
index 0000000..33b48c7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_books_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_books_black_48.png b/app/src/main/res/drawable-hdpi/round_library_books_black_48.png
new file mode 100644
index 0000000..b79d879
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_books_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_music.png b/app/src/main/res/drawable-hdpi/round_library_music.png
new file mode 100644
index 0000000..f60788f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_music.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_music_black_18.png b/app/src/main/res/drawable-hdpi/round_library_music_black_18.png
new file mode 100644
index 0000000..473a522
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_music_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_music_black_24.png b/app/src/main/res/drawable-hdpi/round_library_music_black_24.png
new file mode 100644
index 0000000..c50b937
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_music_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_music_black_48.png b/app/src/main/res/drawable-hdpi/round_library_music_black_48.png
new file mode 100644
index 0000000..35b9e3e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_music_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_library_steps.png b/app/src/main/res/drawable-hdpi/round_library_steps.png
new file mode 100644
index 0000000..0f57667
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_library_steps.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_steps.png b/app/src/main/res/drawable-hdpi/round_steps.png
new file mode 100644
index 0000000..217ba99
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_steps.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_access_alarm.png b/app/src/main/res/drawable-mdpi/round_access_alarm.png
new file mode 100644
index 0000000..ea9701c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_access_alarm.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_access_alarm_black_18.png b/app/src/main/res/drawable-mdpi/round_access_alarm_black_18.png
new file mode 100644
index 0000000..45e6636
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_access_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_access_alarm_black_24.png b/app/src/main/res/drawable-mdpi/round_access_alarm_black_24.png
new file mode 100644
index 0000000..a1a254f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_access_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_access_alarm_black_48.png b/app/src/main/res/drawable-mdpi/round_access_alarm_black_48.png
new file mode 100644
index 0000000..86be313
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_access_alarm_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_none_black_18.png b/app/src/main/res/drawable-mdpi/round_filter_none_black_18.png
new file mode 100644
index 0000000..0f44aec
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_none_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_none_black_24.png b/app/src/main/res/drawable-mdpi/round_filter_none_black_24.png
new file mode 100644
index 0000000..e277514
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_none_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_none_black_36.png b/app/src/main/res/drawable-mdpi/round_filter_none_black_36.png
new file mode 100644
index 0000000..a977453
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_none_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_none_black_48.png b/app/src/main/res/drawable-mdpi/round_filter_none_black_48.png
new file mode 100644
index 0000000..8e29c7b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_none_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_format_size.png b/app/src/main/res/drawable-mdpi/round_format_size.png
new file mode 100644
index 0000000..8040bff
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_format_size_black_24.png b/app/src/main/res/drawable-mdpi/round_format_size_black_24.png
new file mode 100644
index 0000000..9dbecfd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_format_size_black_36.png b/app/src/main/res/drawable-mdpi/round_format_size_black_36.png
new file mode 100644
index 0000000..d715d5d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_format_size_black_48.png b/app/src/main/res/drawable-mdpi/round_format_size_black_48.png
new file mode 100644
index 0000000..ba8c109
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock.png
new file mode 100644
index 0000000..b6d8286
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_18.png
new file mode 100644
index 0000000..55a30c0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_24.png
new file mode 100644
index 0000000..c8748d9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_36.png
new file mode 100644
index 0000000..1354428
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_alarm.png b/app/src/main/res/drawable-mdpi/round_library_alarm.png
new file mode 100644
index 0000000..45d1bc5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_alarm.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_books_black_18.png b/app/src/main/res/drawable-mdpi/round_library_books_black_18.png
new file mode 100644
index 0000000..8dc5999
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_books_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_books_black_24.png b/app/src/main/res/drawable-mdpi/round_library_books_black_24.png
new file mode 100644
index 0000000..1bf2dea
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_books_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_books_black_36.png b/app/src/main/res/drawable-mdpi/round_library_books_black_36.png
new file mode 100644
index 0000000..326dbef
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_books_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_books_black_48.png b/app/src/main/res/drawable-mdpi/round_library_books_black_48.png
new file mode 100644
index 0000000..4d072cc
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_books_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_music.png b/app/src/main/res/drawable-mdpi/round_library_music.png
new file mode 100644
index 0000000..c50b937
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_music.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_music_black_18.png b/app/src/main/res/drawable-mdpi/round_library_music_black_18.png
new file mode 100644
index 0000000..1f7863a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_music_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_music_black_24.png b/app/src/main/res/drawable-mdpi/round_library_music_black_24.png
new file mode 100644
index 0000000..f013558
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_music_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_music_black_48.png b/app/src/main/res/drawable-mdpi/round_library_music_black_48.png
new file mode 100644
index 0000000..7be43e9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_music_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_library_steps.png b/app/src/main/res/drawable-mdpi/round_library_steps.png
new file mode 100644
index 0000000..cbced8c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_library_steps.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_steps.png b/app/src/main/res/drawable-mdpi/round_steps.png
new file mode 100644
index 0000000..f80bb82
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_steps.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_access_alarm.png b/app/src/main/res/drawable-xhdpi/round_access_alarm.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_access_alarm.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_access_alarm_black_18.png b/app/src/main/res/drawable-xhdpi/round_access_alarm_black_18.png
new file mode 100644
index 0000000..ea9701c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_access_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_access_alarm_black_24.png b/app/src/main/res/drawable-xhdpi/round_access_alarm_black_24.png
new file mode 100644
index 0000000..86be313
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_access_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_access_alarm_black_48.png b/app/src/main/res/drawable-xhdpi/round_access_alarm_black_48.png
new file mode 100644
index 0000000..ff59ea8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_access_alarm_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_none_black_18.png b/app/src/main/res/drawable-xhdpi/round_filter_none_black_18.png
new file mode 100644
index 0000000..a977453
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_none_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_none_black_24.png b/app/src/main/res/drawable-xhdpi/round_filter_none_black_24.png
new file mode 100644
index 0000000..8e29c7b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_none_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_none_black_36.png b/app/src/main/res/drawable-xhdpi/round_filter_none_black_36.png
new file mode 100644
index 0000000..8ea86b0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_none_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_none_black_48.png b/app/src/main/res/drawable-xhdpi/round_filter_none_black_48.png
new file mode 100644
index 0000000..b6d80fd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_none_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_format_size.png b/app/src/main/res/drawable-xhdpi/round_format_size.png
new file mode 100644
index 0000000..d715d5d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_format_size_black_24.png b/app/src/main/res/drawable-xhdpi/round_format_size_black_24.png
new file mode 100644
index 0000000..ba8c109
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_format_size_black_36.png b/app/src/main/res/drawable-xhdpi/round_format_size_black_36.png
new file mode 100644
index 0000000..9d5cfae
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_format_size_black_48.png b/app/src/main/res/drawable-xhdpi/round_format_size_black_48.png
new file mode 100644
index 0000000..9c5e968
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock.png
new file mode 100644
index 0000000..5a52683
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_18.png
new file mode 100644
index 0000000..1354428
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_24.png
new file mode 100644
index 0000000..b6d8286
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_36.png
new file mode 100644
index 0000000..e6e2d37
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_alarm.png b/app/src/main/res/drawable-xhdpi/round_library_alarm.png
new file mode 100644
index 0000000..0246cda
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_alarm.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_books_black_18.png b/app/src/main/res/drawable-xhdpi/round_library_books_black_18.png
new file mode 100644
index 0000000..326dbef
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_books_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_books_black_24.png b/app/src/main/res/drawable-xhdpi/round_library_books_black_24.png
new file mode 100644
index 0000000..4d072cc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_books_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_books_black_36.png b/app/src/main/res/drawable-xhdpi/round_library_books_black_36.png
new file mode 100644
index 0000000..b79d879
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_books_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_books_black_48.png b/app/src/main/res/drawable-xhdpi/round_library_books_black_48.png
new file mode 100644
index 0000000..9b335c8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_books_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_music.png b/app/src/main/res/drawable-xhdpi/round_library_music.png
new file mode 100644
index 0000000..35b9e3e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_music.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_music_black_18.png b/app/src/main/res/drawable-xhdpi/round_library_music_black_18.png
new file mode 100644
index 0000000..c50b937
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_music_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_music_black_24.png b/app/src/main/res/drawable-xhdpi/round_library_music_black_24.png
new file mode 100644
index 0000000..7be43e9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_music_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_music_black_48.png b/app/src/main/res/drawable-xhdpi/round_library_music_black_48.png
new file mode 100644
index 0000000..6058482
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_music_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_library_steps.png b/app/src/main/res/drawable-xhdpi/round_library_steps.png
new file mode 100644
index 0000000..646b07d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_library_steps.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_steps.png b/app/src/main/res/drawable-xhdpi/round_steps.png
new file mode 100644
index 0000000..a4a0d88
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_steps.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_access_alarm.png b/app/src/main/res/drawable-xxhdpi/round_access_alarm.png
new file mode 100644
index 0000000..04bd252
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_access_alarm.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_18.png b/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_18.png
new file mode 100644
index 0000000..43c6103
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_24.png b/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_24.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_48.png b/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_48.png
new file mode 100644
index 0000000..c48ee8e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_access_alarm_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_none_black_18.png b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_18.png
new file mode 100644
index 0000000..611993e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_none_black_24.png b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_24.png
new file mode 100644
index 0000000..8ea86b0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_none_black_36.png b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_36.png
new file mode 100644
index 0000000..f14c546
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_none_black_48.png b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_48.png
new file mode 100644
index 0000000..746b5c3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_none_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size.png b/app/src/main/res/drawable-xxhdpi/round_format_size.png
new file mode 100644
index 0000000..ccbc7b5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size_black_24.png b/app/src/main/res/drawable-xxhdpi/round_format_size_black_24.png
new file mode 100644
index 0000000..9d5cfae
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size_black_36.png b/app/src/main/res/drawable-xxhdpi/round_format_size_black_36.png
new file mode 100644
index 0000000..98f1b10
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size_black_48.png b/app/src/main/res/drawable-xxhdpi/round_format_size_black_48.png
new file mode 100644
index 0000000..a91f885
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock.png
new file mode 100644
index 0000000..9658371
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_18.png
new file mode 100644
index 0000000..eaed861
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_24.png
new file mode 100644
index 0000000..e6e2d37
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_36.png
new file mode 100644
index 0000000..58bbb97
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_alarm.png b/app/src/main/res/drawable-xxhdpi/round_library_alarm.png
new file mode 100644
index 0000000..21fd2d4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_alarm.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_books_black_18.png b/app/src/main/res/drawable-xxhdpi/round_library_books_black_18.png
new file mode 100644
index 0000000..33b48c7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_books_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_books_black_24.png b/app/src/main/res/drawable-xxhdpi/round_library_books_black_24.png
new file mode 100644
index 0000000..b79d879
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_books_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_books_black_36.png b/app/src/main/res/drawable-xxhdpi/round_library_books_black_36.png
new file mode 100644
index 0000000..58d457a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_books_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_books_black_48.png b/app/src/main/res/drawable-xxhdpi/round_library_books_black_48.png
new file mode 100644
index 0000000..5b70223
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_books_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_music.png b/app/src/main/res/drawable-xxhdpi/round_library_music.png
new file mode 100644
index 0000000..c2ce614
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_music.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_music_black_18.png b/app/src/main/res/drawable-xxhdpi/round_library_music_black_18.png
new file mode 100644
index 0000000..f60788f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_music_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_music_black_24.png b/app/src/main/res/drawable-xxhdpi/round_library_music_black_24.png
new file mode 100644
index 0000000..35b9e3e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_music_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_music_black_48.png b/app/src/main/res/drawable-xxhdpi/round_library_music_black_48.png
new file mode 100644
index 0000000..83072e7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_music_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_library_steps.png b/app/src/main/res/drawable-xxhdpi/round_library_steps.png
new file mode 100644
index 0000000..927d2f2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_library_steps.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_steps.png b/app/src/main/res/drawable-xxhdpi/round_steps.png
new file mode 100644
index 0000000..0ee09b9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_steps.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_access_alarm.png b/app/src/main/res/drawable-xxxhdpi/round_access_alarm.png
new file mode 100644
index 0000000..c48ee8e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_access_alarm.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_18.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_24.png
new file mode 100644
index 0000000..ff59ea8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_48.png
new file mode 100644
index 0000000..0345947
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_access_alarm_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_18.png
new file mode 100644
index 0000000..8ea86b0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_24.png
new file mode 100644
index 0000000..b6d80fd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_36.png
new file mode 100644
index 0000000..746b5c3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_48.png
new file mode 100644
index 0000000..193282a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_none_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size.png b/app/src/main/res/drawable-xxxhdpi/round_format_size.png
new file mode 100644
index 0000000..9d5cfae
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_24.png
new file mode 100644
index 0000000..9c5e968
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_36.png
new file mode 100644
index 0000000..a91f885
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_48.png
new file mode 100644
index 0000000..09e6cff
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock.png
new file mode 100644
index 0000000..bb99075
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_18.png
new file mode 100644
index 0000000..e6e2d37
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_24.png
new file mode 100644
index 0000000..5a52683
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_36.png
new file mode 100644
index 0000000..9658371
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_alarm.png b/app/src/main/res/drawable-xxxhdpi/round_library_alarm.png
new file mode 100644
index 0000000..f3d5bd2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_alarm.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_books_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_18.png
new file mode 100644
index 0000000..b79d879
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_books_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_24.png
new file mode 100644
index 0000000..9b335c8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_books_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_36.png
new file mode 100644
index 0000000..5b70223
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_books_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_48.png
new file mode 100644
index 0000000..d7f9fdb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_books_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_music.png b/app/src/main/res/drawable-xxxhdpi/round_library_music.png
new file mode 100644
index 0000000..83072e7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_music.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_music_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_library_music_black_18.png
new file mode 100644
index 0000000..35b9e3e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_music_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_music_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_library_music_black_24.png
new file mode 100644
index 0000000..6058482
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_music_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_music_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_library_music_black_48.png
new file mode 100644
index 0000000..14d8f1f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_music_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_library_steps.png b/app/src/main/res/drawable-xxxhdpi/round_library_steps.png
new file mode 100644
index 0000000..89d7960
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_library_steps.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_steps.png b/app/src/main/res/drawable-xxxhdpi/round_steps.png
new file mode 100644
index 0000000..cdc33c8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_steps.png differ
diff --git a/app/src/main/res/drawable/clear_day_2.png b/app/src/main/res/drawable/clear_day_2.png
new file mode 100644
index 0000000..0bc89de
Binary files /dev/null and b/app/src/main/res/drawable/clear_day_2.png differ
diff --git a/app/src/main/res/drawable/clear_night_2.png b/app/src/main/res/drawable/clear_night_2.png
new file mode 100644
index 0000000..0166c2a
Binary files /dev/null and b/app/src/main/res/drawable/clear_night_2.png differ
diff --git a/app/src/main/res/drawable/cloudy_weather_2.png b/app/src/main/res/drawable/cloudy_weather_2.png
new file mode 100644
index 0000000..8fb9862
Binary files /dev/null and b/app/src/main/res/drawable/cloudy_weather_2.png differ
diff --git a/app/src/main/res/drawable/haze_day_2.png b/app/src/main/res/drawable/haze_day_2.png
new file mode 100644
index 0000000..1817f5f
Binary files /dev/null and b/app/src/main/res/drawable/haze_day_2.png differ
diff --git a/app/src/main/res/drawable/haze_night_2.png b/app/src/main/res/drawable/haze_night_2.png
new file mode 100644
index 0000000..c3b033b
Binary files /dev/null and b/app/src/main/res/drawable/haze_night_2.png differ
diff --git a/app/src/main/res/drawable/haze_weather_2.png b/app/src/main/res/drawable/haze_weather_2.png
new file mode 100644
index 0000000..9379e83
Binary files /dev/null and b/app/src/main/res/drawable/haze_weather_2.png differ
diff --git a/app/src/main/res/drawable/mostly_cloudy_2.png b/app/src/main/res/drawable/mostly_cloudy_2.png
new file mode 100644
index 0000000..7d25354
Binary files /dev/null and b/app/src/main/res/drawable/mostly_cloudy_2.png differ
diff --git a/app/src/main/res/drawable/mostly_cloudy_night_2.png b/app/src/main/res/drawable/mostly_cloudy_night_2.png
new file mode 100644
index 0000000..e3079d2
Binary files /dev/null and b/app/src/main/res/drawable/mostly_cloudy_night_2.png differ
diff --git a/app/src/main/res/drawable/partly_cloudy_2.png b/app/src/main/res/drawable/partly_cloudy_2.png
new file mode 100644
index 0000000..a1c5f11
Binary files /dev/null and b/app/src/main/res/drawable/partly_cloudy_2.png differ
diff --git a/app/src/main/res/drawable/partly_cloudy_night_2.png b/app/src/main/res/drawable/partly_cloudy_night_2.png
new file mode 100644
index 0000000..10c1027
Binary files /dev/null and b/app/src/main/res/drawable/partly_cloudy_night_2.png differ
diff --git a/app/src/main/res/drawable/rain_snow_2.png b/app/src/main/res/drawable/rain_snow_2.png
new file mode 100644
index 0000000..173bc9a
Binary files /dev/null and b/app/src/main/res/drawable/rain_snow_2.png differ
diff --git a/app/src/main/res/drawable/rain_snow_day_2.png b/app/src/main/res/drawable/rain_snow_day_2.png
new file mode 100644
index 0000000..a6f1aa6
Binary files /dev/null and b/app/src/main/res/drawable/rain_snow_day_2.png differ
diff --git a/app/src/main/res/drawable/rain_snow_night_2.png b/app/src/main/res/drawable/rain_snow_night_2.png
new file mode 100644
index 0000000..af1a9d3
Binary files /dev/null and b/app/src/main/res/drawable/rain_snow_night_2.png differ
diff --git a/app/src/main/res/drawable/rainy_day_2.png b/app/src/main/res/drawable/rainy_day_2.png
new file mode 100644
index 0000000..b7d4ffa
Binary files /dev/null and b/app/src/main/res/drawable/rainy_day_2.png differ
diff --git a/app/src/main/res/drawable/rainy_night_2.png b/app/src/main/res/drawable/rainy_night_2.png
new file mode 100644
index 0000000..88fe02b
Binary files /dev/null and b/app/src/main/res/drawable/rainy_night_2.png differ
diff --git a/app/src/main/res/drawable/rainy_weather_2.png b/app/src/main/res/drawable/rainy_weather_2.png
new file mode 100644
index 0000000..173bc9a
Binary files /dev/null and b/app/src/main/res/drawable/rainy_weather_2.png differ
diff --git a/app/src/main/res/drawable/round_access_alarm_24.xml b/app/src/main/res/drawable/round_access_alarm_24.xml
new file mode 100644
index 0000000..1aa074c
--- /dev/null
+++ b/app/src/main/res/drawable/round_access_alarm_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.87,15.25l-3.37,-2L12.5,8.72c0,-0.4 -0.32,-0.72 -0.72,-0.72h-0.06c-0.4,0 -0.72,0.32 -0.72,0.72v4.72c0,0.35 0.18,0.68 0.49,0.86l3.65,2.19c0.34,0.2 0.78,0.1 0.98,-0.24 0.21,-0.35 0.1,-0.8 -0.25,-1zM21.18,5.01L18.1,2.45c-0.42,-0.35 -1.05,-0.3 -1.41,0.13 -0.35,0.42 -0.29,1.05 0.13,1.41l3.07,2.56c0.42,0.35 1.05,0.3 1.41,-0.13 0.36,-0.42 0.3,-1.05 -0.12,-1.41zM4.1,6.55l3.07,-2.56c0.43,-0.36 0.49,-0.99 0.13,-1.41 -0.35,-0.43 -0.98,-0.48 -1.4,-0.13L2.82,5.01c-0.42,0.36 -0.48,0.99 -0.12,1.41 0.35,0.43 0.98,0.48 1.4,0.13zM12,4c-4.97,0 -9,4.03 -9,9s4.03,9 9,9 9,-4.03 9,-9 -4.03,-9 -9,-9zM12,20c-3.86,0 -7,-3.14 -7,-7s3.14,-7 7,-7 7,3.14 7,7 -3.14,7 -7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_filter_none.xml b/app/src/main/res/drawable/round_filter_none.xml
new file mode 100644
index 0000000..9155d39
--- /dev/null
+++ b/app/src/main/res/drawable/round_filter_none.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2,5c-0.55,0 -1,0.45 -1,1v15c0,1.1 0.9,2 2,2h15c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,21c-0.55,0 -1,-0.45 -1,-1L3,6c0,-0.55 -0.45,-1 -1,-1zM21,1L7,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM20,17L8,17c-0.55,0 -1,-0.45 -1,-1L7,4c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v12c0,0.55 -0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_format_size_24.xml b/app/src/main/res/drawable/round_format_size_24.xml
new file mode 100644
index 0000000..90e46a3
--- /dev/null
+++ b/app/src/main/res/drawable/round_format_size_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,5.5c0,0.83 0.67,1.5 1.5,1.5H14v10.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5V7h3.5c0.83,0 1.5,-0.67 1.5,-1.5S21.33,4 20.5,4h-10C9.67,4 9,4.67 9,5.5zM4.5,12H6v5.5c0,0.83 0.67,1.5 1.5,1.5S9,18.33 9,17.5V12h1.5c0.83,0 1.5,-0.67 1.5,-1.5S11.33,9 10.5,9h-6C3.67,9 3,9.67 3,10.5S3.67,12 4.5,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_keyboard_capslock_24.xml b/app/src/main/res/drawable/round_keyboard_capslock_24.xml
new file mode 100644
index 0000000..5ccc102
--- /dev/null
+++ b/app/src/main/res/drawable/round_keyboard_capslock_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,8.41l3.89,3.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L12.71,6.3c-0.39,-0.39 -1.02,-0.39 -1.41,0l-4.6,4.59c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,8.41zM7,18h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H7c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_library_books.xml b/app/src/main/res/drawable/round_library_books.xml
new file mode 100644
index 0000000..e627201
--- /dev/null
+++ b/app/src/main/res/drawable/round_library_books.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,6c-0.55,0 -1,0.45 -1,1v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,20c-0.55,0 -1,-0.45 -1,-1L4,7c0,-0.55 -0.45,-1 -1,-1zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,11h-8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM14,15h-4c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h4c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM18,7h-8c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_library_music_24.xml b/app/src/main/res/drawable/round_library_music_24.xml
new file mode 100644
index 0000000..f25c106
--- /dev/null
+++ b/app/src/main/res/drawable/round_library_music_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM17,7h-2v5.37c0,1.27 -0.9,2.44 -2.16,2.6 -1.69,0.23 -3.11,-1.25 -2.8,-2.95 0.2,-1.1 1.18,-1.95 2.3,-2.02 0.63,-0.04 1.2,0.16 1.66,0.51L14,6c0,-0.55 0.45,-1 1,-1h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM3,6c-0.55,0 -1,0.45 -1,1v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,20c-0.55,0 -1,-0.45 -1,-1L4,7c0,-0.55 -0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/showcase_2.png b/app/src/main/res/drawable/showcase_2.png
new file mode 100644
index 0000000..d0f3638
Binary files /dev/null and b/app/src/main/res/drawable/showcase_2.png differ
diff --git a/app/src/main/res/drawable/snow_day_2.png b/app/src/main/res/drawable/snow_day_2.png
new file mode 100644
index 0000000..ebdf970
Binary files /dev/null and b/app/src/main/res/drawable/snow_day_2.png differ
diff --git a/app/src/main/res/drawable/snow_night_2.png b/app/src/main/res/drawable/snow_night_2.png
new file mode 100644
index 0000000..50ff440
Binary files /dev/null and b/app/src/main/res/drawable/snow_night_2.png differ
diff --git a/app/src/main/res/drawable/snow_weather_2.png b/app/src/main/res/drawable/snow_weather_2.png
new file mode 100644
index 0000000..29ac249
Binary files /dev/null and b/app/src/main/res/drawable/snow_weather_2.png differ
diff --git a/app/src/main/res/drawable/storm_weather_2.png b/app/src/main/res/drawable/storm_weather_2.png
new file mode 100644
index 0000000..6b7050b
Binary files /dev/null and b/app/src/main/res/drawable/storm_weather_2.png differ
diff --git a/app/src/main/res/drawable/storm_weather_day_2.png b/app/src/main/res/drawable/storm_weather_day_2.png
new file mode 100644
index 0000000..d0f3638
Binary files /dev/null and b/app/src/main/res/drawable/storm_weather_day_2.png differ
diff --git a/app/src/main/res/drawable/storm_weather_night_2.png b/app/src/main/res/drawable/storm_weather_night_2.png
new file mode 100644
index 0000000..d0dacc1
Binary files /dev/null and b/app/src/main/res/drawable/storm_weather_night_2.png differ
diff --git a/app/src/main/res/drawable/thunder_day_2.png b/app/src/main/res/drawable/thunder_day_2.png
new file mode 100644
index 0000000..e267850
Binary files /dev/null and b/app/src/main/res/drawable/thunder_day_2.png differ
diff --git a/app/src/main/res/drawable/thunder_night_2.png b/app/src/main/res/drawable/thunder_night_2.png
new file mode 100644
index 0000000..306ebe5
Binary files /dev/null and b/app/src/main/res/drawable/thunder_night_2.png differ
diff --git a/app/src/main/res/drawable/thunder_weather_2.png b/app/src/main/res/drawable/thunder_weather_2.png
new file mode 100644
index 0000000..2bf3ea6
Binary files /dev/null and b/app/src/main/res/drawable/thunder_weather_2.png differ
diff --git a/app/src/main/res/drawable/windy_day_2.png b/app/src/main/res/drawable/windy_day_2.png
new file mode 100644
index 0000000..6e05f30
Binary files /dev/null and b/app/src/main/res/drawable/windy_day_2.png differ
diff --git a/app/src/main/res/drawable/windy_night_2.png b/app/src/main/res/drawable/windy_night_2.png
new file mode 100644
index 0000000..71ca04d
Binary files /dev/null and b/app/src/main/res/drawable/windy_night_2.png differ
diff --git a/app/src/main/res/drawable/windy_weather_2.png b/app/src/main/res/drawable/windy_weather_2.png
new file mode 100644
index 0000000..78e682f
Binary files /dev/null and b/app/src/main/res/drawable/windy_weather_2.png differ
diff --git a/app/src/main/res/font/product_sans.xml b/app/src/main/res/font/product_sans.xml
new file mode 100644
index 0000000..8c58422
--- /dev/null
+++ b/app/src/main/res/font/product_sans.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="400"
+        app:font="@font/product_sans_regular" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="400"
+        app:font="@font/product_sans_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="200"
+        app:font="@font/product_sans_light" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="300"
+        app:font="@font/product_sans_thin" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="700"
+        app:font="@font/product_sans_medium" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="800"
+        app:font="@font/product_sans_bold" />
+    <font
+        app:fontStyle="italic"
+        app:fontWeight="800"
+        app:font="@font/product_sans_bold_italic" />
+    <font
+        app:fontStyle="normal"
+        app:fontWeight="900"
+        app:font="@font/product_sans_black" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/product_sans_black.ttf b/app/src/main/res/font/product_sans_black.ttf
new file mode 100644
index 0000000..060739f
Binary files /dev/null and b/app/src/main/res/font/product_sans_black.ttf differ
diff --git a/app/src/main/res/font/product_sans_bold.ttf b/app/src/main/res/font/product_sans_bold.ttf
new file mode 100755
index 0000000..d847195
Binary files /dev/null and b/app/src/main/res/font/product_sans_bold.ttf differ
diff --git a/app/src/main/res/font/product_sans_bold_italic.ttf b/app/src/main/res/font/product_sans_bold_italic.ttf
new file mode 100755
index 0000000..129d12d
Binary files /dev/null and b/app/src/main/res/font/product_sans_bold_italic.ttf differ
diff --git a/app/src/main/res/font/product_sans_italic.ttf b/app/src/main/res/font/product_sans_italic.ttf
new file mode 100755
index 0000000..5fc56d4
Binary files /dev/null and b/app/src/main/res/font/product_sans_italic.ttf differ
diff --git a/app/src/main/res/font/product_sans_light.ttf b/app/src/main/res/font/product_sans_light.ttf
new file mode 100644
index 0000000..1221e07
Binary files /dev/null and b/app/src/main/res/font/product_sans_light.ttf differ
diff --git a/app/src/main/res/font/product_sans_medium.ttf b/app/src/main/res/font/product_sans_medium.ttf
new file mode 100644
index 0000000..85860e6
Binary files /dev/null and b/app/src/main/res/font/product_sans_medium.ttf differ
diff --git a/app/src/main/res/font/product_sans_regular.ttf b/app/src/main/res/font/product_sans_regular.ttf
new file mode 100755
index 0000000..c0442ee
Binary files /dev/null and b/app/src/main/res/font/product_sans_regular.ttf differ
diff --git a/app/src/main/res/font/product_sans_thin.ttf b/app/src/main/res/font/product_sans_thin.ttf
new file mode 100644
index 0000000..9d08714
Binary files /dev/null and b/app/src/main/res/font/product_sans_thin.ttf differ
diff --git a/app/src/main/res/layout/activity_choose_application.xml b/app/src/main/res/layout/activity_choose_application.xml
index 04f72a1..261862e 100644
--- a/app/src/main/res/layout/activity_choose_application.xml
+++ b/app/src/main/res/layout/activity_choose_application.xml
@@ -84,6 +84,7 @@
                     android:textColorHint="@color/colorSecondaryText"
                     android:textAlignment="viewStart"
                     android:id="@+id/search"
+                    android:fontFamily="@font/product_sans"
                     android:gravity="center_vertical|start"
                     android:hint="@string/search"
                     android:text="@={viewModel.searchInput}"
diff --git a/app/src/main/res/layout/activity_custom_date.xml b/app/src/main/res/layout/activity_custom_date.xml
index 1d8cc56..4129067 100644
--- a/app/src/main/res/layout/activity_custom_date.xml
+++ b/app/src/main/res/layout/activity_custom_date.xml
@@ -5,6 +5,9 @@
         <variable
             name="viewModel"
             type="com.tommasoberlose.anotherwidget.ui.viewmodels.CustomDateViewModel" />
+        <variable
+            name="isdCapitalizeEnabled"
+            type="Boolean" />
     </data>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -87,6 +90,7 @@
                         android:maxLines="1"
                         android:singleLine="true"
                         android:hint="@string/settings_date_format_title"
+                        android:fontFamily="@font/product_sans"
                         android:text="@={viewModel.dateInput}"
                         android:autofillHints=""
                         tools:ignore="TextFields" />
@@ -112,24 +116,45 @@
             app:cardElevation="2dp"
             app:cardCornerRadius="0dp"
             app:cardBackgroundColor="@color/colorPrimary">
-            <androidx.appcompat.widget.AppCompatTextView
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:id="@+id/date_format_value"
-                android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:letterSpacing="0"
-                android:textColor="@color/colorPrimaryText"
-                android:textSize="20sp"
-                app:textAllCaps="false"
-                android:gravity="center"
-                android:maxLines="1"
-                android:lines="1"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:layout_marginTop="8dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="16dp" />
+                android:layout_height="wrap_content">
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:id="@+id/date_format_value"
+                    android:textAppearance="@style/AnotherWidget.Settings.Title"
+                    android:letterSpacing="0"
+                    android:textColor="@color/colorPrimaryText"
+                    android:textSize="20sp"
+                    app:textAllCaps="false"
+                    android:gravity="center_vertical|start"
+                    android:paddingEnd="32dp"
+                    android:layout_centerVertical="true"
+                    android:textAlignment="viewStart"
+                    android:maxLines="1"
+                    android:lines="1"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginLeft="32dp"
+                    android:layout_marginRight="32dp"
+                    android:layout_marginBottom="16dp" />
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:padding="5dp"
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/round_keyboard_capslock"
+                    android:layout_alignParentEnd="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    app:tint="@color/colorPrimaryText"
+                    android:layout_marginEnd="20dp"
+                    android:alpha="@{isdCapitalizeEnabled ? 1f : 0.3f, default=0.3}"
+                    android:id="@+id/action_capitalize" />
+            </RelativeLayout>
         </com.google.android.material.card.MaterialCardView>
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_custom_location.xml b/app/src/main/res/layout/activity_custom_location.xml
index 6127dc5..ecd93a8 100644
--- a/app/src/main/res/layout/activity_custom_location.xml
+++ b/app/src/main/res/layout/activity_custom_location.xml
@@ -70,6 +70,7 @@
                     android:paddingRight="16dp"
                     android:inputType="textCapWords"
                     android:id="@+id/location"
+                    android:fontFamily="@font/product_sans"
                     android:gravity="center_vertical|start"
                     android:hint="@string/search"
                     android:textAlignment="viewStart"
diff --git a/app/src/main/res/layout/activity_support_dev.xml b/app/src/main/res/layout/activity_support_dev.xml
index 1505075..721447e 100644
--- a/app/src/main/res/layout/activity_support_dev.xml
+++ b/app/src/main/res/layout/activity_support_dev.xml
@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:paddingBottom="20dp"
                     android:textColor="@color/colorSecondaryText"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
                     android:textSize="16sp"
                     android:gravity="center"
                     android:text="@string/support_dev_subtitle" />
diff --git a/app/src/main/res/layout/activity_weather_provider.xml b/app/src/main/res/layout/activity_weather_provider.xml
index ddae682..a9494b7 100644
--- a/app/src/main/res/layout/activity_weather_provider.xml
+++ b/app/src/main/res/layout/activity_weather_provider.xml
@@ -80,6 +80,7 @@
                     app:boxStrokeColor="@color/colorAccent"
                     app:hintTextColor="@color/colorAccent"
                     android:hint="@string/api_key_hint"
+                    android:fontFamily="@font/product_sans"
                     android:textAlignment="viewStart"
                     android:textDirection="locale"
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
@@ -88,6 +89,7 @@
                         android:layout_height="wrap_content"
                         android:textAlignment="viewStart"
                         android:textDirection="locale"
+                        android:fontFamily="@font/product_sans"
                         android:gravity="center_vertical|start" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_dialog.xml b/app/src/main/res/layout/bottom_sheet_dialog.xml
index a6fe0ab..d04ae80 100644
--- a/app/src/main/res/layout/bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_dialog.xml
@@ -16,7 +16,7 @@
         android:paddingBottom="16dp"
         android:orientation="vertical">
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Title"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
@@ -29,7 +29,7 @@
             android:text="Titolo"
             android:textColor="@color/colorPrimaryText"/>
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bottom_sheet_menu.xml b/app/src/main/res/layout/bottom_sheet_menu.xml
index b34fe5d..f0f9151 100644
--- a/app/src/main/res/layout/bottom_sheet_menu.xml
+++ b/app/src/main/res/layout/bottom_sheet_menu.xml
@@ -11,7 +11,7 @@
         android:visibility="gone"
         android:orientation="vertical">
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Title"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
@@ -22,12 +22,11 @@
             android:paddingBottom="8dp"
             android:paddingLeft="32dp"
             android:paddingRight="32dp"
-            android:textSize="16sp"
             android:id="@+id/header_text"
             android:text=""
             android:textColor="@color/colorPrimaryText"/>
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
@@ -38,7 +37,6 @@
             android:paddingBottom="8dp"
             android:paddingLeft="32dp"
             android:paddingRight="32dp"
-            android:textSize="15sp"
             android:id="@+id/warning_text"
             android:text=""
             android:textColor="@color/warningColorText"/>
diff --git a/app/src/main/res/layout/bottom_sheet_menu_divider.xml b/app/src/main/res/layout/bottom_sheet_menu_divider.xml
index 2a9edbf..63cf5af 100644
--- a/app/src/main/res/layout/bottom_sheet_menu_divider.xml
+++ b/app/src/main/res/layout/bottom_sheet_menu_divider.xml
@@ -21,6 +21,7 @@
             android:duplicateParentState="true"
             android:id="@+id/label"
             android:textSize="15sp"
+            android:textStyle="bold"
             android:textColor="@color/colorAccent"
             android:textAppearance="@style/TextAppearance.AppCompat.Button"
             app:textAllCaps="false" />
diff --git a/app/src/main/res/layout/bottom_sheet_menu_hor.xml b/app/src/main/res/layout/bottom_sheet_menu_hor.xml
index 893ccd9..7751b2e 100644
--- a/app/src/main/res/layout/bottom_sheet_menu_hor.xml
+++ b/app/src/main/res/layout/bottom_sheet_menu_hor.xml
@@ -19,7 +19,7 @@
         android:visibility="gone"
         android:orientation="vertical">
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Title"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
@@ -28,7 +28,6 @@
             android:paddingBottom="8dp"
             android:paddingLeft="32dp"
             android:paddingRight="32dp"
-            android:textSize="16sp"
             android:gravity="start"
             android:textAlignment="viewStart"
             android:id="@+id/header_text"
@@ -49,7 +48,7 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
@@ -58,7 +57,6 @@
             android:paddingBottom="16dp"
             android:paddingLeft="32dp"
             android:paddingRight="32dp"
-            android:textSize="15sp"
             android:gravity="start"
             android:textAlignment="viewStart"
             android:id="@+id/text_alpha"
diff --git a/app/src/main/res/layout/bottom_sheet_menu_item.xml b/app/src/main/res/layout/bottom_sheet_menu_item.xml
index 0384682..786ba3f 100644
--- a/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -25,9 +25,10 @@
             android:paddingBottom="12dp"
             android:duplicateParentState="true"
             android:id="@+id/label"
-            android:textSize="15sp"
+            android:textSize="16sp"
+            android:textStyle="bold"
             android:textColor="@drawable/menu_text_color"
-            android:textAppearance="@style/TextAppearance.AppCompat.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Subtitle"
             app:textAllCaps="false" />
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="24dp"
diff --git a/app/src/main/res/layout/custom_date_example_item.xml b/app/src/main/res/layout/custom_date_example_item.xml
index 3e9320b..b83fd34 100644
--- a/app/src/main/res/layout/custom_date_example_item.xml
+++ b/app/src/main/res/layout/custom_date_example_item.xml
@@ -14,7 +14,7 @@
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:textColor="@color/colorPrimaryText"
-        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+        android:textAppearance="@style/AnotherWidget.Settings.Title"
         app:textAllCaps="false"
         android:gravity="start"
         android:textSize="18sp"
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:gravity="start"
         android:textColor="@color/colorSecondaryText"
-        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+        android:textAppearance="@style/AnotherWidget.Settings.Title"
         app:textAllCaps="false"
         android:textSize="18sp"
         android:textAlignment="viewStart"
diff --git a/app/src/main/res/layout/custom_notes_dialog_layout.xml b/app/src/main/res/layout/custom_notes_dialog_layout.xml
index 5007c57..74f4a27 100644
--- a/app/src/main/res/layout/custom_notes_dialog_layout.xml
+++ b/app/src/main/res/layout/custom_notes_dialog_layout.xml
@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
     <androidx.appcompat.widget.AppCompatTextView
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+        android:textAppearance="@style/AnotherWidget.Settings.Title"
         app:textAllCaps="false"
         android:letterSpacing="0"
         android:layout_width="match_parent"
@@ -29,7 +29,7 @@
         android:background="@color/disabledButtonBackground" />
     <EditText
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="64dp"
         android:background="@color/colorPrimaryDark"
         android:paddingStart="16dp"
         android:paddingEnd="56dp"
@@ -37,13 +37,12 @@
         android:layout_marginStart="24dp"
         android:layout_marginTop="8dp"
         android:id="@+id/notes"
-        android:gravity="center_vertical|start"
+        android:gravity="center"
         android:textDirection="locale"
-        android:textAlignment="viewStart"
-        android:lines="1"
-        android:inputType="textCapSentences"
-        android:maxLines="1"
-        android:singleLine="true"
+        android:fontFamily="@font/product_sans"
+        android:inputType="textCapSentences|textMultiLine"
+        android:maxLines="2"
+        android:lines="2"
         android:autofillHints=""
         tools:ignore="TextFields" />
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_app_main.xml b/app/src/main/res/layout/fragment_app_main.xml
index 08df1fe..695783f 100644
--- a/app/src/main/res/layout/fragment_app_main.xml
+++ b/app/src/main/res/layout/fragment_app_main.xml
@@ -45,6 +45,7 @@
                         android:layout_height="match_parent"
                         android:text="@string/app_name"
                         android:gravity="center"
+                        android:textStyle="bold"
                         android:layout_marginBottom="1dp"
                         style="@style/AnotherWidget.Main.Title"/>
                 </LinearLayout>
@@ -76,8 +77,6 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="-80dp"
-                    android:layout_marginStart="-80dp"
                     android:scaleType="fitStart"
                     android:adjustViewBounds="true"
                     android:id="@+id/widget_bg" />
diff --git a/app/src/main/res/layout/fragment_calendar_settings.xml b/app/src/main/res/layout/fragment_calendar_settings.xml
index ff0536e..43abe08 100644
--- a/app/src/main/res/layout/fragment_calendar_settings.xml
+++ b/app/src/main/res/layout/fragment_calendar_settings.xml
@@ -83,20 +83,6 @@
                     android:id="@+id/show_events_switch"
                     android:buttonTint="@color/colorAccent" />
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/disabledButtonBackground" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/colorPrimary" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -214,43 +200,6 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp"
-                    android:paddingBottom="16dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_show_multiple_events"
-                    android:orientation="horizontal">
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:padding="12dp"
-                        android:src="@drawable/round_code"
-                        android:tint="@color/colorPrimaryText"/>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="8dp"
-                        android:paddingRight="8dp"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_show_multiple_events_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/show_multiple_events_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -336,13 +285,13 @@
                     android:focusable="true"
                     android:background="?android:attr/selectableItemBackground"
                     android:gravity="center_vertical"
-                    android:id="@+id/action_date_format"
+                    android:id="@+id/action_widget_update_frequency"
                     android:orientation="horizontal">
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="10dp"
-                        android:src="@drawable/round_text_format"
+                        android:padding="12dp"
+                        android:src="@drawable/round_update"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -354,11 +303,11 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_date_format_title"/>
+                            android:text="@string/settings_widget_update_frequency_title"/>
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:id="@+id/date_format_label"
+                            android:id="@+id/widget_update_frequency_label"
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
@@ -399,6 +348,43 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_show_multiple_events"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_code"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_show_multiple_events_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/show_multiple_events_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_clock_settings.xml b/app/src/main/res/layout/fragment_clock_settings.xml
index 93e78a6..1ed40a2 100644
--- a/app/src/main/res/layout/fragment_clock_settings.xml
+++ b/app/src/main/res/layout/fragment_clock_settings.xml
@@ -48,7 +48,7 @@
                         android:text="@string/clock_warning"
                         android:textColor="@color/colorPrimaryText"
                         android:letterSpacing="0"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                        android:textAppearance="@style/AnotherWidget.Settings.Title"
                         app:textAllCaps="false" />
                     <com.google.android.material.button.MaterialButton
                         android:layout_width="wrap_content"
@@ -106,20 +106,6 @@
                     android:id="@+id/show_clock_switch"
                     android:buttonTint="@color/colorAccent" />
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/disabledButtonBackground" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/colorPrimary" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -163,6 +149,43 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_clock_text_color"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_palette"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_clock_text_color_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/clock_text_color_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -201,43 +224,6 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp"
-                    android:paddingBottom="16dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_clock_text_color"
-                    android:orientation="horizontal">
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:padding="12dp"
-                        android:src="@drawable/round_palette"
-                        android:tint="@color/colorPrimaryText"/>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="8dp"
-                        android:paddingRight="8dp"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_clock_text_color_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/clock_text_color_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -330,6 +316,7 @@
                     android:text="@string/clock_warning"
                     android:textColor="@color/colorPrimaryText"
                     android:letterSpacing="0"
+                    android:fontFamily="@font/product_sans"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     app:textAllCaps="false" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
index 5ca7b40..ff70941 100644
--- a/app/src/main/res/layout/fragment_general_settings.xml
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -55,43 +55,6 @@
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:background="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:id="@+id/action_second_text_size"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:src="@drawable/round_text_fields"
-                    android:tint="@color/colorPrimaryText"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/title_second_text_size"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/second_text_size_label"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -129,6 +92,80 @@
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_second_text_size"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_text_fields"
+                    android:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/title_second_text_size"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/second_text_size_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_secondary_font_color"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_palette"
+                    android:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/settings_secondary_font_color_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/secondary_font_color_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -166,6 +203,43 @@
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_date_format"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="10dp"
+                    android:src="@drawable/round_text_format"
+                    android:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/settings_date_format_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/date_format_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -220,7 +294,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:padding="12dp"
-                    android:src="@drawable/round_crop_3_2"
+                    android:src="@drawable/round_aspect_ratio"
                     android:tint="@color/colorPrimaryText"/>
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/fragment_glance_settings.xml b/app/src/main/res/layout/fragment_glance_settings.xml
index f910ada..4b6474b 100644
--- a/app/src/main/res/layout/fragment_glance_settings.xml
+++ b/app/src/main/res/layout/fragment_glance_settings.xml
@@ -38,8 +38,8 @@
                 <ImageView
                     android:layout_width="48dp"
                     android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:src="@drawable/round_hourglass_empty"
+                    android:padding="11dp"
+                    android:src="@drawable/round_widgets"
                     android:tint="@color/colorPrimaryText"/>
                 <LinearLayout
                     android:layout_width="0dp"
@@ -68,19 +68,6 @@
                     android:id="@+id/show_glance_switch"
                     android:buttonTint="@color/colorAccent" />
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/disabledButtonBackground" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/colorPrimary" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -156,7 +143,7 @@
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="12dp"
+                        android:padding="11dp"
                         android:src="@drawable/round_alarm"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
@@ -185,6 +172,59 @@
                             android:textColor="@color/warningColorText" />
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_show_steps"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="10dp"
+                        android:src="@drawable/round_steps"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_daily_steps_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/show_steps_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                        <com.google.android.material.button.MaterialButton
+                            android:layout_width="wrap_content"
+                            android:layout_height="36dp"
+                            style="@style/Widget.MaterialComponents.Button.TextButton"
+                            android:letterSpacing="0"
+                            android:textAllCaps="false"
+                            android:clickable="true"
+                            android:layout_marginStart="-8dp"
+                            android:layout_marginBottom="-8dp"
+                            android:paddingBottom="0dp"
+                            android:paddingTop="0dp"
+                            android:focusable="true"
+                            android:visibility="gone"
+                            android:id="@+id/fitness_permission_alert"
+                            android:textColor="@color/errorColorText"
+                            android:text="@string/action_grant_permission"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -239,7 +279,7 @@
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="12dp"
+                        android:padding="10dp"
                         android:src="@drawable/round_notes"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
@@ -276,7 +316,7 @@
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="12dp"
+                        android:padding="10dp"
                         android:src="@drawable/round_flip_to_front"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index b5105ab..a37adbd 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -45,7 +45,7 @@
                     android:text="@string/settings_title"
                     android:textColor="@color/colorPrimaryText"
                     android:gravity="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                    android:textAppearance="@style/AnotherWidget.Main.Title"
                     tools:ignore="RelativeOverlap" />
             </RelativeLayout>
         </com.google.android.material.card.MaterialCardView>
@@ -122,8 +122,8 @@
                     <ImageView
                         android:layout_width="48dp"
                         android:layout_height="48dp"
-                        android:padding="13dp"
-                        android:src="@drawable/round_aspect_ratio"
+                        android:padding="11dp"
+                        android:src="@drawable/round_compare"
                         android:tint="@color/colorPrimaryText"/>
                     <LinearLayout
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_weather_settings.xml b/app/src/main/res/layout/fragment_weather_settings.xml
index 86dbae2..694f74e 100644
--- a/app/src/main/res/layout/fragment_weather_settings.xml
+++ b/app/src/main/res/layout/fragment_weather_settings.xml
@@ -48,7 +48,7 @@
                         android:text="@string/weather_warning"
                         android:textColor="@color/colorPrimaryText"
                         android:letterSpacing="0"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                        android:textAppearance="@style/AnotherWidget.Settings.Title"
                         app:textAllCaps="false" />
                     <com.google.android.material.button.MaterialButton
                         android:layout_width="wrap_content"
@@ -106,20 +106,6 @@
                     android:id="@+id/show_weather_switch"
                     android:buttonTint="@color/colorAccent" />
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/disabledButtonBackground" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:background="@color/colorPrimary" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -300,6 +286,43 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_weather_icon_pack"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_cloud_queue"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_weather_icon_pack_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/label_weather_icon_pack"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/glance_provider_item.xml b/app/src/main/res/layout/glance_provider_item.xml
index 92ab4d8..62e0a54 100644
--- a/app/src/main/res/layout/glance_provider_item.xml
+++ b/app/src/main/res/layout/glance_provider_item.xml
@@ -39,22 +39,6 @@
                 android:textSize="16sp"
                 style="@style/AnotherWidget.Settings.Title"
                 android:text="@string/settings_show_music_title"/>
-            <com.google.android.material.button.MaterialButton
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:letterSpacing="0"
-                android:textAllCaps="false"
-                android:clickable="true"
-                android:layout_marginStart="-8dp"
-                android:layout_marginBottom="-8dp"
-                android:paddingBottom="0dp"
-                android:paddingTop="0dp"
-                android:focusable="true"
-                android:visibility="gone"
-                android:id="@+id/button"
-                android:textColor="@color/errorColorText"
-                android:text="@string/action_grant_permission"/>
         </LinearLayout>
         <ImageView
             android:layout_width="48dp"
diff --git a/app/src/main/res/layout/glance_provider_sort_bottom_menu.xml b/app/src/main/res/layout/glance_provider_sort_bottom_menu.xml
index b7a0bae..77039db 100644
--- a/app/src/main/res/layout/glance_provider_sort_bottom_menu.xml
+++ b/app/src/main/res/layout/glance_provider_sort_bottom_menu.xml
@@ -10,7 +10,7 @@
         android:id="@+id/header"
         android:orientation="vertical">
         <androidx.appcompat.widget.AppCompatTextView
-            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            android:textAppearance="@style/AnotherWidget.Settings.Title"
             app:textAllCaps="false"
             android:letterSpacing="0"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/inapp_product_layout.xml b/app/src/main/res/layout/inapp_product_layout.xml
index 845193e..8a1b45f 100644
--- a/app/src/main/res/layout/inapp_product_layout.xml
+++ b/app/src/main/res/layout/inapp_product_layout.xml
@@ -26,7 +26,7 @@
         android:textSize="16sp"
         android:textColor="@color/colorPrimaryText"
         android:letterSpacing="0"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Button"/>
+        android:textAppearance="@style/AnotherWidget.Settings.Title"/>
 
     <com.google.android.material.card.MaterialCardView
         android:layout_width="wrap_content"
@@ -42,6 +42,7 @@
             android:paddingRight="12dp"
             android:gravity="center"
             android:text="12.00$"
+            android:fontFamily="@font/product_sans"
             android:textColor="@color/colorAccent"
             android:id="@+id/product_price"
             android:textSize="14sp"/>
diff --git a/app/src/main/res/layout/the_widget.xml b/app/src/main/res/layout/the_widget.xml
index ecca95f..6095b48 100644
--- a/app/src/main/res/layout/the_widget.xml
+++ b/app/src/main/res/layout/the_widget.xml
@@ -43,7 +43,7 @@
                 android:layout_height="20dp"
                 android:id="@+id/empty_weather_icon"
                 android:layout_marginStart="4dp"
-                android:layout_marginEnd="4dp"/>
+                android:layout_marginEnd="8dp"/>
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -156,9 +156,9 @@
                 <TextView
                     android:id="@+id/next_event_date"
                     android:layout_width="wrap_content"
+                    android:ellipsize="end"
                     android:lines="1"
                     android:maxLines="1"
-                    android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:layout_height="wrap_content"
                     style="@style/AnotherWidget.Subtitle" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4e5d99f..dbeaedb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -227,4 +227,18 @@
 	<string name="settings_low_battery_level_title">Battery level</string>
 	<string name="settings_daily_steps_title">Daily steps</string>
 	<string name="battery_low_warning">Low battery level</string>
+	<string name="settings_request_fitness_access">We need a few permissions to get your daily steps from Google Fit.</string>
+	<string name="settings_ampm_indicator_title">Show AM/PM Indicator</string>
+	<string name="daily_steps_counter">%d steps today</string>
+	<string name="settings_secondary_font_color_title">Second row text color</string>
+	<string name="soon">soon</string>
+	<string name="now">now</string>
+	<string name="settings_widget_update_frequency_title">Time left update frequency</string>
+	<string name="settings_widget_update_frequency_subtitle">High frequency causes more battery consume</string>
+	<string name="settings_widget_update_frequency_low">Low</string>
+	<string name="settings_widget_update_frequency_default">Default</string>
+	<string name="settings_widget_update_frequency_high">High</string>
+	<string name="settings_weather_icon_pack_title">Icon pack</string>
+	<string name="settings_weather_icon_pack_default">Default</string>
+	<string name="settings_weather_icon_pack_minimal">Minimal</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8e50cea..09229d4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -207,4 +207,18 @@
     <string name="settings_low_battery_level_title">Battery level</string>
     <string name="settings_daily_steps_title">Daily steps</string>
     <string name="battery_low_warning">Low battery level</string>
+    <string name="settings_request_fitness_access">We need a few permissions to get your daily steps from Google Fit.</string>
+    <string name="settings_ampm_indicator_title">Show AM/PM Indicator</string>
+    <string name="daily_steps_counter">%d steps today</string>
+    <string name="settings_secondary_font_color_title">Second row text color</string>
+    <string name="soon">soon</string>
+    <string name="now">now</string>
+    <string name="settings_widget_update_frequency_title">Time left update frequency</string>
+    <string name="settings_widget_update_frequency_subtitle">High frequency causes more battery consume</string>
+    <string name="settings_widget_update_frequency_low">Low</string>
+    <string name="settings_widget_update_frequency_default">Default</string>
+    <string name="settings_widget_update_frequency_high">High</string>
+    <string name="settings_weather_icon_pack_title">Icon pack</string>
+    <string name="settings_weather_icon_pack_default">Default</string>
+    <string name="settings_weather_icon_pack_minimal">Minimal</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 12c3dd4..3985f48 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -98,7 +98,8 @@
     <string name="settings_second_row_info_subtitle_0">Orario evento</string>
     <string name="settings_second_row_info_subtitle_1">Location evento</string>
     <string name="settings_second_row_info_subtitle_2">Mostra orario prossimo allarme</string>
-    <string name="settings_font_color_title">Colore Testo</string>
+    <string name="settings_font_color_title">Colore testo prima riga</string>
+    <string name="settings_secondary_font_color_title">Colore testo seconda riga</string>
     <string name="title_main_text_size">Dimensione Testo Prima Riga</string>
     <string name="title_second_text_size">Dimensione Testo Seconda Riga</string>
     <string name="settings_clock_title">Orologio</string>
@@ -206,4 +207,17 @@
     <string name="settings_low_battery_level_title">Livello batteria</string>
     <string name="settings_daily_steps_title">Passi di oggi</string>
     <string name="battery_low_warning">Livello batteria basso</string>
+    <string name="settings_request_fitness_access">Abbiamo bisogno di alcuni permessi per leggere i tuoi passi di oggi da Google Fit.</string>
+    <string name="settings_ampm_indicator_title">Mostra AM/PM</string>
+    <string name="daily_steps_counter">%d passi</string>
+    <string name="soon">a breve</string>
+    <string name="now">ora</string>
+    <string name="settings_widget_update_frequency_title">Frequenza aggiornamento tempo rimanente</string>
+    <string name="settings_widget_update_frequency_subtitle">Maggiore è la frequenza maggiore sarà il consumo di batteria</string>
+    <string name="settings_widget_update_frequency_low">Bassa</string>
+    <string name="settings_widget_update_frequency_default">Default</string>
+    <string name="settings_widget_update_frequency_high">Alta</string>
+    <string name="settings_weather_icon_pack_title">Icon pack</string>
+    <string name="settings_weather_icon_pack_default">Default</string>
+    <string name="settings_weather_icon_pack_minimal">Minimal</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea0b7bd..cd9f5fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,7 +104,8 @@
     <string name="settings_second_row_info_subtitle_1">Event address</string>
     <string name="settings_second_row_info_subtitle_0">Event time</string>
     <string name="settings_second_row_info_subtitle_2">Show next alarm time</string>
-    <string name="settings_font_color_title">Text color</string>
+    <string name="settings_font_color_title">First row text color</string>
+    <string name="settings_secondary_font_color_title">Second row text color</string>
     <string name="settings_background_color_title">Background color</string>
     <string name="title_main_text_size">First row text size</string>
     <string name="title_second_text_size">Second row text size</string>
@@ -207,6 +208,7 @@
     <string name="settings_show_music_disabled_subtitle">Hide playing song info</string>
     <string name="settings_song_info_format_title">Song info format</string>
     <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
+    <string name="settings_request_fitness_access">We need a few permissions to get your daily steps from Google Fit.</string>
     <string name="title_googlefit" translatable="false">Google Fit</string>
     <string name="settings_title_integrations">Integrations</string>
     <string name="label_count_installed_integrations">%d installed integrations</string>
@@ -220,4 +222,16 @@
     <string name="settings_daily_steps_title">Daily steps</string>
     <string name="battery_low_warning">Low battery level</string>
     <string name="settings_ampm_indicator_title">Show AM/PM Indicator</string>
+    <string name="daily_steps_counter">%d steps so far</string>
+    <string name="soon">soon</string>
+    <string name="now">now</string>
+    <string name="settings_widget_update_frequency_title">Time left update frequency</string>
+    <string name="settings_widget_update_frequency_subtitle">High frequency causes more battery consume</string>
+    <string name="settings_widget_update_frequency_low">Low</string>
+    <string name="settings_widget_update_frequency_default">Default</string>
+    <string name="settings_widget_update_frequency_high">High</string>
+    <string name="settings_weather_icon_pack_title">Icon pack</string>
+    <string name="settings_weather_icon_pack_default">Default</string>
+    <string name="settings_weather_icon_pack_minimal">Minimal</string>
+    <string name="action_capitalize_the_date">Capitalize the date</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 243ad95..5a6e555 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,15 +19,18 @@
 
     <style name="AnotherWidget.Main.Title" parent="TextAppearance.AppCompat.Button">
         <item name="android:textColor">@color/colorPrimaryText</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">20sp</item>
         <item name="textAllCaps">false</item>
         <item name="android:gravity">center</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Main.Subtitle" parent="TextAppearance.AppCompat.Small">
         <item name="android:textColor">@color/colorSecondaryText</item>
         <item name="android:textSize">16sp</item>
         <item name="android:gravity">center</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Main.Description" parent="TextAppearance.AppCompat.Small">
@@ -35,6 +38,7 @@
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
         <item name="android:alpha">0.6</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Main.Button" parent="TextAppearance.AppCompat.Button">
@@ -45,6 +49,7 @@
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Main.Button.Dark" parent="TextAppearance.AppCompat.Button">
@@ -56,6 +61,7 @@
         <item name="android:focusable">true</item>
         <item name="android:textSize">12sp</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Main.Button.TabBar" parent="TextAppearance.AppCompat.Button">
@@ -63,23 +69,27 @@
         <item name="android:gravity">center</item>
         <item name="android:padding">8dp</item>
         <item name="android:textSize">12sp</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Settings.Header" parent="TextAppearance.AppCompat.Medium">
         <item name="android:textColor">@color/colorPrimaryText</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Settings.Title" parent="TextAppearance.AppCompat.Medium">
         <item name="android:textColor">@color/colorPrimaryText</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">17sp</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Settings.Subtitle" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">15sp</item>
         <item name="android:textColor">@color/colorSecondaryText</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Title" parent="TextAppearance.AppCompat.Medium">
@@ -88,12 +98,14 @@
         <item name="android:textSize">24sp</item>
         <item name="android:shadowRadius">5</item>
         <item name="android:gravity">center</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Subtitle" parent="TextAppearance.AppCompat.Small">
         <item name="android:textColor">@color/colorAccent</item>
         <item name="android:textSize">16sp</item>
         <item name="android:gravity">center_horizontal</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="AnotherWidget.Date" parent="AnotherWidget.Subtitle">
@@ -101,6 +113,7 @@
 
     <style name="AnotherWidget.Date.Big" parent="AnotherWidget.Title">
         <item name="android:textSize">22sp</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
@@ -113,6 +126,7 @@
         <item name="android:windowIsFloating">false</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="android:fontFamily">@font/product_sans</item>
     </style>
 
     <style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog" />
diff --git a/googlefit/build.gradle b/googlefit/build.gradle
index 4277a20..fc2e6a4 100644
--- a/googlefit/build.gradle
+++ b/googlefit/build.gradle
@@ -1,9 +1,5 @@
 apply plugin: 'com.android.dynamic-feature'
 
-def apiKeyPropertiesFile = rootProject.file("apikey.properties")
-def apiKeyProperties = new Properties()
-apiKeyProperties.load(new FileInputStream(apiKeyPropertiesFile))
-
 android {
     compileSdkVersion 29
 
@@ -12,8 +8,6 @@ android {
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-
-        manifestPlaceholders = [ "AWARENESS_API_KEY": apiKeyProperties['AWARENESS_API_KEY']]
     }
 
     compileOptions {
diff --git a/googlefit/src/main/AndroidManifest.xml b/googlefit/src/main/AndroidManifest.xml
index 726d10f..1cd898e 100644
--- a/googlefit/src/main/AndroidManifest.xml
+++ b/googlefit/src/main/AndroidManifest.xml
@@ -11,10 +11,6 @@
             <dist:on-demand />
         </dist:delivery>
         <dist:fusing dist:include="true" />
-
-        <meta-data
-            android:name="com.google.android.awareness.API_KEY"
-            android:value="${AWARENESS_API_KEY}"/>
     </dist:module>
 </manifest>
 
diff --git a/settings.gradle b/settings.gradle
index 25fe3e0..9ab0d5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,2 @@
 rootProject.name='Another Widget'
 include ':app'
-include ':tasksintegration'
-include ':googlefit'
diff --git a/tasksintegration/.gitignore b/tasksintegration/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/tasksintegration/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/tasksintegration/build.gradle b/tasksintegration/build.gradle
deleted file mode 100644
index 1d4d466..0000000
--- a/tasksintegration/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-apply plugin: 'com.android.dynamic-feature'
-
-android {
-    compileSdkVersion 29
-    
-
-    defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
-
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':app')
-}
diff --git a/tasksintegration/build/generated/source/buildConfig/debug/com/tommasoberlose/tasksintegration/BuildConfig.java b/tasksintegration/build/generated/source/buildConfig/debug/com/tommasoberlose/tasksintegration/BuildConfig.java
deleted file mode 100644
index f386ca9..0000000
--- a/tasksintegration/build/generated/source/buildConfig/debug/com/tommasoberlose/tasksintegration/BuildConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.tommasoberlose.tasksintegration;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String APPLICATION_ID = "com.tommasoberlose.tasksintegration";
-  public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}
diff --git a/tasksintegration/build/intermediates/aapt_proguard_file/debug/aapt_rules.txt b/tasksintegration/build/intermediates/aapt_proguard_file/debug/aapt_rules.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/tasksintegration/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/tasksintegration/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/tasksintegration/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/apk_list/debug/apk-list.gson b/tasksintegration/build/intermediates/apk_list/debug/apk-list.gson
deleted file mode 100644
index cd8ec5d..0000000
--- a/tasksintegration/build/intermediates/apk_list/debug/apk-list.gson
+++ /dev/null
@@ -1 +0,0 @@
-[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""}]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
deleted file mode 100644
index a1bc942..0000000
--- a/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    featureSplit="tasksintegration"
-    package="com.tommasoberlose.anotherwidget"
-    android:versionCode="83"
-    android:versionName="2.0.6" >
-
-    <uses-sdk
-        android:minSdkVersion="23"
-        android:targetSdkVersion="29" />
-
-    <dist:module
-        dist:instant="false"
-        dist:title="@string/title_tasksintegration" >
-        <dist:delivery>
-            <dist:on-demand />
-        </dist:delivery>
-
-        <dist:fusing dist:include="true" />
-    </dist:module>
-
-</manifest>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json b/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json
deleted file mode 100644
index d894a15..0000000
--- a/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"23"}}]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/compatible_screen_manifest/debug/out/output.json b/tasksintegration/build/intermediates/compatible_screen_manifest/debug/out/output.json
deleted file mode 100644
index 0637a08..0000000
--- a/tasksintegration/build/intermediates/compatible_screen_manifest/debug/out/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/tasksintegration/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
deleted file mode 100644
index 4f2203e..0000000
Binary files a/tasksintegration/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ
diff --git a/tasksintegration/build/intermediates/dex_archive_input_jar_hashes/debug/out b/tasksintegration/build/intermediates/dex_archive_input_jar_hashes/debug/out
deleted file mode 100644
index 2398c96..0000000
Binary files a/tasksintegration/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ
diff --git a/tasksintegration/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/tasksintegration/build/intermediates/incremental/debug-mergeJavaRes/merge-state
deleted file mode 100644
index d5ff387..0000000
Binary files a/tasksintegration/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ
diff --git a/tasksintegration/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/tasksintegration/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
deleted file mode 100644
index 1d8b5d1..0000000
Binary files a/tasksintegration/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and /dev/null differ
diff --git a/tasksintegration/build/intermediates/incremental/mergeDebugAssets/merger.xml b/tasksintegration/build/intermediates/incremental/mergeDebugAssets/merger.xml
deleted file mode 100644
index de25402..0000000
--- a/tasksintegration/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/assets"/><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/debug/assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/tasksintegration/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted file mode 100644
index 6949bbf..0000000
--- a/tasksintegration/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/debug/jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
deleted file mode 100644
index 0c2be83..0000000
--- a/tasksintegration/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Sat May 09 15:57:24 CEST 2020
diff --git a/tasksintegration/build/intermediates/incremental/mergeDebugResources/merger.xml b/tasksintegration/build/intermediates/incremental/mergeDebugResources/merger.xml
deleted file mode 100644
index d694534..0000000
--- a/tasksintegration/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/res"/><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/generated/res/rs/debug"/><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/res"/><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/generated/res/rs/debug"/><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/debug/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/incremental/mergeDebugShaders/merger.xml b/tasksintegration/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted file mode 100644
index 19b8b9a..0000000
--- a/tasksintegration/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/debug/shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
deleted file mode 100644
index f1ca318..0000000
--- a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sat May 09 22:27:49 CEST 2020
-base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
-path.0=classes.dex
-renamed.0=classes.dex
diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
deleted file mode 100644
index 7de0dd3..0000000
Binary files a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ
diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
deleted file mode 100644
index 945a7c5..0000000
Binary files a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and /dev/null differ
diff --git a/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
deleted file mode 100644
index e8cefa7..0000000
--- a/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    featureSplit="tasksintegration"
-    package="com.tommasoberlose.anotherwidget"
-    android:targetSandboxVersion="2"
-    android:versionCode="83"
-    android:versionName="2.0.6" >
-
-    <uses-sdk
-        android:minSdkVersion="23"
-        android:targetSdkVersion="29" />
-
-    <dist:module
-        dist:instant="false"
-        dist:title="@string/title_tasksintegration" >
-        <dist:delivery>
-            <dist:on-demand />
-        </dist:delivery>
-
-        <dist:fusing dist:include="true" />
-    </dist:module>
-
-</manifest>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/instant_app_manifest/debug/output.json b/tasksintegration/build/intermediates/instant_app_manifest/debug/output.json
deleted file mode 100644
index d087880..0000000
--- a/tasksintegration/build/intermediates/instant_app_manifest/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"23"}}]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted file mode 100644
index 61b92e7..0000000
--- a/tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    xmlns:dist="http://schemas.android.com/apk/distribution"
-4    featureSplit="tasksintegration"
-5    package="com.tommasoberlose.anotherwidget"
-6    android:versionCode="83"
-7    android:versionName="2.0.6" >
-8
-9    <uses-sdk
-10        android:minSdkVersion="23"
-10-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-11        android:targetSdkVersion="29" />
-11-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-12
-13    <dist:module
-13-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:5:5-12:19
-14        dist:instant="false"
-14-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:6:9-29
-15        dist:title="@string/title_tasksintegration" >
-15-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:7:9-52
-16        <dist:delivery>
-16-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:8:9-10:25
-17            <dist:on-demand />
-17-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:9:13-31
-18        </dist:delivery>
-19
-20        <dist:fusing dist:include="true" />
-20-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:11:9-44
-20-->/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:11:22-41
-21    </dist:module>
-22
-23</manifest>
diff --git a/tasksintegration/build/intermediates/merged_java_res/debug/out.jar b/tasksintegration/build/intermediates/merged_java_res/debug/out.jar
deleted file mode 100644
index 15cb0ec..0000000
Binary files a/tasksintegration/build/intermediates/merged_java_res/debug/out.jar and /dev/null differ
diff --git a/tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml
deleted file mode 100644
index a1bc942..0000000
--- a/tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    featureSplit="tasksintegration"
-    package="com.tommasoberlose.anotherwidget"
-    android:versionCode="83"
-    android:versionName="2.0.6" >
-
-    <uses-sdk
-        android:minSdkVersion="23"
-        android:targetSdkVersion="29" />
-
-    <dist:module
-        dist:instant="false"
-        dist:title="@string/title_tasksintegration" >
-        <dist:delivery>
-            <dist:on-demand />
-        </dist:delivery>
-
-        <dist:fusing dist:include="true" />
-    </dist:module>
-
-</manifest>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/merged_manifests/debug/output.json b/tasksintegration/build/intermediates/merged_manifests/debug/output.json
deleted file mode 100644
index 7536bac..0000000
--- a/tasksintegration/build/intermediates/merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"23"}}]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/metadata_feature_declaration/debug/out/feature-split.json b/tasksintegration/build/intermediates/metadata_feature_declaration/debug/out/feature-split.json
deleted file mode 100644
index 33d0503..0000000
--- a/tasksintegration/build/intermediates/metadata_feature_declaration/debug/out/feature-split.json
+++ /dev/null
@@ -1 +0,0 @@
-{"modulePath":":tasksintegration","applicationId":"com.tommasoberlose.tasksintegration"}
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml b/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml
deleted file mode 100644
index a0cb9a9..0000000
--- a/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    featureSplit="tasksintegration"
-    package="com.tommasoberlose.anotherwidget"
-    android:versionCode="83"
-    android:versionName="2.0.6" >
-
-    <uses-sdk android:targetSdkVersion="29" />
-
-    <dist:module
-        dist:instant="false"
-        dist:title="@string/title_tasksintegration" >
-        <dist:delivery>
-            <dist:on-demand />
-        </dist:delivery>
-
-        <dist:fusing dist:include="true" />
-    </dist:module>
-
-</manifest>
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/output.json b/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/output.json
deleted file mode 100644
index 92a207b..0000000
--- a/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"AndroidManifest.xml","properties":{}}]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/navigation_json/debug/navigation.json b/tasksintegration/build/intermediates/navigation_json/debug/navigation.json
deleted file mode 100644
index 0637a08..0000000
--- a/tasksintegration/build/intermediates/navigation_json/debug/navigation.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/packaged_dependencies/debug/deps.txt b/tasksintegration/build/intermediates/packaged_dependencies/debug/deps.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/tasksintegration/build/intermediates/processed_res/debug/out/output.json b/tasksintegration/build/intermediates/processed_res/debug/out/output.json
deleted file mode 100644
index b650a8c..0000000
--- a/tasksintegration/build/intermediates/processed_res/debug/out/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"PROCESSED_RES"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"resources-debug.ap_","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"23"}}]
\ No newline at end of file
diff --git a/tasksintegration/build/intermediates/project_dex_archive/debug/out/110c036e7f91b8202bf3c11b3b5b2ebb3619832c88689d62d4365decea03bc1b_4.jar b/tasksintegration/build/intermediates/project_dex_archive/debug/out/110c036e7f91b8202bf3c11b3b5b2ebb3619832c88689d62d4365decea03bc1b_4.jar
deleted file mode 100644
index 53665b2..0000000
Binary files a/tasksintegration/build/intermediates/project_dex_archive/debug/out/110c036e7f91b8202bf3c11b3b5b2ebb3619832c88689d62d4365decea03bc1b_4.jar and /dev/null differ
diff --git a/tasksintegration/build/intermediates/runtime_symbol_list/debug/R.txt b/tasksintegration/build/intermediates/runtime_symbol_list/debug/R.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/tasksintegration/build/outputs/apk/debug/output.json b/tasksintegration/build/outputs/apk/debug/output.json
deleted file mode 100644
index c8ee79a..0000000
--- a/tasksintegration/build/outputs/apk/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"tasksintegration-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"tasksintegration-debug.apk","properties":{}}]
\ No newline at end of file
diff --git a/tasksintegration/build/outputs/logs/manifest-merger-debug-report.txt b/tasksintegration/build/outputs/logs/manifest-merger-debug-report.txt
deleted file mode 100644
index 74c505a..0000000
--- a/tasksintegration/build/outputs/logs/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,53 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-	package
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:3:5-50
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-	android:versionName
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-	xmlns:dist
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:2:5-61
-	android:versionCode
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:1-13:12
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-	xmlns:android
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:1:11-69
-dist:module
-ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:5:5-12:19
-	dist:instant
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:6:9-29
-	dist:title
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:7:9-52
-dist:delivery
-ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:8:9-10:25
-dist:on-demand
-ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:9:13-31
-dist:fusing
-ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:11:9-44
-	dist:include
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml:11:22-41
-uses-sdk
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-	android:targetSdkVersion
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-	android:minSdkVersion
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		ADDED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
-		INJECTED from /Users/tommaso/Documents/MyCode/another-widget/tasksintegration/src/main/AndroidManifest.xml
diff --git a/tasksintegration/src/main/AndroidManifest.xml b/tasksintegration/src/main/AndroidManifest.xml
deleted file mode 100644
index 2c2fa4d..0000000
--- a/tasksintegration/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="com.tommasoberlose.tasksintegration">
-
-    <dist:module
-        dist:instant="false"
-        dist:title="@string/title_tasksintegration">
-        <dist:delivery>
-            <dist:on-demand />
-        </dist:delivery>
-        <dist:fusing dist:include="true" />
-    </dist:module>
-</manifest>
-