diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000..12bc99e
Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..88ea3aa
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,122 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..440480e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdcf934..a087ba8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,28 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -80,7 +61,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 63f1460..e31ade1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/another-widget.iml" filepath="$PROJECT_DIR$/another-widget.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <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" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 465c070..b75f3f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,59 +1,117 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+
+// Apply the Crashlytics Gradle plugin
+apply plugin: 'com.google.firebase.crashlytics'
 
 apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
-
 apply plugin: 'kotlin-kapt'
-
-apply plugin: 'io.fabric'
+apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'realm-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+
     defaultConfig {
         applicationId "com.tommasoberlose.anotherwidget"
-        minSdkVersion 19
-        targetSdkVersion 26
-        versionCode 32
-        versionName "1.3"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 23
+        targetSdkVersion 29
+        versionCode 40
+        versionName "2.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+    }
+    dataBinding {
+        enabled = true
+    }
+
+    viewBinding.enabled = true
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.survivingwithandroid:weatherlib:1.6.0'
-    implementation 'com.survivingwithandroid:weatherlib_volleyclient:1.6.0'
-    implementation 'com.mcxiaoke.volley:library:1.0.6@aar'
-    implementation 'com.android.support:customtabs:26.1.0'
-    implementation 'com.android.support:cardview-v7:26.1.0'
-    kapt 'com.android.databinding:compiler:3.0.0'
-    implementation('com.crashlytics.sdk.android:crashlytics:2.7.0@aar') {
-        transitive = true
-    }
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
-    implementation 'com.google.android.gms:play-services-awareness:11.6.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    // UI
+    implementation 'com.google.android.material:material:1.2.0-alpha06'
+    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'net.idik:slimadapter:2.1.2'
+
+    // Lifecycle
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
+    // EventBus
+    implementation 'org.greenrobot:eventbus:3.1.1'
+
+    // Navigation
+    implementation 'androidx.navigation:navigation-fragment:2.3.0-alpha05'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
+
+    // Other
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'joda-time:joda-time:2.9.9'
-    implementation 'com.pes.materialcolorpicker:library:1.0.4'
+    implementation "dev.sasikanth:colorsheet:1.0.1"
     implementation 'com.andkulikov:transitionseverywhere:1.7.6'
     implementation 'me.everything:providers-android:1.0.1'
-    compile 'com.anjlab.android.iab.v3:library:1.0.44'
+
+    //Weather
+    implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
+
+    // Billing
+    implementation 'com.android.billingclient:billing:2.2.0'
+    implementation 'com.android.billingclient:billing-ktx:2.2.0'
+
+    // KTX
+    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+
+    // Recommended: Add the Firebase SDK for Google Analytics.
+    implementation 'com.google.firebase:firebase-analytics:17.4.0'
+
+    // Add the Firebase SDK for Crashlytics.
+    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+
+    // Preferences
+    implementation 'com.chibatching.kotpref:kotpref:2.10.0'
+    implementation 'com.chibatching.kotpref:livedata-support:2.10.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+
+    // Permissions
+    implementation 'com.karumi:dexter:6.1.0'
+
+    // Billing
+    implementation 'com.android.billingclient:billing:2.2.0'
+    implementation 'com.android.billingclient:billing-ktx:2.2.0'
 }
diff --git a/app/fabric.properties b/app/fabric.properties
deleted file mode 100644
index ec998b0..0000000
--- a/app/fabric.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
-#Wed Oct 11 22:01:24 CEST 2017
-apiSecret=df2efbce5a4f9101ba6923b7dfa5725a5283ee08c3e748ccfafb01a5070bb532
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 0000000..f4b7f2b
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,40 @@
+{
+  "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.apk b/app/release/app-release.apk
deleted file mode 100644
index 7c4f93e..0000000
Binary files a/app/release/app-release.apk and /dev/null differ
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index c5b59e5..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":32},"path":"app-release.apk","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"19"}}]
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/tommasoberlose/anotherwidget/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/tommasoberlose/anotherwidget/ExampleInstrumentedTest.kt
index a01b8b4..53e32b8 100644
--- a/app/src/androidTest/java/com/tommasoberlose/anotherwidget/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/tommasoberlose/anotherwidget/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package com.tommasoberlose.anotherwidget
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -15,10 +15,10 @@ import org.junit.Assert.*
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("com.tommasoberlose.anotherwidget", appContext.packageName)
-    }
+  @Test
+  fun useAppContext() {
+    // Context of the app under test.
+    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+    assertEquals("com.tommasoberlose.anotherwidget", appContext.packageName)
+  }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1569079..db44109 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,33 +7,30 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <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" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".ui.AWApplication"
+        android:name=".components.AWApplication"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <meta-data
-            android:name="com.google.android.awareness.API_KEY"
-            android:value="AIzaSyAMkqiQHTdZGOUxRd0ZEvvrIE1qN_3pJb4" />
-
-        <activity
-            android:name=".ui.activity.MainActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleInstance"
-            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" />
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.activities.ChooseApplicationActivity" android:launchMode="singleInstance" />
+        <activity android:name=".ui.activities.CustomLocationActivity" android:launchMode="singleInstance" />
+        <activity android:name=".ui.activities.WeatherProviderActivity" android:launchMode="singleInstance" />
+        <activity android:name=".ui.activities.SupportDevActivity" android:launchMode="singleInstance" />
 
-        <receiver android:name=".ui.widget.TheWidget">
+
+        <receiver android:name=".ui.widgets.TheWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -43,77 +40,47 @@
                 android:resource="@xml/the_widget_info" />
         </receiver>
         <receiver
-            android:name=".receiver.NewCalendarEventReceiver"
+            android:name=".receivers.NewCalendarEventReceiver"
             android:enabled="true"
+            android:exported="true"
             android:priority="1000">
             <intent-filter>
                 <action android:name="android.intent.action.PROVIDER_CHANGED" />
-
-                <data android:scheme="content" />
-                <data android:host="com.android.calendar" />
+                <data android:scheme="content"/>
+                <data android:host="com.android.calendar"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="com.tommasoberlose.anotherwidget.action.GO_TO_NEXT_EVENT" />
+                <action android:name="com.tommasoberlose.anotherwidget.action.GO_TO_PREVIOUS_EVENT" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".receiver.UpdatesReceiver"
+            android:name=".receivers.UpdatesReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="com.tommasoberlose.anotherwidget.action.ACTION_TIME_UPDATE" />
                 <action android:name="com.tommasoberlose.anotherwidget.action.ACTION_CALENDAR_UPDATE" />
-                <action android:name="android.intent.action.USER_PRESENT" />
                 <action android:name="com.sec.android.widgetapp.APPWIDGET_RESIZE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <data android:scheme="package" />
+                <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED" />
+                <action android:name="android.intent.action.DATE_CHANGED" />
             </intent-filter>
         </receiver>
         <receiver
-            android:name=".receiver.WeatherReceiver"
+            android:name=".receivers.WeatherReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="com.tommasoberlose.anotherwidget.action.ACTION_WEATHER_UPDATE" />
-                <action android:name="android.location.PROVIDERS_CHANGED" />
                 <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-
-                <data android:scheme="package" />
             </intent-filter>
         </receiver>
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="5232fd734b08a20a984c2de02b37df19269608ef" />
-
-        <activity
-            android:name=".ui.activity.CustomLocationActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.ChooseApplicationActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.WeatherProviderActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="portrait" />
-
         <receiver
-            android:name=".receiver.OpenWeatherIntentReceiver"
+            android:name=".receivers.WidgetClickListenerReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -121,14 +88,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".util.CrocodileService"
-            android:enabled="true"/>
-
-        <activity android:name=".ui.activity.SupportDevActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleInstance"
-            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..6b5a350
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/components/AWApplication.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/AWApplication.kt
new file mode 100644
index 0000000..cdf8ada
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/AWApplication.kt
@@ -0,0 +1,27 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.app.Application
+import androidx.appcompat.app.AppCompatDelegate
+import com.chibatching.kotpref.Kotpref
+import com.tommasoberlose.anotherwidget.global.Preferences
+import io.realm.Realm
+import io.realm.RealmConfiguration
+
+class AWApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        // Preferences
+        Kotpref.init(this)
+
+        // Dark theme
+        AppCompatDelegate.setDefaultNightMode(Preferences.darkThemePreference)
+
+        // Realm
+        Realm.init(this)
+        val config = RealmConfiguration.Builder()
+            .deleteRealmIfMigrationNeeded()
+            .build()
+        Realm.setDefaultConfiguration(config)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/components/BottomSheetMenu.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/BottomSheetMenu.kt
new file mode 100644
index 0000000..05d0e55
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/BottomSheetMenu.kt
@@ -0,0 +1,66 @@
+package com.tommasoberlose.anotherwidget.components
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.MenuRes
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.tommasoberlose.anotherwidget.R
+import kotlinx.android.synthetic.main.bottom_sheet_menu.view.*
+import kotlinx.android.synthetic.main.bottom_sheet_menu_item.view.*
+
+/**
+ * [BottomSheetDialogFragment] that uses a custom
+ * theme which sets a rounded background to the dialog
+ * and doesn't dim the navigation bar
+ */
+open class BottomSheetMenu<T>(context: Context, private val header: String? = null) : BottomSheetDialog(context, R.style.BottomSheetDialogTheme) {
+
+    private val items: ArrayList<MenuItem<T>> = ArrayList()
+    private var selectedRes: T? = null
+    private var callback: ((selectedValue: T) -> Unit)? = null
+
+    fun selectResource(res: T): BottomSheetMenu<T> {
+        selectedRes = res
+        return this
+    }
+
+    fun addItem(title: String, value: T): BottomSheetMenu<T> {
+        items.add(MenuItem(title, value))
+        return this
+    }
+
+    fun addOnSelectItemListener(callback: (selectedValue: T) -> Unit): BottomSheetMenu<T> {
+        this.callback = callback
+        return this
+    }
+
+    override fun show() {
+        val view = View.inflate(context, R.layout.bottom_sheet_menu, null)
+
+        // Header
+        view.header.isVisible = header != null
+        view.header_text.text = header ?: ""
+
+        // Menu
+        for (item in items) {
+            val itemView = View.inflate(context, R.layout.bottom_sheet_menu_item, null)
+            itemView.label.text = item.title
+            itemView.isSelected = item.value == selectedRes
+            itemView.setOnClickListener {
+                callback?.invoke(item.value)
+                this.dismiss()
+            }
+            view.menu.addView(itemView)
+        }
+        setContentView(view)
+        super.show()
+    }
+
+    class MenuItem<T>(val title: String, val value: T)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/object/CalendarSelector.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/CalendarSelector.kt
similarity index 85%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/object/CalendarSelector.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/components/CalendarSelector.kt
index a58025f..631eede 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/object/CalendarSelector.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/CalendarSelector.kt
@@ -1,4 +1,4 @@
-package com.tommasoberlose.anotherwidget.`object`
+package com.tommasoberlose.anotherwidget.components
 
 /**
  * Created by tommaso on 08/10/17.
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/object/AppInfoSavedEvent.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/AppInfoSavedEvent.kt
similarity index 70%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/object/AppInfoSavedEvent.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/components/events/AppInfoSavedEvent.kt
index 31980d2..9b990a2 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/object/AppInfoSavedEvent.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/AppInfoSavedEvent.kt
@@ -1,4 +1,4 @@
-package com.tommasoberlose.anotherwidget.`object`
+package com.tommasoberlose.anotherwidget.components.events
 
 import android.content.pm.ApplicationInfo
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/object/ApplicationListEvent.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/ApplicationListEvent.kt
similarity index 84%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/object/ApplicationListEvent.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/components/events/ApplicationListEvent.kt
index 0ab019d..c6d25da 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/object/ApplicationListEvent.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/ApplicationListEvent.kt
@@ -1,4 +1,4 @@
-package com.tommasoberlose.anotherwidget.`object`
+package com.tommasoberlose.anotherwidget.components.events
 
 import android.content.pm.ApplicationInfo
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/object/CustomLocationEvent.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/CustomLocationEvent.kt
similarity index 80%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/object/CustomLocationEvent.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/components/events/CustomLocationEvent.kt
index 3757f23..5913484 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/object/CustomLocationEvent.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/CustomLocationEvent.kt
@@ -1,4 +1,4 @@
-package com.tommasoberlose.anotherwidget.`object`
+package com.tommasoberlose.anotherwidget.components.events
 
 import android.location.Address
 
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/object/Event.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/Event.kt
similarity index 77%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/object/Event.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/components/events/Event.kt
index 0120edd..22a42d5 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/object/Event.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/components/events/Event.kt
@@ -1,9 +1,6 @@
-package com.tommasoberlose.anotherwidget.`object`
+package com.tommasoberlose.anotherwidget.components.events
 
-import android.database.Cursor
 import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
 import java.util.Date
 
 /**
@@ -17,7 +14,7 @@ open class Event(var id: Long = 0,
             var endDate: Long = 0,
             var calendarID: Int = 0,
             var allDay: Boolean = false,
-            var address: String = ""): RealmObject(){
+            var address: String = "") : RealmObject(){
 
     override fun toString(): String {
         return "Event:\nID: " + id + "\nTITLE: " + title + "\nSTART DATE: " + Date(startDate) + "\nEND DATE: " + Date(endDate) + "\nCAL DAY: " + calendarID  + "\nADDRESS: " + address
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Actions.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Actions.kt
new file mode 100644
index 0000000..e70a6b5
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Actions.kt
@@ -0,0 +1,13 @@
+package com.tommasoberlose.anotherwidget.global
+
+object Actions {
+    const val ACTION_EXTRA_OPEN_WEATHER_PROVIDER = "ACTION_EXTRA_OPEN_WEATHER_PROVIDER"
+    const val ACTION_EXTRA_DISABLE_GPS_NOTIFICATION = "ACTION_EXTRA_DISABLE_GPS_NOTIFICATION"
+
+    const val ACTION_TIME_UPDATE = "com.tommasoberlose.anotherwidget.action.ACTION_TIME_UPDATE"
+    const val ACTION_CALENDAR_UPDATE = "com.tommasoberlose.anotherwidget.action.ACTION_CALENDAR_UPDATE"
+    const val ACTION_WEATHER_UPDATE = "com.tommasoberlose.anotherwidget.action.ACTION_WEATHER_UPDATE"
+    const val ACTION_OPEN_WEATHER_INTENT = "com.tommasoberlose.anotherwidget.action.ACTION_OPEN_WEATHER_INTENT"
+    const val ACTION_GO_TO_NEXT_EVENT = "com.tommasoberlose.anotherwidget.action.GO_TO_NEXT_EVENT"
+    const val ACTION_GO_TO_PREVIOUS_EVENT = "com.tommasoberlose.anotherwidget.action.GO_TO_PREVIOUS_EVENT"
+}
\ 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
new file mode 100644
index 0000000..cb1d555
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt
@@ -0,0 +1,69 @@
+package com.tommasoberlose.anotherwidget.global
+
+import java.text.SimpleDateFormat
+
+object Constants {
+    const val RESULT_CODE_CUSTOM_LOCATION = 45
+    const val RESULT_APP_NAME = "RESULT_APP_NAME"
+    const val RESULT_APP_PACKAGE = "RESULT_APP_PACKAGE"
+
+    const val PREF_SHOW_EVENTS = "PREF_SHOW_EVENTS"
+    const val PREF_SHOW_WEATHER = "PREF_SHOW_WEATHER"
+    const val PREF_WEATHER_ICON = "PREF_WEATHER_ICON"
+    const val PREF_WEATHER_TEMP = "PREF_WEATHER_TEMP"
+    const val PREF_WEATHER_TEMP_UNIT = "PREF_WEATHER_TEMP_UNIT"
+    const val PREF_WEATHER_REAL_TEMP_UNIT = "PREF_WEATHER_REAL_TEMP_UNIT"
+    const val PREF_CALENDAR_ALL_DAY = "PREF_CALENDAR_ALL_DAY"
+    const val PREF_CALENDAR_FILTER = "PREF_CALENDAR_FILTER"
+
+    const val PREF_EVENT_ID = "PREF_EVENT_ID"
+    const val PREF_NEXT_EVENT_ID = "PREF_NEXT_EVENT_ID"
+    const val PREF_NEXT_EVENT_NAME = "PREF_NEXT_EVENT_NAME"
+    const val PREF_NEXT_EVENT_START_DATE = "PREF_NEXT_EVENT_START_DATE"
+    const val PREF_NEXT_EVENT_ALL_DAY = "PREF_NEXT_EVENT_ALL_DAY"
+    const val PREF_NEXT_EVENT_LOCATION = "PREF_NEXT_EVENT_LOCATION"
+    const val PREF_NEXT_EVENT_END_DATE = "PREF_NEXT_EVENT_END_DATE"
+    const val PREF_NEXT_EVENT_CALENDAR_ID = "PREF_NEXT_EVENT_CALENDAR_ID"
+    const val PREF_CUSTOM_LOCATION_LAT = "PREF_CUSTOM_LOCATION_LAT"
+    const val PREF_CUSTOM_LOCATION_LON = "PREF_CUSTOM_LOCATION_LON"
+    const val PREF_CUSTOM_LOCATION_ADD = "PREF_CUSTOM_LOCATION_ADD"
+    const val PREF_HOUR_FORMAT = "PREF_HOUR_FORMAT"
+    const val PREF_ITA_FORMAT_DATE = "PREF_ITA_FORMAT_DATE"
+    const val PREF_WEATHER_REFRESH_PERIOD = "PREF_WEATHER_REFRESH_PERIOD"
+    const val PREF_SHOW_UNTIL = "PREF_SHOW_UNTIL"
+    const val PREF_CALENDAR_APP_NAME = "PREF_CALENDAR_APP_NAME"
+    const val PREF_CALENDAR_APP_PACKAGE = "PREF_CALENDAR_APP_PACKAGE"
+    const val PREF_WEATHER_APP_NAME = "PREF_WEATHER_APP_NAME"
+    const val PREF_WEATHER_APP_PACKAGE = "PREF_WEATHER_APP_PACKAGE"
+    const val PREF_WEATHER_PROVIDER_API_KEY = "PREF_WEATHER_PROVIDER_API_KEY"
+    const val PREF_EVENT_APP_NAME = "PREF_EVENT_APP_NAME"
+    const val PREF_EVENT_APP_PACKAGE = "PREF_EVENT_APP_PACKAGE"
+    const val PREF_SHOW_EVENT_LOCATION = "PREF_SHOW_EVENT_LOCATION"
+    const val PREF_TEXT_COLOR = "PREF_TEXT_COLOR"
+    const val PREF_TEXT_MAIN_SIZE = "PREF_TEXT_MAIN_SIZE"
+    const val PREF_TEXT_SECOND_SIZE = "PREF_TEXT_SECOND_SIZE"
+    const val PREF_TEXT_CLOCK_SIZE = "PREF_TEXT_CLOCK_SIZE"
+    const val PREF_WEATHER_PROVIDER = "PREF_WEATHER_PROVIDER"
+    const val PREF_SHOW_CLOCK = "PREF_SHOW_CLOCK"
+    const val PREF_CLOCK_APP_NAME = "PREF_CLOCK_APP_NAME"
+    const val PREF_CLOCK_APP_PACKAGE = "PREF_CLOCK_APP_PACKAGE"
+    const val PREF_TEXT_SHADOW = "PREF_TEXT_SHADOW"
+    const val PREF_SHOW_DIFF_TIME = "PREF_SHOW_DIFF_TIME"
+    const val PREF_SHOW_DECLINED_EVENTS = "PREF_SHOW_DECLINED_EVENTS"
+    const val PREF_OPEN_WEATHER_API_KEY = "PREF_OPEN_WEATHER_API_KEY"
+    const val PREF_DARK_SKY_API_KEY = "PREF_DARK_SKY_API_KEY"
+    const val PREF_WU_API_KEY = "PREF_WU_API_KEY"
+    const val PREF_SECOND_ROW_INFORMATION = "PREF_SECOND_ROW_INFORMATION"
+    const val PREF_CUSTOM_FONT = "PREF_CUSTOM_FONT"
+    const val PREF_CUSTOM_FONT_FILE = "PREF_CUSTOM_FONT_FILE"
+    const val PREF_SHOW_NEXT_EVENT = "PREF_SHOW_NEXT_EVENT"
+    const val PREF_SHOW_WIDGET_PREVIEW = "PREF_SHOW_WIDGET_PREVIEW"
+    const val PREF_SHOW_GPS_NOTIFICATION = "PREF_SHOW_GPS_NOTIFICATION"
+
+    const val CUSTOM_FONT_PRODUCT_SANS = 1
+
+    const val itDateFormat = "EEEE, d MMM"
+    const val engDateFormat = "EEEE, MMM d"
+    const val goodHourFormat = "HH:mm"
+    const val badHourFormat = "hh:mm a"
+}
\ 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
new file mode 100755
index 0000000..98332b5
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
@@ -0,0 +1,65 @@
+package com.tommasoberlose.anotherwidget.global
+
+import android.os.Build
+import androidx.appcompat.app.AppCompatDelegate.*
+import com.chibatching.kotpref.KotprefModel
+
+object Preferences : KotprefModel() {
+    override val commitAllPropertiesByDefault: Boolean = true
+
+    var darkThemePreference by intPref(default = if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) MODE_NIGHT_FOLLOW_SYSTEM else MODE_NIGHT_AUTO_BATTERY)
+
+    var showEvents by booleanPref(key = "PREF_SHOW_EVENTS", default = false)
+    var showWeather by booleanPref(key = "PREF_SHOW_WEATHER")
+    var weatherIcon by stringPref(key = "PREF_WEATHER_ICON")
+    var weatherTemp by floatPref(key = "PREF_WEATHER_TEMP")
+    var weatherTempUnit by stringPref(key = "PREF_WEATHER_TEMP_UNIT", default = "F")
+    var weatherRealTempUnit by stringPref(key = "PREF_WEATHER_REAL_TEMP_UNIT", default = "F")
+    var calendarAllDay by booleanPref(key = "PREF_CALENDAR_ALL_DAY", default = false)
+    var calendarFilter by stringPref(key = "PREF_CALENDAR_FILTER", default = "")
+
+    var eventId by intPref(key = "PREF_EVENT_ID", default = -1)
+    var nextEventId by longPref(key = "PREF_NEXT_EVENT_ID", default = -1)
+    var nextEventName by stringPref(key = "PREF_NEXT_EVENT_NAME")
+    var nextEventStartDate by longPref(key = "PREF_NEXT_EVENT_START_DATE")
+    var nextEventAllDay by booleanPref(key = "PREF_NEXT_EVENT_ALL_DAY")
+    var nextEventLocation by stringPref(key = "PREF_NEXT_EVENT_LOCATION")
+    var nextEventEndDate by longPref(key = "PREF_NEXT_EVENT_END_DATE")
+    var nextEventCalendarId by intPref(key = "PREF_NEXT_EVENT_CALENDAR_ID")
+    var customLocationLat by stringPref(key = "PREF_CUSTOM_LOCATION_LAT", default = "")
+    var customLocationLon by stringPref(key = "PREF_CUSTOM_LOCATION_LON", default = "")
+    var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "")
+    var hourFormat by stringPref(key = "PREF_HOUR_FORMAT", default = "12")
+    var dateFormat by booleanPref(key = "PREF_ITA_FORMAT_DATE", default = false)
+    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 = "")
+    var calendarAppPackage by stringPref(key = "PREF_CALENDAR_APP_PACKAGE", default = "")
+    var weatherAppName by stringPref(key = "PREF_WEATHER_APP_NAME", default = "")
+    var weatherAppPackage by stringPref(key = "PREF_WEATHER_APP_PACKAGE", default = "")
+    var weatherProviderApi by stringPref(key = "PREF_WEATHER_PROVIDER_API_KEY", default = "")
+    var eventAppName by stringPref(key = "PREF_EVENT_APP_NAME", default = "")
+    var eventAppPackage by stringPref(key = "PREF_EVENT_APP_PACKAGE", default = "")
+    var showEventLocation by stringPref(key = "PREF_SHOW_EVENT_LOCATION", default = "")
+    var textGlobalColor by stringPref(key = "PREF_TEXT_COLOR", default = "#FFFFFF")
+    var textMainSize by floatPref(key = "PREF_TEXT_MAIN_SIZE", default = 26f)
+    var textSecondSize by floatPref(key = "PREF_TEXT_SECOND_SIZE", default = 18f)
+    var clockTextSize by floatPref(key = "PREF_TEXT_CLOCK_SIZE", default = 90f)
+    var showClock by booleanPref(key = "PREF_SHOW_CLOCK", default = false)
+    var clockAppName by stringPref(key = "PREF_CLOCK_APP_NAME", default = "")
+    var clockAppPackage by stringPref(key = "PREF_CLOCK_APP_PACKAGE", default = "")
+    var showNextAlarm by booleanPref(default = true)
+    var textShadow by intPref(key = "PREF_TEXT_SHADOW", default = 1)
+    var showDiffTime by booleanPref(key = "PREF_SHOW_DIFF_TIME")
+    var showDeclinedEvents by booleanPref(key = "PREF_SHOW_DECLINED_EVENTS", default = true)
+    var openWeatherApiKey by stringPref(key = "PREF_OPEN_WEATHER_API_KEY", default = "")
+    var darkSkyApiKey by stringPref(key = "PREF_DARK_SKY_API_KEY", default = "")
+    var wuApiKey by stringPref(key = "PREF_WU_API_KEY", default = "")
+    var secondRowInformation by intPref(key = "PREF_SECOND_ROW_INFORMATION", default = 1)
+    var customFont by intPref(key = "PREF_CUSTOM_FONT", default = Constants.CUSTOM_FONT_PRODUCT_SANS)
+    var customFontFile by stringPref(key = "PREF_CUSTOM_FONT_FILE")
+    var showNextEvent by booleanPref(key = "PREF_SHOW_NEXT_EVENT", default = true)
+    var showGpsInformation by booleanPref(key = "PREF_SHOW_GPS_NOTIFICATION", default = true)
+
+    var showWallpaper by booleanPref(default = false)
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/RequestCode.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/RequestCode.kt
new file mode 100644
index 0000000..3b41121
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/RequestCode.kt
@@ -0,0 +1,12 @@
+package com.tommasoberlose.anotherwidget.global
+
+enum class RequestCode(val code: Int) {
+    CALENDAR_REQUEST_CODE(1),
+    LOCATION_REQUEST_CODE(2),
+    CALENDAR_APP_REQUEST_CODE(3),
+    WEATHER_APP_REQUEST_CODE(4),
+    EVENT_APP_REQUEST_CODE(6),
+    WEATHER_PROVIDER_REQUEST_CODE(5),
+    CLOCK_APP_REQUEST_CODE(7),
+    CUSTOM_FONT_CHOOSER_REQUEST_CODE(8)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/object/Constants.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/object/Constants.kt
deleted file mode 100644
index 7e9cfc6..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/object/Constants.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.tommasoberlose.anotherwidget.`object`
-
-import android.annotation.SuppressLint
-import java.text.SimpleDateFormat
-import java.util.*
-
-/**
- * Created by tommaso on 05/10/17.
- */
-
-@SuppressLint("SimpleDateFormat")
-object Constants {
-    val CALENDAR_REQUEST_CODE = 1
-    val LOCATION_REQUEST_CODE = 2
-    val CALENDAR_APP_REQUEST_CODE = 3
-    val WEATHER_APP_REQUEST_CODE = 4
-    val EVENT_APP_REQUEST_CODE = 6
-    val WEATHER_PROVIDER_REQUEST_CODE = 5
-    val CLOCK_APP_REQUEST_CODE = 7
-    val CUSTOM_FONT_CHOOSER_REQUEST_CODE = 8
-
-
-    val RESULT_CODE_CUSTOM_LOCATION = 45
-    val RESULT_APP_NAME = "RESULT_APP_NAME"
-    val RESULT_APP_PACKAGE = "RESULT_APP_PACKAGE"
-
-    val PREF_SHOW_EVENTS = "PREF_SHOW_EVENTS"
-    val PREF_SHOW_WEATHER = "PREF_SHOW_WEATHER"
-    val PREF_WEATHER_ICON = "PREF_WEATHER_ICON"
-    val PREF_WEATHER_TEMP = "PREF_WEATHER_TEMP"
-    val PREF_WEATHER_TEMP_UNIT = "PREF_WEATHER_TEMP_UNIT"
-    val PREF_WEATHER_REAL_TEMP_UNIT = "PREF_WEATHER_REAL_TEMP_UNIT"
-    val PREF_CALENDAR_ALL_DAY = "PREF_CALENDAR_ALL_DAY"
-    val PREF_CALENDAR_FILTER = "PREF_CALENDAR_FILTER"
-
-    val PREF_EVENT_ID = "PREF_EVENT_ID"
-    val PREF_NEXT_EVENT_ID = "PREF_NEXT_EVENT_ID"
-    val PREF_NEXT_EVENT_NAME = "PREF_NEXT_EVENT_NAME"
-    val PREF_NEXT_EVENT_START_DATE = "PREF_NEXT_EVENT_START_DATE"
-    val PREF_NEXT_EVENT_ALL_DAY = "PREF_NEXT_EVENT_ALL_DAY"
-    val PREF_NEXT_EVENT_LOCATION = "PREF_NEXT_EVENT_LOCATION"
-    val PREF_NEXT_EVENT_END_DATE = "PREF_NEXT_EVENT_END_DATE"
-    val PREF_NEXT_EVENT_CALENDAR_ID = "PREF_NEXT_EVENT_CALENDAR_ID"
-    val PREF_CUSTOM_LOCATION_LAT = "PREF_CUSTOM_LOCATION_LAT"
-    val PREF_CUSTOM_LOCATION_LON = "PREF_CUSTOM_LOCATION_LON"
-    val PREF_CUSTOM_LOCATION_ADD = "PREF_CUSTOM_LOCATION_ADD"
-    val PREF_HOUR_FORMAT = "PREF_HOUR_FORMAT"
-    val PREF_ITA_FORMAT_DATE = "PREF_ITA_FORMAT_DATE"
-    val PREF_WEATHER_REFRESH_PERIOD = "PREF_WEATHER_REFRESH_PERIOD"
-    val PREF_SHOW_UNTIL = "PREF_SHOW_UNTIL"
-    val PREF_CALENDAR_APP_NAME = "PREF_CALENDAR_APP_NAME"
-    val PREF_CALENDAR_APP_PACKAGE = "PREF_CALENDAR_APP_PACKAGE"
-    val PREF_WEATHER_APP_NAME = "PREF_WEATHER_APP_NAME"
-    val PREF_WEATHER_APP_PACKAGE = "PREF_WEATHER_APP_PACKAGE"
-    val PREF_WEATHER_PROVIDER_API_KEY = "PREF_WEATHER_PROVIDER_API_KEY"
-    val PREF_EVENT_APP_NAME = "PREF_EVENT_APP_NAME"
-    val PREF_EVENT_APP_PACKAGE = "PREF_EVENT_APP_PACKAGE"
-    val PREF_SHOW_EVENT_LOCATION = "PREF_SHOW_EVENT_LOCATION"
-    val PREF_TEXT_COLOR = "PREF_TEXT_COLOR"
-    val PREF_TEXT_MAIN_SIZE = "PREF_TEXT_MAIN_SIZE"
-    val PREF_TEXT_SECOND_SIZE = "PREF_TEXT_SECOND_SIZE"
-    val PREF_TEXT_CLOCK_SIZE = "PREF_TEXT_CLOCK_SIZE"
-    val PREF_WEATHER_PROVIDER = "PREF_WEATHER_PROVIDER"
-    val PREF_SHOW_CLOCK = "PREF_SHOW_CLOCK"
-    val PREF_CLOCK_APP_NAME = "PREF_CLOCK_APP_NAME"
-    val PREF_CLOCK_APP_PACKAGE = "PREF_CLOCK_APP_PACKAGE"
-    val PREF_TEXT_SHADOW = "PREF_TEXT_SHADOW"
-    val PREF_SHOW_DIFF_TIME = "PREF_SHOW_DIFF_TIME"
-    val PREF_SHOW_DECLINED_EVENTS = "PREF_SHOW_DECLINED_EVENTS"
-    val PREF_OPEN_WEATHER_API_KEY = "PREF_OPEN_WEATHER_API_KEY"
-    val PREF_DARK_SKY_API_KEY = "PREF_DARK_SKY_API_KEY"
-    val PREF_WU_API_KEY = "PREF_WU_API_KEY"
-    val PREF_SECOND_ROW_INFORMATION = "PREF_SECOND_ROW_INFORMATION"
-    val PREF_CUSTOM_FONT = "PREF_CUSTOM_FONT"
-    val PREF_CUSTOM_FONT_FILE = "PREF_CUSTOM_FONT_FILE"
-    val PREF_SHOW_NEXT_EVENT = "PREF_SHOW_NEXT_EVENT"
-    val PREF_SHOW_WIDGET_PREVIEW = "PREF_SHOW_WIDGET_PREVIEW"
-    val PREF_SHOW_GPS_NOTIFICATION = "PREF_SHOW_GPS_NOTIFICATION"
-
-    val CUSTOM_FONT_PRODUCT_SANS = 1
-
-    val ACTION_EXTRA_OPEN_WEATHER_PROVIDER = "ACTION_EXTRA_OPEN_WEATHER_PROVIDER"
-    val ACTION_EXTRA_DISABLE_GPS_NOTIFICATION = "ACTION_EXTRA_DISABLE_GPS_NOTIFICATION"
-
-    val itDateFormat = SimpleDateFormat("EEEE, d MMM")
-    val engDateFormat = SimpleDateFormat("EEEE, MMM d")
-    val goodHourFormat = SimpleDateFormat("HH:mm")
-    val badHourFormat = SimpleDateFormat("hh:mm a")
-
-    val ACTION_TIME_UPDATE = "com.tommasoberlose.anotherwidget.action.ACTION_TIME_UPDATE"
-    val ACTION_CALENDAR_UPDATE = "com.tommasoberlose.anotherwidget.action.ACTION_CALENDAR_UPDATE"
-    val ACTION_WEATHER_UPDATE = "com.tommasoberlose.anotherwidget.action.ACTION_WEATHER_UPDATE"
-    val ACTION_SOMETHING_HAPPENED = "com.tommasoberlose.anotherwidget.action.ACTION_SOMETHING_HAPPENED"
-    val ACTION_OPEN_WEATHER_INTENT = "com.tommasoberlose.anotherwidget.action.ACTION_OPEN_WEATHER_INTENT"
-    val ACTION_GO_TO_NEXT_EVENT = "com.tommasoberlose.anotherwidget.action.GO_TO_NEXT_EVENT"
-
-    val WEATHER_PROVIDER_GOOGLE_AWARENESS = 1
-    val WEATHER_PROVIDER_OPEN_WEATHER = 2
-    val WEATHER_PROVIDER_DARK_SKY = 3
-    val WEATHER_PROVIDER_WU = 4
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/NewCalendarEventReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/NewCalendarEventReceiver.kt
deleted file mode 100644
index 79838f9..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/NewCalendarEventReceiver.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tommasoberlose.anotherwidget.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.util.CalendarUtil
-import com.tommasoberlose.anotherwidget.util.Util
-
-class NewCalendarEventReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action.equals(Intent.ACTION_PROVIDER_CHANGED)) {
-            CalendarUtil.updateEventList(context)
-        } else if (intent.action == Constants.ACTION_GO_TO_NEXT_EVENT) {
-            CalendarUtil.goToNextEvent(context)
-        }
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/UpdatesReceiver.kt
deleted file mode 100644
index 1986777..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/UpdatesReceiver.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.tommasoberlose.anotherwidget.receiver
-
-import android.Manifest
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.icu.text.LocaleDisplayNames
-import android.os.Build
-import android.preference.PreferenceManager
-import android.util.Log
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.`object`.Event
-import com.tommasoberlose.anotherwidget.util.CalendarUtil
-import com.tommasoberlose.anotherwidget.util.CrocodileService
-import com.tommasoberlose.anotherwidget.util.Util
-import java.sql.Time
-import java.util.*
-import java.util.concurrent.TimeUnit
-
-
-class UpdatesReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action.equals(Intent.ACTION_BOOT_COMPLETED) || intent.action.equals(Intent.ACTION_MY_PACKAGE_REPLACED) || intent.action.equals("android.intent.action.PACKAGE_REPLACED") || intent.action.equals("android.intent.action.PACKAGE_ADDED")) {
-            setUpdates(context)
-        } else if (intent.action.equals(Constants.ACTION_TIME_UPDATE) || intent.action.equals("com.sec.android.widgetapp.APPWIDGET_RESIZE") || intent.action == "android.intent.action.USER_PRESENT") {
-            val e: Event = CalendarUtil.getNextEvent(context)
-            if (e.id == 0.toLong() || e.endDate <= Calendar.getInstance().timeInMillis) {
-                CalendarUtil.updateEventList(context)
-            } else {
-                Util.updateWidget(context)
-            }
-        } else if (intent.action.equals(Constants.ACTION_CALENDAR_UPDATE)) {
-            CalendarUtil.updateEventList(context)
-        }
-    }
-
-    fun setUpdates(context: Context) {
-        CalendarUtil.updateEventList(context)
-        removeUpdates(context)
-        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(Intent(context, CrocodileService::class.java))
-        } else {
-            context.startService(Intent(context, CrocodileService::class.java))
-        }*/
-
-        val now = Calendar.getInstance()
-        now.set(Calendar.MILLISECOND, 0)
-        now.set(Calendar.SECOND, 0)
-
-        val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val i = Intent(context, UpdatesReceiver::class.java)
-        i.action = Constants.ACTION_TIME_UPDATE
-        val pi = PendingIntent.getBroadcast(context, 0, i, 0)
-        am.setRepeating(AlarmManager.RTC_WAKEUP, now.timeInMillis, (1000 * 60).toLong(), pi)
-    }
-
-    fun removeUpdates(context: Context) {
-        val intent = Intent(context, UpdatesReceiver::class.java)
-        val sender = PendingIntent.getBroadcast(context, 0, intent, 0)
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        alarmManager.cancel(sender)
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/WeatherReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/WeatherReceiver.kt
deleted file mode 100644
index b07f96b..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/WeatherReceiver.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.tommasoberlose.anotherwidget.receiver
-
-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.content.SharedPreferences
-import android.preference.PreferenceManager
-import android.util.Log
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.util.CalendarUtil
-import com.tommasoberlose.anotherwidget.util.Util
-import com.tommasoberlose.anotherwidget.util.WeatherUtil
-import java.util.*
-import android.widget.Toast
-
-
-
-class WeatherReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action.equals(Intent.ACTION_BOOT_COMPLETED) || intent.action.equals(Intent.ACTION_MY_PACKAGE_REPLACED) || intent.action.equals("android.intent.action.PACKAGE_REPLACED") || intent.action.equals("android.intent.action.PACKAGE_ADDED")) {
-            setUpdates(context)
-        } else if (intent.action.equals(Constants.ACTION_WEATHER_UPDATE) || intent.action.equals("android.location.PROVIDERS_CHANGED")) {
-            WeatherUtil.updateWeather(context)
-        } else if (intent.action == "android.location.PROVIDERS_CHANGED") {
-            Util.showWeatherErrorNotification(context)
-        }
-    }
-
-    fun setUpdates(context: Context) {
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        removeUpdates(context)
-        WeatherUtil.updateWeather(context)
-
-        val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val i = Intent(context, WeatherReceiver::class.java)
-        i.action = Constants.ACTION_WEATHER_UPDATE
-        val pi = PendingIntent.getBroadcast(context, 1, i, 0)
-        val refresh: Long = when (SP.getInt(Constants.PREF_WEATHER_REFRESH_PERIOD, 1)) {
-            0 -> 30
-            1 -> 60
-            2 -> 60 * 3
-            3 -> 60 * 6
-            4 -> 60 * 12
-            5 -> 60 * 24
-            else -> 60
-        }
-        val now = Calendar.getInstance()
-        now.set(Calendar.MILLISECOND, 0)
-        now.set(Calendar.SECOND, 0)
-        am.setRepeating(AlarmManager.RTC_WAKEUP, now.timeInMillis, 1000 * 60 * refresh, pi)
-    }
-
-    fun setOneTimeUpdate(context: Context) {
-        val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val i = Intent(context, WeatherReceiver::class.java)
-        i.action = Constants.ACTION_WEATHER_UPDATE
-        val pi = PendingIntent.getBroadcast(context, 1, i, 0)
-
-        val now = Calendar.getInstance()
-        now.set(Calendar.MILLISECOND, 0)
-        now.set(Calendar.SECOND, 0)
-        am.setExact(AlarmManager.RTC_WAKEUP, now.timeInMillis + 1000 * 60 * 10, pi)
-        am.setExact(AlarmManager.RTC_WAKEUP, now.timeInMillis + 1000 * 60 * 15, pi)
-        am.setExact(AlarmManager.RTC_WAKEUP, now.timeInMillis + 1000 * 60 * 20, pi)
-    }
-
-    fun removeUpdates(context: Context) {
-        val intent = Intent(context, WeatherReceiver::class.java)
-        val sender = PendingIntent.getBroadcast(context, 1, intent, 0)
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        alarmManager.cancel(sender)
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt
new file mode 100644
index 0000000..09b2e40
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt
@@ -0,0 +1,26 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.utils.CalendarUtil
+
+class NewCalendarEventReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        when {
+            intent.action.equals(Intent.ACTION_PROVIDER_CHANGED) -> {
+                CalendarUtil.updateEventList(context)
+            }
+            intent.action == Actions.ACTION_GO_TO_NEXT_EVENT -> {
+                CalendarUtil.goToNextEvent(context)
+            }
+            intent.action == Actions.ACTION_GO_TO_PREVIOUS_EVENT -> {
+                CalendarUtil.goToPreviousEvent(context)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
new file mode 100644
index 0000000..0408fcd
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
@@ -0,0 +1,64 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.app.AlarmManager
+import android.app.PendingIntent
+import com.tommasoberlose.anotherwidget.components.events.Event
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.utils.CalendarUtil
+import com.tommasoberlose.anotherwidget.utils.Util
+import org.joda.time.Period
+import java.util.*
+
+
+class UpdatesReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        when (intent.action) {
+            Intent.ACTION_BOOT_COMPLETED,
+            Intent.ACTION_MY_PACKAGE_REPLACED,
+            Actions.ACTION_CALENDAR_UPDATE -> CalendarUtil.updateEventList(context)
+
+            "com.sec.android.widgetapp.APPWIDGET_RESIZE",
+            Intent.ACTION_DATE_CHANGED,
+            AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED -> Util.updateWidget(context)
+        }
+    }
+
+    companion object {
+        fun setUpdates(context: Context) {
+            removeUpdates(context)
+
+            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                CalendarUtil.getEvents().forEach { event ->
+                    val hoursDiff = Period(Calendar.getInstance().timeInMillis, event.startDate).hours
+
+                    // Update the widget every hour till the event
+                    (0 .. hoursDiff).forEach {
+                        setExact(
+                            AlarmManager.RTC_WAKEUP,
+                            (event.startDate + 1000) - it * 1000 * 60* 60,
+                            PendingIntent.getBroadcast(context, 0, Intent(context, UpdatesReceiver::class.java).apply { action = Actions.ACTION_TIME_UPDATE }, 0)
+                        )
+                    }
+
+                    // Update the widget one second after the event is finished
+                    setExact(
+                        AlarmManager.RTC_WAKEUP,
+                        event.endDate + 1000,
+                        PendingIntent.getBroadcast(context, 0, Intent(context, UpdatesReceiver::class.java).apply { action = Actions.ACTION_TIME_UPDATE }, 0)
+                    )
+                }
+            }
+        }
+
+        fun removeUpdates(context: Context) {
+            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                cancel(PendingIntent.getBroadcast(context, 0, Intent(context, UpdatesReceiver::class.java), 0))
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt
new file mode 100644
index 0000000..e4e9136
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt
@@ -0,0 +1,83 @@
+package com.tommasoberlose.anotherwidget.receivers
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.WeatherUtil
+import java.util.*
+
+
+class WeatherReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) {
+            setUpdates(context)
+        } else if (intent.action == Actions.ACTION_WEATHER_UPDATE) {
+            WeatherUtil.updateWeather(context)
+        }
+    }
+
+    companion object {
+        fun setUpdates(context: Context) {
+            removeUpdates(context)
+
+            if (Preferences.showWeather && Preferences.weatherProviderApi != "") {
+                WeatherUtil.updateWeather(context)
+
+                with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                    val pi = PendingIntent.getBroadcast(
+                        context,
+                        1,
+                        Intent(context, WeatherReceiver::class.java).apply {
+                            action = Actions.ACTION_WEATHER_UPDATE
+                        },
+                        0
+                    )
+
+                    val refresh: Long = when (Preferences.weatherRefreshPeriod) {
+                        0 -> 30
+                        1 -> 60
+                        2 -> 60 * 3
+                        3 -> 60 * 6
+                        4 -> 60 * 12
+                        5 -> 60 * 24
+                        else -> 60
+                    }
+                    val now = Calendar.getInstance().apply {
+                        set(Calendar.MILLISECOND, 0)
+                        set(Calendar.SECOND, 0)
+                    }
+
+                    setRepeating(AlarmManager.RTC_WAKEUP, now.timeInMillis, 1000 * 60 * refresh, pi)
+                }
+            }
+        }
+
+        fun setOneTimeUpdate(context: Context) {
+            // Update the weather in a few minuter when the api key has been changed
+            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+                val pi = PendingIntent.getBroadcast(context, 1, Intent(context, WeatherReceiver::class.java).apply { action = Actions.ACTION_WEATHER_UPDATE }, 0)
+                val now = Calendar.getInstance().apply {
+                    set(Calendar.MILLISECOND, 0)
+                    set(Calendar.SECOND, 0)
+                }
+
+                listOf(10, 15, 20).forEach {
+                    setExact(AlarmManager.RTC_WAKEUP, now.timeInMillis + 1000 * 60 * it, pi)
+                }
+            }
+        }
+
+        fun removeUpdates(context: Context) {
+            val intent = Intent(context, WeatherReceiver::class.java)
+            val sender = PendingIntent.getBroadcast(context, 1, intent, 0)
+            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+            alarmManager.cancel(sender)
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/OpenWeatherIntentReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WidgetClickListenerReceiver.kt
similarity index 68%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/receiver/OpenWeatherIntentReceiver.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WidgetClickListenerReceiver.kt
index e63da2c..828fa82 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/receiver/OpenWeatherIntentReceiver.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WidgetClickListenerReceiver.kt
@@ -1,21 +1,19 @@
-package com.tommasoberlose.anotherwidget.receiver
+package com.tommasoberlose.anotherwidget.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.util.Log
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.util.Util
-import android.support.v4.content.ContextCompat.startActivity
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.global.Constants
 
 
-
-class OpenWeatherIntentReceiver : BroadcastReceiver() {
+class WidgetClickListenerReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == Constants.ACTION_OPEN_WEATHER_INTENT) {
-            context.sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
+        if (intent.action == Actions.ACTION_OPEN_WEATHER_INTENT) {
+            context.sendBroadcast(Intent(Actions.ACTION_WEATHER_UPDATE))
             try {
                 context.startActivity(Util.getWeatherIntent(context))
             } catch (e: Exception) {
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/AWApplication.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/AWApplication.kt
deleted file mode 100644
index 66adade..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/AWApplication.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui
-
-import android.annotation.SuppressLint
-import android.app.Application
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import android.util.Log
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.util.MyMigration
-import com.tommasoberlose.anotherwidget.util.Util
-
-import io.realm.Realm
-import io.realm.RealmConfiguration
-
-class AWApplication : Application() {
-    @SuppressLint("ApplySharedPref")
-    override fun onCreate() {
-        super.onCreate()
-        Realm.init(this)
-        val config = RealmConfiguration.Builder()
-                .schemaVersion(2)
-                .migration(MyMigration())
-                .deleteRealmIfMigrationNeeded()
-                .build()
-        Realm.setDefaultConfiguration(config)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt
new file mode 100644
index 0000000..1c8d1ad
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt
@@ -0,0 +1,140 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.app.Activity
+import android.os.Bundle
+import com.tommasoberlose.anotherwidget.R
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import com.tommasoberlose.anotherwidget.components.events.ApplicationListEvent
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.view.Window
+import android.widget.ImageView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.Observable
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.transition.MaterialFadeThrough
+import com.tommasoberlose.anotherwidget.components.events.AppInfoSavedEvent
+import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding
+import com.tommasoberlose.anotherwidget.databinding.FragmentClockSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.ui.viewmodels.ChooseApplicationViewModel
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.toast
+import kotlinx.android.synthetic.main.activity_choose_application.*
+import kotlinx.android.synthetic.main.activity_choose_application.list_view
+import kotlinx.coroutines.*
+import net.idik.lib.slimadapter.SlimAdapter
+
+
+class ChooseApplicationActivity : AppCompatActivity() {
+
+    private lateinit var adapter: SlimAdapter
+    private lateinit var viewModel: ChooseApplicationViewModel
+    private val pm by lazy { packageManager }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(ChooseApplicationViewModel::class.java)
+        val binding = DataBindingUtil.setContentView<ActivityChooseApplicationBinding>(this, R.layout.activity_choose_application)
+
+        list_view.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(this)
+        list_view.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<String>(R.layout.application_info_layout) { _, injector ->
+                injector
+                    .text(R.id.text, getString(R.string.default_name))
+                    .image(R.id.icon, R.drawable.round_add_to_home_screen)
+                    .with<ImageView>(R.id.icon) {
+                        it.scaleX = 0.8f
+                        it.scaleY = 0.8f
+                        it.setColorFilter(ContextCompat.getColor(this, R.color.colorPrimaryText), android.graphics.PorterDuff.Mode.MULTIPLY)
+                    }
+                    .clicked(R.id.item) {
+                    val resultIntent = Intent()
+                    resultIntent.putExtra(Constants.RESULT_APP_NAME, "")
+                    resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, "")
+                    setResult(Activity.RESULT_OK, resultIntent)
+                    finish()
+                }
+            }
+            .register<ApplicationInfo>(R.layout.application_info_layout) { item, injector ->
+                injector
+                    .text(R.id.text, pm.getApplicationLabel(item).toString())
+
+                try {
+                    injector.image(R.id.icon, item.loadIcon(pm))
+                } catch (ignore: Exception) {
+                }
+
+                injector.clicked(R.id.item) {
+                    saveApp(item)
+                }
+            }
+            .attachTo(list_view)
+
+        setupListener()
+        subscribeUi(binding, viewModel)
+
+        search.requestFocus()
+    }
+
+    private var filterJob: Job? = null
+
+    private fun subscribeUi(binding: ActivityChooseApplicationBinding, viewModel: ChooseApplicationViewModel) {
+        binding.viewModel = viewModel
+        viewModel.appList.observe(this, Observer {
+            adapter.updateData(listOf("Default") + it)
+            loader.visibility = View.INVISIBLE
+        })
+
+        viewModel.searchInput.observe(this, Observer { search ->
+            loader.visibility = View.VISIBLE
+            filterJob?.cancel()
+            filterJob = lifecycleScope.launch(Dispatchers.IO) {
+                delay(200)
+                val list = if (search == null || search == "") {
+                    viewModel.appList.value!!
+                } else {
+                    viewModel.appList.value!!.filter {
+                        pm.getApplicationLabel(
+                            it
+                        ).toString().contains(search, true)
+                    }
+                }
+                withContext(Dispatchers.Main) {
+                    adapter.updateData(listOf("Default") + list)
+                    loader.visibility = View.INVISIBLE
+                }
+
+            }
+        })
+    }
+
+    private fun setupListener() {
+        action_back.setOnClickListener {
+            onBackPressed()
+        }
+    }
+
+    private fun saveApp(app: ApplicationInfo) {
+        val resultIntent = Intent()
+        resultIntent.putExtra(Constants.RESULT_APP_NAME, pm.getApplicationLabel(app).toString())
+        resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, app.packageName)
+        setResult(Activity.RESULT_OK, resultIntent)
+        finish()
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt
new file mode 100644
index 0000000..cf50e1c
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt
@@ -0,0 +1,161 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.location.Address
+import android.location.Geocoder
+import android.os.Bundle
+import com.tommasoberlose.anotherwidget.R
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.view.Window
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.chibatching.kotpref.bulk
+import com.google.android.material.transition.MaterialFadeThrough
+import com.google.android.material.transition.MaterialSharedAxis
+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.components.events.CustomLocationEvent
+import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding
+import com.tommasoberlose.anotherwidget.databinding.ActivityCustomLocationBinding
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.viewmodels.ChooseApplicationViewModel
+import com.tommasoberlose.anotherwidget.ui.viewmodels.CustomLocationViewModel
+import kotlinx.android.synthetic.main.activity_custom_location.*
+import kotlinx.coroutines.*
+import net.idik.lib.slimadapter.SlimAdapter
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.ThreadMode
+import org.greenrobot.eventbus.Subscribe
+
+class CustomLocationActivity : AppCompatActivity() {
+
+    private lateinit var adapter: SlimAdapter
+    private lateinit var viewModel: CustomLocationViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(CustomLocationViewModel::class.java)
+        val binding = DataBindingUtil.setContentView<ActivityCustomLocationBinding>(this, R.layout.activity_custom_location)
+
+
+        list_view.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(this)
+        list_view.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<String>(R.layout.custom_location_item) { _, injector ->
+                injector
+                    .text(R.id.text, getString(R.string.custom_location_gps))
+                    .clicked(R.id.text) {
+                        requirePermission()
+                    }
+            }
+            .register<Address>(R.layout.custom_location_item) { item, injector ->
+                injector.text(R.id.text, item.getAddressLine(0))
+                injector.clicked(R.id.text) {
+                    Preferences.bulk {
+                        customLocationLat = item.latitude.toString()
+                        customLocationLon = item.longitude.toString()
+                        customLocationAdd = item.getAddressLine(0)
+                        setResult(Activity.RESULT_OK)
+                        finish()
+                    }
+                }
+            }
+            .attachTo(list_view)
+
+
+        viewModel.addresses.observe(this, Observer {
+            adapter.updateData(listOf("Default") + it)
+        })
+
+        setupListener()
+        subscribeUi(binding, viewModel)
+
+        location.requestFocus()
+
+    }
+    private var searchJob: Job? = null
+
+    private fun subscribeUi(binding: ActivityCustomLocationBinding, viewModel: CustomLocationViewModel) {
+        binding.viewModel = viewModel
+        viewModel.addresses.observe(this, Observer {
+            adapter.updateData(listOf("Default") + it)
+            loader.visibility = View.INVISIBLE
+        })
+
+        viewModel.locationInput.observe(this, Observer { location ->
+            loader.visibility = View.VISIBLE
+            searchJob?.cancel()
+            searchJob = lifecycleScope.launch(Dispatchers.IO) {
+                delay(200)
+                val list = if (location == null || location == "") {
+                    viewModel.addresses.value!!
+                } else {
+                    val coder = Geocoder(this@CustomLocationActivity)
+                    try {
+                        coder.getFromLocationName(location, 10) as ArrayList<Address>
+                    } catch (ignored: Exception) {
+                        emptyList<Address>()
+                    }
+                }
+                withContext(Dispatchers.Main) {
+                    viewModel.addresses.value = list
+                    loader.visibility = View.INVISIBLE
+                }
+
+            }
+        })
+    }
+
+    private fun requirePermission() {
+        Dexter.withContext(this)
+            .withPermissions(
+                Manifest.permission.ACCESS_FINE_LOCATION
+            ).withListener(object: MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        if (report.areAllPermissionsGranted()){
+                            Preferences.bulk {
+                                remove(Preferences::customLocationLat)
+                                remove(Preferences::customLocationLon)
+                                remove(Preferences::customLocationAdd)
+                            }
+                            setResult(Activity.RESULT_OK)
+                            finish()
+                        }
+                    }
+                }
+                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 setupListener() {
+        action_back.setOnClickListener {
+            onBackPressed()
+        }
+    }
+}
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
new file mode 100644
index 0000000..4412842
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt
@@ -0,0 +1,198 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.animation.ValueAnimator
+import android.app.Activity
+import android.os.Bundle
+import android.appwidget.AppWidgetManager
+import android.view.View
+import com.tommasoberlose.anotherwidget.R
+import android.content.Intent
+import android.content.SharedPreferences
+import android.graphics.drawable.Drawable
+import android.util.TypedValue
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.animation.addListener
+import androidx.core.animation.doOnEnd
+import androidx.core.view.isVisible
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.tabs.TabLayoutMediator
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.ui.adapters.ViewPagerAdapter
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.*
+import kotlinx.android.synthetic.main.activity_main.*
+import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver
+import com.tommasoberlose.anotherwidget.ui.widgets.TheWidget
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+
+class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    private var mAppWidgetId: Int = -1
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        viewModel = ViewModelProvider(this).get(MainViewModel::class.java)
+
+        controlExtras(intent)
+
+        // Viewpager
+        pager.adapter = ViewPagerAdapter(this)
+        pager.offscreenPageLimit = 4
+        TabLayoutMediator(tabs, pager) { tab, position ->
+            tab.text = when (position) {
+                0 -> getString(R.string.settings_general_title)
+                1 -> getString(R.string.settings_calendar_title)
+                2 -> getString(R.string.settings_weather_title)
+                3 -> getString(R.string.settings_clock_title)
+                4 -> getString(R.string.advanced_settings_title)
+                else -> ""
+            }
+        }.attach()
+
+        Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
+        subscribeUi(viewModel)
+        updateUI()
+    }
+
+    private fun updateUI() {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val generatedView = TheWidget.generateWidgetView(this@MainActivity, preview.measuredWidth)
+            generatedView.measure(0, 0)
+            val bitmap = Util.getBitmapFromView(generatedView, generatedView.measuredWidth, generatedView.measuredHeight)
+            withContext(Dispatchers.Main) {
+                // Clock
+                clock.setTextColor(Util.getFontColor())
+                clock.setTextSize(TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(this@MainActivity))
+                clock.format12Hour = "hh:mm"
+
+                if ((Preferences.showClock && !clock.isVisible) || (!Preferences.showClock && clock.isVisible)) {
+                    if (Preferences.showClock) {
+                        clock.layoutParams = clock.layoutParams.apply {
+                            height = RelativeLayout.LayoutParams.WRAP_CONTENT
+                        }
+                        clock.measure(0, 0)
+                    }
+                    val initialHeight = clock.measuredHeight
+                    ValueAnimator.ofFloat(
+                        if (Preferences.showClock) 0f else 1f,
+                        if (Preferences.showClock) 1f else 0f
+                    ).apply {
+                        duration = 500L
+                        addUpdateListener {
+                            val animatedValue = animatedValue as Float
+                            clock.layoutParams = clock.layoutParams.apply {
+                                height = (initialHeight * animatedValue).toInt()
+                            }
+                        }
+                        addListener(
+                            onStart = {
+                                if (Preferences.showClock) {
+                                    clock.isVisible = true
+                                }
+                            },
+                            onEnd = {
+                                if (!Preferences.showClock) {
+                                    clock.isVisible = false
+                                }
+                            }
+                        )
+                    }.start()
+
+                    ValueAnimator.ofInt(
+                        preview.measuredHeight,
+                        160.toPixel(this@MainActivity) + if (Preferences.showClock) 100.toPixel(this@MainActivity) else 0
+                    ).apply {
+                        duration = 500L
+                        addUpdateListener {
+                            val animatedValue = animatedValue as Int
+                            val layoutParams = preview.layoutParams
+                            layoutParams.height = animatedValue
+                            preview.layoutParams = layoutParams
+                        }
+                    }.start()
+                }
+
+                widget_bitmap.setImageBitmap(bitmap)
+            }
+        }
+    }
+
+    private fun subscribeUi(viewModel: MainViewModel) {
+        viewModel.showWallpaper.observe(this, Observer {
+            widget_bg.setImageDrawable(if (it) Util.getCurrentWallpaper(this) else null)
+        })
+    }
+
+    override fun onBackPressed() {
+        if (mAppWidgetId > 0) {
+            addNewWidget()
+        } else {
+            setResult(Activity.RESULT_OK)
+            finish()
+        }
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        if (intent != null) {
+            controlExtras(intent)
+        }
+    }
+
+    private fun controlExtras(intent: Intent) {
+        val extras = intent.extras
+        if (extras != null) {
+            mAppWidgetId = extras.getInt(
+                AppWidgetManager.EXTRA_APPWIDGET_ID,
+                AppWidgetManager.INVALID_APPWIDGET_ID)
+
+            if (mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
+                action_add_widget.visibility = View.VISIBLE
+                action_add_widget.setOnClickListener {
+                    addNewWidget()
+                }
+            }
+
+
+            if (extras.containsKey(Actions.ACTION_EXTRA_OPEN_WEATHER_PROVIDER)) {
+                startActivityForResult(Intent(this, WeatherProviderActivity::class.java), RequestCode.WEATHER_PROVIDER_REQUEST_CODE.code)
+            }
+            if (extras.containsKey(Actions.ACTION_EXTRA_DISABLE_GPS_NOTIFICATION)) {
+                Preferences.showGpsInformation = false
+                sendBroadcast(Intent(Actions.ACTION_WEATHER_UPDATE))
+                finish()
+            }
+        }
+    }
+
+    private fun addNewWidget() {
+        val resultValue = Intent()
+        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId)
+        setResult(Activity.RESULT_OK, resultValue)
+        finish()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Preferences.preferences.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(preferences: SharedPreferences, p1: String) {
+        updateUI()
+        Util.updateWidget(this)
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/SupportDevActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/SupportDevActivity.kt
new file mode 100644
index 0000000..56f9f99
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/SupportDevActivity.kt
@@ -0,0 +1,93 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.location.Address
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.isVisible
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.android.billingclient.api.*
+import com.android.billingclient.api.BillingClient.BillingResponseCode.OK
+import com.android.billingclient.api.BillingClient.BillingResponseCode.USER_CANCELED
+import com.chibatching.kotpref.bulk
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.databinding.ActivitySupportDevBinding
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.viewmodels.SupportDevViewModel
+import com.tommasoberlose.anotherwidget.utils.toast
+import kotlinx.android.synthetic.main.activity_support_dev.*
+import net.idik.lib.slimadapter.SlimAdapter
+
+class SupportDevActivity : AppCompatActivity(), PurchasesUpdatedListener {
+
+    private val BILLING_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAox5CcxuoLJ6CmNS7s6lVQzJ253njKKGF8MoQ/gQ5gEw2Fr03fBvtHpiVMpnjhNLw5NMeIpzRvkVqeQ7BfkC7c0BLCJUqf/fFA11ArQe8na6QKt5O4d+v4sbHtP7mm3GQNPOBaqRzcpFZaiAbfk6mnalo+tzM47GXrQFt5bNSrMctCs7bbChqJfH2cyMW0F8DHWEEeO5xElBmH3lh4FVpwIUTPYJIV3n0yhE3qqRA0WXkDej66g/uAt/rebmMZLmwNwIive5cObU4o41YyKRv2wSAicrv3W40LftzXAOOordIbmzDFN8ksh3VrnESqwCDGG97nZVbPG/+3LD0xHWiRwIDAQAB"
+    private lateinit var viewModel: SupportDevViewModel
+    private lateinit var adapter: SlimAdapter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(SupportDevViewModel::class.java)
+        viewModel.billingClient = BillingClient.newBuilder(this).enablePendingPurchases().setListener(this).build()
+        val binding = DataBindingUtil.setContentView<ActivitySupportDevBinding>(this, R.layout.activity_support_dev)
+
+
+        list_view.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(this)
+        list_view.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<SkuDetails>(R.layout.inapp_product_layout) { item, injector ->
+                injector
+                    .text(R.id.product_title, item.title.replace("(Another Widget)", ""))
+                    .text(R.id.product_price, item.price)
+                    .clicked(R.id.item) {
+                        viewModel.purchase(this, item)
+                    }
+            }
+            .attachTo(list_view)
+
+        viewModel.openConnection()
+        subscribeUi(viewModel)
+
+        action_back.setOnClickListener {
+            onBackPressed()
+        }
+    }
+
+    private fun subscribeUi(viewModel: SupportDevViewModel) {
+        viewModel.products.observe(this, Observer {
+            if (it.isNotEmpty()) {
+                loader.isVisible = false
+            }
+            adapter.updateData(it.sortedWith(compareBy(SkuDetails::getPriceAmountMicros)))
+        })
+    }
+
+    override fun onPurchasesUpdated(billingResult: BillingResult, purchases: List<Purchase>?) {
+        if (billingResult.responseCode == OK && purchases != null) {
+            for (purchase in purchases) {
+                if (purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
+                    viewModel.handlePurchase(purchase)
+                    toast(getString(R.string.thanks))
+                }
+            }
+        } else if (billingResult.responseCode == USER_CANCELED) {
+            // DO nothing
+        } else {
+            toast(getString(R.string.error))
+        }
+    }
+
+    public override fun onDestroy() {
+        viewModel.closeConnection()
+        super.onDestroy()
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/WeatherProviderActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/WeatherProviderActivity.kt
new file mode 100644
index 0000000..b1cb423
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/WeatherProviderActivity.kt
@@ -0,0 +1,63 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.DialogInterface
+import android.content.SharedPreferences
+import android.os.Build
+import android.os.Bundle
+import android.text.Editable
+import android.text.Html
+import android.text.TextWatcher
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.WeatherUtil
+import com.tommasoberlose.anotherwidget.utils.openURI
+import kotlinx.android.synthetic.main.activity_weather_provider.*
+
+class WeatherProviderActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_weather_provider)
+
+        action_back.setOnClickListener {
+            onBackPressed()
+        }
+
+        action_save.setOnClickListener {
+            Preferences.weatherProviderApi = api_key.editText?.text.toString()
+            setResult(Activity.RESULT_OK)
+            finish()
+        }
+
+        action_open_provider.setOnClickListener {
+            openURI("https://home.openweathermap.org/users/sign_up")
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            last_info.text = Html.fromHtml(getString(R.string.api_key_info_all_set), Html.FROM_HTML_MODE_LEGACY)
+        } else {
+            last_info.text = Html.fromHtml(getString(R.string.api_key_info_all_set))
+        }
+        api_key.editText?.setText(Preferences.weatherProviderApi)
+    }
+
+    override fun onBackPressed() {
+        if (api_key.editText?.text.toString() == "") {
+            AlertDialog.Builder(this)
+                    .setMessage(getString(R.string.error_weather_api_key))
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .setPositiveButton(android.R.string.yes) { _, _ ->
+                        super.onBackPressed()
+                    }
+                .show()
+        } else {
+            super.onBackPressed()
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/ChooseApplicationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/ChooseApplicationActivity.kt
deleted file mode 100644
index b5429b7..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/ChooseApplicationActivity.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.activity
-
-import android.app.Activity
-import android.location.Address
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import android.preference.PreferenceManager
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.`object`.CustomLocationEvent
-import kotlinx.android.synthetic.main.activity_choose_application.*
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-import android.content.Intent
-import android.content.pm.ApplicationInfo
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import com.tommasoberlose.anotherwidget.`object`.ApplicationListEvent
-import android.content.pm.PackageManager
-import android.location.Geocoder
-import android.support.v7.widget.LinearLayoutManager
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.View
-import com.tommasoberlose.anotherwidget.`object`.AppInfoSavedEvent
-import com.tommasoberlose.anotherwidget.ui.adapter.ApplicationInfoAdapter
-
-
-class ChooseApplicationActivity : AppCompatActivity() {
-    lateinit var adapter: ApplicationInfoAdapter
-    val appList = ArrayList<ApplicationInfo>()
-    val appListFiltered = ArrayList<ApplicationInfo>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_choose_application)
-        val pm = packageManager
-
-        action_default.setOnClickListener {
-            selectDefaultApp()
-        }
-
-        action_back.setOnClickListener {
-            onBackPressed()
-        }
-
-        action_none.setOnClickListener {
-            removeClickAction()
-        }
-
-        list_view.setHasFixedSize(true);
-        val mLayoutManager = LinearLayoutManager(this);
-        list_view.layoutManager = mLayoutManager;
-
-        adapter = ApplicationInfoAdapter(this, appListFiltered);
-        list_view.setAdapter(adapter);
-
-        location.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(text: Editable?) {
-                Thread().run {
-                    val appsFiltered = if (text == null || text.equals("")) appList else appList.filter { pm.getApplicationLabel(it).toString().contains(text.toString(), true) }
-                    EventBus.getDefault().post(ApplicationListEvent(appsFiltered, true))
-                }
-            }
-
-            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-
-            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-        })
-
-    }
-
-    fun selectDefaultApp() {
-        val resultIntent = Intent()
-        resultIntent.putExtra(Constants.RESULT_APP_NAME, "")
-        resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, "")
-        setResult(Activity.RESULT_OK, resultIntent)
-        finish()
-    }
-
-    fun removeClickAction() {
-        val resultIntent = Intent()
-        resultIntent.putExtra(Constants.RESULT_APP_NAME, getString(R.string.action_none))
-        resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, "_")
-        setResult(Activity.RESULT_OK, resultIntent)
-        finish()
-    }
-
-    fun multiEventAction() {
-        val resultIntent = Intent()
-        resultIntent.putExtra(Constants.RESULT_APP_NAME, getString(R.string.action_go_to_next_event))
-        resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, Constants.PREF_SHOW_NEXT_EVENT)
-        setResult(Activity.RESULT_OK, resultIntent)
-        finish()
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
-    fun saveApp(e: AppInfoSavedEvent) {
-        val pm = packageManager
-        val resultIntent = Intent()
-        resultIntent.putExtra(Constants.RESULT_APP_NAME, pm.getApplicationLabel(e.app).toString())
-        resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, e.app.packageName)
-        setResult(Activity.RESULT_OK, resultIntent)
-        finish()
-    }
-
-    public override fun onStart() {
-        super.onStart()
-        EventBus.getDefault().register(this)
-    }
-
-    public override fun onResume() {
-        super.onResume()
-        Thread().run {
-            val pm = packageManager
-            val apps = pm.getInstalledApplications(0)
-            EventBus.getDefault().post(ApplicationListEvent(apps, false))
-        }
-    }
-
-    public override fun onStop() {
-        EventBus.getDefault().unregister(this)
-        super.onStop()
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
-    fun onMessageEvent(event: ApplicationListEvent) {
-        if (!event.filtered) {
-            appList.clear()
-            event.apps.mapTo(appList, {it})
-        }
-        appListFiltered.clear()
-        event.apps.mapTo(appListFiltered, {it})
-        adapter.changeData(appListFiltered)
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/CustomLocationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/CustomLocationActivity.kt
deleted file mode 100644
index 3a57818..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/CustomLocationActivity.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.activity
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.location.Address
-import android.location.Geocoder
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import android.preference.PreferenceManager
-import android.transition.Slide
-import android.view.Gravity
-import com.tommasoberlose.anotherwidget.R
-import android.support.v4.view.ViewCompat.setAlpha
-import android.support.v4.view.ViewCompat.animate
-import android.text.Editable
-import android.text.TextWatcher
-import android.util.Log
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.ListView
-import android.widget.Toast
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.`object`.CustomLocationEvent
-import com.tommasoberlose.anotherwidget.util.WeatherUtil
-import kotlinx.android.synthetic.main.activity_custom_location.*
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.ThreadMode
-import org.greenrobot.eventbus.Subscribe
-
-
-
-
-
-
-class CustomLocationActivity : AppCompatActivity() {
-    lateinit var adapter: ArrayAdapter<String>
-    val addressesList = ArrayList<Address>()
-
-    @SuppressLint("ApplySharedPref")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_custom_location)
-
-        val SP = PreferenceManager.getDefaultSharedPreferences(this)
-
-        adapter = ArrayAdapter(this, R.layout.custom_location_item, addressesList.map { it.getAddressLine(0) })
-        list_view.adapter = adapter
-
-        list_view.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id ->
-            SP.edit()
-                    .putString(Constants.PREF_CUSTOM_LOCATION_LAT, addressesList[position].latitude.toString())
-                    .putString(Constants.PREF_CUSTOM_LOCATION_LON, addressesList[position].longitude.toString())
-                    .putString(Constants.PREF_CUSTOM_LOCATION_ADD, addressesList[position].getAddressLine(0))
-                    .commit()
-            setResult(Activity.RESULT_OK)
-            finish()
-        }
-
-        action_geolocation.setOnClickListener {
-            SP.edit()
-                    .remove(Constants.PREF_CUSTOM_LOCATION_LAT)
-                    .remove(Constants.PREF_CUSTOM_LOCATION_LON)
-                    .remove(Constants.PREF_CUSTOM_LOCATION_ADD)
-                    .commit()
-            setResult(Activity.RESULT_OK)
-            finish()
-        }
-
-        location.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(text: Editable?) {
-                if (text != null && !text.equals("")) {
-                    Thread().run {
-                        val coder = Geocoder(this@CustomLocationActivity)
-                        try {
-                            val addresses = coder.getFromLocationName(text.toString(), 10) as ArrayList<Address>
-                            EventBus.getDefault().post(CustomLocationEvent(addresses))
-                        } catch (ignored: Exception) {
-                            EventBus.getDefault().post(CustomLocationEvent(ArrayList<Address>()))
-                        }
-                    }
-                } else {
-                    EventBus.getDefault().post(CustomLocationEvent(ArrayList<Address>()))
-                }
-            }
-
-            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-
-            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-        })
-
-    }
-
-    public override fun onStart() {
-        super.onStart()
-        EventBus.getDefault().register(this)
-    }
-
-    public override fun onStop() {
-        EventBus.getDefault().unregister(this)
-        super.onStop()
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
-    fun onMessageEvent(event: CustomLocationEvent) {
-        adapter.clear()
-        addressesList.clear()
-        event.addresses.mapTo(addressesList, {it})
-        for (a:Address in addressesList) {
-            adapter.add(a.getAddressLine(0))
-        }
-        adapter.notifyDataSetChanged()
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/MainActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/MainActivity.kt
deleted file mode 100644
index 578d35c..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/MainActivity.kt
+++ /dev/null
@@ -1,882 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.activity
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.AlertDialog
-import android.content.pm.PackageManager
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import android.support.v4.app.ActivityCompat
-import android.appwidget.AppWidgetManager
-import android.content.*
-import android.preference.PreferenceManager
-import android.view.View
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.util.Util
-import com.tommasoberlose.anotherwidget.receiver.WeatherReceiver
-import java.util.*
-import java.util.concurrent.TimeUnit
-import android.content.Intent
-import android.content.BroadcastReceiver
-import com.tommasoberlose.anotherwidget.util.CalendarUtil
-import com.tommasoberlose.anotherwidget.util.WeatherUtil
-import android.content.DialogInterface
-import android.content.res.Resources
-import android.graphics.Color
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import android.os.Build
-import android.support.design.widget.BottomSheetDialog
-import android.support.v4.content.ContextCompat
-import android.text.Html
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.RelativeSizeSpan
-import android.util.Log
-import android.util.TypedValue
-import android.widget.Toast
-import com.crashlytics.android.Crashlytics
-import com.pes.androidmaterialcolorpickerdialog.ColorPicker
-import com.tommasoberlose.anotherwidget.`object`.CalendarSelector
-import com.tommasoberlose.anotherwidget.receiver.UpdatesReceiver
-import io.fabric.sdk.android.Fabric
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.key_time_wait_layout.view.*
-import kotlinx.android.synthetic.main.main_menu_layout.view.*
-import kotlinx.android.synthetic.main.the_widget.*
-import kotlinx.android.synthetic.main.the_widget.view.*
-import java.io.File
-
-
-class MainActivity : AppCompatActivity() {
-
-    private var mAppWidgetId: Int = -1
-    private lateinit var SP: SharedPreferences
-
-    private val receiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            updateUI()
-        }
-    }
-
-    @SuppressLint("ApplySharedPref")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        Fabric.with(this, Crashlytics())
-        sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-        sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-
-        SP = PreferenceManager.getDefaultSharedPreferences(this)
-
-        controlExtras(intent)
-
-        action_menu.setOnClickListener {
-            val mBottomSheetDialog = BottomSheetDialog(this)
-            val menuView: View = getLayoutInflater().inflate(R.layout.main_menu_layout, null)
-
-            menuView.action_share.setOnClickListener(object: View.OnClickListener {
-                override fun onClick(p0: View?) {
-                    Util.share(this@MainActivity)
-                    mBottomSheetDialog.dismiss()
-                }
-            })
-
-            if (SP.getBoolean(Constants.PREF_SHOW_WIDGET_PREVIEW, true)) {
-                menuView.widget_preview_icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_action_hide_preview))
-                menuView.widget_preview_label.text = getString(R.string.action_hide_widget_preview)
-                menuView.action_toggle_widget_preview.setOnClickListener {
-                    SP.edit()
-                            .putBoolean(Constants.PREF_SHOW_WIDGET_PREVIEW, false)
-                            .commit()
-                    updateUI()
-                    mBottomSheetDialog.dismiss()
-                }
-            } else {
-                menuView.widget_preview_icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_action_show_preview))
-                menuView.widget_preview_label.text = getString(R.string.action_show_widget_preview)
-                menuView.action_toggle_widget_preview.setOnClickListener {
-                    SP.edit()
-                            .putBoolean(Constants.PREF_SHOW_WIDGET_PREVIEW, true)
-                            .commit()
-                    updateUI()
-                    mBottomSheetDialog.dismiss()
-                }
-            }
-
-            menuView.action_rate.setOnClickListener(object: View.OnClickListener {
-                override fun onClick(p0: View?) {
-                    Util.rateApp(this@MainActivity, "https://play.google.com/store/apps/details?id=com.tommasoberlose.anotherwidget")
-                    mBottomSheetDialog.dismiss()
-                }
-            })
-
-            menuView.action_feedback.setOnClickListener(object: View.OnClickListener {
-                override fun onClick(p0: View?) {
-                    Util.sendEmail(this@MainActivity)
-                    mBottomSheetDialog.dismiss()
-                }
-            })
-
-            menuView.action_refresh.setOnClickListener {
-                WeatherUtil.updateWeather(this)
-                CalendarUtil.updateEventList(this)
-                Util.updateWidget(this)
-                mBottomSheetDialog.dismiss()
-            }
-
-            menuView.action_support.setOnClickListener {
-                startActivity(Intent(this, SupportDevActivity::class.java))
-                mBottomSheetDialog.dismiss()
-            }
-
-            mBottomSheetDialog.setContentView(menuView)
-            mBottomSheetDialog.show()
-        }
-    }
-
-    override fun onBackPressed() {
-        if (mAppWidgetId > 0) {
-            addNewWidget()
-        } else {
-            setResult(Activity.RESULT_OK)
-            finish()
-        }
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-
-        if (intent != null) {
-            controlExtras(intent)
-        }
-    }
-
-    fun controlExtras(intent: Intent) {
-        val extras = intent.extras
-        if (extras != null) {
-            mAppWidgetId = extras.getInt(
-                    AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID)
-
-            if (mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
-                action_add_widget.visibility = View.VISIBLE
-
-                action_add_widget.setOnClickListener {
-                    addNewWidget()
-                }
-            }
-
-
-            if (extras.containsKey(Constants.ACTION_EXTRA_OPEN_WEATHER_PROVIDER)) {
-                startActivityForResult(Intent(this, WeatherProviderActivity::class.java), Constants.WEATHER_PROVIDER_REQUEST_CODE)
-            }
-            if (extras.containsKey(Constants.ACTION_EXTRA_DISABLE_GPS_NOTIFICATION)) {
-                SP.edit()
-                        .putBoolean(Constants.PREF_SHOW_GPS_NOTIFICATION, false)
-                        .apply()
-                sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-                finish()
-            }
-        }
-    }
-
-    fun addNewWidget() {
-        val resultValue = Intent()
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId)
-        setResult(Activity.RESULT_OK, resultValue)
-        finish()
-        sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-        sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-    }
-
-    override fun onResume() {
-        super.onResume()
-        val filter = IntentFilter()
-        filter.addAction(Constants.ACTION_SOMETHING_HAPPENED);
-        registerReceiver(receiver, filter);
-        updateUI()
-    }
-
-    override fun onPause() {
-        unregisterReceiver(receiver);
-        super.onPause();
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>,
-                                   grantResults: IntArray) {
-        when (requestCode) {
-            Constants.CALENDAR_REQUEST_CODE -> if (!(permissions.size != 1 || grantResults.size != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED)) {
-                sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-                updateAppWidget()
-                updateSettings()
-            }
-            Constants.LOCATION_REQUEST_CODE -> if (!(permissions.size != 1 || grantResults.size != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED)) {
-                val SP = PreferenceManager.getDefaultSharedPreferences(this)
-                sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-                updateAppWidget()
-                updateSettings()
-            }
-        }
-    }
-
-    fun updateUI() {
-        updateSettings()
-        updateAppWidget()
-        updateClockView()
-
-        if (SP.getBoolean(Constants.PREF_SHOW_WIDGET_PREVIEW, true)) {
-            val displayMetrics = Resources.getSystem().displayMetrics
-            var width = displayMetrics.widthPixels
-            if (width <= 0) {
-                width = Util.convertDpToPixel(300f, this).toInt()
-            }
-            var height = Util.convertDpToPixel(120f, this).toInt()
-            if (SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-                height += Util.convertSpToPixels(SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f), this).toInt() + Util.convertDpToPixel(16f, this).toInt()
-            }
-            if (SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) + SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) > 50) {
-                height += Util.convertDpToPixel(24f, this).toInt()
-            }
-            widget_bitmap.setImageBitmap(Util.getBitmapFromView(main_layout, width, height - Util.convertDpToPixel(32f, this).toInt()))
-            widget.layoutParams.height = height + Util.convertDpToPixel(16f, this).toInt()
-
-            widget.visibility = View.VISIBLE
-        } else {
-            widget.visibility = View.GONE
-        }
-    }
-
-
-    internal fun updateAppWidget() {
-        val wallpaper: Drawable? = Util.getCurrentWallpaper(this)
-        if (wallpaper != null) {
-            widget_bg.setImageDrawable(wallpaper)
-        }
-        widget_bg.setBackgroundColor(Color.WHITE)
-        updateCalendarView()
-        updateLocationView()
-        updateClockView()
-    }
-
-    @SuppressLint("ApplySharedPref")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == Constants.RESULT_CODE_CUSTOM_LOCATION && resultCode == Activity.RESULT_OK) {
-            sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-            updateSettings()
-        } else if (requestCode == Constants.CALENDAR_APP_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-            SP.edit()
-                    .putString(Constants.PREF_CALENDAR_APP_NAME, if (data.getStringExtra(Constants.RESULT_APP_NAME) != "") data.getStringExtra(Constants.RESULT_APP_NAME) else getString(R.string.default_calendar_app))
-                    .putString(Constants.PREF_CALENDAR_APP_PACKAGE, data.getStringExtra(Constants.RESULT_APP_PACKAGE))
-                    .commit()
-            Util.updateWidget(this)
-            updateSettings()
-        } else if (requestCode == Constants.WEATHER_APP_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-            SP.edit()
-                    .putString(Constants.PREF_WEATHER_APP_NAME, if (data.getStringExtra(Constants.RESULT_APP_NAME) != "") data.getStringExtra(Constants.RESULT_APP_NAME) else getString(R.string.default_weather_app))
-                    .putString(Constants.PREF_WEATHER_APP_PACKAGE, data.getStringExtra(Constants.RESULT_APP_PACKAGE))
-                    .commit()
-            Util.updateWidget(this)
-            updateSettings()
-        } else if (requestCode == Constants.EVENT_APP_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-            SP.edit()
-                    .putString(Constants.PREF_EVENT_APP_NAME, if (data.getStringExtra(Constants.RESULT_APP_NAME) != "") data.getStringExtra(Constants.RESULT_APP_NAME) else getString(R.string.default_event_app))
-                    .putString(Constants.PREF_EVENT_APP_PACKAGE, data.getStringExtra(Constants.RESULT_APP_PACKAGE))
-                    .commit()
-            Util.updateWidget(this)
-            updateSettings()
-        } else if (requestCode == Constants.CLOCK_APP_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-            SP.edit()
-                    .putString(Constants.PREF_CLOCK_APP_NAME, if (data.getStringExtra(Constants.RESULT_APP_NAME) != "") data.getStringExtra(Constants.RESULT_APP_NAME) else getString(R.string.default_clock_app))
-                    .putString(Constants.PREF_CLOCK_APP_PACKAGE, data.getStringExtra(Constants.RESULT_APP_PACKAGE))
-                    .commit()
-            Util.updateWidget(this)
-            updateSettings()
-        } else if (requestCode == Constants.WEATHER_PROVIDER_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
-            WeatherReceiver().setOneTimeUpdate(this)
-            sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-            updateSettings()
-        } else if (requestCode == Constants.CUSTOM_FONT_CHOOSER_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-            /*val uri = data.data
-            Log.d("AW", "File Uri: " + uri.toString())
-            val path = Util.getPath(this, uri)
-            Log.d("AW", "File Path: " + path)
-            SP.edit()
-                    .putString(Constants.PREF_CUSTOM_FONT_FILE, path)
-                    .commit()
-            sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            updateSettings()*/
-        }
-    }
-
-    fun updateClockView() {
-        if (!SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-            time.visibility = View.GONE
-        } else {
-            time.visibility = View.VISIBLE
-        }
-        val now = Calendar.getInstance()
-        if (SP.getString(Constants.PREF_HOUR_FORMAT, "12") == "12") {
-            // time.format12Hour = "hh:mm a"
-//            val textBadHour = SpannableString(Constants.badHourFormat.format(time.))
-//            textBadHour.setSpan(RelativeSizeSpan(0.4f), textBadHour.length - 2,
-//                    textBadHour.length, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
-//
-//            time.text = textBadHour
-        } else {
-          // time.format24Hour = "HH:mm"
-//            time.text = Constants.goodHourFormat.format(now.timeInMillis)
-        }
-    }
-
-    fun updateCalendarView() {
-        val now = Calendar.getInstance()
-        val calendarLayout = SP.getBoolean(Constants.PREF_SHOW_EVENTS, true) && Util.checkGrantedPermission(this, Manifest.permission.READ_CALENDAR)
-
-        empty_layout.visibility = View.VISIBLE
-        calendar_layout.visibility = View.GONE
-        var dateStringValue: String = Util.getCapWordString(Constants.engDateFormat.format(now.time))
-        if (SP.getBoolean(Constants.PREF_ITA_FORMAT_DATE, false)) {
-            dateStringValue = Util.getCapWordString(Constants.itDateFormat.format(now.time))
-        }
-        empty_date.text = dateStringValue
-
-        if (calendarLayout) {
-            val e = CalendarUtil.getNextEvent(this)
-
-            if (e.id != 0.toLong()) {
-                next_event.text = e.title
-
-                if (SP.getBoolean(Constants.PREF_SHOW_NEXT_EVENT, false) && CalendarUtil.getEventsCount(this) > 1) {
-                    multiple_events.visibility = View.VISIBLE
-                } else {
-                    multiple_events.visibility = View.GONE
-                }
-
-                if (SP.getBoolean(Constants.PREF_SHOW_DIFF_TIME, true)) {
-                    next_event_difference_time.text = Util.getDifferenceText(this, now.timeInMillis, e.startDate)
-                    next_event_difference_time.visibility = View.VISIBLE
-                } else {
-                    next_event_difference_time.visibility = View.GONE
-                }
-
-
-                if (SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0) == 2 && Util.getNextAlarm(this) != null) {
-                    second_row_icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_action_alarm))
-                    next_event_date.text = Util.getNextAlarm(this)
-                } else if (!e.address.equals("") && SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0) == 1) {
-                    second_row_icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_action_location))
-                    next_event_date.text = e.address
-                } else {
-                    second_row_icon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_action_calendar))
-                    if (!e.allDay) {
-                        val startHour: String = if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) Constants.badHourFormat.format(e.startDate) else Constants.goodHourFormat.format(e.startDate)
-                        val endHour: String = if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) Constants.badHourFormat.format(e.endDate) else Constants.goodHourFormat.format(e.endDate)
-                        var dayDiff = TimeUnit.MILLISECONDS.toDays(e.endDate - e.startDate)
-
-                        val startCal = Calendar.getInstance()
-                        startCal.timeInMillis = e.startDate
-
-                        val endCal = Calendar.getInstance()
-                        endCal.timeInMillis = e.endDate
-
-                        if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
-                            dayDiff++
-                        } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(Calendar.MINUTE) >= endCal.get(Calendar.MINUTE)) {
-                            dayDiff++
-                        }
-                        var multipleDay: String = ""
-                        if (dayDiff > 0) {
-                            multipleDay = String.format(" (+%s%s)", dayDiff, getString(R.string.day_char))
-                        }
-                        next_event_date.text = String.format("%s - %s%s", startHour, endHour, multipleDay)
-                    } else {
-                        next_event_date.text = dateStringValue
-                    }
-                }
-
-                empty_layout.visibility = View.GONE
-                calendar_layout.visibility = View.VISIBLE
-            }
-        }
-
-        empty_date.setTextColor(Util.getFontColor(SP))
-        divider1.setTextColor(Util.getFontColor(SP))
-        temp.setTextColor(Util.getFontColor(SP))
-        next_event.setTextColor(Util.getFontColor(SP))
-        next_event_difference_time.setTextColor(Util.getFontColor(SP))
-        next_event_date.setTextColor(Util.getFontColor(SP))
-        divider2.setTextColor(Util.getFontColor(SP))
-        calendar_temp.setTextColor(Util.getFontColor(SP))
-        second_row_icon.setColorFilter(Util.getFontColor(SP))
-        // time.setTextColor(Util.getFontColor(SP))
-
-
-        empty_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-        divider1.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-        temp.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-        next_event.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-        next_event_difference_time.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-        next_event_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-        divider2.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-        calendar_temp.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-        // time.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f))
-
-        second_row_icon.scaleX = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-        second_row_icon.scaleY = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-
-        weather_icon.scaleX = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-        weather_icon.scaleY = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-
-        empty_weather_icon.scaleX = SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) / 24f
-        empty_weather_icon.scaleY = SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) / 24f
-
-        multiple_events.scaleX = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 16f
-        multiple_events.scaleY = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 16f
-
-        val shadowRadius = when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-            0 -> 0f
-            1 -> 5f
-            2 -> 4f
-            else -> 5f
-        }
-        val shadowColor =  when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-            0 -> Color.TRANSPARENT
-            1 -> R.color.black_50
-            2 -> Color.BLACK
-            else -> R.color.black_50
-        }
-        val shadowDy =  when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-            0 -> 0f
-            1 -> 0f
-            2 -> 1f
-            else -> 0f
-        }
-        empty_date.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        divider1.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        temp.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        next_event.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        next_event_difference_time.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        next_event_date.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        divider2.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-        calendar_temp.setShadowLayer(shadowRadius, 0f, 0f, shadowColor)
-        // time.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-
-        if (SP.getInt(Constants.PREF_CUSTOM_FONT, Constants.CUSTOM_FONT_PRODUCT_SANS) == Constants.CUSTOM_FONT_PRODUCT_SANS) {
-            val product_sans: Typeface = Typeface.createFromAsset(assets, "fonts/product_sans_regular.ttf")
-            val product_sans_light: Typeface = Typeface.createFromAsset(assets, "fonts/product_sans_light.ttf")
-
-
-            /*if (SP.getString(Constants.PREF_CUSTOM_FONT_FILE, "") != "") {
-                val file = File(SP.getString(Constants.PREF_CUSTOM_FONT_FILE, ""))
-                if (file.exists()) {
-                    Log.d("AW", "OK")
-                }
-                // product_sans = Typeface.createFromFile("")
-            }*/
-            empty_date.typeface = product_sans
-            divider1.typeface = product_sans
-            temp.typeface = product_sans
-            next_event.typeface = product_sans
-            next_event_difference_time.typeface = product_sans
-            next_event_date.typeface = product_sans
-            divider2.typeface = product_sans
-            calendar_temp.typeface = product_sans
-            //time.typeface = product_sans_light
-        } else {
-            empty_date.typeface = Typeface.DEFAULT
-            divider1.typeface = Typeface.DEFAULT
-            temp.typeface = Typeface.DEFAULT
-            next_event.typeface = Typeface.DEFAULT
-            next_event_difference_time.typeface = Typeface.DEFAULT
-            next_event_date.typeface = Typeface.DEFAULT
-            divider2.typeface = Typeface.DEFAULT
-            calendar_temp.typeface = Typeface.DEFAULT
-            //time.typeface = Typeface.DEFAULT
-        }
-    }
-
-    fun updateLocationView() {
-        val locationLayout = SP.getBoolean(Constants.PREF_SHOW_WEATHER, true)
-
-        if (locationLayout && SP.contains(Constants.PREF_WEATHER_TEMP) && SP.contains(Constants.PREF_WEATHER_ICON)) {
-            weather.visibility = View.VISIBLE
-            calendar_weather.visibility = View.VISIBLE
-            val currentTemp = String.format(Locale.getDefault(), "%.0f °%s", SP.getFloat(Constants.PREF_WEATHER_TEMP, 0f), SP.getString(Constants.PREF_WEATHER_REAL_TEMP_UNIT, "F"))
-
-
-            weather_icon.visibility = View.VISIBLE
-            empty_weather_icon.visibility = View.VISIBLE
-            val icon: String = SP.getString(Constants.PREF_WEATHER_ICON, "")
-            if (icon.equals("")) {
-                weather_icon.visibility = View.GONE
-                empty_weather_icon.visibility = View.GONE
-            } else {
-                weather_icon.setImageResource(WeatherUtil.getWeatherIconResource(icon))
-                empty_weather_icon.setImageResource(WeatherUtil.getWeatherIconResource(icon))
-            }
-
-            temp.text = currentTemp
-            calendar_temp.text = currentTemp
-        } else {
-            weather.visibility = View.GONE
-            calendar_weather.visibility = View.GONE
-        }
-    }
-
-    @SuppressLint("ApplySharedPref")
-    fun updateSettings() {
-
-        if (SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-            clock_settings.visibility = View.VISIBLE
-            action_show_clock.setOnClickListener {
-                SP.edit()
-                        .putBoolean(Constants.PREF_SHOW_CLOCK, false)
-                        .commit()
-                sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            }
-            show_clock_label.text = getString(R.string.show_clock_visible)
-        } else {
-            clock_settings.visibility= View.GONE
-            action_show_clock.setOnClickListener {
-                SP.edit()
-                        .putBoolean(Constants.PREF_SHOW_CLOCK, true)
-                        .commit()
-                sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            }
-            show_clock_label.text = getString(R.string.show_clock_not_visible)
-        }
-
-
-        if (SP.getBoolean(Constants.PREF_SHOW_EVENTS, true) && Util.checkGrantedPermission(this, Manifest.permission.READ_CALENDAR)) {
-            calendar_settings.visibility = View.VISIBLE
-            action_show_events.setOnClickListener {
-                SP.edit()
-                        .putBoolean(Constants.PREF_SHOW_EVENTS, false)
-                        .commit()
-                sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-                updateSettings()
-                updateAppWidget()
-            }
-            show_events_label.text = getString(R.string.show_events_visible)
-        } else {
-            calendar_settings.visibility= View.GONE
-            action_show_events.setOnClickListener {
-                if (Util.checkGrantedPermission(this, Manifest.permission.READ_CALENDAR)) {
-                    SP.edit()
-                            .putBoolean(Constants.PREF_SHOW_EVENTS, true)
-                            .commit()
-                    sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-                    updateSettings()
-                    updateAppWidget()
-                } else {
-                    ActivityCompat.requestPermissions(this@MainActivity, arrayOf(Manifest.permission.READ_CALENDAR), Constants.CALENDAR_REQUEST_CODE)
-                }
-            }
-            show_events_label.text = if (Util.checkGrantedPermission(this, Manifest.permission.READ_CALENDAR)) getString(R.string.show_events_not_visible) else getString(R.string.description_permission_calendar)
-        }
-
-        if (SP.getBoolean(Constants.PREF_SHOW_WEATHER, true) && Util.checkGrantedPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)) {
-            weather_settings.visibility = View.VISIBLE
-            action_show_weather.setOnClickListener {
-                SP.edit()
-                        .putBoolean(Constants.PREF_SHOW_WEATHER, false)
-                        .commit()
-                sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-                updateSettings()
-                updateAppWidget()
-            }
-            show_weather_label.text = getString(R.string.show_weather_visible)
-        } else {
-            weather_settings.visibility= View.GONE
-            action_show_weather.setOnClickListener {
-                if (Util.checkGrantedPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)) {
-                    SP.edit()
-                            .putBoolean(Constants.PREF_SHOW_WEATHER, true)
-                            .commit()
-                    sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-                    updateSettings()
-                    updateAppWidget()
-                } else {
-                    ActivityCompat.requestPermissions(this@MainActivity, arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), Constants.LOCATION_REQUEST_CODE)
-                }
-            }
-            show_weather_label.text = if (Util.checkGrantedPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)) getString(R.string.show_weather_not_visible) else getString(R.string.description_permission_location)
-        }
-
-        temp_unit.text = if (SP.getString(Constants.PREF_WEATHER_TEMP_UNIT, "F").equals("F")) getString(R.string.fahrenheit) else getString(R.string.celsius)
-        action_change_unit.setOnClickListener {
-            SP.edit().putString(Constants.PREF_WEATHER_TEMP_UNIT, if (SP.getString(Constants.PREF_WEATHER_TEMP_UNIT, "F").equals("F")) "C" else "F").commit()
-            sendBroadcast(Intent(Constants.ACTION_WEATHER_UPDATE))
-            updateSettings()
-        }
-
-        all_day_label.text = if (SP.getBoolean(Constants.PREF_CALENDAR_ALL_DAY, false)) getString(R.string.settings_all_day_subtitle_visible) else getString(R.string.settings_all_day_subtitle_gone)
-        action_show_all_day.setOnClickListener {
-            SP.edit().putBoolean(Constants.PREF_CALENDAR_ALL_DAY, !SP.getBoolean(Constants.PREF_CALENDAR_ALL_DAY, false)).commit()
-            sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-            updateSettings()
-        }
-
-        show_multiple_events_label.text = if (SP.getBoolean(Constants.PREF_SHOW_NEXT_EVENT, true)) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-        action_show_multiple_events.setOnClickListener {
-            SP.edit().putBoolean(Constants.PREF_SHOW_NEXT_EVENT, !SP.getBoolean(Constants.PREF_SHOW_NEXT_EVENT, true)).commit()
-            sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            updateSettings()
-        }
-
-        show_diff_time_label.text = if (SP.getBoolean(Constants.PREF_SHOW_DIFF_TIME, true)) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-        action_show_diff_time.setOnClickListener {
-            SP.edit().putBoolean(Constants.PREF_SHOW_DIFF_TIME, !SP.getBoolean(Constants.PREF_SHOW_DIFF_TIME, true)).commit()
-            sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            updateSettings()
-        }
-
-        show_declined_events_label.text = if (SP.getBoolean(Constants.PREF_SHOW_DECLINED_EVENTS, true)) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
-        action_show_declined_events.setOnClickListener {
-            SP.edit().putBoolean(Constants.PREF_SHOW_DECLINED_EVENTS, !SP.getBoolean(Constants.PREF_SHOW_DECLINED_EVENTS, true)).commit()
-            sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-            updateSettings()
-        }
-
-        hour_format_label.text = if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) getString(R.string.settings_hour_format_subtitle_12) else getString(R.string.settings_hour_format_subtitle_24)
-        action_hour_format.setOnClickListener {
-            SP.edit().putString(Constants.PREF_HOUR_FORMAT, if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) "24" else "12").commit()
-            Util.updateWidget(this)
-            updateSettings()
-            updateAppWidget()
-        }
-
-        second_row_info_label.text = getString(Util.getSecondRowInfoString(SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0)))
-        action_second_row_info.setOnClickListener {
-            SP.edit().putInt(Constants.PREF_SECOND_ROW_INFORMATION, when (SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0)) {
-                0 -> 1
-                1 -> 2
-                2 -> 0
-                else -> 0
-            }).commit()
-            updateSettings()
-            sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-        }
-
-        main_text_size_label.text = String.format("%.0f%s", SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f), "sp")
-        action_main_text_size.setOnClickListener {
-            var fontSize = SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) + 1
-            if (fontSize > 36) {
-                fontSize = 20f
-            }
-            SP.edit().putFloat(Constants.PREF_TEXT_MAIN_SIZE, fontSize).commit()
-            Util.updateWidget(this)
-            updateSettings()
-            updateAppWidget()
-        }
-
-        second_text_size_label.text = String.format("%.0f%s", SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f), "sp")
-        action_second_text_size.setOnClickListener {
-            var fontSize = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) + 1
-            if (fontSize > 28) {
-                fontSize = 12f
-            }
-            SP.edit().putFloat(Constants.PREF_TEXT_SECOND_SIZE, fontSize).commit()
-            Util.updateWidget(this)
-            updateSettings()
-        }
-
-        clock_text_size_label.text = String.format("%.0f%s", SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f), "sp")
-        action_clock_text_size.setOnClickListener {
-            var fontSize = SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f) + 5
-            if (fontSize > 110) {
-                fontSize = 50f
-            }
-            SP.edit().putFloat(Constants.PREF_TEXT_CLOCK_SIZE, fontSize).commit()
-            Util.updateWidget(this)
-            updateSettings()
-        }
-
-        val textColor = try {
-            Color.parseColor(SP.getString(Constants.PREF_TEXT_COLOR, "#FFFFFF"))
-        } catch (e: Exception) {
-            SP.edit().remove(Constants.PREF_TEXT_COLOR).commit()
-            Color.parseColor(SP.getString(Constants.PREF_TEXT_COLOR, "#FFFFFF"))
-        }
-        font_color_label.text = SP.getString(Constants.PREF_TEXT_COLOR, "#FFFFFF").toUpperCase()
-        action_font_color.setOnClickListener {
-            val cp: ColorPicker = ColorPicker(this@MainActivity, Color.red(textColor), Color.green(textColor), Color.blue(textColor))
-            cp.setOnColorSelected { color ->
-                SP.edit().putString(Constants.PREF_TEXT_COLOR, "#" + Integer.toHexString(color)).commit()
-                Util.updateWidget(this)
-                updateSettings()
-                updateAppWidget()
-                cp.dismiss()
-            }
-            cp.show()
-        }
-
-        val now = Calendar.getInstance()
-        var dateStringValue: String = String.format("%s%s", Constants.engDateFormat.format(now.time)[0].toUpperCase(), Constants.engDateFormat.format(now.time).substring(1))
-        if (SP.getBoolean(Constants.PREF_ITA_FORMAT_DATE, false)) {
-            dateStringValue = String.format("%s%s", Constants.itDateFormat.format(now.time)[0].toUpperCase(), Constants.itDateFormat.format(now.time).substring(1))
-        }
-        date_format_label.text = dateStringValue
-        action_date_format.setOnClickListener {
-            SP.edit().putBoolean(Constants.PREF_ITA_FORMAT_DATE, !SP.getBoolean(Constants.PREF_ITA_FORMAT_DATE, false)).commit()
-            Util.updateWidget(this)
-            updateAppWidget()
-            updateSettings()
-        }
-
-        label_weather_refresh_period.text = getString(Util.getRefreshPeriodString(SP.getInt(Constants.PREF_WEATHER_REFRESH_PERIOD, 1)))
-        action_weather_refresh_period.setOnClickListener {
-            SP.edit().putInt(Constants.PREF_WEATHER_REFRESH_PERIOD, when (SP.getInt(Constants.PREF_WEATHER_REFRESH_PERIOD, 1)) {
-                0 -> 1
-                1 -> 2
-                2 -> 3
-                3 -> 4
-                4 -> 5
-                5 -> 0
-                else -> 1
-            }).commit()
-            updateSettings()
-            WeatherReceiver().setUpdates(this@MainActivity)
-        }
-
-        show_until_label.text = getString(Util.getShowUntilString(SP.getInt(Constants.PREF_SHOW_UNTIL, 1)))
-        action_show_until.setOnClickListener {
-            SP.edit().putInt(Constants.PREF_SHOW_UNTIL, when (SP.getInt(Constants.PREF_SHOW_UNTIL, 1)) {
-                0 -> 1
-                1 -> 2
-                2 -> 3
-                3 -> 4
-                4 -> 5
-                5 -> 6
-                6 -> 7
-                7 -> 0
-                else -> 1
-            }).commit()
-            updateSettings()
-            sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-        }
-
-        text_shadow_label.text = getString(Util.getTextShadowString(SP.getInt(Constants.PREF_TEXT_SHADOW, 1)))
-        action_text_shadow.setOnClickListener {
-            SP.edit().putInt(Constants.PREF_TEXT_SHADOW, when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-                0 -> 1
-                1 -> 2
-                2 -> 0
-                else -> 1
-            }).commit()
-            sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            updateSettings()
-            updateAppWidget()
-        }
-
-        custom_font_label.text = getString(Util.getCustomFontLabel(SP.getInt(Constants.PREF_CUSTOM_FONT, Constants.CUSTOM_FONT_PRODUCT_SANS)))
-        action_custom_font.setOnClickListener {
-
-            SP.edit().putInt(Constants.PREF_CUSTOM_FONT, when (SP.getInt(Constants.PREF_CUSTOM_FONT, Constants.CUSTOM_FONT_PRODUCT_SANS)) {
-                0 -> Constants.CUSTOM_FONT_PRODUCT_SANS
-                Constants.CUSTOM_FONT_PRODUCT_SANS -> 0
-                else -> Constants.CUSTOM_FONT_PRODUCT_SANS
-            }).commit()
-/*
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
-            intent.type = "* / *" TO FIX WITHOUT SPACE
-            intent.addCategory(Intent.CATEGORY_OPENABLE)
-
-            try {
-                startActivityForResult(Intent.createChooser(intent, "Select a File to Upload"), Constants.CUSTOM_FONT_CHOOSER_REQUEST_CODE)
-            } catch (ex: android.content.ActivityNotFoundException) {
-                Toast.makeText(this, "Please install a File Manager.", Toast.LENGTH_SHORT).show()
-            }
-*/
-
-            sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            updateSettings()
-            updateAppWidget()
-        }
-
-        if (SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) == Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) {
-            action_custom_location.visibility = View.GONE
-        } else {
-            label_custom_location.text = SP.getString(Constants.PREF_CUSTOM_LOCATION_ADD, getString(R.string.custom_location_gps))
-            action_custom_location.setOnClickListener {
-                startActivityForResult(Intent(this, CustomLocationActivity::class.java), Constants.RESULT_CODE_CUSTOM_LOCATION)
-            }
-            action_custom_location.visibility = View.VISIBLE
-        }
-
-        if (SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) == Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) {
-            label_weather_provider_api_key.text = getString(R.string.provider_google_awareness)
-            alert_icon.visibility = View.GONE
-        } else {
-            if (WeatherUtil.getWeatherProviderKey(this, SP) == ("")) {
-                label_weather_provider_api_key.text = getString(R.string.settings_weather_provider_api_key_subtitle_not_set)
-                alert_icon.visibility = View.VISIBLE
-            } else {
-                label_weather_provider_api_key.text = getString(when (SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS)) {
-                    Constants.WEATHER_PROVIDER_OPEN_WEATHER -> R.string.provider_open_weather
-                    else -> R.string.settings_weather_provider_api_key_subtitle_all_set
-                })
-                alert_icon.visibility = View.GONE
-            }
-        }
-        action_weather_provider_api_key.setOnClickListener {
-            startActivityForResult(Intent(this, WeatherProviderActivity::class.java), Constants.WEATHER_PROVIDER_REQUEST_CODE)
-        }
-
-        calendar_app_label.text = SP.getString(Constants.PREF_CALENDAR_APP_NAME, getString(R.string.default_calendar_app))
-        action_calendar_app.setOnClickListener {
-            val i = Intent(this, ChooseApplicationActivity::class.java)
-            i.putExtra("requestCode", Constants.CALENDAR_APP_REQUEST_CODE)
-            startActivityForResult(i, Constants.CALENDAR_APP_REQUEST_CODE)
-        }
-
-        weather_app_label.text = SP.getString(Constants.PREF_WEATHER_APP_NAME, getString(R.string.default_weather_app))
-        action_weather_app.setOnClickListener {
-            startActivityForResult(Intent(this, ChooseApplicationActivity::class.java), Constants.WEATHER_APP_REQUEST_CODE)
-        }
-
-        clock_app_label.text = SP.getString(Constants.PREF_CLOCK_APP_NAME, getString(R.string.default_clock_app))
-        action_clock_app.setOnClickListener {
-            startActivityForResult(Intent(this, ChooseApplicationActivity::class.java), Constants.CLOCK_APP_REQUEST_CODE)
-        }
-
-        event_app_label.text = SP.getString(Constants.PREF_EVENT_APP_NAME, getString(R.string.default_event_app))
-        action_event_app.setOnClickListener {
-            startActivityForResult(Intent(this, ChooseApplicationActivity::class.java), Constants.EVENT_APP_REQUEST_CODE)
-        }
-
-        action_filter_calendar.setOnClickListener {
-            val calendarSelectorList: List<CalendarSelector> = CalendarUtil.getCalendarList(this).map { CalendarSelector(it.id.toInt(), it.displayName, it.accountName) }
-            var calFiltered = SP.getString(Constants.PREF_CALENDAR_FILTER, "")
-
-            if (!calendarSelectorList.isEmpty()) {
-                val calNames = calendarSelectorList.map { if (it.name.equals(it.account_name)) String.format("%s: %s", getString(R.string.main_calendar), it.name) else it.name }.toTypedArray()
-                val calSelected = calendarSelectorList.map { !calFiltered.contains(" " + Integer.toString(it.id) + ",") }.toBooleanArray()
-
-                AlertDialog.Builder(this).setTitle(getString(R.string.settings_filter_calendar_subtitle))
-                        .setMultiChoiceItems(calNames, calSelected,
-                                DialogInterface.OnMultiChoiceClickListener { dialog, item, isChecked ->
-                                    val dialogItem: String = String.format(" %s%s", calendarSelectorList.get(item).id, ",")
-                                    calFiltered = calFiltered.replace(dialogItem, "");
-                                    if (!isChecked) {
-                                        calFiltered += dialogItem
-                                    }
-                                })
-                        .setPositiveButton(android.R.string.ok, { dialog: DialogInterface, _: Int ->
-                            SP.edit().putString(Constants.PREF_CALENDAR_FILTER, calFiltered).commit()
-                            sendBroadcast(Intent(Constants.ACTION_CALENDAR_UPDATE))
-                            updateSettings()
-                        })
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .show()
-            } else {
-                Toast.makeText(this, R.string.calendar_settings_list_error, Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/SupportDevActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/SupportDevActivity.kt
deleted file mode 100644
index 8b92a0c..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/SupportDevActivity.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.activity
-
-import android.content.Intent
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import com.anjlab.android.iab.v3.BillingProcessor
-import com.anjlab.android.iab.v3.TransactionDetails
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.util.Util
-import kotlinx.android.synthetic.main.activity_support_dev.*
-
-class SupportDevActivity : AppCompatActivity(), BillingProcessor.IBillingHandler {
-    internal lateinit var bp: BillingProcessor
-
-    internal val BILLING_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAox5CcxuoLJ6CmNS7s6lVQzJ253njKKGF8MoQ/gQ5gEw2Fr03fBvtHpiVMpnjhNLw5NMeIpzRvkVqeQ7BfkC7c0BLCJUqf/fFA11ArQe8na6QKt5O4d+v4sbHtP7mm3GQNPOBaqRzcpFZaiAbfk6mnalo+tzM47GXrQFt5bNSrMctCs7bbChqJfH2cyMW0F8DHWEEeO5xElBmH3lh4FVpwIUTPYJIV3n0yhE3qqRA0WXkDej66g/uAt/rebmMZLmwNwIive5cObU4o41YyKRv2wSAicrv3W40LftzXAOOordIbmzDFN8ksh3VrnESqwCDGG97nZVbPG/+3LD0xHWiRwIDAQAB"
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_support_dev)
-        bp = BillingProcessor(this, BILLING_KEY, this)
-
-        action_website.setOnClickListener {
-            Util.openURI(this, "http://tommasoberlose.com/")
-        }
-
-        action_translate.setOnClickListener {
-            Util.openURI(this, "https://github.com/tommasoberlose/another-widget/blob/master/app/src/main/res/values/strings.xml")
-        }
-    }
-
-    override fun onBillingInitialized() {
-        loader.visibility = View.GONE
-        try {
-            val isAvailable = BillingProcessor.isIabServiceAvailable(this)
-            val isOneTimePurchaseSupported = bp.isOneTimePurchaseSupported
-            if (isAvailable && isOneTimePurchaseSupported) {
-                val coffee = bp.getPurchaseListingDetails("donation_coffee")
-                val donuts = bp.getPurchaseListingDetails("donation_donuts")
-                val breakfast = bp.getPurchaseListingDetails("donation_breakfast")
-                val lunch = bp.getPurchaseListingDetails("donation_lunch")
-                val dinner = bp.getPurchaseListingDetails("donation_dinner")
-
-                if (coffee != null) {
-                    import_donation_coffee.text = coffee.priceText
-                    action_donation_coffee.setOnClickListener {
-                        bp.purchase(this, "donation_coffee")
-                    }
-                } else {
-                    action_donation_coffee.visibility = View.GONE
-                }
-
-                if (donuts != null) {
-                    import_donation_donuts.text = donuts.priceText
-                    action_donation_donuts.setOnClickListener {
-                        bp.purchase(this, "donation_donuts")
-                    }
-                } else {
-                    action_donation_donuts.visibility = View.GONE
-                }
-
-                if (breakfast != null) {
-                    import_donation_breakfast.text = breakfast.priceText
-                    action_donation_breakfast.setOnClickListener {
-                        bp.purchase(this, "donation_breakfast")
-                    }
-                } else {
-                    action_donation_breakfast.visibility = View.GONE
-                }
-
-                if (lunch != null) {
-                    import_donation_lunch.text = lunch.priceText
-                    action_donation_lunch.setOnClickListener {
-                        bp.purchase(this, "donation_lunch")
-                    }
-                } else {
-                    action_donation_lunch.visibility = View.GONE
-                }
-
-                if (dinner != null) {
-                    import_donation_dinner.text = dinner.priceText
-                    action_donation_dinner.setOnClickListener {
-                        bp.purchase(this, "donation_dinner")
-                    }
-                } else {
-                    action_donation_dinner.visibility = View.GONE
-                }
-
-                products_list.visibility = View.VISIBLE
-            } else {
-                products_card.visibility = View.GONE
-            }
-        } catch (ignored: Exception) {
-            products_card.visibility = View.GONE
-        }
-    }
-
-    override fun onPurchaseHistoryRestored() {
-    }
-
-    override fun onProductPurchased(productId: String, details: TransactionDetails?) {
-        Toast.makeText(this, R.string.thanks, Toast.LENGTH_SHORT).show()
-        bp.consumePurchase(productId)
-    }
-
-    override fun onBillingError(errorCode: Int, error: Throwable?) {
-        Toast.makeText(this, R.string.error, Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (!bp.handleActivityResult(requestCode, resultCode, data)) {
-            super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
-    public override fun onDestroy() {
-        bp.release()
-        super.onDestroy()
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/WeatherProviderActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/WeatherProviderActivity.kt
deleted file mode 100644
index 48985f6..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activity/WeatherProviderActivity.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.activity
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.AlertDialog
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.DialogInterface
-import android.content.SharedPreferences
-import android.os.Build
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import android.preference.PreferenceManager
-import android.support.design.widget.BottomSheetDialog
-import android.text.Editable
-import android.text.Html
-import android.text.TextWatcher
-import android.view.View
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.util.CalendarUtil
-import com.tommasoberlose.anotherwidget.util.Util
-import com.tommasoberlose.anotherwidget.util.WeatherUtil
-import kotlinx.android.synthetic.main.activity_weather_provider.*
-import kotlinx.android.synthetic.main.key_time_wait_layout.view.*
-import kotlinx.android.synthetic.main.main_menu_layout.view.*
-import kotlinx.android.synthetic.main.provider_info_layout.view.*
-
-class WeatherProviderActivity : AppCompatActivity() {
-
-    lateinit var SP: SharedPreferences
-
-    @SuppressLint("ApplySharedPref")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_weather_provider)
-
-        SP = PreferenceManager.getDefaultSharedPreferences(this)
-
-        updateUI()
-
-        action_save.setOnClickListener {
-            SP.edit()
-                    .putString(WeatherUtil.getWeatherProviderKeyConstant(this, SP), api_key.text.toString())
-                    .commit()
-            setResult(Activity.RESULT_OK)
-            finish()
-        }
-
-        api_key.addTextChangedListener(object: TextWatcher {
-            override fun afterTextChanged(text: Editable?) {
-                if (text.toString().equals("") || text.toString().equals(
-                        WeatherUtil.getWeatherProviderKey(this@WeatherProviderActivity, SP))) {
-                    Util.collapse(button_container)
-                } else {
-                    Util.expand(button_container)
-                }
-            }
-
-            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-
-            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-            }
-        })
-
-        action_open_provider.setOnClickListener {
-            Util.openURI(this, "https://home.openweathermap.org/users/sign_up")
-        }
-    }
-
-    @SuppressLint("ApplySharedPref")
-    private fun updateUI() {
-        val currentProvider = SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS)
-        if (currentProvider == Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) {
-            api_key_container.visibility = View.GONE
-            content_info.visibility = View.GONE
-        } else {
-            api_key_container.visibility = View.VISIBLE
-            content_info.visibility = View.VISIBLE
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                last_info.text = Html.fromHtml(getString(R.string.api_key_info_all_set), Html.FROM_HTML_MODE_LEGACY)
-            } else {
-                last_info.text = Html.fromHtml(getString(R.string.api_key_info_all_set))
-            }
-        }
-        label_weather_provider.text = when (currentProvider) {
-            Constants.WEATHER_PROVIDER_OPEN_WEATHER -> getString(R.string.provider_open_weather)
-            else -> getString(R.string.provider_google_awareness)
-        }
-        action_change_provider.setOnClickListener {
-            SP.edit()
-                    .putInt(Constants.PREF_WEATHER_PROVIDER, when (currentProvider) {
-                        Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS -> Constants.WEATHER_PROVIDER_OPEN_WEATHER
-                        else -> Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS
-                    }).commit()
-            updateUI()
-        }
-
-        Util.collapse(button_container)
-        api_key.setText(WeatherUtil.getWeatherProviderKey(this, SP))
-    }
-
-    override fun onBackPressed() {
-        val SP = PreferenceManager.getDefaultSharedPreferences(this)
-        if (!SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS).equals(Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) && (api_key.text.toString().equals("") || !api_key.text.toString().equals(WeatherUtil.getWeatherProviderKey(this, SP)))) {
-            AlertDialog.Builder(this)
-                    .setMessage(getString(R.string.error_weather_api_key))
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .setPositiveButton(android.R.string.yes, DialogInterface.OnClickListener { _,_ ->
-                        super.onBackPressed()
-                    })
-                    .show()
-        } else {
-            super.onBackPressed()
-        }
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapter/ApplicationInfoAdapter.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapter/ApplicationInfoAdapter.kt
deleted file mode 100644
index 764a087..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapter/ApplicationInfoAdapter.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.adapter
-
-import android.content.Context
-import android.content.pm.ApplicationInfo
-import android.support.v7.widget.RecyclerView
-import android.util.EventLog
-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 com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.`object`.AppInfoSavedEvent
-import org.greenrobot.eventbus.EventBus
-import java.io.File
-
-/**
- * Created by tommaso on 15/10/17.
- */
-class ApplicationInfoAdapter (private val context: Context, private var mDataset: ArrayList<ApplicationInfo>) : RecyclerView.Adapter<ApplicationInfoAdapter.ViewHolder>() {
-
-    class ViewHolder(var view: View, var text: TextView, var icon: ImageView) : RecyclerView.ViewHolder(view)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(parent.context).inflate(R.layout.application_info_layout, parent, false)
-        return ViewHolder(v, v.findViewById(R.id.text), v.findViewById(R.id.icon))
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val pm = context.packageManager
-        val app = mDataset[position]
-        holder.text.text = pm.getApplicationLabel(app).toString()
-        try {
-            holder.icon.setImageDrawable(app.loadIcon(pm))
-        } catch (ignore: Exception) {
-        }
-
-        holder.view.setOnClickListener {
-            EventBus.getDefault().post(AppInfoSavedEvent(app))
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return mDataset.size
-    }
-
-    fun changeData(newData: ArrayList<ApplicationInfo>) {
-        mDataset = newData
-        notifyDataSetChanged()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapters/ViewPagerAdapter.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapters/ViewPagerAdapter.kt
new file mode 100644
index 0000000..790dc52
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/adapters/ViewPagerAdapter.kt
@@ -0,0 +1,22 @@
+package com.tommasoberlose.anotherwidget.ui.adapters
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.tommasoberlose.anotherwidget.ui.fragments.*
+
+class ViewPagerAdapter(fragmentActivity: FragmentActivity) :
+    FragmentStateAdapter(fragmentActivity) {
+
+    override fun getItemCount(): Int = 5
+
+    override fun createFragment(position: Int): Fragment {
+        return when (position) {
+            1 -> CalendarSettingsFragment.newInstance()
+            2 -> WeatherSettingsFragment.newInstance()
+            3 -> ClockSettingsFragment.newInstance()
+            4 -> AdvancedSettingsFragment.newInstance()
+            else -> GeneralSettingsFragment.newInstance()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt
new file mode 100644
index 0000000..d8f9ba0
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt
@@ -0,0 +1,175 @@
+package com.tommasoberlose.anotherwidget.ui.fragments
+
+import android.Manifest
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.bottomsheet.BottomSheetDialog
+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.databinding.FragmentAdvancedSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.activities.SupportDevActivity
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.CalendarUtil
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.openURI
+import kotlinx.android.synthetic.main.fragment_advanced_settings.*
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+
+class AdvancedSettingsFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = AdvancedSettingsFragment()
+    }
+
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+
+        viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
+        val binding = DataBindingUtil.inflate<FragmentAdvancedSettingsBinding>(inflater, R.layout.fragment_advanced_settings, container, false)
+
+        subscribeUi(binding, viewModel)
+
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+
+        return binding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        setupListener()
+    }
+
+    private fun subscribeUi(
+        binding: FragmentAdvancedSettingsBinding,
+        viewModel: MainViewModel
+    ) {
+        viewModel.darkThemePreference.observe(viewLifecycleOwner, Observer {
+            AppCompatDelegate.setDefaultNightMode(it)
+            theme.text = when (it) {
+                AppCompatDelegate.MODE_NIGHT_NO -> getString(R.string.settings_subtitle_dark_theme_light)
+                AppCompatDelegate.MODE_NIGHT_YES -> getString(R.string.settings_subtitle_dark_theme_dark)
+                AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY -> getString(R.string.settings_subtitle_dark_theme_by_battery_saver)
+                AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> getString(R.string.settings_subtitle_dark_theme_follow_system)
+                else -> ""
+            }
+        })
+
+        viewModel.showWallpaper.observe(viewLifecycleOwner, Observer {
+            show_wallpaper_label.text = if (it && requireActivity().checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+        })
+    }
+
+    private fun setupListener() {
+        action_change_theme.setOnClickListener {
+            maintainScrollPosition {
+                BottomSheetMenu<Int>(requireContext())
+                    .selectResource(Preferences.darkThemePreference)
+                    .addItem(
+                        getString(R.string.settings_subtitle_dark_theme_light),
+                        AppCompatDelegate.MODE_NIGHT_NO
+                    )
+                    .addItem(
+                        getString(R.string.settings_subtitle_dark_theme_dark),
+                        AppCompatDelegate.MODE_NIGHT_YES
+                    )
+                    .addItem(
+                        getString(R.string.settings_subtitle_dark_theme_default),
+                        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM else AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
+                    )
+                    .addOnSelectItemListener { value ->
+                        Preferences.darkThemePreference = value
+                    }.show()
+            }
+        }
+
+        action_show_wallpaper.setOnClickListener {
+            maintainScrollPosition {
+                if (Preferences.showWallpaper) {
+                    Preferences.showWallpaper = false
+                } else {
+                    requirePermission()
+                }
+            }
+        }
+
+        action_translate.setOnClickListener {
+            activity?.openURI("https://github.com/tommasoberlose/another-widget/blob/master/app/src/main/res/values/strings.xml")
+        }
+
+        action_website.setOnClickListener {
+            activity?.openURI("http://tommasoberlose.com/")
+        }
+
+        action_help_dev.setOnClickListener {
+            startActivity(Intent(requireContext(), SupportDevActivity::class.java))
+        }
+
+        action_refresh_widget.setOnClickListener {
+            Util.updateWidget(requireContext())
+            CalendarUtil.updateEventList(requireContext())
+        }
+    }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        val scrollPosition = scrollView.scrollY
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.smoothScrollTo(0, scrollPosition)
+        }
+    }
+
+    private fun requirePermission() {
+        Dexter.withContext(requireContext())
+            .withPermissions(
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ).withListener(object: MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        Preferences.showWallpaper = report.areAllPermissionsGranted()
+                    }
+                }
+                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()
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt
new file mode 100644
index 0000000..a8beceb
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt
@@ -0,0 +1,330 @@
+package com.tommasoberlose.anotherwidget.ui.fragments
+
+import android.Manifest
+import android.app.Activity
+import android.content.DialogInterface
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.SimpleAdapter
+import androidx.appcompat.app.AlertDialog
+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 com.chibatching.kotpref.bulk
+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.CalendarSelector
+import com.tommasoberlose.anotherwidget.databinding.FragmentCalendarSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.CalendarUtil
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.toast
+import kotlinx.android.synthetic.main.fragment_calendar_settings.*
+import kotlinx.android.synthetic.main.fragment_calendar_settings.scrollView
+import kotlinx.android.synthetic.main.fragment_weather_settings.*
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.*
+
+class CalendarSettingsFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = CalendarSettingsFragment()
+    }
+
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+
+        viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
+        val binding = DataBindingUtil.inflate<FragmentCalendarSettingsBinding>(inflater, R.layout.fragment_calendar_settings, container, false)
+
+        subscribeUi(binding, viewModel)
+
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+
+        return binding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        setupListener()
+    }
+
+    private fun subscribeUi(
+        binding: FragmentCalendarSettingsBinding,
+        viewModel: MainViewModel
+    ) {
+        viewModel.showEvents.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                binding.isCalendarEnabled = it
+            }
+            checkReadEventsPermission()
+        })
+
+        viewModel.calendarAllDay.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                all_day_label.text =
+                    if (it) getString(R.string.settings_all_day_subtitle_visible) else getString(R.string.settings_all_day_subtitle_gone)
+            }
+            checkReadEventsPermission()
+        })
+
+        viewModel.showDeclinedEvents.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_declined_events_label.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+            checkReadEventsPermission()
+        })
+
+        viewModel.secondRowInformation.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                second_row_info_label.text = getString(Util.getSecondRowInfoString(it))
+            }
+        })
+
+        viewModel.showDiffTime.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_diff_time_label.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+        })
+
+        viewModel.showUntil.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_until_label.text = getString(Util.getShowUntilString(it))
+            }
+            checkReadEventsPermission()
+        })
+
+        viewModel.showNextEvent.observe(viewLifecycleOwner, Observer {
+            show_multiple_events_label.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+        })
+
+        viewModel.dateFormat.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                val now = Calendar.getInstance()
+                var dateStringValue: String = String.format("%s%s", SimpleDateFormat(Constants.engDateFormat, Locale.getDefault()).format(now.time)[0].toUpperCase(), SimpleDateFormat(Constants.engDateFormat, Locale.getDefault()).format(now.time).substring(1))
+                if (it) {
+                    dateStringValue = String.format("%s%s", SimpleDateFormat(Constants.itDateFormat, Locale.getDefault()).format(now.time)[0].toUpperCase(), SimpleDateFormat(Constants.itDateFormat, Locale.getDefault()).format(now.time).substring(1))
+                }
+                date_format_label.text = dateStringValue
+            }
+        })
+
+        viewModel.calendarAppName.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                calendar_app_label.text = if (it != "") it else getString(R.string.default_calendar_app)
+            }
+        })
+
+        viewModel.eventAppName.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                event_app_label.text = if (it != "") it else getString(R.string.default_calendar_app)
+            }
+        })
+
+    }
+
+    private fun setupListener() {
+
+        action_show_events.setOnClickListener {
+            Preferences.showEvents = !Preferences.showEvents
+        }
+
+        action_filter_calendar.setOnClickListener {
+            val calendarSelectorList: List<CalendarSelector> = CalendarUtil.getCalendarList(requireContext()).map { CalendarSelector(it.id.toInt(), it.displayName, it.accountName) }
+            var calFiltered = Preferences.calendarFilter
+
+            if (calendarSelectorList.isNotEmpty()) {
+                val calNames = calendarSelectorList.map { if (it.name == it.account_name) String.format("%s: %s", getString(R.string.main_calendar), it.name) else it.name }.toTypedArray()
+                val calSelected = calendarSelectorList.map { !calFiltered.contains(" " + it.id.toString() + ",") }.toBooleanArray()
+
+                AlertDialog.Builder(requireContext()).setTitle(getString(R.string.settings_filter_calendar_subtitle))
+                    .setMultiChoiceItems(calNames, calSelected) { _, item, isChecked ->
+                        val dialogItem: String = String.format(" %s%s", calendarSelectorList.get(item).id, ",")
+                        calFiltered = calFiltered.replace(dialogItem, "");
+                        if (!isChecked) {
+                            calFiltered += dialogItem
+                        }
+                    }
+                    .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
+                        Preferences.calendarFilter = calFiltered
+                    }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show()
+            } else {
+                requireActivity().toast(getString(R.string.calendar_settings_list_error))
+            }
+        }
+
+        action_show_all_day.setOnClickListener {
+            if (Preferences.showEvents) {
+                BottomSheetMenu<Boolean>(requireContext()).selectResource(Preferences.calendarAllDay)
+                    .addItem(getString(R.string.settings_all_day_subtitle_visible), true)
+                    .addItem(getString(R.string.settings_all_day_subtitle_gone), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.calendarAllDay = value
+                    }.show()
+            }
+        }
+
+        action_show_declined_events.setOnClickListener {
+            if (Preferences.showEvents) {
+                BottomSheetMenu<Boolean>(requireContext()).selectResource(Preferences.showDeclinedEvents)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.showDeclinedEvents = value
+                    }.show()
+            }
+        }
+
+        action_show_multiple_events.setOnClickListener {
+            if (Preferences.showEvents) {
+                BottomSheetMenu<Boolean>(requireContext()).selectResource(Preferences.showNextEvent)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.showNextEvent = value
+                    }.show()
+            }
+        }
+
+        action_show_diff_time.setOnClickListener {
+            if (Preferences.showEvents) {
+                BottomSheetMenu<Boolean>(requireContext()).selectResource(Preferences.showDiffTime)
+                    .addItem(getString(R.string.settings_visible), true)
+                    .addItem(getString(R.string.settings_not_visible), false)
+                    .addOnSelectItemListener { value ->
+                        Preferences.showDiffTime = value
+                    }.show()
+            }
+        }
+
+        action_second_row_info.setOnClickListener {
+            if (Preferences.showEvents) {
+                val dialog = BottomSheetMenu<Int>(requireContext()).selectResource(Preferences.secondRowInformation)
+                (0 .. 1).forEach {
+                    dialog.addItem(getString(Util.getSecondRowInfoString(it)), it)
+                }
+                dialog.addOnSelectItemListener { value ->
+                        Preferences.secondRowInformation = value
+                    }.show()
+            }
+        }
+
+        action_show_until.setOnClickListener {
+            if (Preferences.showEvents) {
+                val dialog = BottomSheetMenu<Int>(requireContext()).selectResource(Preferences.showUntil)
+                intArrayOf(6,7,0,1,2,3,4,5).forEach {
+                    dialog.addItem(getString(Util.getShowUntilString(it)), it)
+                }
+                dialog.addOnSelectItemListener { value ->
+                        Preferences.showUntil = value
+                    }.show()
+            }
+        }
+
+        action_event_app.setOnClickListener {
+            startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java), RequestCode.EVENT_APP_REQUEST_CODE.code)
+        }
+
+        action_calendar_app.setOnClickListener {
+            startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java), RequestCode.CALENDAR_APP_REQUEST_CODE.code)
+        }
+    }
+
+    private fun checkReadEventsPermission(showEvents: Boolean = Preferences.showEvents) {
+        if (requireActivity().checkCallingOrSelfPermission(Manifest.permission.READ_CALENDAR) == PackageManager.PERMISSION_GRANTED) {
+            show_events_label.text = if (showEvents) getString(R.string.show_events_visible) else getString(R.string.show_events_not_visible)
+            read_calendar_permission_alert_icon.isVisible = false
+            CalendarUtil.updateEventList(requireContext())
+        } else {
+            show_events_label.text = if (showEvents) getString(R.string.description_permission_calendar) else getString(R.string.show_events_not_visible)
+            read_calendar_permission_alert_icon.isVisible = showEvents
+            read_calendar_permission_alert_icon.setOnClickListener {
+                requirePermission()
+            }
+        }
+    }
+
+    private fun requirePermission() {
+        Dexter.withContext(requireActivity())
+            .withPermissions(
+                Manifest.permission.READ_CALENDAR
+            ).withListener(object: MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        if (report.areAllPermissionsGranted()){
+                            checkReadEventsPermission()
+                        }
+                    }
+                }
+                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()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK) {
+            when (requestCode) {
+                RequestCode.CALENDAR_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        calendarAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_calendar_app)
+                        calendarAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
+                    }
+                }
+                RequestCode.EVENT_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        eventAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_event_app)
+                        eventAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
+                    }
+                }
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        val scrollPosition = scrollView.scrollY
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.smoothScrollTo(0, scrollPosition)
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt
new file mode 100644
index 0000000..330708c
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt
@@ -0,0 +1,149 @@
+package com.tommasoberlose.anotherwidget.ui.fragments
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import com.chibatching.kotpref.bulk
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.databinding.FragmentCalendarSettingsBinding
+import com.tommasoberlose.anotherwidget.databinding.FragmentClockSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.toast
+import kotlinx.android.synthetic.main.fragment_clock_settings.*
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class ClockSettingsFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = ClockSettingsFragment()
+    }
+
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+
+        viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
+        val binding = DataBindingUtil.inflate<FragmentClockSettingsBinding>(inflater, R.layout.fragment_clock_settings, container, false)
+
+        subscribeUi(binding, viewModel)
+
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+
+        return binding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        setupListener()
+    }
+
+    private fun subscribeUi(
+        binding: FragmentClockSettingsBinding,
+        viewModel: MainViewModel
+    ) {
+        viewModel.showClock.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_clock_label.text =
+                    if (it) getString(R.string.show_clock_visible) else getString(R.string.show_clock_not_visible)
+                binding.isClockVisible = it
+            }
+        })
+
+        viewModel.clockTextSize.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                clock_text_size_label.text = String.format("%.0fsp", it)
+            }
+        })
+
+        viewModel.showNextAlarm.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_next_alarm_label.text = if (it) getString(R.string.settings_visible) else getString(R.string.settings_not_visible)
+            }
+        })
+
+        viewModel.clockAppName.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                clock_app_label.text =
+                    if (Preferences.clockAppName != "") Preferences.clockAppName else getString(R.string.default_clock_app)
+            }
+        })
+    }
+
+    private fun setupListener() {
+        action_show_clock.setOnClickListener {
+            Preferences.showClock = !Preferences.showClock
+        }
+
+        action_clock_text_size.setOnClickListener {
+            val dialog = BottomSheetMenu<Float>(requireContext()).selectResource(Preferences.clockTextSize)
+            (46 downTo 28).filter { it % 2 == 0 }.forEach {
+                dialog.addItem("${it}sp", it.toFloat())
+            }
+            dialog.addOnSelectItemListener { value ->
+                Preferences.clockTextSize = value
+            }.show()
+        }
+
+        action_show_next_alarm.setOnClickListener {
+            BottomSheetMenu<Boolean>(requireContext()).selectResource(Preferences.showNextAlarm)
+                .addItem(getString(R.string.settings_visible), true)
+                .addItem(getString(R.string.settings_not_visible), false)
+                .addOnSelectItemListener { value ->
+                    Preferences.showNextAlarm = value
+                }.show()
+        }
+
+        action_clock_app.setOnClickListener {
+            if (Preferences.showClock) {
+                startActivityForResult(Intent(requireActivity(), ChooseApplicationActivity::class.java),
+                    RequestCode.CLOCK_APP_REQUEST_CODE.code
+                )
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK && requestCode ==  RequestCode.CLOCK_APP_REQUEST_CODE.code) {
+            Preferences.bulk {
+                clockAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_clock_app)
+                clockAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        val scrollPosition = scrollView.scrollY
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.smoothScrollTo(0, scrollPosition)
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt
new file mode 100644
index 0000000..c808c08
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt
@@ -0,0 +1,208 @@
+package com.tommasoberlose.anotherwidget.ui.fragments
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.components.BottomSheetMenu
+import com.tommasoberlose.anotherwidget.databinding.FragmentGeneralSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.toPixel
+import com.tommasoberlose.anotherwidget.utils.toast
+import dev.sasikanth.colorsheet.ColorSheet
+import kotlinx.android.synthetic.main.fragment_general_settings.*
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.util.*
+
+
+class GeneralSettingsFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = GeneralSettingsFragment()
+    }
+
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+
+        viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
+        val binding = DataBindingUtil.inflate<FragmentGeneralSettingsBinding>(inflater, R.layout.fragment_general_settings, container, false)
+
+        subscribeUi(binding, viewModel)
+
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+
+        return binding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        setupListener()
+    }
+
+
+    private fun subscribeUi(
+        binding: FragmentGeneralSettingsBinding,
+        viewModel: MainViewModel
+    ) {
+
+        viewModel.textMainSize.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                main_text_size_label.text = String.format("%.0fsp", it)
+            }
+        })
+
+        viewModel.textSecondSize.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                second_text_size_label.text = String.format("%.0fsp", it)
+            }
+        })
+
+        viewModel.textGlobalColor.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                try {
+                    Color.parseColor(it)
+                } catch (e: Exception) {
+                    Preferences.textGlobalColor = "#FFFFFF"
+                }
+                font_color_label.text = it.toUpperCase()
+            }
+        })
+
+        viewModel.textShadow.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                text_shadow_label.text = getString(Util.getTextShadowString(it))
+            }
+        })
+
+        viewModel.customFont.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                custom_font_label.text = getString(Util.getCustomFontLabel(it))
+            }
+        })
+    }
+
+    private fun maintainScrollPosition(callback: () -> Unit) {
+        val scrollPosition = scrollView.scrollY
+        callback.invoke()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.smoothScrollTo(0, scrollPosition)
+        }
+    }
+
+    private fun setupListener() {
+        action_main_text_size.setOnClickListener {
+            val dialog = BottomSheetMenu<Float>(requireContext()).selectResource(Preferences.textMainSize)
+            (32 downTo 20).filter { it % 2 == 0 }.forEach {
+                dialog.addItem("${it}sp", it.toFloat())
+            }
+            dialog.addOnSelectItemListener { value ->
+                    Preferences.textMainSize = value
+            }.show()
+        }
+
+        action_second_text_size.setOnClickListener {
+            val dialog = BottomSheetMenu<Float>(requireContext()).selectResource(Preferences.textSecondSize)
+            (24 downTo 12).filter { it % 2 == 0 }.forEach {
+                dialog.addItem("${it}sp", it.toFloat())
+            }
+            dialog.addOnSelectItemListener { value ->
+                Preferences.textSecondSize = value
+            }.show()
+        }
+
+        action_font_color.setOnClickListener {
+            val textColor = try {
+                Color.parseColor(Preferences.textGlobalColor)
+            } catch (e: Exception) {
+                Preferences.textGlobalColor = "#FFFFFF"
+                Color.parseColor(Preferences.textGlobalColor)
+            }
+            ColorSheet()
+                .cornerRadius(16.toPixel(requireContext()))
+                .colorPicker(
+                colors = requireActivity().resources.getIntArray(R.array.grey),
+                selectedColor = textColor,
+                listener = { color ->
+                    Preferences.textGlobalColor = "#" + Integer.toHexString(color)
+                })
+                .show(requireActivity().supportFragmentManager)
+        }
+
+        action_text_shadow.setOnClickListener {
+            val dialog = BottomSheetMenu<Int>(requireContext()).selectResource(Preferences.textShadow)
+            (2 downTo 0).forEach {
+                dialog.addItem(getString(Util.getTextShadowString(it)), it)
+            }
+            dialog.addOnSelectItemListener { value ->
+                Preferences.textShadow = value
+            }.show()
+        }
+
+        action_custom_font.setOnClickListener {
+            val dialog = BottomSheetMenu<Int>(requireContext()).selectResource(Preferences.customFont)
+            (0..1).forEach {
+                dialog.addItem(getString(Util.getCustomFontLabel(it)), it)
+            }
+            dialog.addOnSelectItemListener { value ->
+                Preferences.customFont = value
+            }.show()
+
+/*
+            val intent = Intent(Intent.ACTION_GET_CONTENT)
+            intent.type = "* / *" TO FIX WITHOUT SPACE
+            intent.addCategory(Intent.CATEGORY_OPENABLE)
+
+            try {
+                startActivityForResult(Intent.createChooser(intent, "Select a File to Upload"), Constants.CUSTOM_FONT_CHOOSER_REQUEST_CODE)
+            } catch (ex: android.content.ActivityNotFoundException) {
+                Toast.makeText(this, "Please install a File Manager.", Toast.LENGTH_SHORT).show()
+            }
+*/
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK) {
+            when (requestCode) {
+                RequestCode.CUSTOM_FONT_CHOOSER_REQUEST_CODE.code -> {
+                    /*val uri = data.data
+                    Log.d("AW", "File Uri: " + uri.toString())
+                    val path = Util.getPath(this, uri)
+                    Log.d("AW", "File Path: " + path)
+                    SP.edit()
+                            .putString(Constants.PREF_CUSTOM_FONT_FILE, path)
+                            .commit()
+                    sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
+                    updateSettings()*/
+                }
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt
new file mode 100644
index 0000000..653b5af
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt
@@ -0,0 +1,253 @@
+package com.tommasoberlose.anotherwidget.ui.fragments
+
+import android.Manifest
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+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 com.chibatching.kotpref.bulk
+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.databinding.FragmentWeatherSettingsBinding
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.global.RequestCode
+import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver
+import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity
+import com.tommasoberlose.anotherwidget.ui.activities.CustomLocationActivity
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
+import com.tommasoberlose.anotherwidget.ui.activities.WeatherProviderActivity
+import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.utils.Util
+import kotlinx.android.synthetic.main.fragment_weather_settings.*
+import kotlinx.android.synthetic.main.fragment_weather_settings.scrollView
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class WeatherSettingsFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = WeatherSettingsFragment()
+    }
+
+    private lateinit var viewModel: MainViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+
+        viewModel = ViewModelProvider(activity as MainActivity).get(MainViewModel::class.java)
+        val binding = DataBindingUtil.inflate<FragmentWeatherSettingsBinding>(inflater, R.layout.fragment_weather_settings, container, false)
+
+        subscribeUi(binding, viewModel)
+
+        binding.lifecycleOwner = this
+        binding.viewModel = viewModel
+
+        return binding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        setupListener()
+    }
+
+    private fun subscribeUi(
+        binding: FragmentWeatherSettingsBinding,
+        viewModel: MainViewModel
+    ) {
+        viewModel.showWeather.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                show_weather_label.text =
+                    if (it) getString(R.string.show_weather_visible) else getString(R.string.show_weather_not_visible)
+                binding.isWeatherVisible = it
+            }
+            checkLocationPermission()
+        })
+
+        viewModel.weatherProviderApi.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                label_weather_provider_api_key.text =
+                    if (it == "") getString(R.string.settings_weather_provider_api_key_subtitle_not_set) else getString(
+                        R.string.settings_weather_provider_api_key_subtitle_all_set
+                    )
+                api_key_alert_icon.isVisible = it == ""
+            }
+            checkLocationPermission()
+        })
+
+        viewModel.customLocationAdd.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                label_custom_location.text =
+                    if (it == "") getString(R.string.custom_location_gps) else it
+            }
+            checkLocationPermission()
+        })
+
+        viewModel.weatherTempUnit.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                temp_unit.text =
+                    if (it == "F") getString(R.string.fahrenheit) else getString(R.string.celsius)
+            }
+        })
+
+        viewModel.weatherRefreshPeriod.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                label_weather_refresh_period.text = getString(Util.getRefreshPeriodString(it))
+            }
+            checkLocationPermission()
+        })
+
+        viewModel.weatherAppName.observe(viewLifecycleOwner, Observer {
+            maintainScrollPosition {
+                weather_app_label.text =
+                    if (it != "") it else getString(R.string.default_weather_app)
+            }
+        })
+    }
+
+    private fun checkLocationPermission() {
+        if (requireActivity().checkCallingOrSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            location_permission_alert_icon.isVisible = false
+            WeatherReceiver.setUpdates(requireContext())
+        } else if (Preferences.showWeather && Preferences.customLocationAdd == "") {
+            location_permission_alert_icon.isVisible = true
+            location_permission_alert_icon.setOnClickListener {
+                requirePermission()
+            }
+        }
+    }
+
+    private fun setupListener() {
+
+        action_show_weather.setOnClickListener {
+            Preferences.showWeather = !Preferences.showWeather
+        }
+
+        action_weather_provider_api_key.setOnClickListener {
+            if (Preferences.showWeather) {
+                startActivityForResult(
+                    Intent(requireContext(), WeatherProviderActivity::class.java),
+                    RequestCode.WEATHER_PROVIDER_REQUEST_CODE.code
+                )
+            }
+        }
+
+        action_custom_location.setOnClickListener {
+            if (Preferences.showWeather) {
+                startActivityForResult(
+                    Intent(requireContext(), CustomLocationActivity::class.java),
+                    Constants.RESULT_CODE_CUSTOM_LOCATION
+                )
+            }
+        }
+
+        action_change_unit.setOnClickListener {
+            if (Preferences.showWeather) {
+                BottomSheetMenu<String>(requireContext()).selectResource(Preferences.weatherTempUnit)
+                    .addItem(getString(R.string.fahrenheit), "F")
+                    .addItem(getString(R.string.celsius), "C")
+                    .addOnSelectItemListener { value ->
+                        Preferences.weatherTempUnit = value
+                    }.show()
+            }
+        }
+
+        action_weather_refresh_period.setOnClickListener {
+            if (Preferences.showWeather) {
+                val dialog =
+                    BottomSheetMenu<Int>(requireContext()).selectResource(Preferences.weatherRefreshPeriod)
+                (5 downTo 0).forEach {
+                    dialog.addItem(getString(Util.getRefreshPeriodString(it)), it)
+                }
+                dialog
+                    .addOnSelectItemListener { value ->
+                        Preferences.weatherRefreshPeriod = value
+                    }.show()
+            }
+        }
+
+        action_weather_app.setOnClickListener {
+            if (Preferences.showWeather) {
+                startActivityForResult(
+                    Intent(requireContext(), ChooseApplicationActivity::class.java),
+                    RequestCode.WEATHER_APP_REQUEST_CODE.code
+                )
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == Activity.RESULT_OK) {
+            when (requestCode) {
+                Constants.RESULT_CODE_CUSTOM_LOCATION -> {
+                    WeatherReceiver.setUpdates(requireContext())
+                }
+                RequestCode.WEATHER_APP_REQUEST_CODE.code -> {
+                    Preferences.bulk {
+                        weatherAppName = data?.getStringExtra(Constants.RESULT_APP_NAME) ?: getString(R.string.default_weather_app)
+                        weatherAppPackage = data?.getStringExtra(Constants.RESULT_APP_PACKAGE) ?: ""
+                    }
+                    Util.updateWidget(requireContext())
+                }
+                RequestCode.WEATHER_PROVIDER_REQUEST_CODE.code -> {
+                    WeatherReceiver.setOneTimeUpdate(requireContext())
+                }
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun requirePermission() {
+        Dexter.withContext(requireActivity())
+            .withPermissions(
+                Manifest.permission.ACCESS_FINE_LOCATION
+            ).withListener(object: MultiplePermissionsListener {
+                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
+                    report?.let {
+                        if (report.areAllPermissionsGranted()){
+                            checkLocationPermission()
+                        }
+                    }
+                }
+                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()
+        lifecycleScope.launch {
+            delay(200)
+            scrollView.smoothScrollTo(0, scrollPosition)
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/view/CustomTypefaceSpan.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/view/CustomTypefaceSpan.kt
deleted file mode 100644
index fc118af..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/view/CustomTypefaceSpan.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.view
-
-import android.graphics.Paint
-import android.graphics.Typeface
-import android.text.TextPaint
-import android.text.style.TypefaceSpan
-
-class CustomTypefaceSpan(family: String, private val newType: Typeface) : TypefaceSpan(family) {
-
-    override fun updateDrawState(ds: TextPaint) {
-        applyCustomTypeFace(ds, newType)
-    }
-
-    override fun updateMeasureState(paint: TextPaint) {
-        applyCustomTypeFace(paint, newType)
-    }
-
-    private fun applyCustomTypeFace(paint: Paint, tf: Typeface) {
-        val oldStyle: Int
-        val old = paint.typeface
-        if (old == null) {
-            oldStyle = 0
-        } else {
-            oldStyle = old.style
-        }
-
-        val fake = oldStyle and tf.style.inv()
-        if (fake and Typeface.BOLD != 0) {
-            paint.isFakeBoldText = true
-        }
-
-        if (fake and Typeface.ITALIC != 0) {
-            paint.textSkewX = -0.25f
-        }
-
-        paint.typeface = tf
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/view/TitleTextView.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/view/TitleTextView.kt
deleted file mode 100644
index 5531ece..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/view/TitleTextView.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.view
-
-import android.content.Context
-import android.graphics.Typeface
-import android.content.res.TypedArray
-import android.util.AttributeSet
-import android.util.Log
-import android.widget.TextView
-import com.tommasoberlose.anotherwidget.R
-
-
-/**
- * Created by tommaso on 12/10/17.
- */
-class TitleTextView : TextView {
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
-        init(context, attrs)
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init(context, attrs)
-    }
-
-    constructor(context: Context) : super(context) {}
-
-    fun init(context: Context, attrs: AttributeSet) {
-        try {
-            val ta = context.obtainStyledAttributes(attrs, R.styleable.FontText)
-
-            if (ta != null) {
-                val fontAsset = ta.getString(R.styleable.FontText_typefaceAsset)
-
-                if (fontAsset != null && !fontAsset.isEmpty()) {
-                    val tf = Typeface.createFromAsset(getContext().assets, fontAsset)
-
-                    if (tf != null)
-                        typeface = tf
-                    else
-                        Log.i("FontText", String.format("Could not create a font from asset: %s", fontAsset))
-                }
-                ta.recycle()
-            }
-        } catch (e: Exception) {
-            Log.i("FontText", "Could not create a font from asset")
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/ChooseApplicationViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/ChooseApplicationViewModel.kt
new file mode 100644
index 0000000..86e9012
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/ChooseApplicationViewModel.kt
@@ -0,0 +1,18 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels
+
+import android.app.Application
+import android.content.pm.ApplicationInfo
+import androidx.databinding.ObservableField
+import androidx.lifecycle.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class ChooseApplicationViewModel(application: Application) : AndroidViewModel(application) {
+
+    val appList: LiveData<List<ApplicationInfo>> = liveData {
+        val app = application.packageManager.getInstalledApplications(0)
+        emit(app)
+    }
+    val searchInput: MutableLiveData<String> = MutableLiveData("")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomLocationViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomLocationViewModel.kt
new file mode 100644
index 0000000..c27bda8
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomLocationViewModel.kt
@@ -0,0 +1,17 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels
+
+import android.app.Application
+import android.content.pm.ApplicationInfo
+import android.location.Address
+import android.location.Geocoder
+import androidx.lifecycle.*
+import com.tommasoberlose.anotherwidget.global.Preferences
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.EventBus
+
+class CustomLocationViewModel(application: Application) : AndroidViewModel(application) {
+
+    val addresses: MutableLiveData<List<Address>> =  MutableLiveData(emptyList())
+    val locationInput: MutableLiveData<String> = MutableLiveData(Preferences.customLocationAdd)
+}
\ 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
new file mode 100644
index 0000000..417ccd7
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
@@ -0,0 +1,51 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels
+
+import androidx.lifecycle.*
+import com.chibatching.kotpref.livedata.asLiveData
+import com.tommasoberlose.anotherwidget.global.Preferences
+
+class MainViewModel : ViewModel() {
+
+    // General Settings
+    val textGlobalColor = Preferences.asLiveData(Preferences::textGlobalColor)
+    val textMainSize = Preferences.asLiveData(Preferences::textMainSize)
+    val textSecondSize = Preferences.asLiveData(Preferences::textSecondSize)
+    val textShadow = Preferences.asLiveData(Preferences::textShadow)
+    val customFont = Preferences.asLiveData(Preferences::customFont)
+    val secondRowInformation = Preferences.asLiveData(Preferences::secondRowInformation)
+
+    // Calendar Settings
+    val showEvents = Preferences.asLiveData(Preferences::showEvents)
+    val calendarAllDay = Preferences.asLiveData(Preferences::calendarAllDay)
+    val showUntil = Preferences.asLiveData(Preferences::showUntil)
+    val showDiffTime = Preferences.asLiveData(Preferences::showDiffTime)
+    val showDeclinedEvents = Preferences.asLiveData(Preferences::showDeclinedEvents)
+    val showNextEvent = Preferences.asLiveData(Preferences::showNextEvent)
+
+    val calendarAppName = Preferences.asLiveData(Preferences::calendarAppName)
+
+    val eventAppName = Preferences.asLiveData(Preferences::eventAppName)
+
+
+    // Clock Settings
+    val showClock = Preferences.asLiveData(Preferences::showClock)
+    val clockTextSize = Preferences.asLiveData(Preferences::clockTextSize)
+
+    val clockAppName = Preferences.asLiveData(Preferences::clockAppName)
+    val showNextAlarm = Preferences.asLiveData(Preferences::showNextAlarm)
+    val dateFormat = Preferences.asLiveData(Preferences::dateFormat)
+
+    // Weather Settings
+    val showWeather = Preferences.asLiveData(Preferences::showWeather)
+    val weatherTempUnit = Preferences.asLiveData(Preferences::weatherTempUnit)
+    val weatherRefreshPeriod = Preferences.asLiveData(Preferences::weatherRefreshPeriod)
+
+    val weatherAppName = Preferences.asLiveData(Preferences::weatherAppName)
+    val weatherProviderApi = Preferences.asLiveData(Preferences::weatherProviderApi)
+
+    val customLocationAdd = Preferences.asLiveData(Preferences::customLocationAdd)
+
+    // Advanced Settings
+    val darkThemePreference = Preferences.asLiveData(Preferences::darkThemePreference)
+    val showWallpaper = Preferences.asLiveData(Preferences::showWallpaper)
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/SupportDevViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/SupportDevViewModel.kt
new file mode 100644
index 0000000..2b4c6a5
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/SupportDevViewModel.kt
@@ -0,0 +1,68 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels
+
+import android.app.Activity
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.android.billingclient.api.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class SupportDevViewModel : ViewModel() {
+
+    lateinit var billingClient: BillingClient
+    val products: MutableLiveData<List<SkuDetails>> = MutableLiveData(emptyList())
+
+    fun openConnection() {
+
+        billingClient.startConnection(object : BillingClientStateListener {
+            override fun onBillingSetupFinished(billingResult: BillingResult) {
+                if (billingResult.responseCode ==  BillingClient.BillingResponseCode.OK) {
+                    val params = SkuDetailsParams.newBuilder()
+                    params.setSkusList(listOf("donation_coffee", "donation_donuts", "donation_breakfast", "donation_lunch", "donation_dinner")).setType(BillingClient.SkuType.INAPP)
+                    viewModelScope.launch(Dispatchers.IO) {
+                        val skuDetailsList = billingClient.querySkuDetails(params.build()).skuDetailsList
+                        withContext(Dispatchers.Main) {
+                            products.value = skuDetailsList
+                        }
+                    }
+                }
+            }
+            override fun onBillingServiceDisconnected() {
+                // Try to restart the connection on the next request to
+                // Google Play by calling the startConnection() method.
+            }
+        })
+    }
+
+    fun purchase(activity: Activity, product: SkuDetails) {
+        val flowParams = BillingFlowParams.newBuilder()
+            .setSkuDetails(product)
+            .build()
+        billingClient.launchBillingFlow(activity, flowParams)
+    }
+
+    fun handlePurchase(purchase: Purchase) {
+        if (!purchase.isAcknowledged) {
+            viewModelScope.launch(Dispatchers.IO) {
+                val acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder()
+                    .setPurchaseToken(purchase.purchaseToken)
+                billingClient.acknowledgePurchase(acknowledgePurchaseParams.build())
+
+                val consumeParams =
+                    ConsumeParams.newBuilder()
+                        .setPurchaseToken(purchase.purchaseToken)
+                        .build()
+                billingClient.consumePurchase(consumeParams)
+            }
+        }
+    }
+
+    fun closeConnection() {
+        billingClient.endConnection()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widget/TheWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widget/TheWidget.kt
deleted file mode 100644
index b8c2fae..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widget/TheWidget.kt
+++ /dev/null
@@ -1,543 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.widget
-
-import android.Manifest
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.content.Intent
-import android.preference.PreferenceManager
-import android.view.View
-import android.widget.RemoteViews
-
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.receiver.UpdatesReceiver
-import com.tommasoberlose.anotherwidget.util.Util
-import com.tommasoberlose.anotherwidget.receiver.WeatherReceiver
-
-import java.util.Calendar
-import java.util.Locale
-import java.util.concurrent.TimeUnit
-import android.app.PendingIntent
-import android.provider.CalendarContract
-import android.content.ContentUris
-import android.util.Log
-import com.tommasoberlose.anotherwidget.util.CalendarUtil
-import com.tommasoberlose.anotherwidget.util.WeatherUtil
-import android.graphics.Typeface
-import android.net.Uri
-import android.widget.TextClock
-import android.widget.TextView
-import android.content.ComponentName
-import android.content.res.Resources
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.Color
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import android.support.v4.content.ContextCompat.startActivity
-import android.provider.CalendarContract.Events
-import android.support.v4.content.ContextCompat
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.RelativeSizeSpan
-import android.text.style.StyleSpan
-import android.util.DisplayMetrics
-import android.util.TypedValue
-import android.widget.LinearLayout
-import com.tommasoberlose.anotherwidget.receiver.OpenWeatherIntentReceiver
-import com.tommasoberlose.anotherwidget.ui.view.CustomTypefaceSpan
-import kotlinx.android.synthetic.main.the_widget.*
-import kotlinx.android.synthetic.main.the_widget.view.*
-import kotlinx.android.synthetic.main.the_widget_sans.view.*
-
-
-/**
- * Implementation of App Widget functionality.
- */
-class TheWidget : AppWidgetProvider() {
-
-    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
-        Util.updateSettingsByDefault(context)
-
-        for (appWidgetId in appWidgetIds) {
-            updateAppWidget(context, appWidgetManager, appWidgetId)
-        }
-    }
-
-    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
-        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
-        updateAppWidget(context, appWidgetManager, appWidgetId)
-    }
-
-    override fun onEnabled(context: Context) {
-        UpdatesReceiver().setUpdates(context)
-        WeatherReceiver().setUpdates(context)
-    }
-
-    override fun onDisabled(context: Context) {
-        UpdatesReceiver().removeUpdates(context)
-        WeatherReceiver().removeUpdates(context)
-    }
-
-    companion object {
-
-        internal fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager,
-                                     appWidgetId: Int) {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            val displayMetrics = Resources.getSystem().displayMetrics
-            var height = Util.convertDpToPixel(110f, context).toInt()
-            val width = displayMetrics.widthPixels
-            if (SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-                height += Util.convertSpToPixels(SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f), context).toInt() + Util.convertDpToPixel(16f, context).toInt()
-            }
-            if (SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) > 30 && SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) > 22) {
-                height += Util.convertDpToPixel(24f, context).toInt()
-            }
-
-            generateWidgetView(context, appWidgetId, appWidgetManager, width - Util.convertDpToPixel(16f, context).toInt(), height)
-        }
-
-        fun generateWidgetView(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager, w: Int, h: Int) {
-            var views = RemoteViews(context.packageName, R.layout.the_widget_sans)
-            var v = View.inflate(context, R.layout.the_widget, null)
-
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            views.setTextColor(R.id.empty_date, Util.getFontColor(SP))
-            views.setTextColor(R.id.divider1, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            views.setTextColor(R.id.temp, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            views.setTextColor(R.id.next_event, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            views.setTextColor(R.id.next_event_difference_time, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            views.setTextColor(R.id.next_event_date, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            views.setTextColor(R.id.divider2, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            views.setTextColor(R.id.calendar_temp, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-            //views.setTextColor(R.id.time, Util.getFontColor(PreferenceManager.getDefaultSharedPreferences(context)))
-
-            views.setTextViewTextSize(R.id.empty_date, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            views.setTextViewTextSize(R.id.divider1, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            views.setTextViewTextSize(R.id.temp, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            views.setTextViewTextSize(R.id.next_event, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            views.setTextViewTextSize(R.id.next_event_difference_time, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            views.setTextViewTextSize(R.id.next_event_date, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            views.setTextViewTextSize(R.id.divider2, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            views.setTextViewTextSize(R.id.calendar_temp, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            //views.setTextViewTextSize(R.id.time, TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f))
-
-            v = updateCalendarViewByLayout(context, v)
-            v = updateLocationViewByLayout(context, v)
-            v = updateClockViewByLayout(context, v)
-            views.setImageViewBitmap(R.id.bitmap_container, Util.getBitmapFromView(v, w, h))
-
-            views = updateCalendarView(context, views, appWidgetId)
-            views = updateLocationView(context, views, appWidgetId)
-            views = updateClockView(context, views, appWidgetId)
-
-            views = fixViewsMargin(context, views)
-
-            appWidgetManager.updateAppWidget(appWidgetId, views)
-        }
-
-        fun updateCalendarView(context: Context, views: RemoteViews, widgetID: Int): RemoteViews {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            val now = Calendar.getInstance()
-            val calendarLayout = SP.getBoolean(Constants.PREF_SHOW_EVENTS, true) && Util.checkGrantedPermission(context, Manifest.permission.READ_CALENDAR)
-
-            views.setViewVisibility(R.id.empty_layout, View.VISIBLE)
-            views.setViewVisibility(R.id.calendar_layout, View.GONE)
-            var dateStringValue: String = Util.getCapWordString(Constants.engDateFormat.format(now.time))
-            if (SP.getBoolean(Constants.PREF_ITA_FORMAT_DATE, false)) {
-                dateStringValue = Util.getCapWordString(Constants.itDateFormat.format(now.time))
-            }
-            views.setTextViewText(R.id.empty_date, dateStringValue)
-
-
-            val calPIntent = PendingIntent.getActivity(context, widgetID, Util.getCalendarIntent(context), 0)
-            views.setOnClickPendingIntent(R.id.empty_date, calPIntent)
-
-
-            if (calendarLayout) {
-                val e = CalendarUtil.getNextEvent(context)
-
-                if (e.id != 0.toLong()) {
-                    views.setTextViewText(R.id.next_event, e.title)
-
-                    if (SP.getBoolean(Constants.PREF_SHOW_NEXT_EVENT, false) && CalendarUtil.getEventsCount(context) > 1) {
-                        val multipleIntent = PendingIntent.getBroadcast(context, widgetID, Intent(Constants.ACTION_GO_TO_NEXT_EVENT), 0)
-                        views.setViewVisibility(R.id.multiple_events, View.VISIBLE)
-                        views.setOnClickPendingIntent(R.id.multiple_events, multipleIntent)
-                    } else {
-                        views.setViewVisibility(R.id.multiple_events, View.GONE)
-                    }
-
-                    val pIntent = PendingIntent.getActivity(context, widgetID, Util.getEventIntent(context, e), 0)
-                    views.setOnClickPendingIntent(R.id.next_event, pIntent)
-                    views.setOnClickPendingIntent(R.id.next_event_difference_time, pIntent)
-
-                    if (SP.getBoolean(Constants.PREF_SHOW_DIFF_TIME, true)) {
-                        views.setTextViewText(R.id.next_event_difference_time, Util.getDifferenceText(context, now.timeInMillis, e.startDate))
-                        views.setViewVisibility(R.id.next_event_difference_time, View.VISIBLE)
-                    } else {
-                        views.setViewVisibility(R.id.next_event_difference_time, View.GONE)
-                    }
-
-                    if (SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0) == 2 && Util.getNextAlarm(context) != null) {
-                        val source = BitmapFactory.decodeResource(context.resources, R.drawable.ic_action_alarm);
-                        val result = Util.changeBitmapColor(source, Util.getFontColor(SP))
-                        views.setImageViewBitmap(R.id.second_row_icon, result)
-
-                        views.setTextViewText(R.id.next_event_date, Util.getNextAlarm(context))
-
-                        val clockIntent = PendingIntent.getActivity(context, widgetID, Util.getClockIntent(context), 0)
-                        views.setOnClickPendingIntent(R.id.next_event_date, clockIntent)
-                    } else if (e.address != "" && SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0) == 1) {
-
-                        val source = BitmapFactory.decodeResource(context.resources, R.drawable.ic_action_location);
-                        val result = Util.changeBitmapColor(source, Util.getFontColor(SP))
-                        views.setImageViewBitmap(R.id.second_row_icon, result)
-
-                        views.setTextViewText(R.id.next_event_date, e.address)
-
-                        val mapIntent = PendingIntent.getActivity(context, widgetID, Util.getGoogleMapsIntentFromAddress(context, e.address), 0)
-                        views.setOnClickPendingIntent(R.id.next_event_date, mapIntent)
-                    } else {
-                        val source = BitmapFactory.decodeResource(context.resources, R.drawable.ic_action_calendar);
-                        val result = Util.changeBitmapColor(source, Util.getFontColor(SP))
-                        views.setImageViewBitmap(R.id.second_row_icon, result)
-
-                        if (!e.allDay) {
-                            var startHour = Constants.goodHourFormat.format(e.startDate)
-                            var endHour = Constants.goodHourFormat.format(e.endDate)
-                            if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) {
-                                startHour = Constants.badHourFormat.format(e.startDate)
-                                endHour = Constants.badHourFormat.format(e.endDate)
-                            }
-                            var dayDiff = TimeUnit.MILLISECONDS.toDays(e.endDate - e.startDate)
-
-                            val startCal = Calendar.getInstance()
-                            startCal.timeInMillis = e.startDate
-
-                            val endCal = Calendar.getInstance()
-                            endCal.timeInMillis = e.endDate
-
-                            if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
-                                dayDiff++
-                            } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(Calendar.MINUTE) >= endCal.get(Calendar.MINUTE)) {
-                                dayDiff++
-                            }
-
-                            var multipleDay = ""
-                            if (dayDiff > 0) {
-                                multipleDay = String.format(" (+%s%s)", dayDiff, context.getString(R.string.day_char))
-                            }
-
-                            views.setTextViewText(R.id.next_event_date, String.format("%s - %s%s", startHour, endHour, multipleDay))
-                        } else {
-                            views.setTextViewText(R.id.next_event_date, dateStringValue)
-                        }
-
-                        if (SP.getBoolean(Constants.PREF_SHOW_NEXT_EVENT, false) && CalendarUtil.getEventsCount(context) > 1) {
-                            val multipleIntent = PendingIntent.getBroadcast(context, widgetID, Intent(Constants.ACTION_GO_TO_NEXT_EVENT), 0)
-                            views.setOnClickPendingIntent(R.id.next_event_date, multipleIntent)
-                        } else {
-                            views.setOnClickPendingIntent(R.id.next_event_date, pIntent)
-                        }
-                    }
-
-                    views.setViewVisibility(R.id.empty_layout, View.GONE)
-                    views.setViewVisibility(R.id.calendar_layout, View.VISIBLE)
-                }
-            }
-
-            return views
-        }
-
-        fun updateLocationView(context: Context, views: RemoteViews, widgetID: Int): RemoteViews {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            val locationLayout = SP.getBoolean(Constants.PREF_SHOW_WEATHER, true)
-
-            if (locationLayout && SP.contains(Constants.PREF_WEATHER_TEMP) && SP.contains(Constants.PREF_WEATHER_ICON)) {
-                views.setViewVisibility(R.id.weather, View.VISIBLE)
-                views.setViewVisibility(R.id.calendar_weather, View.VISIBLE)
-                val temp = String.format(Locale.getDefault(), "%.0f °%s", SP.getFloat(Constants.PREF_WEATHER_TEMP, 0f), SP.getString(Constants.PREF_WEATHER_REAL_TEMP_UNIT, "F"))
-
-
-                views.setViewVisibility(R.id.weather_icon, View.VISIBLE)
-                views.setViewVisibility(R.id.empty_weather_icon, View.VISIBLE)
-                val icon: String = SP.getString(Constants.PREF_WEATHER_ICON, "")
-                if (icon.equals("")) {
-                    views.setViewVisibility(R.id.weather_icon, View.GONE)
-                    views.setViewVisibility(R.id.empty_weather_icon, View.GONE)
-                } else {
-                    views.setImageViewResource(R.id.weather_icon, WeatherUtil.getWeatherIconResource(icon))
-                    views.setImageViewResource(R.id.empty_weather_icon, WeatherUtil.getWeatherIconResource(icon))
-                }
-
-                views.setTextViewText(R.id.temp, temp)
-                views.setTextViewText(R.id.calendar_temp, temp)
-
-                val i = Intent(context, OpenWeatherIntentReceiver::class.java)
-                i.action = Constants.ACTION_OPEN_WEATHER_INTENT
-                val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
-
-                views.setOnClickPendingIntent(R.id.weather, weatherPIntent)
-                views.setOnClickPendingIntent(R.id.calendar_weather, weatherPIntent)
-            } else {
-                views.setViewVisibility(R.id.weather, View.GONE)
-                views.setViewVisibility(R.id.calendar_weather, View.GONE)
-            }
-            return views
-        }
-
-        fun updateClockView(context: Context, views: RemoteViews, widgetID: Int): RemoteViews {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            if (!SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-                views.setViewVisibility(R.id.time, View.GONE)
-            } else {
-//                val now = Calendar.getInstance()
-//                if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) {
-//                    val textBadHour = SpannableString(Constants.badHourFormat.format(now.timeInMillis).replace(" ", ""))
-//                    textBadHour.setSpan(RelativeSizeSpan(0.4f), textBadHour.length - 2,
-//                            textBadHour.length, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
-//
-//                    views.setTextViewText(R.id.time, textBadHour)
-//                } else {
-//                    views.setTextViewText(R.id.time,  Constants.goodHourFormat.format(now.timeInMillis))
-//                }
-
-                val clockPIntent = PendingIntent.getActivity(context, widgetID, Util.getClockIntent(context), 0)
-                views.setOnClickPendingIntent(R.id.time, clockPIntent)
-                views.setViewVisibility(R.id.time, View.VISIBLE)
-            }
-
-            return views
-        }
-
-        fun fixViewsMargin(context: Context, views: RemoteViews): RemoteViews {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            views.setViewVisibility(R.id.bottom_divider_24, View.GONE)
-            views.setViewVisibility(R.id.bottom_divider_16, View.GONE)
-            views.setViewVisibility(R.id.bottom_divider_8, View.GONE)
-            val eVisible = SP.getBoolean(Constants.PREF_SHOW_EVENTS, true) && Util.checkGrantedPermission(context, Manifest.permission.READ_CALENDAR)
-            if (SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-                if (eVisible) {
-                    views.setViewVisibility(R.id.bottom_divider_8, View.VISIBLE)
-                } else {
-                    views.setViewVisibility(R.id.bottom_divider_24, View.VISIBLE)
-                }
-            } else {
-                if (eVisible) {
-                    views.setViewVisibility(R.id.bottom_divider_8, View.VISIBLE)
-                }
-            }
-            return views
-        }
-
-        fun updateCalendarViewByLayout(context: Context, v: View): View {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            val now = Calendar.getInstance()
-            val calendarLayout = SP.getBoolean(Constants.PREF_SHOW_EVENTS, true) && Util.checkGrantedPermission(context, Manifest.permission.READ_CALENDAR)
-
-            v.empty_layout.visibility = View.VISIBLE
-            v.calendar_layout.visibility = View.GONE
-            var dateStringValue: String = Util.getCapWordString(Constants.engDateFormat.format(now.time))
-            if (SP.getBoolean(Constants.PREF_ITA_FORMAT_DATE, false)) {
-                dateStringValue = Util.getCapWordString(Constants.itDateFormat.format(now.time))
-            }
-
-            v.empty_date.text = dateStringValue
-
-            if (calendarLayout) {
-                val e = CalendarUtil.getNextEvent(context)
-
-                if (e.id != 0.toLong()) {
-                    v.next_event.text = e.title
-
-                    if (SP.getBoolean(Constants.PREF_SHOW_NEXT_EVENT, false) && CalendarUtil.getEventsCount(context) > 1) {
-                        v.multiple_events.visibility = View.VISIBLE
-                    } else {
-                        v.multiple_events.visibility = View.GONE
-                    }
-
-                    if (SP.getBoolean(Constants.PREF_SHOW_DIFF_TIME, true)) {
-                        v.next_event_difference_time.text = Util.getDifferenceText(context, now.timeInMillis, e.startDate)
-                        v.next_event_difference_time.visibility = View.VISIBLE
-                    } else {
-                        v.next_event_difference_time.visibility = View.GONE
-                    }
-
-                    if (SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0) == 2 && Util.getNextAlarm(context) != null) {
-                        v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_alarm))
-                        v.next_event_date.text = Util.getNextAlarm(context)
-                    } else if (!e.address.equals("") && SP.getInt(Constants.PREF_SECOND_ROW_INFORMATION, 0) == 1) {
-                        v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_location))
-                        v.next_event_date.text = e.address
-                    } else {
-                        v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_calendar))
-                        if (!e.allDay) {
-                            var startHour = Constants.goodHourFormat.format(e.startDate)
-                            var endHour = Constants.goodHourFormat.format(e.endDate)
-                            if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) {
-                                startHour = Constants.badHourFormat.format(e.startDate)
-                                endHour = Constants.badHourFormat.format(e.endDate)
-                            }
-                            var dayDiff = TimeUnit.MILLISECONDS.toDays(e.endDate - e.startDate)
-
-                            val startCal = Calendar.getInstance()
-                            startCal.timeInMillis = e.startDate
-
-                            val endCal = Calendar.getInstance()
-                            endCal.timeInMillis = e.endDate
-
-                            if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
-                                dayDiff++
-                            } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(Calendar.MINUTE) >= endCal.get(Calendar.MINUTE)) {
-                                dayDiff++
-                            }
-                            var multipleDay: String = ""
-                            if (dayDiff > 0) {
-                                multipleDay = String.format(" (+%s%s)", dayDiff, context.getString(R.string.day_char))
-                            }
-                            v.next_event_date.text = String.format("%s - %s%s", startHour, endHour, multipleDay)
-
-                        } else {
-                            v.next_event_date.text = dateStringValue
-                        }
-                    }
-
-                    v.empty_layout.visibility = View.GONE
-                    v.calendar_layout.visibility = View.VISIBLE
-                }
-            }
-
-            v.empty_date.setTextColor(Util.getFontColor(SP))
-            v.divider1.setTextColor(Util.getFontColor(SP))
-            v.temp.setTextColor(Util.getFontColor(SP))
-            v.next_event.setTextColor(Util.getFontColor(SP))
-            v.next_event_difference_time.setTextColor(Util.getFontColor(SP))
-            v.next_event_date.setTextColor(Util.getFontColor(SP))
-            v.divider2.setTextColor(Util.getFontColor(SP))
-            v.calendar_temp.setTextColor(Util.getFontColor(SP))
-            v.second_row_icon.setColorFilter(Util.getFontColor(SP))
-            v.time.setTextColor(Util.getFontColor(SP))
-            v.multiple_events.setColorFilter(Util.getFontColor(SP))
-
-
-            v.empty_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            v.divider1.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            v.temp.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            v.next_event.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            v.next_event_difference_time.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f))
-            v.next_event_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            v.divider2.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            v.calendar_temp.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f))
-            v.time.setTextSize(TypedValue.COMPLEX_UNIT_SP, SP.getFloat(Constants.PREF_TEXT_CLOCK_SIZE, 90f))
-
-            v.second_row_icon.scaleX = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-            v.second_row_icon.scaleY = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-
-            v.weather_icon.scaleX = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-            v.weather_icon.scaleY = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 18f
-
-            v.empty_weather_icon.scaleX = SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) / 24f
-            v.empty_weather_icon.scaleY = SP.getFloat(Constants.PREF_TEXT_MAIN_SIZE, 24f) / 24f
-
-            v.multiple_events.scaleX = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 16f
-            v.multiple_events.scaleY = SP.getFloat(Constants.PREF_TEXT_SECOND_SIZE, 16f) / 16f
-
-            val shadowRadius = when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-                0 -> 0f
-                1 -> 5f
-                2 -> 5f
-                else -> 5f
-            }
-            val shadowColor =  when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-                0 -> Color.TRANSPARENT
-                1 -> R.color.black_50
-                2 -> Color.BLACK
-                else -> R.color.black_50
-            }
-            val shadowDy =  when (SP.getInt(Constants.PREF_TEXT_SHADOW, 1)) {
-                0 -> 0f
-                1 -> 0f
-                2 -> 1f
-                else -> 0f
-            }
-            v.empty_date.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.divider1.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.temp.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.next_event.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.next_event_difference_time.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.next_event_date.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.divider2.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-            v.calendar_temp.setShadowLayer(shadowRadius, 0f, 0f, shadowColor)
-            v.time.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
-
-            if (SP.getInt(Constants.PREF_CUSTOM_FONT, Constants.CUSTOM_FONT_PRODUCT_SANS) == Constants.CUSTOM_FONT_PRODUCT_SANS) {
-                val product_sans: Typeface = Typeface.createFromAsset(context.assets, "fonts/product_sans_regular.ttf")
-                val product_sans_light: Typeface = Typeface.createFromAsset(context.assets, "fonts/product_sans_light.ttf")
-                v.empty_date.typeface = product_sans
-                v.divider1.typeface = product_sans
-                v.temp.typeface = product_sans
-                v.next_event.typeface = product_sans
-                v.next_event_difference_time.typeface = product_sans
-                v.next_event_date.typeface = product_sans
-                v.divider2.typeface = product_sans
-                v.calendar_temp.typeface = product_sans
-                v.time.typeface = product_sans_light
-            }
-
-            return v
-        }
-
-        fun updateLocationViewByLayout(context: Context, v: View): View {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            val locationLayout = SP.getBoolean(Constants.PREF_SHOW_WEATHER, true)
-
-            if (locationLayout && SP.contains(Constants.PREF_WEATHER_TEMP) && SP.contains(Constants.PREF_WEATHER_ICON)) {
-                v.weather.visibility = View.VISIBLE
-                v.calendar_weather.visibility = View.VISIBLE
-                val currentTemp = String.format(Locale.getDefault(), "%.0f °%s", SP.getFloat(Constants.PREF_WEATHER_TEMP, 0f), SP.getString(Constants.PREF_WEATHER_REAL_TEMP_UNIT, "F"))
-
-
-                v.weather_icon.visibility = View.VISIBLE
-                v.empty_weather_icon.visibility = View.VISIBLE
-                val icon: String = SP.getString(Constants.PREF_WEATHER_ICON, "")
-                if (icon.equals("")) {
-                    v.weather_icon.visibility = View.GONE
-                    v.empty_weather_icon.visibility = View.GONE
-                } else {
-                    v.weather_icon.setImageResource(WeatherUtil.getWeatherIconResource(icon))
-                    v.empty_weather_icon.setImageResource(WeatherUtil.getWeatherIconResource(icon))
-                }
-
-                v.temp.text = currentTemp
-                v.calendar_temp.text = currentTemp
-            } else {
-                v.weather.visibility = View.GONE
-                v.calendar_weather.visibility = View.GONE
-            }
-            return v
-        }
-
-        fun updateClockViewByLayout(context: Context, v: View): View {
-            val SP = PreferenceManager.getDefaultSharedPreferences(context)
-            if (!SP.getBoolean(Constants.PREF_SHOW_CLOCK, false)) {
-                v.time.visibility = View.GONE
-            } else {
-//                val now = Calendar.getInstance()
-//                if (SP.getString(Constants.PREF_HOUR_FORMAT, "12").equals("12")) {
-//                    val textBadHour = SpannableString(Constants.badHourFormat.format(now.timeInMillis).replace(" ", ""))
-//                    textBadHour.setSpan(RelativeSizeSpan(0.4f), textBadHour.length - 2,
-//                            textBadHour.length, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-//
-//                    v.time.text = textBadHour
-//                } else {
-//                    v.time.text = Constants.goodHourFormat.format(now.timeInMillis)
-//                }
-                v.time.visibility = View.VISIBLE
-            }
-            return v
-        }
-    }
-}
-
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/TheWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/TheWidget.kt
new file mode 100644
index 0000000..e39acf0
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/TheWidget.kt
@@ -0,0 +1,397 @@
+package com.tommasoberlose.anotherwidget.ui.widgets
+
+import android.Manifest
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.content.res.Resources
+import android.graphics.BitmapFactory
+import android.graphics.Color
+import android.graphics.Typeface
+import android.os.Bundle
+import android.text.format.DateUtils
+import android.util.Log
+import android.util.TypedValue
+import android.view.View
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.RemoteViews
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.receivers.NewCalendarEventReceiver
+import com.tommasoberlose.anotherwidget.receivers.WidgetClickListenerReceiver
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver
+import com.tommasoberlose.anotherwidget.utils.CalendarUtil
+import com.tommasoberlose.anotherwidget.utils.Util
+import com.tommasoberlose.anotherwidget.utils.WeatherUtil
+import com.tommasoberlose.anotherwidget.utils.toPixel
+import kotlinx.android.synthetic.main.the_widget.view.*
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+
+class TheWidget : AppWidgetProvider() {
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        for (appWidgetId in appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId)
+        }
+    }
+
+    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
+        updateAppWidget(context, appWidgetManager, appWidgetId)
+    }
+
+    override fun onEnabled(context: Context) {
+        CalendarUtil.updateEventList(context)
+        WeatherReceiver.setUpdates(context)
+    }
+
+    override fun onDisabled(context: Context) {
+        UpdatesReceiver.removeUpdates(context)
+        WeatherReceiver.removeUpdates(context)
+    }
+
+    companion object {
+
+        internal fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager,
+                                     appWidgetId: Int) {
+            val displayMetrics = Resources.getSystem().displayMetrics
+            var height = 110.toPixel(context)
+            val width = displayMetrics.widthPixels
+            if (Preferences.showClock) {
+                height += Util.convertSpToPixels(Preferences.clockTextSize, context).toInt() + 16.toPixel(context)
+            }
+            if (Preferences.textMainSize > 30 && Preferences.textSecondSize > 22) {
+                height += 24.toPixel(context)
+            }
+
+            generateWidgetView(context, appWidgetId, appWidgetManager, width - 16.toPixel(context), height)
+        }
+
+        private fun generateWidgetView(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager, w: Int, h: Int) {
+            var views = RemoteViews(context.packageName, R.layout.the_widget_sans)
+
+            val generatedView = generateWidgetView(context, w)
+            generatedView.measure(0, 0)
+            views.setImageViewBitmap(R.id.bitmap_container, Util.getBitmapFromView(generatedView, w, generatedView.measuredHeight))
+
+            // Clock
+            views = updateClockView(context, views, appWidgetId)
+
+            // Setup listener
+            views = updateCalendarView(context, generatedView, views, appWidgetId)
+            views = updateWeatherView(context, generatedView, views, appWidgetId)
+
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+        }
+
+        private fun updateCalendarView(context: Context, v: View, views: RemoteViews, widgetID: Int): RemoteViews {
+
+            v.empty_date.measure(0, 0)
+            views.setImageViewBitmap(R.id.empty_date_rect, Util.getBitmapFromView(v.empty_date))
+
+            views.setViewVisibility(R.id.empty_layout_rect, View.VISIBLE)
+            views.setViewVisibility(R.id.calendar_layout_rect, View.GONE)
+            views.setViewVisibility(R.id.second_row_rect, View.GONE)
+
+            val calPIntent = PendingIntent.getActivity(context, widgetID, Util.getCalendarIntent(context), 0)
+            views.setOnClickPendingIntent(R.id.empty_date_rect, calPIntent)
+
+            val nextEvent = CalendarUtil.getNextEvent()
+            val nextAlarm = Util.getNextAlarm(context)
+
+            if (Preferences.showEvents && Util.checkGrantedPermission(context, Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                if (Preferences.showNextEvent && CalendarUtil.getEventsCount() > 1) {
+                    v.action_next.measure(0, 0)
+                    views.setImageViewBitmap(R.id.action_next_rect, Util.getBitmapFromView(v.action_next))
+                    views.setViewVisibility(R.id.action_next_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.action_next_rect, PendingIntent.getBroadcast(context, widgetID, Intent(context, NewCalendarEventReceiver::class.java).apply { action = Actions.ACTION_GO_TO_NEXT_EVENT }, 0))
+
+                    v.action_previous.measure(0, 0)
+                    views.setImageViewBitmap(R.id.action_previous_rect, Util.getBitmapFromView(v.action_previous))
+                    views.setViewVisibility(R.id.action_previous_rect, View.VISIBLE)
+                    views.setOnClickPendingIntent(R.id.action_previous_rect, PendingIntent.getBroadcast(context, widgetID, Intent(context, NewCalendarEventReceiver::class.java).apply { action = Actions.ACTION_GO_TO_PREVIOUS_EVENT }, 0))
+                } else {
+                    views.setViewVisibility(R.id.action_next_rect, View.GONE)
+                    views.setViewVisibility(R.id.action_previous_rect, View.GONE)
+                }
+
+                val pIntent = PendingIntent.getActivity(context, widgetID, Util.getEventIntent(context, nextEvent), 0)
+                views.setOnClickPendingIntent(R.id.next_event_rect, pIntent)
+                views.setOnClickPendingIntent(R.id.next_event_difference_time_rect, pIntent)
+
+                if (Preferences.showDiffTime && Calendar.getInstance().timeInMillis < nextEvent.startDate) {
+                    v.next_event_difference_time.measure(0, 0)
+                    views.setImageViewBitmap(R.id.next_event_difference_time_rect, Util.getBitmapFromView(v.next_event_difference_time))
+                    views.setViewVisibility(R.id.next_event_difference_time_rect, View.VISIBLE)
+                } else {
+                    views.setViewVisibility(R.id.next_event_difference_time_rect, View.GONE)
+                }
+
+                if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
+                    val mapIntent = PendingIntent.getActivity(context, widgetID, Util.getGoogleMapsIntentFromAddress(context, nextEvent.address), 0)
+                    views.setOnClickPendingIntent(R.id.second_row_rect, mapIntent)
+                } else {
+                    views.setOnClickPendingIntent(R.id.next_event_rect, pIntent)
+                }
+
+                v.next_event.measure(0, 0)
+                views.setImageViewBitmap(R.id.next_event_rect, Util.getBitmapFromView(v.next_event))
+
+
+                v.second_row.measure(0, 0)
+                views.setImageViewBitmap(R.id.second_row_rect, Util.getBitmapFromView(v.second_row))
+                views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
+
+                views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
+                views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+            } else if (Preferences.secondRowInformation == 2 && nextAlarm != "") {
+                val clockIntent = PendingIntent.getActivity(context, widgetID, Util.getClockIntent(context), 0)
+                views.setOnClickPendingIntent(R.id.second_row_rect, clockIntent)
+
+                v.next_event.measure(0, 0)
+                views.setImageViewBitmap(R.id.next_event_rect, Util.getBitmapFromView(v.next_event))
+
+                v.second_row.measure(0, 0)
+                views.setImageViewBitmap(R.id.second_row_rect, Util.getBitmapFromView(v.second_row))
+                views.setViewVisibility(R.id.second_row_rect, View.VISIBLE)
+
+                views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
+                views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
+            }
+
+            return views
+        }
+
+        private fun updateWeatherView(context: Context, v: View, views: RemoteViews, widgetID: Int): RemoteViews {
+
+            if (Preferences.showWeather && Preferences.weatherIcon != "") {
+                views.setViewVisibility(R.id.weather_rect, View.VISIBLE)
+                views.setViewVisibility(R.id.calendar_weather_rect, View.VISIBLE)
+
+                val i = Intent(context, WidgetClickListenerReceiver::class.java)
+                i.action = Actions.ACTION_OPEN_WEATHER_INTENT
+                val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
+
+                views.setOnClickPendingIntent(R.id.weather_rect, weatherPIntent)
+                views.setOnClickPendingIntent(R.id.calendar_weather_rect, weatherPIntent)
+
+                v.weather.measure(0, 0)
+                views.setImageViewBitmap(R.id.weather_rect, Util.getBitmapFromView(v.weather))
+
+                v.calendar_weather.measure(0, 0)
+                views.setImageViewBitmap(R.id.calendar_weather_rect, Util.getBitmapFromView(v.calendar_weather))
+            } else {
+                views.setViewVisibility(R.id.weather_rect, View.GONE)
+                views.setViewVisibility(R.id.calendar_weather_rect, View.GONE)
+            }
+            return views
+        }
+
+        private fun updateClockView(context: Context, views: RemoteViews, widgetID: Int): RemoteViews {
+            if (!Preferences.showClock) {
+                views.setViewVisibility(R.id.time, View.GONE)
+            } else {
+                views.setTextColor(R.id.time, Util.getFontColor())
+                views.setTextViewTextSize(R.id.time, TypedValue.COMPLEX_UNIT_SP, Preferences.clockTextSize.toPixel(context))
+                val clockPIntent = PendingIntent.getActivity(context, widgetID, Util.getClockIntent(context), 0)
+                views.setOnClickPendingIntent(R.id.time, clockPIntent)
+                views.setViewVisibility(R.id.time, View.VISIBLE)
+            }
+
+            return views
+        }
+
+        fun generateWidgetView(context: Context, maxWidth: Int): View {
+            val v = View.inflate(context, R.layout.the_widget, null)
+
+            val now = Calendar.getInstance()
+
+            v.empty_layout.visibility = View.VISIBLE
+            v.calendar_layout.visibility = View.GONE
+
+            val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
+            v.empty_date.text = Util.getCapWordString("${SimpleDateFormat("EEEE", Locale.getDefault()).format(now.time)}, ${DateUtils.formatDateTime(context, now.timeInMillis, flags)}")
+
+            val nextEvent = CalendarUtil.getNextEvent()
+            val nextAlarm = Util.getNextAlarm(context)
+
+            if (Preferences.showEvents && Util.checkGrantedPermission(context, Manifest.permission.READ_CALENDAR) && nextEvent != null) {
+                // Multiple counter
+                v.action_next.isVisible = Preferences.showNextEvent && CalendarUtil.getEventsCount() > 1
+                v.action_previous.isVisible = Preferences.showNextEvent && CalendarUtil.getEventsCount() > 1
+
+                v.next_event.text = nextEvent.title
+
+                if (Preferences.showDiffTime && now.timeInMillis < nextEvent.startDate) {
+                    v.next_event_difference_time.text = Util.getDifferenceText(context, now.timeInMillis, nextEvent.startDate).toLowerCase(Locale.getDefault())
+                    v.next_event_difference_time.visibility = View.VISIBLE
+                } else {
+                    v.next_event_difference_time.visibility = View.GONE
+                }
+
+                if (nextEvent.address != "" && Preferences.secondRowInformation == 1) {
+                    v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.round_place))
+                    v.next_event_date.text = nextEvent.address
+                } 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)
+
+                        var dayDiff = TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate)
+
+                        val startCal = Calendar.getInstance()
+                        startCal.timeInMillis = nextEvent.startDate
+
+                        val endCal = Calendar.getInstance()
+                        endCal.timeInMillis = nextEvent.endDate
+
+                        if (startCal.get(Calendar.HOUR_OF_DAY) > endCal.get(Calendar.HOUR_OF_DAY)) {
+                            dayDiff++
+                        } else if (startCal.get(Calendar.HOUR_OF_DAY) == endCal.get(Calendar.HOUR_OF_DAY) && startCal.get(Calendar.MINUTE) >= endCal.get(Calendar.MINUTE)) {
+                            dayDiff++
+                        }
+                        var multipleDay = ""
+                        if (dayDiff > 0) {
+                            multipleDay = String.format(" (+%s%s)", dayDiff, context.getString(R.string.day_char))
+                        }
+                        v.next_event_date.text = String.format("%s - %s%s", startHour, endHour, multipleDay)
+
+                    } else {
+                        v.next_event_date.text = Util.getCapWordString(DateUtils.formatDateTime(context, now.timeInMillis, flags))
+                    }
+                }
+
+                v.empty_layout.visibility = View.GONE
+                v.calendar_layout.visibility = View.VISIBLE
+            } else if (Preferences.secondRowInformation == 2 && nextAlarm != "") {
+                v.second_row_icon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.round_alarm
+                    )
+                )
+                v.next_event.text = Util.getCapWordString("${SimpleDateFormat("EEEE", Locale.getDefault()).format(now.time)}, ${DateUtils.formatDateTime(context, now.timeInMillis, flags)}")
+                v.next_event_date.text = Util.getNextAlarm(context)
+                v.empty_layout.visibility = View.GONE
+                v.calendar_layout.visibility = View.VISIBLE
+            }
+
+
+            // 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).forEach {
+                it.setTextColor(Util.getFontColor())
+            }
+
+            listOf<ImageView>(v.second_row_icon, v.action_next, v.action_previous).forEach {
+                it.setColorFilter(Util.getFontColor())
+            }
+
+            // Text Size
+            listOf<Pair<TextView, Float>>(
+                v.empty_date to Preferences.textMainSize,
+                v.divider1 to Preferences.textSecondSize,
+                v.temp to Preferences.textMainSize,
+                v.next_event to Preferences.textMainSize,
+                v.next_event_difference_time to Preferences.textMainSize,
+                v.next_event_date to Preferences.textSecondSize,
+                v.divider2 to Preferences.textSecondSize,
+                v.calendar_temp to Preferences.textSecondSize
+            ).forEach {
+                it.first.setTextSize(TypedValue.COMPLEX_UNIT_SP, it.second)
+            }
+
+            // Icons scale
+            v.second_row_icon.scaleX = Preferences.textSecondSize / 18f
+            v.second_row_icon.scaleY = Preferences.textSecondSize / 18f
+
+            v.weather_icon.scaleX = Preferences.textSecondSize / 18f
+            v.weather_icon.scaleY = Preferences.textSecondSize / 18f
+
+            v.empty_weather_icon.scaleX = Preferences.textMainSize / 20f
+            v.empty_weather_icon.scaleY = Preferences.textMainSize / 20f
+
+            v.action_next.scaleX = Preferences.textMainSize / 28f
+            v.action_next.scaleY = Preferences.textMainSize / 28f
+
+            v.action_previous.scaleX = Preferences.textMainSize / 28f
+            v.action_previous.scaleY = Preferences.textMainSize / 28f
+
+
+            // Shadows
+            val shadowRadius = when (Preferences.textShadow) {
+                0 -> 0f
+                1 -> 5f
+                2 -> 5f
+                else -> 5f
+            }
+            val shadowColor =  when (Preferences.textShadow) {
+                0 -> Color.TRANSPARENT
+                1 -> R.color.black_50
+                2 -> Color.BLACK
+                else -> R.color.black_50
+            }
+            val shadowDy =  when (Preferences.textShadow) {
+                0 -> 0f
+                1 -> 0f
+                2 -> 1f
+                else -> 0f
+            }
+
+            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).forEach {
+                it.setShadowLayer(shadowRadius, 0f, shadowDy, shadowColor)
+            }
+
+            // Custom Font
+            if (Preferences.customFont == Constants.CUSTOM_FONT_PRODUCT_SANS) {
+                val productSans: Typeface = Typeface.createFromAsset(context.assets, "fonts/product_sans_regular.ttf")
+                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).forEach {
+                    it.typeface = productSans
+                }
+            }
+
+            // Weather
+            if (Preferences.showWeather && Preferences.weatherIcon != "") {
+                v.weather.visibility = View.VISIBLE
+                v.calendar_weather.visibility = View.VISIBLE
+                val currentTemp = String.format(Locale.getDefault(), "%.0f °%s", Preferences.weatherTemp, Preferences.weatherRealTempUnit)
+
+                val icon: String = Preferences.weatherIcon
+                if (icon == "") {
+                    v.weather_icon.visibility = View.GONE
+                    v.empty_weather_icon.visibility = View.GONE
+                } else {
+                    v.weather_icon.setImageResource(WeatherUtil.getWeatherIconResource(icon))
+                    v.empty_weather_icon.setImageResource(WeatherUtil.getWeatherIconResource(icon))
+                    v.weather_icon.visibility = View.VISIBLE
+                    v.empty_weather_icon.visibility = View.VISIBLE
+                }
+
+                v.temp.text = currentTemp
+                v.calendar_temp.text = currentTemp
+            } else {
+                v.weather.visibility = View.GONE
+                v.calendar_weather.visibility = View.GONE
+            }
+
+            // Apply max width
+            v.main_layout.layoutParams = RelativeLayout.LayoutParams(maxWidth, RelativeLayout.LayoutParams.WRAP_CONTENT)
+
+            return v
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/util/CrocodileService.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/util/CrocodileService.kt
deleted file mode 100644
index 4affcef..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/util/CrocodileService.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.tommasoberlose.anotherwidget.util
-
-import android.app.Notification
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Intent
-import android.os.IBinder
-import android.content.BroadcastReceiver
-import android.content.Context
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import android.content.IntentFilter
-import android.os.Build
-import android.support.v4.app.NotificationCompat
-import android.support.v4.content.ContextCompat
-import android.util.Log
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.ui.activity.MainActivity
-
-
-class CrocodileService : Service() {
-
-    private val receiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action == Intent.ACTION_TIME_TICK && isScreenOn) {
-                sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            } else if (intent.action == Intent.ACTION_SCREEN_OFF) {
-                isScreenOn = false
-            } else if (intent.action == Intent.ACTION_SCREEN_ON) {
-                isScreenOn = true
-                sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
-            }
-        }
-    }
-
-    private var isScreenOn = true
-
-    override fun onCreate() {
-        super.onCreate()
-        val filter = IntentFilter()
-        filter.addAction(Intent.ACTION_TIME_TICK)
-        filter.addAction(Intent.ACTION_SCREEN_OFF)
-        filter.addAction(Intent.ACTION_SCREEN_ON)
-        registerReceiver(receiver, filter)
-    }
-
-    override fun onDestroy() {
-        unregisterReceiver(receiver)
-        super.onDestroy()
-    }
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(this, "Config")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .setPriority(Notification.PRIORITY_MIN)
-                    .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
-                    .setContentTitle(this.getString(R.string.background_service_title))
-                    .setContentText(this.getString(R.string.background_service_subtitle))
-                    .setAutoCancel(true);
-            startForeground(5, mBuilder.build())
-        }
-
-        return Service.START_NOT_STICKY
-    }
-
-    override fun onBind(intent: Intent): IBinder? {
-        return null
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/util/MyMigration.java b/app/src/main/java/com/tommasoberlose/anotherwidget/util/MyMigration.java
deleted file mode 100644
index 2711af0..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/util/MyMigration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.tommasoberlose.anotherwidget.util;
-
-import android.support.annotation.NonNull;
-import android.util.Log;
-
-import io.realm.DynamicRealm;
-import io.realm.DynamicRealmObject;
-import io.realm.RealmMigration;
-import io.realm.RealmObjectSchema;
-import io.realm.RealmSchema;
-
-/**
- * Created by tommaso on 06/11/17.
- */
-
-public class MyMigration implements RealmMigration {
-    @Override
-    public void migrate(@NonNull DynamicRealm realm, long oldVersion, long newVersion) {
-
-        RealmSchema schema = realm.getSchema();
-        if (oldVersion == 1) {
-            RealmObjectSchema event = schema.get("Event");
-            if (event != null) {
-                if (!event.hasField("eventID")) {
-                    event.addField("eventID", long.class);
-                }
-                event
-                        .addField("id_tmp", long.class)
-                        .transform(new RealmObjectSchema.Function() {
-                            @Override
-                            public void apply(@NonNull DynamicRealmObject obj) {
-                                obj.setLong("id_tmp", obj.getInt("id"));
-                            }
-                        })
-                        .removeField("id")
-                        .renameField("id_tmp", "id");
-            }
-            oldVersion++;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return 37;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return (o instanceof MyMigration);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/util/Util.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/util/Util.kt
deleted file mode 100644
index 372a408..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/util/Util.kt
+++ /dev/null
@@ -1,680 +0,0 @@
-package com.tommasoberlose.anotherwidget.util
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.*
-import android.appwidget.AppWidgetManager
-import android.content.*
-import android.content.pm.PackageManager
-import android.content.res.Resources
-import android.graphics.*
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
-import android.support.v4.app.NotificationCompat
-import android.support.v4.content.ContextCompat
-import android.util.DisplayMetrics
-import com.tommasoberlose.anotherwidget.R
-
-import com.tommasoberlose.anotherwidget.ui.activity.MainActivity
-import com.tommasoberlose.anotherwidget.ui.widget.TheWidget
-import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
-import android.support.annotation.StringRes
-import android.util.TypedValue
-import android.content.Intent
-import android.content.ComponentName
-import android.database.Cursor
-import android.location.LocationManager
-import android.os.Build
-import android.preference.PreferenceManager
-import android.provider.AlarmClock
-import android.provider.CalendarContract
-import android.provider.Settings
-import android.support.v4.graphics.drawable.DrawableCompat
-import android.util.Log
-import android.view.View
-import android.view.animation.Animation
-import android.view.animation.Transformation
-import android.widget.LinearLayout
-import android.widget.RemoteViews
-import android.widget.Toast
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.`object`.Event
-import io.realm.Realm
-import io.realm.RealmConfiguration
-import org.joda.time.DateTime
-import java.net.URISyntaxException
-import java.util.concurrent.TimeUnit
-
-
-/**
- * Created by tommaso on 05/10/17.
- */
-
-object Util {
-
-    fun checkGrantedPermission(context: Context, permission: String): Boolean {
-        return ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
-    }
-
-    fun updateWidget(context: Context) {
-        val widgetManager = AppWidgetManager.getInstance(context)
-        val widgetComponent = ComponentName(context, TheWidget::class.java)
-        val widgetIds = widgetManager.getAppWidgetIds(widgetComponent)
-        val update = Intent(context, TheWidget::class.java)
-        update.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds)
-        update.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
-        context.sendBroadcast(update)
-        context.sendBroadcast(Intent(Constants.ACTION_SOMETHING_HAPPENED))
-    }
-
-    fun showNotification(context: Context) {
-        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-
-        if (!Util.checkGrantedPermission(context, Manifest.permission.READ_CALENDAR)) {
-            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Config")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .setPriority(Notification.PRIORITY_MIN)
-                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-                    .setContentTitle(context.getString(R.string.notification_title))
-                    .setContentText(context.getString(R.string.notification_subtitle))
-                    .setAutoCancel(true);
-
-            val intent: Intent = Intent(context, MainActivity::class.java);
-            val pi: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-            mBuilder.setContentIntent(pi);
-            mNotificationManager.notify(0, mBuilder.build());
-        } else {
-            mNotificationManager.cancel(0);
-        }
-
-    }
-
-    fun showWeatherErrorNotification(context: Context) {
-        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-        val SP = PreferenceManager.getDefaultSharedPreferences(context)
-
-        if (SP.getBoolean(Constants.PREF_SHOW_GPS_NOTIFICATION, true) && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) && SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) == Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) {
-            val settingsIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-            val pi: PendingIntent = PendingIntent.getActivity(context, 50, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-            val providerIntent2 = Intent(context, MainActivity::class.java)
-            providerIntent2.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            providerIntent2.putExtra(Constants.ACTION_EXTRA_OPEN_WEATHER_PROVIDER, true)
-            val pi2: PendingIntent = PendingIntent.getActivity(context, 51, providerIntent2, PendingIntent.FLAG_UPDATE_CURRENT)
-
-            val providerIntentDisable = Intent(context, MainActivity::class.java)
-            providerIntentDisable.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            providerIntentDisable.putExtra(Constants.ACTION_EXTRA_DISABLE_GPS_NOTIFICATION, true)
-            val piDisable: PendingIntent = PendingIntent.getActivity(context, 52, providerIntentDisable, PendingIntent.FLAG_UPDATE_CURRENT)
-
-            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Error")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-                    .setContentTitle(context.getString(R.string.notification_gps_title))
-                    .setContentText(context.getString(R.string.notification_gps_subtitle))
-                    .addAction(R.drawable.ic_action_sync, context.getString(R.string.change_provider), pi2)
-                    .addAction(R.drawable.ic_action_settings, context.getString(R.string.disable_notification), piDisable)
-                    .setContentIntent(pi)
-
-            mNotificationManager.notify(10, mBuilder.build());
-        } else {
-            mNotificationManager.cancel(10)
-        }
-    }
-
-    fun openURI(context: Context, url: String) {
-        try {
-            val builder: CustomTabsIntent.Builder = CustomTabsIntent.Builder()
-            builder.setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary))
-            val customTabsIntent: CustomTabsIntent = builder.build()
-            customTabsIntent.launchUrl(context, Uri.parse(url))
-        } catch (e: Exception) {
-            try {
-                val openIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url));
-                context.startActivity(openIntent);
-            } catch (ignored: Exception) {
-                val clipboard:ClipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                val clip = ClipData.newPlainText(context.getString(R.string.app_name), url);
-                clipboard.primaryClip = clip;
-                Toast.makeText(context, R.string.error_opening_uri, Toast.LENGTH_LONG).show()
-            }
-        }
-    }
-
-    fun rateApp(context: Context, url: String) {
-        val openIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-        context.startActivity(openIntent)
-    }
-
-    fun share(context: Context) {
-        val sendIntent = Intent(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_TEXT,
-                "Yep, just another cool widget: https://play.google.com/store/apps/details?id=com.tommasoberlose.anotherwidget");
-        sendIntent.setType("text/plain");
-        context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.action_share)));
-    }
-
-    fun getGoogleMapsIntentFromAddress(context: Context, address:String): Intent {
-        val gmmIntentUri: Uri = Uri.parse("geo:0,0?q=" + address);
-        val mapIntent = Intent(Intent.ACTION_VIEW, gmmIntentUri);
-        mapIntent.`package` = "com.google.android.apps.maps";
-
-        return if (mapIntent.resolveActivity(context.packageManager) != null) {
-            mapIntent
-        } else {
-            val map = "http://maps.google.co.in/maps?q=" + address
-            val i = Intent(Intent.ACTION_VIEW, Uri.parse(map));
-            i
-        }
-    }
-
-    fun getCurrentWallpaper(context: Context): Drawable? {
-        var wallpaper: Drawable? = null
-        try {
-            wallpaper = WallpaperManager.getInstance(context).drawable
-        } catch (e: Exception) {
-            wallpaper = BitmapDrawable(context.resources, getResizedBitmap(BitmapFactory.decodeResource(context.resources, R.drawable.pixel_2_wallpaper), 800))
-        } finally {
-            return wallpaper
-        }
-    }
-
-    fun getBitmapFromView(view: View): Bitmap {
-        //Define a bitmap with the same size as the view
-        val measuredWidth = View.MeasureSpec.makeMeasureSpec(view.width, View.MeasureSpec.UNSPECIFIED)
-        val measuredHeight = View.MeasureSpec.makeMeasureSpec(view.height, View.MeasureSpec.UNSPECIFIED)
-        view.measure(measuredWidth, measuredHeight)
-        view.layout(0,0, measuredWidth, measuredHeight)
-        val returnedBitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888)
-        //Bind a canvas to it
-        val canvas = Canvas(returnedBitmap)
-        // draw the view on the canvas
-        view.draw(canvas)
-        //return the bitmap
-        return returnedBitmap
-    }
-
-    fun getBitmapFromView(view: View, w: Int, h: Int): Bitmap {
-        //Define a bitmap with the same size as the view
-        val measuredWidth = View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY)
-        val measuredHeight = View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)
-        view.measure(measuredWidth, measuredHeight)
-        view.layout(0,0, measuredWidth, measuredHeight)
-        val returnedBitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888)
-        //Bind a canvas to it
-        val canvas = Canvas(returnedBitmap)
-        // draw the view on the canvas
-        view.draw(canvas)
-        //return the bitmap
-        return returnedBitmap
-    }
-
-    fun convertDpToPixel(dp: Float, context: Context): Float {
-        val resources: Resources = context.resources
-        val metrics: DisplayMetrics = resources.displayMetrics
-        val px: Float = dp * (metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT)
-        return px
-    }
-
-    fun convertSpToPixels(sp: Float, context: Context): Float {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, context.resources.displayMetrics)
-    }
-
-    fun getResizedBitmap(image: Bitmap, maxSize: Int): Bitmap {
-        var width = image.width
-        var height = image.height
-
-        val bitmapRatio = width.toFloat() / height.toFloat()
-        if (bitmapRatio > 1) {
-            width = maxSize
-            height = (width / bitmapRatio).toInt()
-        } else {
-            height = maxSize
-            width = (height * bitmapRatio).toInt()
-        }
-
-        return Bitmap.createScaledBitmap(image, width, height, true)
-    }
-
-    fun getRefreshPeriodString(period: Int): Int {
-        return when (period) {
-            0 -> R.string.settings_weather_refresh_period_subtitle_0
-            1 -> R.string.settings_weather_refresh_period_subtitle_1
-            2 -> R.string.settings_weather_refresh_period_subtitle_2
-            3 -> R.string.settings_weather_refresh_period_subtitle_3
-            4 -> R.string.settings_weather_refresh_period_subtitle_4
-            5 -> R.string.settings_weather_refresh_period_subtitle_5
-            else -> R.string.settings_weather_refresh_period_subtitle_0
-        }
-    }
-
-    fun getShowUntilString(period: Int): Int {
-        return when (period) {
-            0 -> R.string.settings_show_until_subtitle_0
-            1 -> R.string.settings_show_until_subtitle_1
-            2 -> R.string.settings_show_until_subtitle_2
-            3 -> R.string.settings_show_until_subtitle_3
-            4 -> R.string.settings_show_until_subtitle_4
-            5 -> R.string.settings_show_until_subtitle_5
-            6 -> R.string.settings_show_until_subtitle_6
-            7 -> R.string.settings_show_until_subtitle_7
-            else -> R.string.settings_show_until_subtitle_1
-        }
-    }
-
-    fun getSecondRowInfoString(info: Int): Int {
-        return when (info) {
-            0 -> R.string.settings_second_row_info_subtitle_0
-            1 -> R.string.settings_second_row_info_subtitle_1
-            2 -> R.string.settings_second_row_info_subtitle_2
-            else -> R.string.settings_second_row_info_subtitle_0
-        }
-    }
-
-    fun getTextShadowString(shadow: Int): Int {
-        return when (shadow) {
-            0 -> R.string.settings_text_shadow_subtitle_none
-            1 -> R.string.settings_text_shadow_subtitle_low
-            2 -> R.string.settings_text_shadow_subtitle_high
-            else -> R.string.settings_text_shadow_subtitle_low
-        }
-    }
-
-    fun getCustomFontLabel(shadow: Int): Int {
-        return when (shadow) {
-            0 -> R.string.custom_font_subtitle_0
-            1 -> R.string.custom_font_subtitle_1
-            else -> R.string.custom_font_subtitle_1
-        }
-    }
-
-    fun getCalendarIntent(context: Context): Intent {
-        val SP = PreferenceManager.getDefaultSharedPreferences(context)
-
-        if (SP.getString(Constants.PREF_CALENDAR_APP_PACKAGE, "").equals("")) {
-            val calIntent = Intent(Intent.ACTION_MAIN)
-            calIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            calIntent.addCategory(Intent.CATEGORY_APP_CALENDAR)
-            return calIntent
-        } else if (SP.getString(Constants.PREF_CALENDAR_APP_PACKAGE, "").equals("_")) {
-            return Intent()
-        } else {
-            val pm: PackageManager = context.packageManager
-            return try {
-                val intent: Intent = pm.getLaunchIntentForPackage(SP.getString(Constants.PREF_CALENDAR_APP_PACKAGE, ""))
-                intent.addCategory(Intent.CATEGORY_LAUNCHER)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                intent
-            } catch (e: Exception) {
-                e.printStackTrace()
-                val calIntent = Intent(Intent.ACTION_MAIN)
-                calIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                calIntent.addCategory(Intent.CATEGORY_APP_CALENDAR)
-                calIntent
-            }
-        }
-    }
-
-    fun getWeatherIntent(context: Context): Intent {
-        val SP = PreferenceManager.getDefaultSharedPreferences(context)
-        if (SP.getString(Constants.PREF_WEATHER_APP_PACKAGE, "").equals("")) {
-            val weatherIntent: Intent = Intent(Intent.ACTION_VIEW)
-            weatherIntent.addCategory(Intent.CATEGORY_DEFAULT)
-            weatherIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            weatherIntent.data = Uri.parse("dynact://velour/weather/ProxyActivity")
-            weatherIntent.component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
-            return weatherIntent
-        } else if (SP.getString(Constants.PREF_WEATHER_APP_PACKAGE, "").equals("_")) {
-            return Intent()
-        } else {
-            val pm: PackageManager = context.packageManager
-            return try {
-                val intent: Intent = pm.getLaunchIntentForPackage(SP.getString(Constants.PREF_WEATHER_APP_PACKAGE, ""))
-                intent.addCategory(Intent.CATEGORY_LAUNCHER)
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                intent
-            } catch (e: Exception) {
-                val weatherIntent: Intent = Intent(Intent.ACTION_VIEW)
-                weatherIntent.addCategory(Intent.CATEGORY_DEFAULT)
-                weatherIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                weatherIntent.data = Uri.parse("dynact://velour/weather/ProxyActivity")
-                weatherIntent.component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
-                weatherIntent
-            }
-        }
-    }
-
-    fun getEventIntent(context: Context, e: Event): Intent {
-        val SP = PreferenceManager.getDefaultSharedPreferences(context)
-        if (SP.getString(Constants.PREF_EVENT_APP_PACKAGE, "").equals("")) {
-            val uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, e.eventID)
-            val intent = Intent(Intent.ACTION_VIEW)
-                    .setData(uri)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            intent.putExtra("beginTime", e.startDate);
-            intent.putExtra("endTime", e.endDate);
-            return intent
-        } else if (SP.getString(Constants.PREF_EVENT_APP_PACKAGE, "") == ("_")) {
-            return Intent()
-        } else {
-            val pm: PackageManager = context.packageManager
-            return try {
-                val intent: Intent = pm.getLaunchIntentForPackage(SP.getString(Constants.PREF_EVENT_APP_PACKAGE, ""))
-                intent.addCategory(Intent.CATEGORY_LAUNCHER)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                intent
-            } catch (ex: Exception) {
-                val uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, e.id.toLong())
-                val intent = Intent(Intent.ACTION_VIEW)
-                        .setData(uri)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                intent.putExtra("beginTime", e.startDate);
-                intent.putExtra("endTime", e.endDate);
-                intent
-            }
-        }
-    }
-
-    fun getClockIntent(context: Context): Intent {
-        val SP = PreferenceManager.getDefaultSharedPreferences(context)
-        if (SP.getString(Constants.PREF_CLOCK_APP_PACKAGE, "").equals("")) {
-            val clockIntent = Intent(AlarmClock.ACTION_SHOW_ALARMS)
-            clockIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            return clockIntent
-        } else if (SP.getString(Constants.PREF_CLOCK_APP_PACKAGE, "").equals("_")) {
-            return Intent()
-        } else {
-            val pm: PackageManager = context.packageManager
-            return try {
-                val intent: Intent = pm.getLaunchIntentForPackage(SP.getString(Constants.PREF_CLOCK_APP_PACKAGE, ""))
-                intent.addCategory(Intent.CATEGORY_LAUNCHER)
-                intent
-            } catch (e: Exception) {
-                val clockIntent = Intent(AlarmClock.ACTION_SHOW_ALARMS)
-                clockIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                return clockIntent
-            }
-        }
-    }
-
-    fun getCapWordString(text: String): String {
-        return try {
-            val ar = text.split(" ")
-            var newText = ""
-            for (t: String in ar) {
-                newText += " "
-                newText += t.substring(0, 1).toUpperCase()
-                newText += t.substring(1)
-            }
-            newText.substring(1)
-        } catch (e: Exception) {
-            text
-        }
-    }
-
-    fun showLocationNotification(context: Context, show: Boolean) {
-        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-
-        if (show) {
-            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Config")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .setPriority(Notification.PRIORITY_MIN)
-                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-                    .setContentTitle(context.getString(R.string.notification_gps_title))
-                    .setContentText(context.getString(R.string.notification_gps_subtitle))
-                    .setAutoCancel(true);
-
-            val intent: Intent = Intent( Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-            val pi: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-            mBuilder.setContentIntent(pi);
-            mNotificationManager.notify(1, mBuilder.build());
-        } else {
-            mNotificationManager.cancel(1);
-        }
-
-    }
-
-    fun showWeatherNotification(context: Context, show: Boolean) {
-        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-
-        if (show) {
-            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Config")
-                    .setSmallIcon(R.drawable.ic_stat_name)
-                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
-                    .setContentTitle(context.getString(R.string.settings_weather_provider_api_key_title))
-                    .setContentText(context.getString(R.string.settings_weather_provider_api_key_subtitle_not_set))
-                    .setAutoCancel(true);
-
-            val intent: Intent = Intent(context, MainActivity::class.java);
-            intent.putExtra(Constants.ACTION_EXTRA_OPEN_WEATHER_PROVIDER, true)
-            val pi: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-            mBuilder.setContentIntent(pi);
-            mNotificationManager.notify(2, mBuilder.build());
-        } else {
-            mNotificationManager.cancel(2);
-        }
-
-    }
-
-    fun sendEmail(context: Context) {
-        val i:Intent = Intent(Intent.ACTION_SEND)
-        i.type = "message/rfc822"
-        i.putExtra(Intent.EXTRA_EMAIL, arrayOf("tommaso.berlose@gmail.com"))
-        i.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.feedback_title))
-        try {
-            context.startActivity(Intent.createChooser(i, context.getString(R.string.feedback_chooser_title)))
-        } catch (ex: Exception) {
-            Toast.makeText(context, R.string.feedback_error, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    fun expand(v: View) {
-        if (v.visibility != View.VISIBLE) {
-            v.measure(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
-            val targetHeight = v.getMeasuredHeight()
-
-            v.layoutParams.height = 0
-            v.visibility = View.VISIBLE
-            val a = object : Animation() {
-                protected override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
-                    v.layoutParams.height = if (interpolatedTime == 1f)
-                        LinearLayout.LayoutParams.WRAP_CONTENT
-                    else
-                        (targetHeight * interpolatedTime).toInt()
-                    v.requestLayout()
-                }
-
-                override fun willChangeBounds(): Boolean {
-                    return true
-                }
-            }
-
-            a.duration = (targetHeight / v.context.resources.displayMetrics.density).toLong()
-            v.startAnimation(a)
-        }
-    }
-
-    fun collapse(v: View) {
-        if (v.visibility != View.GONE) {
-            val initialHeight = v.getMeasuredHeight()
-
-            val a = object : Animation() {
-                protected override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
-                    if (interpolatedTime == 1f) {
-                        v.visibility = View.GONE
-                    } else {
-                        v.layoutParams.height = initialHeight - (initialHeight * interpolatedTime).toInt()
-                        v.requestLayout()
-                    }
-                }
-
-                override fun willChangeBounds(): Boolean {
-                    return true
-                }
-            }
-
-            a.duration = (initialHeight / v.context.resources.displayMetrics.density).toLong()
-            v.startAnimation(a)
-        }
-    }
-
-    fun getEmojiByUnicode(unicode: Int): String {
-        return String(Character.toChars(unicode))
-    }
-
-    fun getDifferenceText(context: Context, now: Long, start: Long): String {
-        val nowDate = DateTime(now)
-        val eventDate = DateTime(start)
-
-        var difference = start - now
-        difference += 60 * 1000 - (difference % (60 * 1000))
-
-        if (difference <= 0) {
-            return ""
-        } else if (TimeUnit.MILLISECONDS.toHours(difference) < 1) {
-            val minutes = TimeUnit.MILLISECONDS.toMinutes(difference)
-            var time = ""
-            if (minutes > 0) {
-                time += "" + minutes + context.getString(R.string.min_code)
-            }
-
-            return String.format("%s %s", context.getString(R.string.in_code), time)
-        } else if (TimeUnit.MILLISECONDS.toHours(difference) < 12) {
-            val hour = TimeUnit.MILLISECONDS.toHours(difference)
-            var time = ""
-            if (hour > 0) {
-                time = if (hour > 1) {
-                    hour.toString() + context.getString(R.string.hs_code) + " "
-                } else {
-                    hour.toString() + context.getString(R.string.h_code) + " "
-                }
-            }
-            val minutes = TimeUnit.MILLISECONDS.toMinutes(difference - hour * 3600 * 1000)
-            if (minutes > 0) {
-                time += "" + minutes + context.getString(R.string.min_code)
-            }
-
-            return String.format("%s %s", context.getString(R.string.in_code), time)
-        } else if (eventDate.dayOfYear == nowDate.plusDays(1).dayOfYear) {
-            return String.format("%s", context.getString(R.string.tomorrow))
-        } else if (eventDate.dayOfYear == nowDate.dayOfYear) {
-            return String.format("%s", context.getString(R.string.today))
-        } else {
-            var days = TimeUnit.MILLISECONDS.toDays(difference)
-            if (eventDate.hourOfDay < nowDate.hourOfDay || (eventDate.hourOfDay == nowDate.hourOfDay && eventDate.minuteOfHour <= nowDate.minuteOfHour)) {
-                days++
-            }
-            return String.format("%s %s%s", context.getString(R.string.in_code), days, context.getString(R.string.day_char))
-        }
-
-    }
-
-    @SuppressLint("ApplySharedPref")
-    fun getFontColor(SP: SharedPreferences): Int {
-        return try {
-            Color.parseColor(SP.getString(Constants.PREF_TEXT_COLOR, "#FFFFFF"))
-        } catch (e: Exception) {
-            SP.edit().remove(Constants.PREF_TEXT_COLOR).commit()
-            Color.parseColor(SP.getString(Constants.PREF_TEXT_COLOR, "#FFFFFF"))
-        }
-    }
-
-    fun getTintedDrawable(context: Context, inputDrawable: Int, color: Int): Drawable {
-        val wrapDrawable = ContextCompat.getDrawable(context, inputDrawable);
-        DrawableCompat.setTint(wrapDrawable, color);
-        DrawableCompat.setTintMode(wrapDrawable, PorterDuff.Mode.SRC_IN);
-        return wrapDrawable;
-    }
-
-    fun changeBitmapColor(sourceBitmap: Bitmap, color: Int): Bitmap {
-        val resultBitmap = Bitmap.createBitmap(sourceBitmap, 0, 0,
-                sourceBitmap.getWidth() - 1, sourceBitmap.getHeight() - 1);
-        val p = Paint()
-        val filter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN);
-        p.colorFilter = filter;
-
-        val canvas = Canvas(resultBitmap);
-        canvas.drawBitmap(resultBitmap, 0f, 0f, p);
-
-        return resultBitmap;
-    }
-
-    @SuppressLint("ApplySharedPref")
-    fun updateSettingsByDefault(context: Context) {
-        try {
-            // context.startService(Intent(context, CrocodileService::class.java))
-        } catch (e: Exception) {
-
-        }
-
-        val SP = PreferenceManager.getDefaultSharedPreferences(context)
-        val editor = SP.edit()
-        if (SP.contains(Constants.PREF_SHOW_EVENT_LOCATION)) {
-            editor.putInt(Constants.PREF_SECOND_ROW_INFORMATION, 1)
-            editor.remove(Constants.PREF_SHOW_EVENT_LOCATION)
-        }
-        if (SP.contains(Constants.PREF_WEATHER_PROVIDER_API_KEY)) {
-            editor.putString(Constants.PREF_OPEN_WEATHER_API_KEY, SP.getString(Constants.PREF_WEATHER_PROVIDER_API_KEY, ""))
-            editor.remove(Constants.PREF_WEATHER_PROVIDER_API_KEY)
-        }
-        editor.commit()
-    }
-
-    fun getRealInstance(context: Context): Realm {
-        Realm.init(context)
-        return Realm.getDefaultInstance()
-    }
-
-    fun getNextAlarm(context: Context): String? {
-        try {
-            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                val SP = PreferenceManager.getDefaultSharedPreferences(context)
-                val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-                val alarm = am.nextAlarmClock
-                if (alarm != null) {
-                    val time = am.nextAlarmClock.triggerTime
-                    if (SP.getString(Constants.PREF_HOUR_FORMAT, "12") == "12") Constants.badHourFormat.format(time) else Constants.goodHourFormat.format(time)
-                } else {
-                    null
-                }
-            } else {
-                val time = Settings.System.getString(context.contentResolver,
-                        Settings.System.NEXT_ALARM_FORMATTED)
-                return if (time != "") {
-                    time
-                } else {
-                    null
-                }
-            }
-        } catch (ignored: Exception) {
-            return null
-        }
-    }
-
-    @Throws(Exception::class)
-    fun getPath(context: Context, uri: Uri): String? {
-        if ("content".equals(uri.scheme, ignoreCase = true)) {
-            val projection = arrayOf(android.provider.MediaStore.Files.FileColumns.DATA)
-            var cursor: Cursor? = null
-
-            try {
-                cursor = context.contentResolver.query(uri, projection, null, null, null)
-                val column_index = cursor.getColumnIndexOrThrow(android.provider.MediaStore.Files.FileColumns.DATA)
-                if (cursor.moveToFirst()) {
-                    Log.d("AW", "4: " + cursor.getString(0))
-                    return cursor.getString(0)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-
-        } else if ("file".equals(uri.scheme, ignoreCase = true)) {
-            return uri.path
-        }
-
-        return null
-    }
-}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/util/WeatherUtil.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/util/WeatherUtil.kt
deleted file mode 100644
index 41dbd3d..0000000
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/util/WeatherUtil.kt
+++ /dev/null
@@ -1,321 +0,0 @@
-package com.tommasoberlose.anotherwidget.util
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.UiModeManager
-import android.content.Context
-import android.content.Context.LOCATION_SERVICE
-import android.content.SharedPreferences
-import android.location.*
-import android.os.Bundle
-import android.preference.PreferenceManager
-import com.survivingwithandroid.weather.lib.WeatherClient
-import com.survivingwithandroid.weather.lib.WeatherConfig
-import com.survivingwithandroid.weather.lib.exception.WeatherLibException
-import com.survivingwithandroid.weather.lib.model.CurrentWeather
-import com.survivingwithandroid.weather.lib.provider.openweathermap.OpenweathermapProviderType
-import com.survivingwithandroid.weather.lib.request.WeatherRequest
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import android.content.DialogInterface
-import android.support.v4.content.ContextCompat.startActivity
-import android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS
-import android.content.Intent
-import android.location.LocationManager
-import android.support.annotation.NonNull
-import android.support.v7.app.AppCompatDelegate
-import android.util.Log
-import com.google.android.gms.awareness.Awareness
-import com.google.android.gms.awareness.snapshot.WeatherResponse
-import com.google.android.gms.awareness.snapshot.WeatherResult
-import com.google.android.gms.awareness.state.Weather
-import com.google.android.gms.common.api.GoogleApiClient
-import com.google.android.gms.common.api.ResultCallback
-import com.google.android.gms.tasks.OnFailureListener
-import com.google.android.gms.tasks.OnSuccessListener
-import java.util.*
-
-
-/**
- * Created by tommaso on 08/10/17.
- */
-
-object WeatherUtil {
-
-    fun updateWeather(context: Context) {
-        Util.showLocationNotification(context, false)
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        Util.showWeatherErrorNotification(context)
-
-        if (SP.getString(Constants.PREF_CUSTOM_LOCATION_ADD, "").equals("") || SP.getString(Constants.PREF_CUSTOM_LOCATION_LAT, "").equals("") || SP.getString(Constants.PREF_CUSTOM_LOCATION_LON, "").equals("")) {
-            if (SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) == Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) {
-                newWeatherProvider(context)
-            } else {
-                if (!Util.checkGrantedPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)) {
-                    return
-                }
-                val mGoogleApiClient = GoogleApiClient.Builder(context)
-                        .addApi(Awareness.API)
-                        .build()
-                mGoogleApiClient.connect()
-                Awareness.SnapshotApi.getLocation(mGoogleApiClient)
-                        .setResultCallback({ locationResult ->
-                            if (locationResult.status.isSuccess) {
-                                getCurrentWeather(context, locationResult.location)
-                            } else {
-                                val locationManager = context.getSystemService(LOCATION_SERVICE) as LocationManager
-                                if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-                                    val gpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
-                                    if (gpsLocation != null) {
-                                        getCurrentWeather(context, gpsLocation)
-                                    } else {
-                                       if (locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
-                                           val networkLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
-                                           if (networkLocation != null) {
-                                               getCurrentWeather(context, networkLocation)
-                                           } else {
-                                               getWeatherByDefaultLocation(context)
-                                           }
-                                       } else {
-                                           getWeatherByDefaultLocation(context)
-                                       }
-                                    }
-                                }
-                            }
-                        })
-            }
-        } else {
-            weatherNetworkRequest(context, SP.getString(Constants.PREF_CUSTOM_LOCATION_LAT, "").toDouble(), SP.getString(Constants.PREF_CUSTOM_LOCATION_LON, "").toDouble())
-        }
-    }
-
-    @SuppressLint("ApplySharedPref")
-    fun newWeatherProvider(context: Context) {
-        if (!Util.checkGrantedPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)) {
-            return
-        }
-        val mGoogleApiClient = GoogleApiClient.Builder(context)
-                .addApi(Awareness.API)
-                .build()
-        mGoogleApiClient.connect()
-
-        Awareness.SnapshotApi.getWeather(mGoogleApiClient)
-                    .setResultCallback({ weatherResult ->
-                        if (weatherResult.status.isSuccess && weatherResult.weather != null) {
-                            val weather: Weather = weatherResult.weather
-                            val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-                            SP.edit()
-                                    .putFloat(Constants.PREF_WEATHER_TEMP, weather.getTemperature(if (SP.getString(Constants.PREF_WEATHER_TEMP_UNIT, "F").equals("F")) Weather.FAHRENHEIT else Weather.CELSIUS))
-                                    .putString(Constants.PREF_WEATHER_ICON, getIconCodeFromAwareness(context, weather.conditions))
-                                    .putString(Constants.PREF_WEATHER_REAL_TEMP_UNIT, SP.getString(Constants.PREF_WEATHER_TEMP_UNIT, "F"))
-                                    .commit()
-                            Util.updateWidget(context)
-                        }
-                        mGoogleApiClient.disconnect()
-                    })
-
-    }
-
-    fun getWeatherByDefaultLocation(context: Context) {
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        if (!SP.getString(Constants.PREF_CUSTOM_LOCATION_LAT, "").equals("") && !SP.getString(Constants.PREF_CUSTOM_LOCATION_LON, "").equals("")) {
-            weatherNetworkRequest(context, SP.getString(Constants.PREF_CUSTOM_LOCATION_LAT, "").toDouble(), SP.getString(Constants.PREF_CUSTOM_LOCATION_LON, "").toDouble())
-        }
-    }
-
-    @SuppressLint("ApplySharedPref")
-    fun getCurrentWeather(context: Context, location: Location?) {
-        if (location != null) {
-            weatherNetworkRequest(context, location.latitude, location.longitude)
-        }
-    }
-
-    fun weatherNetworkRequest(context: Context, latitude: Double, longitude: Double) {
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        SP.edit()
-                .putString(Constants.PREF_CUSTOM_LOCATION_LAT, latitude.toString())
-                .putString(Constants.PREF_CUSTOM_LOCATION_LON, longitude.toString())
-                .apply()
-
-        if (!getWeatherProviderKey(context, SP).equals("")) {
-            try {
-                val config = WeatherConfig()
-                config.unitSystem = if (SP.getString(Constants.PREF_WEATHER_TEMP_UNIT, "F").equals("C")) WeatherConfig.UNIT_SYSTEM.M else WeatherConfig.UNIT_SYSTEM.I
-                config.lang = "en"
-                config.maxResult = 1
-                config.numDays = 1
-                config.ApiKey = WeatherUtil.getWeatherProviderKey(context, SP)
-
-                val client = WeatherClient.ClientBuilder().attach(context)
-                        .httpClient(com.survivingwithandroid.weather.lib.client.volley.WeatherClientDefault::class.java)
-                        .provider(OpenweathermapProviderType())
-                        .config(config)
-                        .build()
-
-                client.getCurrentCondition(WeatherRequest(longitude, latitude), object : WeatherClient.WeatherEventListener {
-                    @SuppressLint("ApplySharedPref")
-                    override fun onWeatherRetrieved(currentWeather: CurrentWeather) {
-                        SP.edit()
-                                .putFloat(Constants.PREF_WEATHER_TEMP, currentWeather.weather.temperature.temp)
-                                .putString(Constants.PREF_WEATHER_ICON, currentWeather.weather.currentCondition.icon)
-                                .putString(Constants.PREF_WEATHER_REAL_TEMP_UNIT, SP.getString(Constants.PREF_WEATHER_TEMP_UNIT, "F"))
-                                .commit()
-                        Util.updateWidget(context)
-                    }
-
-                    @SuppressLint("ApplySharedPref")
-                    override fun onWeatherError(e: WeatherLibException?) {
-                        // removeWeather(context, SP)
-                    }
-
-                    @SuppressLint("ApplySharedPref")
-                    override fun onConnectionError(throwable: Throwable?) {
-                        // removeWeather(context, SP)
-                    }
-                })
-            } catch (t: Exception) {
-                // removeWeather(context, SP)
-            }
-        } else {
-            removeWeather(context, SP)
-        }
-    }
-
-    fun getWeatherProviderKeyConstant(context: Context, SP: SharedPreferences): String {
-        return when (SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS)) {
-            Constants.WEATHER_PROVIDER_OPEN_WEATHER -> Constants.PREF_OPEN_WEATHER_API_KEY
-            Constants.WEATHER_PROVIDER_DARK_SKY -> Constants.PREF_DARK_SKY_API_KEY
-            Constants.WEATHER_PROVIDER_WU -> Constants.PREF_WU_API_KEY
-            else -> Constants.PREF_OPEN_WEATHER_API_KEY
-        }
-    }
-
-    fun getWeatherProviderKey(context: Context, SP: SharedPreferences): String {
-        return SP.getString(getWeatherProviderKeyConstant(context, SP), "")
-    }
-
-    @SuppressLint("ApplySharedPref")
-    fun removeWeather(context: Context, SP: SharedPreferences) {
-        SP.edit().
-                remove(Constants.PREF_WEATHER_TEMP)
-                .remove(Constants.PREF_WEATHER_ICON)
-                .commit()
-        Util.updateWidget(context)
-    }
-
-    fun getIconCodeFromAwareness(context: Context, conditions: IntArray): String {
-        var icon = ""
-        return if (conditions.contains(Weather.CONDITION_UNKNOWN)) {
-            ""
-        } else {
-            if (conditions.contains(Weather.CONDITION_CLEAR)) {
-                icon = "01"
-            } else if (conditions.contains(Weather.CONDITION_CLOUDY)) {
-                icon = "02"
-            } else if (conditions.contains(Weather.CONDITION_RAINY)) {
-                icon = "10"
-            } else if (conditions.contains(Weather.CONDITION_STORMY)) {
-                icon = "09"
-            } else if (conditions.contains(Weather.CONDITION_SNOWY)) {
-                icon = "13"
-            } else if (conditions.contains(Weather.CONDITION_WINDY)) {
-                icon = "80"
-            } else if (conditions.contains(Weather.CONDITION_HAZY)) {
-                icon = "50"
-            } else if (conditions.contains(Weather.CONDITION_ICY)) {
-                icon = "81"
-            } else if (conditions.contains(Weather.CONDITION_FOGGY)) {
-                icon = "82"
-            }
-
-            return if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) >= 19 || Calendar.getInstance().get(Calendar.HOUR_OF_DAY) < 7) {
-                icon + "n"
-            } else {
-                icon + "d"
-            }
-        }
-    }
-
-    fun getWeatherIconResource(icon: String): Int {
-        when (icon) {
-            "01d" -> {
-                return R.drawable.clear_day
-            }
-            "02d" -> {
-                return R.drawable.partly_cloudy
-            }
-            "03d" -> {
-                return R.drawable.mostly_cloudy
-            }
-            "04d" -> {
-                return R.drawable.cloudy_weather
-            }
-            "09d" -> {
-                return R.drawable.storm_weather_day
-            }
-            "10d" -> {
-                return R.drawable.rainy_day
-            }
-            "11d" -> {
-                return R.drawable.thunder_day
-            }
-            "13d" -> {
-                return R.drawable.snow_day
-            }
-            "50d" -> {
-                return R.drawable.haze_day
-            }
-            "80d" -> {
-                return R.drawable.windy_day
-            }
-            "81d" -> {
-                return R.drawable.rain_snow_day
-            }
-            "82d" -> {
-                return R.drawable.haze_weather
-            }
-
-
-
-            "01n" -> {
-                return R.drawable.clear_night
-            }
-            "02n" -> {
-                return R.drawable.partly_cloudy_night
-            }
-            "03n" -> {
-                return R.drawable.mostly_cloudy_night
-            }
-            "04n" -> {
-                return R.drawable.cloudy_weather
-            }
-            "09n" -> {
-                return R.drawable.storm_weather_night
-            }
-            "10n" -> {
-                return R.drawable.rainy_night
-            }
-            "11n" -> {
-                return R.drawable.thunder_night
-            }
-            "13n" -> {
-                return R.drawable.snow_night
-            }
-            "50n" -> {
-                return R.drawable.haze_night
-            }
-            "80n" -> {
-                return R.drawable.windy_night
-            }
-            "81n" -> {
-                return R.drawable.rain_snow_night
-            }
-            "82n" -> {
-                return R.drawable.haze_weather
-            }
-            else -> {
-                return R.drawable.unknown
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/util/CalendarUtil.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/CalendarUtil.kt
similarity index 50%
rename from app/src/main/java/com/tommasoberlose/anotherwidget/util/CalendarUtil.kt
rename to app/src/main/java/com/tommasoberlose/anotherwidget/utils/CalendarUtil.kt
index 241e7ec..2c51cdc 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/util/CalendarUtil.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/CalendarUtil.kt
@@ -1,26 +1,19 @@
-package com.tommasoberlose.anotherwidget.util
+package com.tommasoberlose.anotherwidget.utils
 
 import android.Manifest
-import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.net.Uri
-import android.preference.PreferenceManager
 import android.provider.CalendarContract
 import android.util.Log
-import android.util.TimeUtils
-import android.widget.Toast
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.`object`.CalendarSelector
-import com.tommasoberlose.anotherwidget.`object`.Constants
-import com.tommasoberlose.anotherwidget.`object`.Event
+import com.chibatching.kotpref.blockingBulk
+import com.chibatching.kotpref.bulk
+import com.tommasoberlose.anotherwidget.components.events.Event
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
 import io.realm.Realm
+import io.realm.RealmResults
 import me.everything.providers.android.calendar.CalendarProvider
-import me.everything.providers.android.contacts.ContactsProvider
 import java.util.*
-import java.util.concurrent.TimeUnit
 import kotlin.Comparator
 import kotlin.collections.ArrayList
 
@@ -31,13 +24,12 @@ import kotlin.collections.ArrayList
 object CalendarUtil {
 
     fun updateEventList(context: Context) {
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        if (SP.getBoolean(Constants.PREF_SHOW_EVENTS, true)) {
+        if (Preferences.showEvents) {
             val eventList = ArrayList<Event>()
 
             val now = Calendar.getInstance()
             val limit = Calendar.getInstance()
-            when (SP.getInt(Constants.PREF_SHOW_UNTIL, 1)) {
+            when (Preferences.showUntil) {
                 0 -> limit.add(Calendar.HOUR, 3)
                 1 -> limit.add(Calendar.HOUR, 6)
                 2 -> limit.add(Calendar.HOUR, 12)
@@ -49,7 +41,6 @@ object CalendarUtil {
                 else -> limit.add(Calendar.HOUR, 6)
             }
 
-
             val builder = CalendarContract.Instances.CONTENT_URI.buildUpon()
             ContentUris.appendId(builder, now.timeInMillis)
             ContentUris.appendId(builder, limit.timeInMillis)
@@ -64,7 +55,7 @@ object CalendarUtil {
                     for (instance in instances) {
                         try {
                             val e = provider.getEvent(instance.eventId)
-                            if (e != null && instance.begin <= limit.timeInMillis && (SP.getBoolean(Constants.PREF_CALENDAR_ALL_DAY, false) || !e.allDay) && !(SP.getString(Constants.PREF_CALENDAR_FILTER, "").contains(" " + e.calendarId + ",")) && (SP.getBoolean(Constants.PREF_SHOW_DECLINED_EVENTS, true) || !e.selfAttendeeStatus.equals(CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED))) {
+                            if (e != null && instance.begin <= limit.timeInMillis && (Preferences.calendarAllDay || !e.allDay) && !(Preferences.calendarFilter.contains(" " + e.calendarId + ",")) && (Preferences.showDeclinedEvents || e.selfAttendeeStatus.toInt() != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED)) {
                                 if (e.allDay) {
                                     val start = Calendar.getInstance()
                                     start.timeInMillis = instance.begin
@@ -94,7 +85,7 @@ object CalendarUtil {
                         }
                     })
                     eventList.reverse()
-                    saveEvents(context, eventList)
+                    saveEvents(eventList)
                     saveNextEventData(context, eventList[0])
                 }
             }
@@ -102,6 +93,8 @@ object CalendarUtil {
             resetNextEventData(context)
         }
 
+        UpdatesReceiver.setUpdates(context)
+        Util.updateWidget(context)
     }
 
     fun getCalendarList(context: Context): List<me.everything.providers.android.calendar.Calendar> {
@@ -112,104 +105,82 @@ object CalendarUtil {
         }
         val provider = CalendarProvider(context)
         val data = provider.calendars
-        if (data != null) {
-            return data.list
+        return if (data != null) {
+            data.list
         } else {
-            return calendarList
+            calendarList
         }
     }
 
-    fun saveEvents(context: Context, eventList: ArrayList<Event>) {
-        val db = Util.getRealInstance(context)
-        db.executeTransaction { realm ->
+    private fun saveEvents(eventList: ArrayList<Event>) {
+        Realm.getDefaultInstance().executeTransactionAsync { realm ->
             realm.where(Event::class.java).findAll().deleteAllFromRealm()
             realm.copyToRealm(eventList)
         }
     }
 
-    @SuppressLint("ApplySharedPref")
-    fun resetNextEventData(context: Context) {
-        val db = Util.getRealInstance(context)
-        db.executeTransaction {
-            db.where(Event::class.java).findAll().deleteAllFromRealm()
+    private fun resetNextEventData(context: Context) {
+        Realm.getDefaultInstance().executeTransactionAsync {
+            it.where(Event::class.java).findAll().deleteAllFromRealm()
         }
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        SP.edit()
-                .remove(Constants.PREF_EVENT_ID)
-                .remove(Constants.PREF_NEXT_EVENT_ID)
-                .remove(Constants.PREF_NEXT_EVENT_NAME)
-                .remove(Constants.PREF_NEXT_EVENT_START_DATE)
-                .remove(Constants.PREF_NEXT_EVENT_END_DATE)
-                .remove(Constants.PREF_NEXT_EVENT_ALL_DAY)
-                .remove(Constants.PREF_NEXT_EVENT_CALENDAR_ID)
-                .remove(Constants.PREF_NEXT_EVENT_LOCATION)
-                .commit()
+
+        Preferences.bulk {
+            remove(Preferences::nextEventId)
+            remove(Preferences::nextEventName)
+            remove(Preferences::nextEventStartDate)
+            remove(Preferences::nextEventAllDay)
+            remove(Preferences::nextEventLocation)
+            remove(Preferences::nextEventEndDate)
+            remove(Preferences::nextEventCalendarId)
+        }
+
         Util.updateWidget(context)
     }
 
-    @SuppressLint("ApplySharedPref")
-    fun saveNextEventData(context: Context, event: Event) {
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        SP.edit()
-                .putLong(Constants.PREF_EVENT_ID, event.id)
-                .commit()
+    private fun saveNextEventData(context: Context, event: Event) {
+        Preferences.nextEventId = event.id
         Util.updateWidget(context)
     }
 
-    fun getNextEvent(context: Context): Event {
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val db = Util.getRealInstance(context)
-        val nextEvent = db.where(Event::class.java).equalTo("id", SP.getLong(Constants.PREF_EVENT_ID, 0)).findFirst()
-        return if (nextEvent != null) {
-            nextEvent
-        } else {
-            val eventList = db.where(Event::class.java).findAll()
-            if (eventList.isNotEmpty()) {
-                eventList[0] ?: Event()
-            } else {
-                Event()
-            }
-        }
+    fun getNextEvent(): Event? {
+        val realm = Realm.getDefaultInstance()
+        return realm.where(Event::class.java).equalTo("id", Preferences.nextEventId).findFirst() ?: realm.where(Event::class.java).findFirst()
     }
 
-    @SuppressLint("ApplySharedPref")
     fun goToNextEvent(context: Context) {
-        val db = Util.getRealInstance(context)
-        val SP: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val eventList = db.where(Event::class.java).findAll()
+        val eventList = Realm.getDefaultInstance().where(Event::class.java).findAll()
 
         if (eventList.isNotEmpty()) {
-            var found = false
-            for (e in eventList) {
-                if (e.id == SP.getLong(Constants.PREF_EVENT_ID, 0)) {
-                    if (eventList.indexOf(e) < eventList.size - 1) {
-                        SP.edit()
-                                .putLong(Constants.PREF_EVENT_ID, eventList[eventList.indexOf(e) + 1]?.id ?: 0)
-                                .commit()
-                    } else {
-                        SP.edit()
-                                .putLong(Constants.PREF_EVENT_ID, eventList[0]?.id ?: 0)
-                                .commit()
-                    }
-                    found = true
-                    break
-                }
-            }
-
-            if (!found) {
-                SP.edit()
-                        .putLong(Constants.PREF_EVENT_ID, eventList[0]?.id ?: 0)
-                        .commit()
+            val index = eventList.indexOfFirst { it.id == Preferences.nextEventId }
+            if (index > -1 && index < eventList.size - 1) {
+                Preferences.nextEventId = eventList[index + 1]!!.id
+            } else {
+                Preferences.nextEventId = eventList.first()!!.id
             }
         } else {
             resetNextEventData(context)
         }
-
-        context.sendBroadcast(Intent(Constants.ACTION_TIME_UPDATE))
+        UpdatesReceiver.setUpdates(context)
+        Util.updateWidget(context)
     }
 
-    fun getEventsCount(context: Context): Int {
-        val db = Util.getRealInstance(context)
-        return db.where(Event::class.java).findAll().size
+    fun goToPreviousEvent(context: Context) {
+        val eventList = Realm.getDefaultInstance().where(Event::class.java).findAll()
+
+        if (eventList.isNotEmpty()) {
+            val index = eventList.indexOfFirst { it.id == Preferences.nextEventId }
+            if (index > 0) {
+                Preferences.nextEventId = eventList[index - 1]!!.id
+            } else {
+                Preferences.nextEventId = eventList.last()!!.id
+            }
+        } else {
+            resetNextEventData(context)
+        }
+        UpdatesReceiver.setUpdates(context)
+        Util.updateWidget(context)
     }
+
+    fun getEvents(): RealmResults<Event> = Realm.getDefaultInstance().where(Event::class.java).findAll()
+    fun getEventsCount(): Int = Realm.getDefaultInstance().where(Event::class.java).findAll().size
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt
new file mode 100644
index 0000000..e101c92
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Extensions.kt
@@ -0,0 +1,130 @@
+package com.tommasoberlose.anotherwidget.utils
+
+import android.content.pm.PackageManager
+import android.view.Gravity
+import android.view.View
+import android.view.ViewAnimationUtils
+import android.widget.Toast
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.app.Activity
+import android.content.*
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.ContextCompat
+import android.content.res.Configuration
+import android.provider.Settings
+import android.util.Patterns
+import java.security.NoSuchAlgorithmException
+import kotlin.math.max
+import android.content.Intent
+import android.util.TypedValue
+import com.tommasoberlose.anotherwidget.R
+
+
+fun PackageManager.missingSystemFeature(name: String): Boolean = !hasSystemFeature(name)
+
+fun Context.toast(message: String) {
+    val toast = Toast.makeText(this, message, Toast.LENGTH_SHORT)
+//    toast.setGravity(Gravity.CENTER, 0, 0)
+    toast.show()
+}
+
+fun Int.toPixel(context: Context): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), context.resources.displayMetrics).toInt()
+fun Float.toPixel(context: Context): Float = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this, context.resources.displayMetrics)
+
+fun View.reveal(initialX: Int, initialY: Int) {
+    when (visibility) {
+        View.VISIBLE -> {
+            val anim = ViewAnimationUtils.createCircularReveal(this, initialX, initialY, max(width.toFloat(), height.toFloat()), 0f)
+                .apply {
+                    duration = 200
+                }
+            anim.addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    visibility = View.GONE
+                    super.onAnimationEnd(animation)
+                }
+            })
+            anim.start()
+        } else -> {
+            val anim = ViewAnimationUtils.createCircularReveal(this, initialX, initialY, 0f, max(width.toFloat(), height.toFloat()))
+                .apply {
+                    duration = 200
+                }
+            visibility = View.VISIBLE
+            anim.start()
+        }
+    }
+}
+
+fun Context.openURI(url: String) {
+    try {
+        val builder: CustomTabsIntent.Builder = CustomTabsIntent.Builder()
+        builder.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
+        val customTabsIntent: CustomTabsIntent = builder.build()
+        customTabsIntent.launchUrl(this, Uri.parse(url))
+    } catch (e: Exception) {
+        try {
+            val openIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            startActivity(openIntent)
+        } catch (ignored: Exception) {
+            val clipboard: ClipboardManager = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clip = ClipData.newPlainText(getString(R.string.app_name), url)
+            clipboard.setPrimaryClip(clip)
+            Toast.makeText(this, R.string.error_opening_uri, Toast.LENGTH_LONG).show()
+        }
+    }
+}
+
+fun Context.isTablet(): Boolean {
+    return (resources.configuration.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE
+}
+
+fun String.md5(): String {
+    val MD5 = "MD5"
+    try {
+        // Create MD5 Hash
+        val digest = java.security.MessageDigest
+            .getInstance(MD5)
+        digest.update(toByteArray())
+        val messageDigest = digest.digest()
+
+        // Create Hex String
+        val hexString = StringBuilder()
+        for (aMessageDigest in messageDigest) {
+            var h = Integer.toHexString(0xFF and aMessageDigest.toInt())
+            while (h.length < 2)
+                h = "0$h"
+            hexString.append(h)
+        }
+        return hexString.toString()
+
+    } catch (e: NoSuchAlgorithmException) {
+        e.printStackTrace()
+    }
+
+    return ""
+}
+
+fun String.isValidEmail(): Boolean
+        = this.isNotEmpty() &&
+        Patterns.EMAIL_ADDRESS.matcher(this).matches()
+
+fun Activity.isDarkTheme(): Boolean {
+    return resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+}
+
+fun Activity.isNotificationAccessGranted(): Boolean = Settings.Secure.getString(this.contentResolver,"enabled_notification_listeners").contains(this.packageName)
+
+//fun Activity.sendEmailTo(email: String) {
+//    val i = Intent(Intent.ACTION_VIEW).apply {
+//        data = Uri.parse("mailto:$email")
+//    }
+//    try {
+//        startActivity(Intent.createChooser(i, getString(R.string.settings_title_feedback)))
+//    } catch (ex: java.lang.Exception) {
+//        toast(getString(R.string.generic_error))
+//    }
+//
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Util.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Util.kt
new file mode 100644
index 0000000..bebcd29
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/Util.kt
@@ -0,0 +1,521 @@
+package com.tommasoberlose.anotherwidget.utils
+
+import android.app.*
+import android.appwidget.AppWidgetManager
+import android.content.*
+import android.content.pm.PackageManager
+import android.content.res.Resources
+import android.graphics.*
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.util.DisplayMetrics
+import com.tommasoberlose.anotherwidget.R
+
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.util.TypedValue
+import android.content.Intent
+import android.content.ComponentName
+import android.provider.AlarmClock
+import android.provider.CalendarContract
+import android.text.format.DateFormat
+import android.text.format.DateUtils
+import android.util.Log
+import android.view.View
+import android.view.animation.Animation
+import android.view.animation.Transformation
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import com.tommasoberlose.anotherwidget.components.events.Event
+import com.tommasoberlose.anotherwidget.global.Actions
+import com.tommasoberlose.anotherwidget.global.Constants
+import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.ui.widgets.TheWidget
+import org.joda.time.DateTime
+import java.text.SimpleDateFormat
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+
+/**
+ * Created by tommaso on 05/10/17.
+ */
+
+object Util {
+
+    fun checkGrantedPermission(context: Context, permission: String): Boolean {
+        return ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+    }
+
+    fun updateWidget(context: Context) {
+        val widgetManager = AppWidgetManager.getInstance(context)
+        val widgetComponent = ComponentName(context, TheWidget::class.java)
+        val widgetIds = widgetManager.getAppWidgetIds(widgetComponent)
+        val update = Intent(context, TheWidget::class.java)
+        update.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds)
+        update.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+        context.sendBroadcast(update)
+    }
+
+    fun showWeatherErrorNotification(context: Context) {
+        TODO("weather notification")
+//        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+//        val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+//        val SP = PreferenceManager.getDefaultSharedPreferences(context)
+//
+//        if (SP.getBoolean(Constants.PREF_SHOW_GPS_NOTIFICATION, true) && !locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) && SP.getInt(Constants.PREF_WEATHER_PROVIDER, Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) == Constants.WEATHER_PROVIDER_GOOGLE_AWARENESS) {
+//            val settingsIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+//            val pi: PendingIntent = PendingIntent.getActivity(context, 50, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+//
+//            val providerIntent2 = Intent(context, MainActivity::class.java)
+//            providerIntent2.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+//            providerIntent2.putExtra(Constants.ACTION_EXTRA_OPEN_WEATHER_PROVIDER, true)
+//            val pi2: PendingIntent = PendingIntent.getActivity(context, 51, providerIntent2, PendingIntent.FLAG_UPDATE_CURRENT)
+//
+//            val providerIntentDisable = Intent(context, MainActivity::class.java)
+//            providerIntentDisable.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+//            providerIntentDisable.putExtra(Constants.ACTION_EXTRA_DISABLE_GPS_NOTIFICATION, true)
+//            val piDisable: PendingIntent = PendingIntent.getActivity(context, 52, providerIntentDisable, PendingIntent.FLAG_UPDATE_CURRENT)
+//
+//            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Error")
+//                    .setSmallIcon(R.drawable.ic_stat_name)
+//                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
+//                    .setContentTitle(context.getString(R.string.notification_gps_title))
+//                    .setContentText(context.getString(R.string.notification_gps_subtitle))
+//                    .addAction(R.drawable.ic_action_sync, context.getString(R.string.change_provider), pi2)
+//                    .addAction(R.drawable.ic_action_settings, context.getString(R.string.disable_notification), piDisable)
+//                    .setContentIntent(pi)
+//
+//            mNotificationManager.notify(10, mBuilder.build());
+//        } else {
+//            mNotificationManager.cancel(10)
+//        }
+    }
+
+    fun getGoogleMapsIntentFromAddress(context: Context, address:String): Intent {
+        val gmmIntentUri: Uri = Uri.parse("geo:0,0?q=$address")
+        val mapIntent = Intent(Intent.ACTION_VIEW, gmmIntentUri)
+        mapIntent.`package` = "com.google.android.apps.maps"
+
+        return if (mapIntent.resolveActivity(context.packageManager) != null) {
+            mapIntent
+        } else {
+            val map = "http://maps.google.co.in/maps?q=$address"
+            val i = Intent(Intent.ACTION_VIEW, Uri.parse(map));
+            i
+        }
+    }
+
+    fun getCurrentWallpaper(context: Context): Drawable? = try {
+        WallpaperManager.getInstance(context).drawable
+    } catch (e: Exception) {
+//        BitmapDrawable(context.resources, getResizedBitmap(BitmapFactory.decodeResource(context.resources, R.drawable.pixel_2_wallpaper), 800))
+        null
+    }
+
+    fun getBitmapFromView(view: View): Bitmap {
+        //Define a bitmap with the same size as the view
+        val measuredWidth = View.MeasureSpec.makeMeasureSpec(view.width, View.MeasureSpec.UNSPECIFIED)
+        val measuredHeight = View.MeasureSpec.makeMeasureSpec(view.height, View.MeasureSpec.UNSPECIFIED)
+        view.measure(measuredWidth, measuredHeight)
+        view.layout(0,0, measuredWidth, measuredHeight)
+        val returnedBitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888)
+        //Bind a canvas to it
+        val canvas = Canvas(returnedBitmap)
+        // draw the view on the canvas
+        view.draw(canvas)
+        //return the bitmap
+        return returnedBitmap
+    }
+
+    fun getBitmapFromView(view: View, w: Int, h: Int): Bitmap {
+        //Define a bitmap with the same size as the view
+        val measuredWidth = View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY)
+        val measuredHeight = View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)
+        view.measure(measuredWidth, measuredHeight)
+        view.layout(0,0, measuredWidth, measuredHeight)
+        val returnedBitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888)
+        //Bind a canvas to it
+        val canvas = Canvas(returnedBitmap)
+        // draw the view on the canvas
+        view.draw(canvas)
+        //return the bitmap
+        return returnedBitmap
+    }
+
+    fun convertDpToPixel(dp: Float, context: Context): Float {
+        val resources: Resources = context.resources
+        val metrics: DisplayMetrics = resources.displayMetrics
+        val px: Float = dp * (metrics.densityDpi / DisplayMetrics.DENSITY_DEFAULT)
+        return px
+    }
+
+    fun convertSpToPixels(sp: Float, context: Context): Float {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, context.resources.displayMetrics)
+    }
+
+    fun getResizedBitmap(image: Bitmap, maxSize: Int): Bitmap {
+        var width = image.width
+        var height = image.height
+
+        val bitmapRatio = width.toFloat() / height.toFloat()
+        if (bitmapRatio > 1) {
+            width = maxSize
+            height = (width / bitmapRatio).toInt()
+        } else {
+            height = maxSize
+            width = (height * bitmapRatio).toInt()
+        }
+
+        return Bitmap.createScaledBitmap(image, width, height, true)
+    }
+
+    fun getRefreshPeriodString(period: Int): Int {
+        return when (period) {
+            0 -> R.string.settings_weather_refresh_period_subtitle_0
+            1 -> R.string.settings_weather_refresh_period_subtitle_1
+            2 -> R.string.settings_weather_refresh_period_subtitle_2
+            3 -> R.string.settings_weather_refresh_period_subtitle_3
+            4 -> R.string.settings_weather_refresh_period_subtitle_4
+            5 -> R.string.settings_weather_refresh_period_subtitle_5
+            else -> R.string.settings_weather_refresh_period_subtitle_0
+        }
+    }
+
+    fun getShowUntilString(period: Int): Int {
+        return when (period) {
+            0 -> R.string.settings_show_until_subtitle_0
+            1 -> R.string.settings_show_until_subtitle_1
+            2 -> R.string.settings_show_until_subtitle_2
+            3 -> R.string.settings_show_until_subtitle_3
+            4 -> R.string.settings_show_until_subtitle_4
+            5 -> R.string.settings_show_until_subtitle_5
+            6 -> R.string.settings_show_until_subtitle_6
+            7 -> R.string.settings_show_until_subtitle_7
+            else -> R.string.settings_show_until_subtitle_1
+        }
+    }
+
+    fun getSecondRowInfoString(info: Int): Int {
+        return when (info) {
+            0 -> R.string.settings_second_row_info_subtitle_0
+            1 -> R.string.settings_second_row_info_subtitle_1
+            2 -> R.string.settings_second_row_info_subtitle_2
+            else -> R.string.settings_second_row_info_subtitle_0
+        }
+    }
+
+    fun getTextShadowString(shadow: Int): Int {
+        return when (shadow) {
+            0 -> R.string.settings_text_shadow_subtitle_none
+            1 -> R.string.settings_text_shadow_subtitle_low
+            2 -> R.string.settings_text_shadow_subtitle_high
+            else -> R.string.settings_text_shadow_subtitle_low
+        }
+    }
+
+    fun getCustomFontLabel(shadow: Int): Int {
+        return when (shadow) {
+            0 -> R.string.custom_font_subtitle_0
+            1 -> R.string.custom_font_subtitle_1
+            else -> R.string.custom_font_subtitle_1
+        }
+    }
+
+    fun getCalendarIntent(context: Context): Intent {
+        return when (Preferences.calendarAppPackage) {
+            "" -> {
+                Intent(Intent.ACTION_MAIN).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    addCategory(Intent.CATEGORY_APP_CALENDAR)
+                }
+            }
+            "_" -> {
+                Intent()
+            }
+            else -> {
+                val pm: PackageManager = context.packageManager
+                try {
+                    pm.getLaunchIntentForPackage(Preferences.calendarAppPackage)!!.apply {
+                        addCategory(Intent.CATEGORY_LAUNCHER)
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    Intent(Intent.ACTION_MAIN).apply {
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        addCategory(Intent.CATEGORY_APP_CALENDAR)
+                    }
+                }
+            }
+        }
+    }
+
+    fun getWeatherIntent(context: Context): Intent {
+        return when (Preferences.weatherAppPackage) {
+            "" -> {
+                Intent(Intent.ACTION_VIEW).apply {
+                    addCategory(Intent.CATEGORY_DEFAULT)
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    data = Uri.parse("dynact://velour/weather/ProxyActivity")
+                    component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
+                }
+            }
+            "_" -> {
+                Intent()
+            }
+            else -> {
+                val pm: PackageManager = context.packageManager
+                try {
+                    pm.getLaunchIntentForPackage(Preferences.weatherAppPackage)!!.apply {
+                        addCategory(Intent.CATEGORY_LAUNCHER)
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    }
+                } catch (e: Exception) {
+                    Intent(Intent.ACTION_VIEW).apply {
+                        addCategory(Intent.CATEGORY_DEFAULT)
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        data = Uri.parse("dynact://velour/weather/ProxyActivity")
+                        component = ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline")
+                    }
+                }
+            }
+        }
+    }
+
+    fun getEventIntent(context: Context, e: Event): Intent {
+        return when (Preferences.eventAppPackage) {
+            "" -> {
+                val uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, e.eventID)
+                Intent(Intent.ACTION_VIEW).apply {
+                    data = uri
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    putExtra("beginTime", e.startDate)
+                    putExtra("endTime", e.endDate)
+                }
+            }
+            "_" -> {
+                Intent()
+            }
+            else -> {
+                val pm: PackageManager = context.packageManager
+                try {
+                    pm.getLaunchIntentForPackage(Preferences.eventAppPackage)!!.apply {
+                        addCategory(Intent.CATEGORY_LAUNCHER)
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    }
+                } catch (ex: Exception) {
+                    val uri = ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, e.id)
+                    Intent(Intent.ACTION_VIEW).apply {
+                        data = uri
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        putExtra("beginTime", e.startDate)
+                        putExtra("endTime", e.endDate)
+                    }
+                }
+            }
+        }
+    }
+
+    fun getClockIntent(context: Context): Intent {
+        return when (Preferences.clockAppPackage) {
+            "" -> {
+                Intent(AlarmClock.ACTION_SHOW_ALARMS).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                }
+            }
+            "_" -> {
+                Intent()
+            }
+            else -> {
+                val pm: PackageManager = context.packageManager
+                try {
+                    pm.getLaunchIntentForPackage(Preferences.clockAppPackage)!!.apply {
+                        addCategory(Intent.CATEGORY_LAUNCHER)
+                    }
+                } catch (e: Exception) {
+                    Intent(AlarmClock.ACTION_SHOW_ALARMS).apply {
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    }
+                }
+            }
+        }
+    }
+
+    fun getCapWordString(text: String): String {
+        return try {
+            val ar = text.split(" ")
+            var newText = ""
+            for (t: String in ar) {
+                newText += " "
+                newText += t.substring(0, 1).toUpperCase(Locale.getDefault())
+                newText += t.substring(1)
+            }
+            newText.substring(1)
+        } catch (e: Exception) {
+            text
+        }
+    }
+
+    fun showLocationNotification(context: Context, show: Boolean) {
+        TODO("Show location notification")
+//        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
+//
+//        if (show) {
+//            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Config")
+//                    .setSmallIcon(R.drawable.ic_stat_name)
+//                    .setPriority(Notification.PRIORITY_MIN)
+//                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
+//                    .setContentTitle(context.getString(R.string.notification_gps_title))
+//                    .setContentText(context.getString(R.string.notification_gps_subtitle))
+//                    .setAutoCancel(true);
+//
+//            val intent: Intent = Intent( Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+//            val pi: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+//            mBuilder.setContentIntent(pi);
+//            mNotificationManager.notify(1, mBuilder.build());
+//        } else {
+//            mNotificationManager.cancel(1);
+//        }
+
+    }
+
+    fun showWeatherNotification(context: Context, show: Boolean) {
+        TODO("Show location notification")
+//        val mNotificationManager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
+//
+//        if (show) {
+//            val mBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, "Config")
+//                    .setSmallIcon(R.drawable.ic_stat_name)
+//                    .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
+//                    .setContentTitle(context.getString(R.string.settings_weather_provider_api_key_title))
+//                    .setContentText(context.getString(R.string.settings_weather_provider_api_key_subtitle_not_set))
+//                    .setAutoCancel(true);
+//
+//            val intent: Intent = Intent(context, MainActivity::class.java);
+//            intent.putExtra(Constants.ACTION_EXTRA_OPEN_WEATHER_PROVIDER, true)
+//            val pi: PendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+//            mBuilder.setContentIntent(pi);
+//            mNotificationManager.notify(2, mBuilder.build());
+//        } else {
+//            mNotificationManager.cancel(2);
+//        }
+    }
+
+    fun expand(v: View) {
+        if (v.visibility != View.VISIBLE) {
+            v.measure(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+            val targetHeight = v.measuredHeight
+
+            v.layoutParams.height = 0
+            v.visibility = View.VISIBLE
+            val a = object : Animation() {
+                protected override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
+                    v.layoutParams.height = if (interpolatedTime == 1f)
+                        LinearLayout.LayoutParams.WRAP_CONTENT
+                    else
+                        (targetHeight * interpolatedTime).toInt()
+                    v.translationY = 0f
+                    v.requestLayout()
+                }
+
+                override fun willChangeBounds(): Boolean {
+                    return true
+                }
+            }
+
+            a.duration = 500L
+            v.startAnimation(a)
+        }
+    }
+
+    fun collapse(v: View) {
+        if (v.visibility != View.GONE) {
+            val initialHeight = v.measuredHeight
+
+            val a = object : Animation() {
+                protected override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
+                    if (interpolatedTime == 1f) {
+                        v.visibility = View.GONE
+                    } else {
+                        v.layoutParams.height = initialHeight - (initialHeight * interpolatedTime).toInt()
+                        v.requestLayout()
+                    }
+                }
+
+                override fun willChangeBounds(): Boolean {
+                    return true
+                }
+            }
+
+            a.duration = 500L //(initialHeight / v.context.resources.displayMetrics.density).toLong()
+            v.startAnimation(a)
+        }
+    }
+
+    fun getEmojiByUnicode(unicode: Int): String {
+        return String(Character.toChars(unicode))
+    }
+
+    fun getDifferenceText(context: Context, now: Long, start: Long): String {
+        val nowDate = DateTime(now)
+        val eventDate = DateTime(start)
+
+        var difference = start - now
+        difference += 60 * 1000 - (difference % (60 * 1000))
+
+        when {
+            difference <= 0 || TimeUnit.MILLISECONDS.toHours(difference) < 1 -> {
+                return ""
+            }
+            TimeUnit.MILLISECONDS.toHours(difference) < 12 -> {
+                return DateUtils.getRelativeTimeSpanString(start, now, DateUtils.HOUR_IN_MILLIS).toString()
+            }
+            eventDate.dayOfYear == nowDate.plusDays(1).dayOfYear -> {
+                return String.format("%s", context.getString(R.string.tomorrow))
+            }
+            eventDate.dayOfYear == nowDate.dayOfYear -> {
+                return String.format("%s", context.getString(R.string.today))
+            }
+            else -> {
+                return DateUtils.getRelativeTimeSpanString(start, now, DateUtils.DAY_IN_MILLIS).toString()
+            }
+        }
+
+    }
+
+    fun getFontColor(): Int {
+        return try {
+            Color.parseColor(Preferences.textGlobalColor)
+        } catch (e: Exception) {
+            Color.parseColor("#FFFFFF")
+        }
+    }
+
+    fun getTintedDrawable(context: Context, inputDrawable: Int, color: Int): Drawable?  = ContextCompat.getDrawable(context, inputDrawable)?.apply {
+        DrawableCompat.setTint(this, color)
+        DrawableCompat.setTintMode(this, PorterDuff.Mode.SRC_IN)
+    }
+
+    fun changeBitmapColor(sourceBitmap: Bitmap, color: Int): Bitmap {
+        val resultBitmap = Bitmap.createBitmap(sourceBitmap, 0, 0,
+                sourceBitmap.width - 1, sourceBitmap.height - 1)
+        val p = Paint()
+        val filter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
+        p.colorFilter = filter
+
+        val canvas = Canvas(resultBitmap)
+        canvas.drawBitmap(resultBitmap, 0f, 0f, p)
+
+        return resultBitmap
+    }
+
+    fun getNextAlarm(context: Context): String = with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
+        return if (nextAlarmClock != null && nextAlarmClock.triggerTime - Calendar.getInstance().timeInMillis > 5 * 60 * 1000) {
+            DateFormat.getTimeFormat(context).format(Date(nextAlarmClock.triggerTime))
+        } else {
+            ""
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/utils/WeatherUtil.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/WeatherUtil.kt
new file mode 100644
index 0000000..fe9ebc9
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/utils/WeatherUtil.kt
@@ -0,0 +1,145 @@
+package com.tommasoberlose.anotherwidget.utils
+
+import android.content.Context
+import com.google.android.gms.location.LocationServices
+import com.kwabenaberko.openweathermaplib.constants.Units
+import com.kwabenaberko.openweathermaplib.implementation.OpenWeatherMapHelper
+import com.kwabenaberko.openweathermaplib.implementation.callbacks.CurrentWeatherCallback
+import com.kwabenaberko.openweathermaplib.models.currentweather.CurrentWeather
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.global.Preferences
+
+
+/**
+ * Created by tommaso on 08/10/17.
+ */
+
+object WeatherUtil {
+
+    fun updateWeather(context: Context) {
+        if (Preferences.customLocationAdd != "") {
+            weatherNetworkRequest(
+                context
+            )
+        } else {
+            LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnSuccessListener {
+                Preferences.customLocationLat = it.latitude.toString()
+                Preferences.customLocationLon = it.longitude.toString()
+
+                weatherNetworkRequest(context)
+            }
+        }
+    }
+
+    private fun weatherNetworkRequest(context: Context) {
+        if (Preferences.showWeather && Preferences.weatherProviderApi != "" && Preferences.customLocationLat != "" && Preferences.customLocationLon != "") {
+            val helper = OpenWeatherMapHelper(Preferences.weatherProviderApi)
+            helper.setUnits(if (Preferences.weatherTempUnit == "F") Units.IMPERIAL else Units.METRIC)
+            helper.getCurrentWeatherByGeoCoordinates(Preferences.customLocationLat.toDouble(), Preferences.customLocationLon.toDouble(), object : CurrentWeatherCallback {
+                override fun onSuccess(currentWeather: CurrentWeather?) {
+                    currentWeather?.let {
+                        Preferences.weatherTemp = currentWeather.main.temp.toFloat()
+                        Preferences.weatherIcon = currentWeather.weather[0].icon
+                        Preferences.weatherRealTempUnit = Preferences.weatherTempUnit
+                        Util.updateWidget(context)
+                    }
+                }
+
+                override fun onFailure(throwable: Throwable?) {
+                }
+
+            })
+        } else {
+            removeWeather(context)
+        }
+    }
+
+    private fun removeWeather(context: Context) {
+        Preferences.remove(Preferences::weatherTemp)
+        Preferences.remove(Preferences::weatherTempUnit)
+        Util.updateWidget(context)
+    }
+
+    fun getWeatherIconResource(icon: String): Int {
+        when (icon) {
+            "01d" -> {
+                return R.drawable.clear_day
+            }
+            "02d" -> {
+                return R.drawable.partly_cloudy
+            }
+            "03d" -> {
+                return R.drawable.mostly_cloudy
+            }
+            "04d" -> {
+                return R.drawable.cloudy_weather
+            }
+            "09d" -> {
+                return R.drawable.storm_weather_day
+            }
+            "10d" -> {
+                return R.drawable.rainy_day
+            }
+            "11d" -> {
+                return R.drawable.thunder_day
+            }
+            "13d" -> {
+                return R.drawable.snow_day
+            }
+            "50d" -> {
+                return R.drawable.haze_day
+            }
+            "80d" -> {
+                return R.drawable.windy_day
+            }
+            "81d" -> {
+                return R.drawable.rain_snow_day
+            }
+            "82d" -> {
+                return R.drawable.haze_weather
+            }
+
+
+
+            "01n" -> {
+                return R.drawable.clear_night
+            }
+            "02n" -> {
+                return R.drawable.partly_cloudy_night
+            }
+            "03n" -> {
+                return R.drawable.mostly_cloudy_night
+            }
+            "04n" -> {
+                return R.drawable.cloudy_weather
+            }
+            "09n" -> {
+                return R.drawable.storm_weather_night
+            }
+            "10n" -> {
+                return R.drawable.rainy_night
+            }
+            "11n" -> {
+                return R.drawable.thunder_night
+            }
+            "13n" -> {
+                return R.drawable.snow_night
+            }
+            "50n" -> {
+                return R.drawable.haze_night
+            }
+            "80n" -> {
+                return R.drawable.windy_night
+            }
+            "81n" -> {
+                return R.drawable.rain_snow_night
+            }
+            "82n" -> {
+                return R.drawable.haze_weather
+            }
+            else -> {
+                return R.drawable.unknown
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml
deleted file mode 100644
index 04b4878..0000000
--- a/app/src/main/res/anim/slide_down.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator">
-
-    <translate
-        android:duration="@android:integer/config_longAnimTime"
-        android:fromYDelta="0"
-        android:toYDelta="100%p" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_up.xml b/app/src/main/res/anim/slide_up.xml
deleted file mode 100644
index a70ce80..0000000
--- a/app/src/main/res/anim/slide_up.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_decelerate_interpolator">
-
-    <translate
-        android:duration="@android:integer/config_longAnimTime"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/stay.xml b/app/src/main/res/anim/stay.xml
deleted file mode 100644
index 0f9dfd0..0000000
--- a/app/src/main/res/anim/stay.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_longAnimTime"
-    android:fromYDelta="0%p"
-    android:toYDelta="0%p" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_action_alarm.png b/app/src/main/res/drawable-hdpi/ic_action_alarm.png
deleted file mode 100644
index bc6f184..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_alarm.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_alert.png b/app/src/main/res/drawable-hdpi/ic_action_alert.png
deleted file mode 100644
index 3603ce8..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_aw.png b/app/src/main/res/drawable-hdpi/ic_action_aw.png
deleted file mode 100644
index ee22b41..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_aw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_calendar.png b/app/src/main/res/drawable-hdpi/ic_action_calendar.png
deleted file mode 100644
index 5e217b0..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_calendar.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_close.png b/app/src/main/res/drawable-hdpi/ic_action_close.png
deleted file mode 100644
index 75e65bc..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_code.png b/app/src/main/res/drawable-hdpi/ic_action_code.png
deleted file mode 100644
index 3811ff9..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_code.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_dev.png b/app/src/main/res/drawable-hdpi/ic_action_dev.png
deleted file mode 100644
index 3b54f95..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_dev.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_face.png b/app/src/main/res/drawable-hdpi/ic_action_face.png
deleted file mode 100644
index 3b54f95..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_face.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_feedback.png b/app/src/main/res/drawable-hdpi/ic_action_feedback.png
deleted file mode 100644
index 7ff2b85..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_feedback.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_geolocation.png b/app/src/main/res/drawable-hdpi/ic_action_geolocation.png
deleted file mode 100644
index cb729bb..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_geolocation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_gift.png b/app/src/main/res/drawable-hdpi/ic_action_gift.png
deleted file mode 100644
index 01f6a71..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_gift.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_gps.png b/app/src/main/res/drawable-hdpi/ic_action_gps.png
deleted file mode 100644
index cb729bb..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_gps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_hide_preview.png b/app/src/main/res/drawable-hdpi/ic_action_hide_preview.png
deleted file mode 100644
index 0890800..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_hide_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_info.png b/app/src/main/res/drawable-hdpi/ic_action_info.png
deleted file mode 100644
index 9bb3891..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_info.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_library.png b/app/src/main/res/drawable-hdpi/ic_action_library.png
deleted file mode 100644
index ae63300..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_library.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_location.png b/app/src/main/res/drawable-hdpi/ic_action_location.png
deleted file mode 100644
index 4f610b4..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_location.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_menu.png b/app/src/main/res/drawable-hdpi/ic_action_menu.png
deleted file mode 100644
index ddb4dcc..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_next.png b/app/src/main/res/drawable-hdpi/ic_action_next.png
deleted file mode 100644
index 0b18d95..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_next.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_paste.png b/app/src/main/res/drawable-hdpi/ic_action_paste.png
deleted file mode 100644
index b5fe06e..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_paste.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_rate.png b/app/src/main/res/drawable-hdpi/ic_action_rate.png
deleted file mode 100644
index 220c2e1..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_rate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
deleted file mode 100644
index 3396344..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh_0.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_0.png
deleted file mode 100644
index 8f325d3..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh_1.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_1.png
deleted file mode 100644
index 92f97dc..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh_2.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_2.png
deleted file mode 100644
index 3312987..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh_3.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_3.png
deleted file mode 100644
index 3e3eba4..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh_4.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_4.png
deleted file mode 100644
index 99fa173..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh_5.png b/app/src/main/res/drawable-hdpi/ic_action_refresh_5.png
deleted file mode 100644
index c0dbdc2..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_reset.png b/app/src/main/res/drawable-hdpi/ic_action_reset.png
deleted file mode 100644
index 9b008a0..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_save.png b/app/src/main/res/drawable-hdpi/ic_action_save.png
deleted file mode 100644
index 757596c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index 30b356d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_share.png b/app/src/main/res/drawable-hdpi/ic_action_share.png
deleted file mode 100644
index 1beca5c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_show_preview.png b/app/src/main/res/drawable-hdpi/ic_action_show_preview.png
deleted file mode 100644
index 4725568..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_show_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_sms.png b/app/src/main/res/drawable-hdpi/ic_action_sms.png
deleted file mode 100644
index cd1806c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_sms.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_sync.png b/app/src/main/res/drawable-hdpi/ic_action_sync.png
deleted file mode 100644
index 7f80184..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_translate.png b/app/src/main/res/drawable-hdpi/ic_action_translate.png
deleted file mode 100644
index 8a837ef..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_splash_logo.png b/app/src/main/res/drawable-hdpi/ic_splash_logo.png
new file mode 100644
index 0000000..3d510d6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_splash_logo.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_name.png b/app/src/main/res/drawable-hdpi/ic_stat_name.png
deleted file mode 100644
index dce1092..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_name.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/round_add.png b/app/src/main/res/drawable-hdpi/round_add.png
new file mode 100644
index 0000000..0e07f0b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_18.png b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_18.png
new file mode 100644
index 0000000..4301584
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_24.png b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_24.png
new file mode 100644
index 0000000..4e02f1c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_36.png b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_36.png
new file mode 100644
index 0000000..b297c39
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_48.png b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_48.png
new file mode 100644
index 0000000..f6d7deb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_circle_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_to_home_screen.png b/app/src/main/res/drawable-hdpi/round_add_to_home_screen.png
new file mode 100644
index 0000000..a7de700
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_to_home_screen.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_18.png b/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_18.png
new file mode 100644
index 0000000..680c845
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_24.png b/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_24.png
new file mode 100644
index 0000000..ecb62d7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_48.png b/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_48.png
new file mode 100644
index 0000000..1a44c1e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_to_home_screen_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_white_18.png b/app/src/main/res/drawable-hdpi/round_add_white_18.png
new file mode 100644
index 0000000..2e1fe35
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_white_24.png b/app/src/main/res/drawable-hdpi/round_add_white_24.png
new file mode 100644
index 0000000..6755cdc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_add_white_48.png b/app/src/main/res/drawable-hdpi/round_add_white_48.png
new file mode 100644
index 0000000..b014e27
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_add_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_alarm.png b/app/src/main/res/drawable-hdpi/round_alarm.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_alarm.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_alarm_black_18.png b/app/src/main/res/drawable-hdpi/round_alarm_black_18.png
new file mode 100644
index 0000000..124c040
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_alarm_black_24.png b/app/src/main/res/drawable-hdpi/round_alarm_black_24.png
new file mode 100644
index 0000000..ea9701c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_alarm_black_36.png b/app/src/main/res/drawable-hdpi/round_alarm_black_36.png
new file mode 100644
index 0000000..43c6103
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_alarm_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_arrow_back_black_18.png b/app/src/main/res/drawable-hdpi/round_arrow_back_black_18.png
new file mode 100644
index 0000000..1915452
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_arrow_back_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_arrow_back_black_24.png b/app/src/main/res/drawable-hdpi/round_arrow_back_black_24.png
new file mode 100644
index 0000000..c3de8c1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_arrow_back_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_arrow_back_black_36.png b/app/src/main/res/drawable-hdpi/round_arrow_back_black_36.png
new file mode 100644
index 0000000..684e245
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_arrow_back_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_arrow_back_black_48.png b/app/src/main/res/drawable-hdpi/round_arrow_back_black_48.png
new file mode 100644
index 0000000..7553ab2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_arrow_back_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_left.png b/app/src/main/res/drawable-hdpi/round_chevron_left.png
new file mode 100644
index 0000000..5885e20
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_left.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_left_black_24.png b/app/src/main/res/drawable-hdpi/round_chevron_left_black_24.png
new file mode 100644
index 0000000..62d2b90
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_left_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_left_black_36.png b/app/src/main/res/drawable-hdpi/round_chevron_left_black_36.png
new file mode 100644
index 0000000..dc5653e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_left_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_left_black_48.png b/app/src/main/res/drawable-hdpi/round_chevron_left_black_48.png
new file mode 100644
index 0000000..21f1766
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_left_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_right.png b/app/src/main/res/drawable-hdpi/round_chevron_right.png
new file mode 100644
index 0000000..6fb94b6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_right.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_right_black_18.png b/app/src/main/res/drawable-hdpi/round_chevron_right_black_18.png
new file mode 100644
index 0000000..76883a2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_right_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_right_black_24.png b/app/src/main/res/drawable-hdpi/round_chevron_right_black_24.png
new file mode 100644
index 0000000..a725964
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_right_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_chevron_right_black_48.png b/app/src/main/res/drawable-hdpi/round_chevron_right_black_48.png
new file mode 100644
index 0000000..8f608d3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_chevron_right_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_cloud_queue_white_18.png b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_18.png
new file mode 100644
index 0000000..b14da74
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_cloud_queue_white_24.png b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_24.png
new file mode 100644
index 0000000..2b2799a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_cloud_queue_white_36.png b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_36.png
new file mode 100644
index 0000000..b4c341a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_cloud_queue_white_48.png b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_48.png
new file mode 100644
index 0000000..52faf47
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_cloud_queue_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_date_range.png b/app/src/main/res/drawable-hdpi/round_date_range.png
new file mode 100644
index 0000000..0bb14c2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_date_range.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_date_range_black_18.png b/app/src/main/res/drawable-hdpi/round_date_range_black_18.png
new file mode 100644
index 0000000..dab7f87
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_date_range_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_date_range_black_36.png b/app/src/main/res/drawable-hdpi/round_date_range_black_36.png
new file mode 100644
index 0000000..b151c9b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_date_range_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_date_range_black_48.png b/app/src/main/res/drawable-hdpi/round_date_range_black_48.png
new file mode 100644
index 0000000..e978d3d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_date_range_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_error_outline_white_18.png b/app/src/main/res/drawable-hdpi/round_error_outline_white_18.png
new file mode 100644
index 0000000..8701876
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_error_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_error_outline_white_24.png b/app/src/main/res/drawable-hdpi/round_error_outline_white_24.png
new file mode 100644
index 0000000..325cb99
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_error_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_error_outline_white_36.png b/app/src/main/res/drawable-hdpi/round_error_outline_white_36.png
new file mode 100644
index 0000000..e24bcfe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_error_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_error_outline_white_48.png b/app/src/main/res/drawable-hdpi/round_error_outline_white_48.png
new file mode 100644
index 0000000..906b7f7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_error_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_busy.png b/app/src/main/res/drawable-hdpi/round_event_busy.png
new file mode 100644
index 0000000..b2bcb2a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_busy.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_busy_black_18.png b/app/src/main/res/drawable-hdpi/round_event_busy_black_18.png
new file mode 100644
index 0000000..44b99b6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_busy_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_busy_black_36.png b/app/src/main/res/drawable-hdpi/round_event_busy_black_36.png
new file mode 100644
index 0000000..83484ba
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_busy_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_busy_black_48.png b/app/src/main/res/drawable-hdpi/round_event_busy_black_48.png
new file mode 100644
index 0000000..1e38651
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_busy_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_note.png b/app/src/main/res/drawable-hdpi/round_event_note.png
new file mode 100644
index 0000000..f8f0d4c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_note.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_note_black_18.png b/app/src/main/res/drawable-hdpi/round_event_note_black_18.png
new file mode 100644
index 0000000..491333f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_note_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_note_black_24.png b/app/src/main/res/drawable-hdpi/round_event_note_black_24.png
new file mode 100644
index 0000000..4363f79
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_note_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_event_note_black_36.png b/app/src/main/res/drawable-hdpi/round_event_note_black_36.png
new file mode 100644
index 0000000..9138806
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_event_note_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_list.png b/app/src/main/res/drawable-hdpi/round_filter_list.png
new file mode 100644
index 0000000..1690f23
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_list_white_18.png b/app/src/main/res/drawable-hdpi/round_filter_list_white_18.png
new file mode 100644
index 0000000..5ee0c1c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_list_white_24.png b/app/src/main/res/drawable-hdpi/round_filter_list_white_24.png
new file mode 100644
index 0000000..ab7719c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_filter_list_white_36.png b/app/src/main/res/drawable-hdpi/round_filter_list_white_36.png
new file mode 100644
index 0000000..5786f08
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_font_download.png b/app/src/main/res/drawable-hdpi/round_font_download.png
new file mode 100644
index 0000000..63524ee
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_font_download.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_font_download_white_18.png b/app/src/main/res/drawable-hdpi/round_font_download_white_18.png
new file mode 100644
index 0000000..a3fd517
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_font_download_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_font_download_white_24.png b/app/src/main/res/drawable-hdpi/round_font_download_white_24.png
new file mode 100644
index 0000000..0ee79f1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_font_download_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_font_download_white_36.png b/app/src/main/res/drawable-hdpi/round_font_download_white_36.png
new file mode 100644
index 0000000..13bd14c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_font_download_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_launch.png b/app/src/main/res/drawable-hdpi/round_launch.png
new file mode 100644
index 0000000..629942f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_launch.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_launch_white_18.png b/app/src/main/res/drawable-hdpi/round_launch_white_18.png
new file mode 100644
index 0000000..7bca4da
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_launch_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_launch_white_24.png b/app/src/main/res/drawable-hdpi/round_launch_white_24.png
new file mode 100644
index 0000000..fee49f3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_launch_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_launch_white_48.png b/app/src/main/res/drawable-hdpi/round_launch_white_48.png
new file mode 100644
index 0000000..3a9026b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_launch_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_local_cafe_white_18.png b/app/src/main/res/drawable-hdpi/round_local_cafe_white_18.png
new file mode 100644
index 0000000..99f020e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_local_cafe_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_local_cafe_white_24.png b/app/src/main/res/drawable-hdpi/round_local_cafe_white_24.png
new file mode 100644
index 0000000..377ce25
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_local_cafe_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_local_cafe_white_36.png b/app/src/main/res/drawable-hdpi/round_local_cafe_white_36.png
new file mode 100644
index 0000000..6ee1b30
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_local_cafe_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_local_cafe_white_48.png b/app/src/main/res/drawable-hdpi/round_local_cafe_white_48.png
new file mode 100644
index 0000000..545e85c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_local_cafe_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_low_priority.png b/app/src/main/res/drawable-hdpi/round_low_priority.png
new file mode 100644
index 0000000..b382370
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_low_priority.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_low_priority_white_18.png b/app/src/main/res/drawable-hdpi/round_low_priority_white_18.png
new file mode 100644
index 0000000..b279afb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_low_priority_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_low_priority_white_36.png b/app/src/main/res/drawable-hdpi/round_low_priority_white_36.png
new file mode 100644
index 0000000..c5d3cf0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_low_priority_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_low_priority_white_48.png b/app/src/main/res/drawable-hdpi/round_low_priority_white_48.png
new file mode 100644
index 0000000..4457aee
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_low_priority_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_more_vert.png b/app/src/main/res/drawable-hdpi/round_more_vert.png
new file mode 100644
index 0000000..70c6b7a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_more_vert.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_more_vert_white_18.png b/app/src/main/res/drawable-hdpi/round_more_vert_white_18.png
new file mode 100644
index 0000000..45ccf9e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_more_vert_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_more_vert_white_24.png b/app/src/main/res/drawable-hdpi/round_more_vert_white_24.png
new file mode 100644
index 0000000..117bd08
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_more_vert_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_more_vert_white_36.png b/app/src/main/res/drawable-hdpi/round_more_vert_white_36.png
new file mode 100644
index 0000000..efe49c9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_more_vert_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_palette.png b/app/src/main/res/drawable-hdpi/round_palette.png
new file mode 100644
index 0000000..e440fdb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_palette.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_palette_white_24.png b/app/src/main/res/drawable-hdpi/round_palette_white_24.png
new file mode 100644
index 0000000..4b51cd6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_palette_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_palette_white_36.png b/app/src/main/res/drawable-hdpi/round_palette_white_36.png
new file mode 100644
index 0000000..82b5d2d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_palette_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_palette_white_48.png b/app/src/main/res/drawable-hdpi/round_palette_white_48.png
new file mode 100644
index 0000000..3c5495b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_palette_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_place.png b/app/src/main/res/drawable-hdpi/round_place.png
new file mode 100644
index 0000000..2952d54
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_place.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_place_white_18.png b/app/src/main/res/drawable-hdpi/round_place_white_18.png
new file mode 100644
index 0000000..6905d63
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_place_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_place_white_36.png b/app/src/main/res/drawable-hdpi/round_place_white_36.png
new file mode 100644
index 0000000..253b86e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_place_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_place_white_48.png b/app/src/main/res/drawable-hdpi/round_place_white_48.png
new file mode 100644
index 0000000..56ea3ed
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_place_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_redo.png b/app/src/main/res/drawable-hdpi/round_redo.png
new file mode 100644
index 0000000..fbba521
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_redo.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_redo_white_18.png b/app/src/main/res/drawable-hdpi/round_redo_white_18.png
new file mode 100644
index 0000000..b138261
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_redo_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_redo_white_36.png b/app/src/main/res/drawable-hdpi/round_redo_white_36.png
new file mode 100644
index 0000000..a52701d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_redo_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_redo_white_48.png b/app/src/main/res/drawable-hdpi/round_redo_white_48.png
new file mode 100644
index 0000000..47a9433
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_redo_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_refresh_black_18.png b/app/src/main/res/drawable-hdpi/round_refresh_black_18.png
new file mode 100644
index 0000000..f57e333
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_refresh_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_refresh_black_24.png b/app/src/main/res/drawable-hdpi/round_refresh_black_24.png
new file mode 100644
index 0000000..3dad121
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_refresh_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_refresh_black_36.png b/app/src/main/res/drawable-hdpi/round_refresh_black_36.png
new file mode 100644
index 0000000..939d83c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_refresh_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_refresh_black_48.png b/app/src/main/res/drawable-hdpi/round_refresh_black_48.png
new file mode 100644
index 0000000..f000d3a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_refresh_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_schedule.png b/app/src/main/res/drawable-hdpi/round_schedule.png
new file mode 100644
index 0000000..25d30a8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_schedule.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_schedule_white_18.png b/app/src/main/res/drawable-hdpi/round_schedule_white_18.png
new file mode 100644
index 0000000..a0bf5a5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_schedule_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_schedule_white_24.png b/app/src/main/res/drawable-hdpi/round_schedule_white_24.png
new file mode 100644
index 0000000..e1d6da1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_schedule_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_schedule_white_36.png b/app/src/main/res/drawable-hdpi/round_schedule_white_36.png
new file mode 100644
index 0000000..4e9a74e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_schedule_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_schedule_white_48.png b/app/src/main/res/drawable-hdpi/round_schedule_white_48.png
new file mode 100644
index 0000000..25d30a8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_schedule_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_settings.png b/app/src/main/res/drawable-hdpi/round_settings.png
new file mode 100644
index 0000000..471eb41
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_settings.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_settings_white_18.png b/app/src/main/res/drawable-hdpi/round_settings_white_18.png
new file mode 100644
index 0000000..6b6460d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_settings_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_settings_white_36.png b/app/src/main/res/drawable-hdpi/round_settings_white_36.png
new file mode 100644
index 0000000..483ccb8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_settings_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_settings_white_48.png b/app/src/main/res/drawable-hdpi/round_settings_white_48.png
new file mode 100644
index 0000000..5b25ac4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_settings_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_fields.png b/app/src/main/res/drawable-hdpi/round_text_fields.png
new file mode 100644
index 0000000..584210f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_fields.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_fields_white_24.png b/app/src/main/res/drawable-hdpi/round_text_fields_white_24.png
new file mode 100644
index 0000000..0b249d7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_fields_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_fields_white_36.png b/app/src/main/res/drawable-hdpi/round_text_fields_white_36.png
new file mode 100644
index 0000000..e372ab3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_fields_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_fields_white_48.png b/app/src/main/res/drawable-hdpi/round_text_fields_white_48.png
new file mode 100644
index 0000000..7947a39
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_fields_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_format.png b/app/src/main/res/drawable-hdpi/round_text_format.png
new file mode 100644
index 0000000..1d4ccbe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_format.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_format_white_18.png b/app/src/main/res/drawable-hdpi/round_text_format_white_18.png
new file mode 100644
index 0000000..dfe83de
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_format_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_format_white_24.png b/app/src/main/res/drawable-hdpi/round_text_format_white_24.png
new file mode 100644
index 0000000..ba3a19e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_format_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_text_format_white_36.png b/app/src/main/res/drawable-hdpi/round_text_format_white_36.png
new file mode 100644
index 0000000..aeb0237
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_text_format_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_texture.png b/app/src/main/res/drawable-hdpi/round_texture.png
new file mode 100644
index 0000000..7241210
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_texture.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_texture_white_18.png b/app/src/main/res/drawable-hdpi/round_texture_white_18.png
new file mode 100644
index 0000000..be24113
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_texture_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_texture_white_24.png b/app/src/main/res/drawable-hdpi/round_texture_white_24.png
new file mode 100644
index 0000000..02ee290
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_texture_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_texture_white_36.png b/app/src/main/res/drawable-hdpi/round_texture_white_36.png
new file mode 100644
index 0000000..f79fc6d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_texture_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_title.png b/app/src/main/res/drawable-hdpi/round_title.png
new file mode 100644
index 0000000..3883687
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_title.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_title_white_18.png b/app/src/main/res/drawable-hdpi/round_title_white_18.png
new file mode 100644
index 0000000..020ff07
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_title_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_title_white_36.png b/app/src/main/res/drawable-hdpi/round_title_white_36.png
new file mode 100644
index 0000000..565c8b3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_title_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_title_white_48.png b/app/src/main/res/drawable-hdpi/round_title_white_48.png
new file mode 100644
index 0000000..b64e752
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_title_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_today.png b/app/src/main/res/drawable-hdpi/round_today.png
new file mode 100644
index 0000000..b359d42
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_today.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_today_white_18.png b/app/src/main/res/drawable-hdpi/round_today_white_18.png
new file mode 100644
index 0000000..240bfc9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_today_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_today_white_24.png b/app/src/main/res/drawable-hdpi/round_today_white_24.png
new file mode 100644
index 0000000..c9d08b5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_today_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_today_white_48.png b/app/src/main/res/drawable-hdpi/round_today_white_48.png
new file mode 100644
index 0000000..06fe89c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_today_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_translate.png b/app/src/main/res/drawable-hdpi/round_translate.png
new file mode 100644
index 0000000..146c995
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_translate.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_translate_white_18.png b/app/src/main/res/drawable-hdpi/round_translate_white_18.png
new file mode 100644
index 0000000..a23c35e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_translate_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_translate_white_24.png b/app/src/main/res/drawable-hdpi/round_translate_white_24.png
new file mode 100644
index 0000000..1f83060
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_translate_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_translate_white_36.png b/app/src/main/res/drawable-hdpi/round_translate_white_36.png
new file mode 100644
index 0000000..d75bef9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_translate_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_vpn_key_black_18.png b/app/src/main/res/drawable-hdpi/round_vpn_key_black_18.png
new file mode 100644
index 0000000..63eb57a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_vpn_key_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_vpn_key_black_24.png b/app/src/main/res/drawable-hdpi/round_vpn_key_black_24.png
new file mode 100644
index 0000000..d9582aa
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_vpn_key_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_vpn_key_black_36.png b/app/src/main/res/drawable-hdpi/round_vpn_key_black_36.png
new file mode 100644
index 0000000..0b728f6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_vpn_key_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_vpn_key_black_48.png b/app/src/main/res/drawable-hdpi/round_vpn_key_black_48.png
new file mode 100644
index 0000000..4045e56
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_vpn_key_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wallpaper_black_18.png b/app/src/main/res/drawable-hdpi/round_wallpaper_black_18.png
new file mode 100644
index 0000000..ec5d787
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wallpaper_black_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wallpaper_black_24.png b/app/src/main/res/drawable-hdpi/round_wallpaper_black_24.png
new file mode 100644
index 0000000..8265bcd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wallpaper_black_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wallpaper_black_36.png b/app/src/main/res/drawable-hdpi/round_wallpaper_black_36.png
new file mode 100644
index 0000000..c93f35b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wallpaper_black_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wallpaper_black_48.png b/app/src/main/res/drawable-hdpi/round_wallpaper_black_48.png
new file mode 100644
index 0000000..441dde7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wallpaper_black_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_auto.png b/app/src/main/res/drawable-hdpi/round_wb_auto.png
new file mode 100644
index 0000000..152acbb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_auto.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_auto_white_18.png b/app/src/main/res/drawable-hdpi/round_wb_auto_white_18.png
new file mode 100644
index 0000000..83bf422
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_auto_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_auto_white_24.png b/app/src/main/res/drawable-hdpi/round_wb_auto_white_24.png
new file mode 100644
index 0000000..d76a59d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_auto_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_auto_white_36.png b/app/src/main/res/drawable-hdpi/round_wb_auto_white_36.png
new file mode 100644
index 0000000..a859588
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_auto_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_sunny.png b/app/src/main/res/drawable-hdpi/round_wb_sunny.png
new file mode 100644
index 0000000..cf449e2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_sunny.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_sunny_white_18.png b/app/src/main/res/drawable-hdpi/round_wb_sunny_white_18.png
new file mode 100644
index 0000000..b626073
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_sunny_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_sunny_white_24.png b/app/src/main/res/drawable-hdpi/round_wb_sunny_white_24.png
new file mode 100644
index 0000000..835b3fc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_sunny_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_wb_sunny_white_36.png b/app/src/main/res/drawable-hdpi/round_wb_sunny_white_36.png
new file mode 100644
index 0000000..2b4502a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_wb_sunny_white_36.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_widgets.png b/app/src/main/res/drawable-hdpi/round_widgets.png
new file mode 100644
index 0000000..a33317f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_widgets.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_widgets_white_18.png b/app/src/main/res/drawable-hdpi/round_widgets_white_18.png
new file mode 100644
index 0000000..585235b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_widgets_white_18.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_widgets_white_24.png b/app/src/main/res/drawable-hdpi/round_widgets_white_24.png
new file mode 100644
index 0000000..b0ffc85
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_widgets_white_24.png differ
diff --git a/app/src/main/res/drawable-hdpi/round_widgets_white_48.png b/app/src/main/res/drawable-hdpi/round_widgets_white_48.png
new file mode 100644
index 0000000..89b3c89
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_widgets_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_alarm.png b/app/src/main/res/drawable-mdpi/ic_action_alarm.png
deleted file mode 100644
index 95e7cf8..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_alarm.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_alert.png b/app/src/main/res/drawable-mdpi/ic_action_alert.png
deleted file mode 100644
index 1d48902..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_aw.png b/app/src/main/res/drawable-mdpi/ic_action_aw.png
deleted file mode 100644
index 532811f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_aw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_calendar.png b/app/src/main/res/drawable-mdpi/ic_action_calendar.png
deleted file mode 100644
index 7f2e2fc..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_calendar.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_close.png b/app/src/main/res/drawable-mdpi/ic_action_close.png
deleted file mode 100644
index a1816d4..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_code.png b/app/src/main/res/drawable-mdpi/ic_action_code.png
deleted file mode 100644
index 5dcd105..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_code.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_dev.png b/app/src/main/res/drawable-mdpi/ic_action_dev.png
deleted file mode 100644
index 32efd39..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_dev.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_face.png b/app/src/main/res/drawable-mdpi/ic_action_face.png
deleted file mode 100644
index 32efd39..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_face.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_feedback.png b/app/src/main/res/drawable-mdpi/ic_action_feedback.png
deleted file mode 100644
index bd9ce90..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_feedback.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_geolocation.png b/app/src/main/res/drawable-mdpi/ic_action_geolocation.png
deleted file mode 100644
index 5f5c47b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_geolocation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_gift.png b/app/src/main/res/drawable-mdpi/ic_action_gift.png
deleted file mode 100644
index 61b96f3..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_gift.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_gps.png b/app/src/main/res/drawable-mdpi/ic_action_gps.png
deleted file mode 100644
index 5f5c47b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_gps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_hide_preview.png b/app/src/main/res/drawable-mdpi/ic_action_hide_preview.png
deleted file mode 100644
index 9fbd1f5..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_hide_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_info.png b/app/src/main/res/drawable-mdpi/ic_action_info.png
deleted file mode 100644
index a45cf77..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_info.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_library.png b/app/src/main/res/drawable-mdpi/ic_action_library.png
deleted file mode 100644
index 06e6f7d..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_library.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_location.png b/app/src/main/res/drawable-mdpi/ic_action_location.png
deleted file mode 100644
index d178b2b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_location.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_menu.png b/app/src/main/res/drawable-mdpi/ic_action_menu.png
deleted file mode 100644
index b07955b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_next.png b/app/src/main/res/drawable-mdpi/ic_action_next.png
deleted file mode 100644
index 6f21bbc..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_next.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_paste.png b/app/src/main/res/drawable-mdpi/ic_action_paste.png
deleted file mode 100644
index 1ccd675..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_paste.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_rate.png b/app/src/main/res/drawable-mdpi/ic_action_rate.png
deleted file mode 100644
index 6cc7f06..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_rate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
deleted file mode 100644
index 9224ce3..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh_0.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_0.png
deleted file mode 100644
index 6fcbb48..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh_1.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_1.png
deleted file mode 100644
index 42d0255..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh_2.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_2.png
deleted file mode 100644
index f8a2ee2..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh_3.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_3.png
deleted file mode 100644
index 6aa4952..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh_4.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_4.png
deleted file mode 100644
index 9df5110..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh_5.png b/app/src/main/res/drawable-mdpi/ic_action_refresh_5.png
deleted file mode 100644
index 586be1d..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_refresh_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_reset.png b/app/src/main/res/drawable-mdpi/ic_action_reset.png
deleted file mode 100644
index 2e3a2e3..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_save.png b/app/src/main/res/drawable-mdpi/ic_action_save.png
deleted file mode 100644
index b788742..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index ce72de5..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_share.png b/app/src/main/res/drawable-mdpi/ic_action_share.png
deleted file mode 100644
index 7560ad2..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_show_preview.png b/app/src/main/res/drawable-mdpi/ic_action_show_preview.png
deleted file mode 100644
index 1854e96..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_show_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_sms.png b/app/src/main/res/drawable-mdpi/ic_action_sms.png
deleted file mode 100644
index b9f96fc..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_sms.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_sync.png b/app/src/main/res/drawable-mdpi/ic_action_sync.png
deleted file mode 100644
index c7fd1be..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_translate.png b/app/src/main/res/drawable-mdpi/ic_action_translate.png
deleted file mode 100644
index 7188f70..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_splash_logo.png b/app/src/main/res/drawable-mdpi/ic_splash_logo.png
new file mode 100644
index 0000000..708e628
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_splash_logo.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_name.png b/app/src/main/res/drawable-mdpi/ic_stat_name.png
deleted file mode 100644
index ab1fac0..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_name.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/round_add.png b/app/src/main/res/drawable-mdpi/round_add.png
new file mode 100644
index 0000000..6755cdc
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_18.png b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_18.png
new file mode 100644
index 0000000..614c6a2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_24.png b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_24.png
new file mode 100644
index 0000000..a9158a1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_36.png b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_36.png
new file mode 100644
index 0000000..4e02f1c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_48.png b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_48.png
new file mode 100644
index 0000000..0174e59
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_circle_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_to_home_screen.png b/app/src/main/res/drawable-mdpi/round_add_to_home_screen.png
new file mode 100644
index 0000000..ecb62d7
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_to_home_screen.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_18.png b/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_18.png
new file mode 100644
index 0000000..6a287f5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_24.png b/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_24.png
new file mode 100644
index 0000000..c2033f8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_48.png b/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_48.png
new file mode 100644
index 0000000..1ee650c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_to_home_screen_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_white_18.png b/app/src/main/res/drawable-mdpi/round_add_white_18.png
new file mode 100644
index 0000000..f61df7f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_white_24.png b/app/src/main/res/drawable-mdpi/round_add_white_24.png
new file mode 100644
index 0000000..746c0dc
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_add_white_48.png b/app/src/main/res/drawable-mdpi/round_add_white_48.png
new file mode 100644
index 0000000..5a5e5f0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_add_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_alarm.png b/app/src/main/res/drawable-mdpi/round_alarm.png
new file mode 100644
index 0000000..86be313
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_alarm.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_alarm_black_18.png b/app/src/main/res/drawable-mdpi/round_alarm_black_18.png
new file mode 100644
index 0000000..45e6636
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_alarm_black_24.png b/app/src/main/res/drawable-mdpi/round_alarm_black_24.png
new file mode 100644
index 0000000..a1a254f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_alarm_black_36.png b/app/src/main/res/drawable-mdpi/round_alarm_black_36.png
new file mode 100644
index 0000000..ea9701c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_alarm_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_arrow_back_black_18.png b/app/src/main/res/drawable-mdpi/round_arrow_back_black_18.png
new file mode 100644
index 0000000..5703e46
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_arrow_back_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_arrow_back_black_24.png b/app/src/main/res/drawable-mdpi/round_arrow_back_black_24.png
new file mode 100644
index 0000000..26e0280
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_arrow_back_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_arrow_back_black_36.png b/app/src/main/res/drawable-mdpi/round_arrow_back_black_36.png
new file mode 100644
index 0000000..c3de8c1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_arrow_back_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_arrow_back_black_48.png b/app/src/main/res/drawable-mdpi/round_arrow_back_black_48.png
new file mode 100644
index 0000000..91774ea
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_arrow_back_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_left.png b/app/src/main/res/drawable-mdpi/round_chevron_left.png
new file mode 100644
index 0000000..bd0a67a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_left.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_left_black_24.png b/app/src/main/res/drawable-mdpi/round_chevron_left_black_24.png
new file mode 100644
index 0000000..e21d971
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_left_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_left_black_36.png b/app/src/main/res/drawable-mdpi/round_chevron_left_black_36.png
new file mode 100644
index 0000000..62d2b90
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_left_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_left_black_48.png b/app/src/main/res/drawable-mdpi/round_chevron_left_black_48.png
new file mode 100644
index 0000000..4cd1120
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_left_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_right.png b/app/src/main/res/drawable-mdpi/round_chevron_right.png
new file mode 100644
index 0000000..a725964
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_right.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_right_black_18.png b/app/src/main/res/drawable-mdpi/round_chevron_right_black_18.png
new file mode 100644
index 0000000..9183e49
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_right_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_right_black_24.png b/app/src/main/res/drawable-mdpi/round_chevron_right_black_24.png
new file mode 100644
index 0000000..ed309ff
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_right_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_chevron_right_black_48.png b/app/src/main/res/drawable-mdpi/round_chevron_right_black_48.png
new file mode 100644
index 0000000..890681c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_chevron_right_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_cloud_queue_white_18.png b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_18.png
new file mode 100644
index 0000000..db399de
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_cloud_queue_white_24.png b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_24.png
new file mode 100644
index 0000000..7a2c6e8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_cloud_queue_white_36.png b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_36.png
new file mode 100644
index 0000000..2b2799a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_cloud_queue_white_48.png b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_48.png
new file mode 100644
index 0000000..75c6181
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_cloud_queue_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_date_range.png b/app/src/main/res/drawable-mdpi/round_date_range.png
new file mode 100644
index 0000000..bc0c93f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_date_range.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_date_range_black_18.png b/app/src/main/res/drawable-mdpi/round_date_range_black_18.png
new file mode 100644
index 0000000..ab88dbc
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_date_range_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_date_range_black_36.png b/app/src/main/res/drawable-mdpi/round_date_range_black_36.png
new file mode 100644
index 0000000..0bb14c2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_date_range_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_date_range_black_48.png b/app/src/main/res/drawable-mdpi/round_date_range_black_48.png
new file mode 100644
index 0000000..02cfa41
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_date_range_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_error_outline_white_18.png b/app/src/main/res/drawable-mdpi/round_error_outline_white_18.png
new file mode 100644
index 0000000..56a30f2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_error_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_error_outline_white_24.png b/app/src/main/res/drawable-mdpi/round_error_outline_white_24.png
new file mode 100644
index 0000000..44041ce
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_error_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_error_outline_white_36.png b/app/src/main/res/drawable-mdpi/round_error_outline_white_36.png
new file mode 100644
index 0000000..325cb99
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_error_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_error_outline_white_48.png b/app/src/main/res/drawable-mdpi/round_error_outline_white_48.png
new file mode 100644
index 0000000..d313cff
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_error_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_busy.png b/app/src/main/res/drawable-mdpi/round_event_busy.png
new file mode 100644
index 0000000..0872aff
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_busy.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_busy_black_18.png b/app/src/main/res/drawable-mdpi/round_event_busy_black_18.png
new file mode 100644
index 0000000..5318637
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_busy_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_busy_black_36.png b/app/src/main/res/drawable-mdpi/round_event_busy_black_36.png
new file mode 100644
index 0000000..b2bcb2a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_busy_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_busy_black_48.png b/app/src/main/res/drawable-mdpi/round_event_busy_black_48.png
new file mode 100644
index 0000000..27e9d9b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_busy_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_note.png b/app/src/main/res/drawable-mdpi/round_event_note.png
new file mode 100644
index 0000000..039ef3d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_note.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_note_black_18.png b/app/src/main/res/drawable-mdpi/round_event_note_black_18.png
new file mode 100644
index 0000000..1c787c3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_note_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_note_black_24.png b/app/src/main/res/drawable-mdpi/round_event_note_black_24.png
new file mode 100644
index 0000000..7775278
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_note_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_event_note_black_36.png b/app/src/main/res/drawable-mdpi/round_event_note_black_36.png
new file mode 100644
index 0000000..4363f79
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_event_note_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_list.png b/app/src/main/res/drawable-mdpi/round_filter_list.png
new file mode 100644
index 0000000..5e83811
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_list_white_18.png b/app/src/main/res/drawable-mdpi/round_filter_list_white_18.png
new file mode 100644
index 0000000..cb48162
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_list_white_24.png b/app/src/main/res/drawable-mdpi/round_filter_list_white_24.png
new file mode 100644
index 0000000..ec964b2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_filter_list_white_36.png b/app/src/main/res/drawable-mdpi/round_filter_list_white_36.png
new file mode 100644
index 0000000..ab7719c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_font_download.png b/app/src/main/res/drawable-mdpi/round_font_download.png
new file mode 100644
index 0000000..5a3e03c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_font_download.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_font_download_white_18.png b/app/src/main/res/drawable-mdpi/round_font_download_white_18.png
new file mode 100644
index 0000000..efea8b1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_font_download_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_font_download_white_24.png b/app/src/main/res/drawable-mdpi/round_font_download_white_24.png
new file mode 100644
index 0000000..9ce7b43
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_font_download_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_font_download_white_36.png b/app/src/main/res/drawable-mdpi/round_font_download_white_36.png
new file mode 100644
index 0000000..0ee79f1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_font_download_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_launch.png b/app/src/main/res/drawable-mdpi/round_launch.png
new file mode 100644
index 0000000..fee49f3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_launch.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_launch_white_18.png b/app/src/main/res/drawable-mdpi/round_launch_white_18.png
new file mode 100644
index 0000000..d6e9912
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_launch_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_launch_white_24.png b/app/src/main/res/drawable-mdpi/round_launch_white_24.png
new file mode 100644
index 0000000..a0cf20a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_launch_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_launch_white_48.png b/app/src/main/res/drawable-mdpi/round_launch_white_48.png
new file mode 100644
index 0000000..c1b67da
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_launch_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_local_cafe_white_18.png b/app/src/main/res/drawable-mdpi/round_local_cafe_white_18.png
new file mode 100644
index 0000000..e8534a4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_local_cafe_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_local_cafe_white_24.png b/app/src/main/res/drawable-mdpi/round_local_cafe_white_24.png
new file mode 100644
index 0000000..09bc3c9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_local_cafe_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_local_cafe_white_36.png b/app/src/main/res/drawable-mdpi/round_local_cafe_white_36.png
new file mode 100644
index 0000000..377ce25
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_local_cafe_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_local_cafe_white_48.png b/app/src/main/res/drawable-mdpi/round_local_cafe_white_48.png
new file mode 100644
index 0000000..6503ff4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_local_cafe_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_low_priority.png b/app/src/main/res/drawable-mdpi/round_low_priority.png
new file mode 100644
index 0000000..2586fc6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_low_priority.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_low_priority_white_18.png b/app/src/main/res/drawable-mdpi/round_low_priority_white_18.png
new file mode 100644
index 0000000..940eff3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_low_priority_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_low_priority_white_36.png b/app/src/main/res/drawable-mdpi/round_low_priority_white_36.png
new file mode 100644
index 0000000..b382370
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_low_priority_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_low_priority_white_48.png b/app/src/main/res/drawable-mdpi/round_low_priority_white_48.png
new file mode 100644
index 0000000..62d8872
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_low_priority_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_more_vert.png b/app/src/main/res/drawable-mdpi/round_more_vert.png
new file mode 100644
index 0000000..c686b2c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_more_vert.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_more_vert_white_18.png b/app/src/main/res/drawable-mdpi/round_more_vert_white_18.png
new file mode 100644
index 0000000..9569249
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_more_vert_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_more_vert_white_24.png b/app/src/main/res/drawable-mdpi/round_more_vert_white_24.png
new file mode 100644
index 0000000..a2dbc34
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_more_vert_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_more_vert_white_36.png b/app/src/main/res/drawable-mdpi/round_more_vert_white_36.png
new file mode 100644
index 0000000..117bd08
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_more_vert_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_palette.png b/app/src/main/res/drawable-mdpi/round_palette.png
new file mode 100644
index 0000000..f39436a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_palette.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_palette_white_24.png b/app/src/main/res/drawable-mdpi/round_palette_white_24.png
new file mode 100644
index 0000000..ade57d9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_palette_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_palette_white_36.png b/app/src/main/res/drawable-mdpi/round_palette_white_36.png
new file mode 100644
index 0000000..4b51cd6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_palette_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_palette_white_48.png b/app/src/main/res/drawable-mdpi/round_palette_white_48.png
new file mode 100644
index 0000000..4a8bd85
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_palette_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_place.png b/app/src/main/res/drawable-mdpi/round_place.png
new file mode 100644
index 0000000..32b358d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_place.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_place_white_18.png b/app/src/main/res/drawable-mdpi/round_place_white_18.png
new file mode 100644
index 0000000..57f2d01
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_place_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_place_white_36.png b/app/src/main/res/drawable-mdpi/round_place_white_36.png
new file mode 100644
index 0000000..2952d54
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_place_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_place_white_48.png b/app/src/main/res/drawable-mdpi/round_place_white_48.png
new file mode 100644
index 0000000..908e357
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_place_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_redo.png b/app/src/main/res/drawable-mdpi/round_redo.png
new file mode 100644
index 0000000..f8acefb
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_redo.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_redo_white_18.png b/app/src/main/res/drawable-mdpi/round_redo_white_18.png
new file mode 100644
index 0000000..2a7511d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_redo_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_redo_white_36.png b/app/src/main/res/drawable-mdpi/round_redo_white_36.png
new file mode 100644
index 0000000..fbba521
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_redo_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_redo_white_48.png b/app/src/main/res/drawable-mdpi/round_redo_white_48.png
new file mode 100644
index 0000000..a31c883
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_redo_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_refresh_black_18.png b/app/src/main/res/drawable-mdpi/round_refresh_black_18.png
new file mode 100644
index 0000000..7c49748
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_refresh_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_refresh_black_24.png b/app/src/main/res/drawable-mdpi/round_refresh_black_24.png
new file mode 100644
index 0000000..c8fe096
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_refresh_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_refresh_black_36.png b/app/src/main/res/drawable-mdpi/round_refresh_black_36.png
new file mode 100644
index 0000000..3dad121
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_refresh_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_refresh_black_48.png b/app/src/main/res/drawable-mdpi/round_refresh_black_48.png
new file mode 100644
index 0000000..21ff6e5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_refresh_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_schedule.png b/app/src/main/res/drawable-mdpi/round_schedule.png
new file mode 100644
index 0000000..7469713
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_schedule.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_schedule_white_18.png b/app/src/main/res/drawable-mdpi/round_schedule_white_18.png
new file mode 100644
index 0000000..0b6e621
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_schedule_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_schedule_white_24.png b/app/src/main/res/drawable-mdpi/round_schedule_white_24.png
new file mode 100644
index 0000000..e520c56
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_schedule_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_schedule_white_36.png b/app/src/main/res/drawable-mdpi/round_schedule_white_36.png
new file mode 100644
index 0000000..e1d6da1
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_schedule_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_schedule_white_48.png b/app/src/main/res/drawable-mdpi/round_schedule_white_48.png
new file mode 100644
index 0000000..7469713
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_schedule_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_settings.png b/app/src/main/res/drawable-mdpi/round_settings.png
new file mode 100644
index 0000000..9a59c27
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_settings_white_18.png b/app/src/main/res/drawable-mdpi/round_settings_white_18.png
new file mode 100644
index 0000000..0b7c7da
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_settings_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_settings_white_36.png b/app/src/main/res/drawable-mdpi/round_settings_white_36.png
new file mode 100644
index 0000000..471eb41
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_settings_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_settings_white_48.png b/app/src/main/res/drawable-mdpi/round_settings_white_48.png
new file mode 100644
index 0000000..2dcf4cd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_settings_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_fields.png b/app/src/main/res/drawable-mdpi/round_text_fields.png
new file mode 100644
index 0000000..7323f89
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_fields.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_fields_white_24.png b/app/src/main/res/drawable-mdpi/round_text_fields_white_24.png
new file mode 100644
index 0000000..005cc77
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_fields_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_fields_white_36.png b/app/src/main/res/drawable-mdpi/round_text_fields_white_36.png
new file mode 100644
index 0000000..0b249d7
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_fields_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_fields_white_48.png b/app/src/main/res/drawable-mdpi/round_text_fields_white_48.png
new file mode 100644
index 0000000..e612760
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_fields_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_format.png b/app/src/main/res/drawable-mdpi/round_text_format.png
new file mode 100644
index 0000000..c92c8ab
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_format.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_format_white_18.png b/app/src/main/res/drawable-mdpi/round_text_format_white_18.png
new file mode 100644
index 0000000..3325171
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_format_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_format_white_24.png b/app/src/main/res/drawable-mdpi/round_text_format_white_24.png
new file mode 100644
index 0000000..aa2fd40
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_format_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_text_format_white_36.png b/app/src/main/res/drawable-mdpi/round_text_format_white_36.png
new file mode 100644
index 0000000..ba3a19e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_text_format_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_texture.png b/app/src/main/res/drawable-mdpi/round_texture.png
new file mode 100644
index 0000000..7d00aac
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_texture.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_texture_white_18.png b/app/src/main/res/drawable-mdpi/round_texture_white_18.png
new file mode 100644
index 0000000..525d9ac
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_texture_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_texture_white_24.png b/app/src/main/res/drawable-mdpi/round_texture_white_24.png
new file mode 100644
index 0000000..2b8658f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_texture_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_texture_white_36.png b/app/src/main/res/drawable-mdpi/round_texture_white_36.png
new file mode 100644
index 0000000..02ee290
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_texture_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_title.png b/app/src/main/res/drawable-mdpi/round_title.png
new file mode 100644
index 0000000..fb942f2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_title.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_title_white_18.png b/app/src/main/res/drawable-mdpi/round_title_white_18.png
new file mode 100644
index 0000000..51462f0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_title_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_title_white_36.png b/app/src/main/res/drawable-mdpi/round_title_white_36.png
new file mode 100644
index 0000000..3883687
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_title_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_title_white_48.png b/app/src/main/res/drawable-mdpi/round_title_white_48.png
new file mode 100644
index 0000000..16b85da
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_title_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_today.png b/app/src/main/res/drawable-mdpi/round_today.png
new file mode 100644
index 0000000..c9d08b5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_today.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_today_white_18.png b/app/src/main/res/drawable-mdpi/round_today_white_18.png
new file mode 100644
index 0000000..2aea46b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_today_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_today_white_24.png b/app/src/main/res/drawable-mdpi/round_today_white_24.png
new file mode 100644
index 0000000..085449c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_today_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_today_white_48.png b/app/src/main/res/drawable-mdpi/round_today_white_48.png
new file mode 100644
index 0000000..a071f7f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_today_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_translate.png b/app/src/main/res/drawable-mdpi/round_translate.png
new file mode 100644
index 0000000..e809c8f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_translate.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_translate_white_18.png b/app/src/main/res/drawable-mdpi/round_translate_white_18.png
new file mode 100644
index 0000000..aa5eb23
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_translate_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_translate_white_24.png b/app/src/main/res/drawable-mdpi/round_translate_white_24.png
new file mode 100644
index 0000000..6d0908c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_translate_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_translate_white_36.png b/app/src/main/res/drawable-mdpi/round_translate_white_36.png
new file mode 100644
index 0000000..1f83060
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_translate_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_vpn_key_black_18.png b/app/src/main/res/drawable-mdpi/round_vpn_key_black_18.png
new file mode 100644
index 0000000..6200fc3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_vpn_key_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_vpn_key_black_24.png b/app/src/main/res/drawable-mdpi/round_vpn_key_black_24.png
new file mode 100644
index 0000000..76eee75
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_vpn_key_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_vpn_key_black_36.png b/app/src/main/res/drawable-mdpi/round_vpn_key_black_36.png
new file mode 100644
index 0000000..d9582aa
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_vpn_key_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_vpn_key_black_48.png b/app/src/main/res/drawable-mdpi/round_vpn_key_black_48.png
new file mode 100644
index 0000000..02109b3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_vpn_key_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wallpaper_black_18.png b/app/src/main/res/drawable-mdpi/round_wallpaper_black_18.png
new file mode 100644
index 0000000..f3d386b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wallpaper_black_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wallpaper_black_24.png b/app/src/main/res/drawable-mdpi/round_wallpaper_black_24.png
new file mode 100644
index 0000000..da1f2d0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wallpaper_black_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wallpaper_black_36.png b/app/src/main/res/drawable-mdpi/round_wallpaper_black_36.png
new file mode 100644
index 0000000..8265bcd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wallpaper_black_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wallpaper_black_48.png b/app/src/main/res/drawable-mdpi/round_wallpaper_black_48.png
new file mode 100644
index 0000000..204700b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wallpaper_black_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_auto.png b/app/src/main/res/drawable-mdpi/round_wb_auto.png
new file mode 100644
index 0000000..dd1458c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_auto.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_auto_white_18.png b/app/src/main/res/drawable-mdpi/round_wb_auto_white_18.png
new file mode 100644
index 0000000..d2a710e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_auto_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_auto_white_24.png b/app/src/main/res/drawable-mdpi/round_wb_auto_white_24.png
new file mode 100644
index 0000000..13f29c3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_auto_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_auto_white_36.png b/app/src/main/res/drawable-mdpi/round_wb_auto_white_36.png
new file mode 100644
index 0000000..d76a59d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_auto_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_sunny.png b/app/src/main/res/drawable-mdpi/round_wb_sunny.png
new file mode 100644
index 0000000..5de28e3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_sunny.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_sunny_white_18.png b/app/src/main/res/drawable-mdpi/round_wb_sunny_white_18.png
new file mode 100644
index 0000000..8e7f0d3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_sunny_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_sunny_white_24.png b/app/src/main/res/drawable-mdpi/round_wb_sunny_white_24.png
new file mode 100644
index 0000000..ce04284
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_sunny_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_wb_sunny_white_36.png b/app/src/main/res/drawable-mdpi/round_wb_sunny_white_36.png
new file mode 100644
index 0000000..835b3fc
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_wb_sunny_white_36.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_widgets.png b/app/src/main/res/drawable-mdpi/round_widgets.png
new file mode 100644
index 0000000..b0ffc85
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_widgets.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_widgets_white_18.png b/app/src/main/res/drawable-mdpi/round_widgets_white_18.png
new file mode 100644
index 0000000..9d8a500
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_widgets_white_18.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_widgets_white_24.png b/app/src/main/res/drawable-mdpi/round_widgets_white_24.png
new file mode 100644
index 0000000..c89ab8f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_widgets_white_24.png differ
diff --git a/app/src/main/res/drawable-mdpi/round_widgets_white_48.png b/app/src/main/res/drawable-mdpi/round_widgets_white_48.png
new file mode 100644
index 0000000..4d87c67
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_widgets_white_48.png differ
diff --git a/app/src/main/res/drawable-nodpi/widget_preview.jpg b/app/src/main/res/drawable-nodpi/widget_preview.jpg
deleted file mode 100644
index 09b7b43..0000000
Binary files a/app/src/main/res/drawable-nodpi/widget_preview.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_alarm.png b/app/src/main/res/drawable-xhdpi/ic_action_alarm.png
deleted file mode 100644
index 43d354b..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_alarm.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_alert.png b/app/src/main/res/drawable-xhdpi/ic_action_alert.png
deleted file mode 100644
index 385a80f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_aw.png b/app/src/main/res/drawable-xhdpi/ic_action_aw.png
deleted file mode 100644
index 1dd0bff..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_aw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_calendar.png b/app/src/main/res/drawable-xhdpi/ic_action_calendar.png
deleted file mode 100644
index b305279..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_calendar.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_close.png b/app/src/main/res/drawable-xhdpi/ic_action_close.png
deleted file mode 100644
index ffbdaa6..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_code.png b/app/src/main/res/drawable-xhdpi/ic_action_code.png
deleted file mode 100644
index 1d9ba40..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_code.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_dev.png b/app/src/main/res/drawable-xhdpi/ic_action_dev.png
deleted file mode 100644
index 50ae8a8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_dev.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_face.png b/app/src/main/res/drawable-xhdpi/ic_action_face.png
deleted file mode 100644
index 50ae8a8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_face.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_feedback.png b/app/src/main/res/drawable-xhdpi/ic_action_feedback.png
deleted file mode 100644
index 7abb816..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_feedback.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_geolocation.png b/app/src/main/res/drawable-xhdpi/ic_action_geolocation.png
deleted file mode 100644
index 896f73d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_geolocation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_gift.png b/app/src/main/res/drawable-xhdpi/ic_action_gift.png
deleted file mode 100644
index e4ccab1..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_gift.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_gps.png b/app/src/main/res/drawable-xhdpi/ic_action_gps.png
deleted file mode 100644
index 896f73d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_gps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_hide_preview.png b/app/src/main/res/drawable-xhdpi/ic_action_hide_preview.png
deleted file mode 100644
index 940f65d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_hide_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_info.png b/app/src/main/res/drawable-xhdpi/ic_action_info.png
deleted file mode 100644
index 0b29c7b..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_info.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_library.png b/app/src/main/res/drawable-xhdpi/ic_action_library.png
deleted file mode 100644
index 50e6f94..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_library.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_location.png b/app/src/main/res/drawable-xhdpi/ic_action_location.png
deleted file mode 100644
index 334ee55..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_location.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_menu.png
deleted file mode 100644
index 276d9b8..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_next.png b/app/src/main/res/drawable-xhdpi/ic_action_next.png
deleted file mode 100644
index 8c83b27..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_next.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_paste.png b/app/src/main/res/drawable-xhdpi/ic_action_paste.png
deleted file mode 100644
index dd9a9ab..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_paste.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_rate.png b/app/src/main/res/drawable-xhdpi/ic_action_rate.png
deleted file mode 100644
index 7efeac3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_rate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
deleted file mode 100644
index ff7d85c..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh_0.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_0.png
deleted file mode 100644
index 622cbbb..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh_1.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_1.png
deleted file mode 100644
index 567957a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh_2.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_2.png
deleted file mode 100644
index 3e65f43..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh_3.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_3.png
deleted file mode 100644
index 2474cfb..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh_4.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_4.png
deleted file mode 100644
index c26691a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh_5.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh_5.png
deleted file mode 100644
index 1c028ba..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_reset.png b/app/src/main/res/drawable-xhdpi/ic_action_reset.png
deleted file mode 100644
index b14fa22..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_save.png b/app/src/main/res/drawable-xhdpi/ic_action_save.png
deleted file mode 100644
index 4609b2d..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index 7afaebc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_share.png b/app/src/main/res/drawable-xhdpi/ic_action_share.png
deleted file mode 100644
index b26e0d3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_show_preview.png b/app/src/main/res/drawable-xhdpi/ic_action_show_preview.png
deleted file mode 100644
index fe7dbeb..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_show_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_sms.png b/app/src/main/res/drawable-xhdpi/ic_action_sms.png
deleted file mode 100644
index 225ac11..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_sms.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_sync.png b/app/src/main/res/drawable-xhdpi/ic_action_sync.png
deleted file mode 100644
index 4a0a2e9..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_translate.png b/app/src/main/res/drawable-xhdpi/ic_action_translate.png
deleted file mode 100644
index 73a606b..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_splash_logo.png b/app/src/main/res/drawable-xhdpi/ic_splash_logo.png
new file mode 100644
index 0000000..a9b59d2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_splash_logo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_name.png b/app/src/main/res/drawable-xhdpi/ic_stat_name.png
deleted file mode 100644
index e8234ac..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_name.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add.png b/app/src/main/res/drawable-xhdpi/round_add.png
new file mode 100644
index 0000000..b014e27
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_18.png b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_18.png
new file mode 100644
index 0000000..4e02f1c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_24.png b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_24.png
new file mode 100644
index 0000000..0174e59
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_36.png b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_36.png
new file mode 100644
index 0000000..f6d7deb
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_48.png b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_48.png
new file mode 100644
index 0000000..4c91893
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_circle_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_to_home_screen.png b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen.png
new file mode 100644
index 0000000..1a44c1e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_18.png b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_18.png
new file mode 100644
index 0000000..ecb62d7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_24.png b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_24.png
new file mode 100644
index 0000000..1ee650c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_48.png b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_48.png
new file mode 100644
index 0000000..aa4c5b1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_to_home_screen_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_white_18.png b/app/src/main/res/drawable-xhdpi/round_add_white_18.png
new file mode 100644
index 0000000..6755cdc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_white_24.png b/app/src/main/res/drawable-xhdpi/round_add_white_24.png
new file mode 100644
index 0000000..5a5e5f0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_add_white_48.png b/app/src/main/res/drawable-xhdpi/round_add_white_48.png
new file mode 100644
index 0000000..5604bb1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_add_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_alarm.png b/app/src/main/res/drawable-xhdpi/round_alarm.png
new file mode 100644
index 0000000..ff59ea8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_alarm.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_alarm_black_18.png b/app/src/main/res/drawable-xhdpi/round_alarm_black_18.png
new file mode 100644
index 0000000..ea9701c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_alarm_black_24.png b/app/src/main/res/drawable-xhdpi/round_alarm_black_24.png
new file mode 100644
index 0000000..86be313
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_alarm_black_36.png b/app/src/main/res/drawable-xhdpi/round_alarm_black_36.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_alarm_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_arrow_back_black_18.png b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_18.png
new file mode 100644
index 0000000..c3de8c1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_arrow_back_black_24.png b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_24.png
new file mode 100644
index 0000000..91774ea
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_arrow_back_black_36.png b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_36.png
new file mode 100644
index 0000000..7553ab2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_arrow_back_black_48.png b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_48.png
new file mode 100644
index 0000000..ad6b82b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_arrow_back_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_left.png b/app/src/main/res/drawable-xhdpi/round_chevron_left.png
new file mode 100644
index 0000000..62d2b90
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_left.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_left_black_24.png b/app/src/main/res/drawable-xhdpi/round_chevron_left_black_24.png
new file mode 100644
index 0000000..4cd1120
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_left_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_left_black_36.png b/app/src/main/res/drawable-xhdpi/round_chevron_left_black_36.png
new file mode 100644
index 0000000..21f1766
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_left_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_left_black_48.png b/app/src/main/res/drawable-xhdpi/round_chevron_left_black_48.png
new file mode 100644
index 0000000..42ddf42
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_left_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_right.png b/app/src/main/res/drawable-xhdpi/round_chevron_right.png
new file mode 100644
index 0000000..8f608d3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_right.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_right_black_18.png b/app/src/main/res/drawable-xhdpi/round_chevron_right_black_18.png
new file mode 100644
index 0000000..a725964
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_right_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_right_black_24.png b/app/src/main/res/drawable-xhdpi/round_chevron_right_black_24.png
new file mode 100644
index 0000000..890681c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_right_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_chevron_right_black_48.png b/app/src/main/res/drawable-xhdpi/round_chevron_right_black_48.png
new file mode 100644
index 0000000..5f2593e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_chevron_right_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_18.png b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_18.png
new file mode 100644
index 0000000..2b2799a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_24.png b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_24.png
new file mode 100644
index 0000000..75c6181
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_36.png b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_36.png
new file mode 100644
index 0000000..52faf47
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_48.png b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_48.png
new file mode 100644
index 0000000..61f8024
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_cloud_queue_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_date_range.png b/app/src/main/res/drawable-xhdpi/round_date_range.png
new file mode 100644
index 0000000..02cfa41
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_date_range.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_date_range_black_18.png b/app/src/main/res/drawable-xhdpi/round_date_range_black_18.png
new file mode 100644
index 0000000..0bb14c2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_date_range_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_date_range_black_36.png b/app/src/main/res/drawable-xhdpi/round_date_range_black_36.png
new file mode 100644
index 0000000..e978d3d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_date_range_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_date_range_black_48.png b/app/src/main/res/drawable-xhdpi/round_date_range_black_48.png
new file mode 100644
index 0000000..de3c84f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_date_range_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_error_outline_white_18.png b/app/src/main/res/drawable-xhdpi/round_error_outline_white_18.png
new file mode 100644
index 0000000..325cb99
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_error_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_error_outline_white_24.png b/app/src/main/res/drawable-xhdpi/round_error_outline_white_24.png
new file mode 100644
index 0000000..d313cff
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_error_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_error_outline_white_36.png b/app/src/main/res/drawable-xhdpi/round_error_outline_white_36.png
new file mode 100644
index 0000000..906b7f7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_error_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_error_outline_white_48.png b/app/src/main/res/drawable-xhdpi/round_error_outline_white_48.png
new file mode 100644
index 0000000..35d90a6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_error_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_busy.png b/app/src/main/res/drawable-xhdpi/round_event_busy.png
new file mode 100644
index 0000000..27e9d9b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_busy.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_busy_black_18.png b/app/src/main/res/drawable-xhdpi/round_event_busy_black_18.png
new file mode 100644
index 0000000..b2bcb2a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_busy_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_busy_black_36.png b/app/src/main/res/drawable-xhdpi/round_event_busy_black_36.png
new file mode 100644
index 0000000..1e38651
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_busy_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_busy_black_48.png b/app/src/main/res/drawable-xhdpi/round_event_busy_black_48.png
new file mode 100644
index 0000000..eaa5080
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_busy_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_note.png b/app/src/main/res/drawable-xhdpi/round_event_note.png
new file mode 100644
index 0000000..ea04285
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_note.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_note_black_18.png b/app/src/main/res/drawable-xhdpi/round_event_note_black_18.png
new file mode 100644
index 0000000..4363f79
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_note_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_note_black_24.png b/app/src/main/res/drawable-xhdpi/round_event_note_black_24.png
new file mode 100644
index 0000000..039ef3d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_note_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_event_note_black_36.png b/app/src/main/res/drawable-xhdpi/round_event_note_black_36.png
new file mode 100644
index 0000000..f8f0d4c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_event_note_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list.png b/app/src/main/res/drawable-xhdpi/round_filter_list.png
new file mode 100644
index 0000000..38c246b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list_white_18.png b/app/src/main/res/drawable-xhdpi/round_filter_list_white_18.png
new file mode 100644
index 0000000..ab7719c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list_white_24.png b/app/src/main/res/drawable-xhdpi/round_filter_list_white_24.png
new file mode 100644
index 0000000..5e83811
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list_white_36.png b/app/src/main/res/drawable-xhdpi/round_filter_list_white_36.png
new file mode 100644
index 0000000..1690f23
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_font_download.png b/app/src/main/res/drawable-xhdpi/round_font_download.png
new file mode 100644
index 0000000..6614068
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_font_download.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_font_download_white_18.png b/app/src/main/res/drawable-xhdpi/round_font_download_white_18.png
new file mode 100644
index 0000000..0ee79f1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_font_download_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_font_download_white_24.png b/app/src/main/res/drawable-xhdpi/round_font_download_white_24.png
new file mode 100644
index 0000000..5a3e03c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_font_download_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_font_download_white_36.png b/app/src/main/res/drawable-xhdpi/round_font_download_white_36.png
new file mode 100644
index 0000000..63524ee
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_font_download_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_launch.png b/app/src/main/res/drawable-xhdpi/round_launch.png
new file mode 100644
index 0000000..3a9026b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_launch.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_launch_white_18.png b/app/src/main/res/drawable-xhdpi/round_launch_white_18.png
new file mode 100644
index 0000000..fee49f3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_launch_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_launch_white_24.png b/app/src/main/res/drawable-xhdpi/round_launch_white_24.png
new file mode 100644
index 0000000..c1b67da
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_launch_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_launch_white_48.png b/app/src/main/res/drawable-xhdpi/round_launch_white_48.png
new file mode 100644
index 0000000..d1ed708
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_launch_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_local_cafe_white_18.png b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_18.png
new file mode 100644
index 0000000..377ce25
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_local_cafe_white_24.png b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_24.png
new file mode 100644
index 0000000..6503ff4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_local_cafe_white_36.png b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_36.png
new file mode 100644
index 0000000..545e85c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_local_cafe_white_48.png b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_48.png
new file mode 100644
index 0000000..ebc6ab4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_local_cafe_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_low_priority.png b/app/src/main/res/drawable-xhdpi/round_low_priority.png
new file mode 100644
index 0000000..62d8872
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_low_priority.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_low_priority_white_18.png b/app/src/main/res/drawable-xhdpi/round_low_priority_white_18.png
new file mode 100644
index 0000000..b382370
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_low_priority_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_low_priority_white_36.png b/app/src/main/res/drawable-xhdpi/round_low_priority_white_36.png
new file mode 100644
index 0000000..4457aee
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_low_priority_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_low_priority_white_48.png b/app/src/main/res/drawable-xhdpi/round_low_priority_white_48.png
new file mode 100644
index 0000000..a2ecef8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_low_priority_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_more_vert.png b/app/src/main/res/drawable-xhdpi/round_more_vert.png
new file mode 100644
index 0000000..df7b446
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_more_vert.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_more_vert_white_18.png b/app/src/main/res/drawable-xhdpi/round_more_vert_white_18.png
new file mode 100644
index 0000000..117bd08
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_more_vert_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_more_vert_white_24.png b/app/src/main/res/drawable-xhdpi/round_more_vert_white_24.png
new file mode 100644
index 0000000..c686b2c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_more_vert_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_more_vert_white_36.png b/app/src/main/res/drawable-xhdpi/round_more_vert_white_36.png
new file mode 100644
index 0000000..70c6b7a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_more_vert_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_palette.png b/app/src/main/res/drawable-xhdpi/round_palette.png
new file mode 100644
index 0000000..4b51cd6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_palette.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_palette_white_24.png b/app/src/main/res/drawable-xhdpi/round_palette_white_24.png
new file mode 100644
index 0000000..4a8bd85
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_palette_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_palette_white_36.png b/app/src/main/res/drawable-xhdpi/round_palette_white_36.png
new file mode 100644
index 0000000..3c5495b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_palette_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_palette_white_48.png b/app/src/main/res/drawable-xhdpi/round_palette_white_48.png
new file mode 100644
index 0000000..b979d4e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_palette_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_place.png b/app/src/main/res/drawable-xhdpi/round_place.png
new file mode 100644
index 0000000..908e357
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_place.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_place_white_18.png b/app/src/main/res/drawable-xhdpi/round_place_white_18.png
new file mode 100644
index 0000000..2952d54
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_place_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_place_white_36.png b/app/src/main/res/drawable-xhdpi/round_place_white_36.png
new file mode 100644
index 0000000..56ea3ed
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_place_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_place_white_48.png b/app/src/main/res/drawable-xhdpi/round_place_white_48.png
new file mode 100644
index 0000000..ed7dbce
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_place_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_redo.png b/app/src/main/res/drawable-xhdpi/round_redo.png
new file mode 100644
index 0000000..a31c883
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_redo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_redo_white_18.png b/app/src/main/res/drawable-xhdpi/round_redo_white_18.png
new file mode 100644
index 0000000..fbba521
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_redo_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_redo_white_36.png b/app/src/main/res/drawable-xhdpi/round_redo_white_36.png
new file mode 100644
index 0000000..47a9433
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_redo_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_redo_white_48.png b/app/src/main/res/drawable-xhdpi/round_redo_white_48.png
new file mode 100644
index 0000000..3808eb1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_redo_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_refresh_black_18.png b/app/src/main/res/drawable-xhdpi/round_refresh_black_18.png
new file mode 100644
index 0000000..3dad121
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_refresh_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_refresh_black_24.png b/app/src/main/res/drawable-xhdpi/round_refresh_black_24.png
new file mode 100644
index 0000000..21ff6e5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_refresh_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_refresh_black_36.png b/app/src/main/res/drawable-xhdpi/round_refresh_black_36.png
new file mode 100644
index 0000000..f000d3a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_refresh_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_refresh_black_48.png b/app/src/main/res/drawable-xhdpi/round_refresh_black_48.png
new file mode 100644
index 0000000..fa2319e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_refresh_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_schedule.png b/app/src/main/res/drawable-xhdpi/round_schedule.png
new file mode 100644
index 0000000..196a738
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_schedule.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_schedule_white_18.png b/app/src/main/res/drawable-xhdpi/round_schedule_white_18.png
new file mode 100644
index 0000000..e1d6da1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_schedule_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_schedule_white_24.png b/app/src/main/res/drawable-xhdpi/round_schedule_white_24.png
new file mode 100644
index 0000000..7469713
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_schedule_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_schedule_white_36.png b/app/src/main/res/drawable-xhdpi/round_schedule_white_36.png
new file mode 100644
index 0000000..25d30a8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_schedule_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_schedule_white_48.png b/app/src/main/res/drawable-xhdpi/round_schedule_white_48.png
new file mode 100644
index 0000000..196a738
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_schedule_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_settings.png b/app/src/main/res/drawable-xhdpi/round_settings.png
new file mode 100644
index 0000000..2dcf4cd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_settings_white_18.png b/app/src/main/res/drawable-xhdpi/round_settings_white_18.png
new file mode 100644
index 0000000..471eb41
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_settings_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_settings_white_36.png b/app/src/main/res/drawable-xhdpi/round_settings_white_36.png
new file mode 100644
index 0000000..5b25ac4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_settings_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_settings_white_48.png b/app/src/main/res/drawable-xhdpi/round_settings_white_48.png
new file mode 100644
index 0000000..d3fb358
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_settings_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_fields.png b/app/src/main/res/drawable-xhdpi/round_text_fields.png
new file mode 100644
index 0000000..0b249d7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_fields.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_fields_white_24.png b/app/src/main/res/drawable-xhdpi/round_text_fields_white_24.png
new file mode 100644
index 0000000..e612760
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_fields_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_fields_white_36.png b/app/src/main/res/drawable-xhdpi/round_text_fields_white_36.png
new file mode 100644
index 0000000..7947a39
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_fields_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_fields_white_48.png b/app/src/main/res/drawable-xhdpi/round_text_fields_white_48.png
new file mode 100644
index 0000000..cab1351
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_fields_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_format.png b/app/src/main/res/drawable-xhdpi/round_text_format.png
new file mode 100644
index 0000000..5188d9c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_format.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_format_white_18.png b/app/src/main/res/drawable-xhdpi/round_text_format_white_18.png
new file mode 100644
index 0000000..ba3a19e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_format_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_format_white_24.png b/app/src/main/res/drawable-xhdpi/round_text_format_white_24.png
new file mode 100644
index 0000000..c92c8ab
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_format_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_text_format_white_36.png b/app/src/main/res/drawable-xhdpi/round_text_format_white_36.png
new file mode 100644
index 0000000..1d4ccbe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_text_format_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_texture.png b/app/src/main/res/drawable-xhdpi/round_texture.png
new file mode 100644
index 0000000..7b818a4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_texture.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_texture_white_18.png b/app/src/main/res/drawable-xhdpi/round_texture_white_18.png
new file mode 100644
index 0000000..02ee290
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_texture_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_texture_white_24.png b/app/src/main/res/drawable-xhdpi/round_texture_white_24.png
new file mode 100644
index 0000000..7d00aac
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_texture_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_texture_white_36.png b/app/src/main/res/drawable-xhdpi/round_texture_white_36.png
new file mode 100644
index 0000000..7241210
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_texture_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_title.png b/app/src/main/res/drawable-xhdpi/round_title.png
new file mode 100644
index 0000000..16b85da
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_title.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_title_white_18.png b/app/src/main/res/drawable-xhdpi/round_title_white_18.png
new file mode 100644
index 0000000..3883687
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_title_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_title_white_36.png b/app/src/main/res/drawable-xhdpi/round_title_white_36.png
new file mode 100644
index 0000000..b64e752
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_title_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_title_white_48.png b/app/src/main/res/drawable-xhdpi/round_title_white_48.png
new file mode 100644
index 0000000..e24589a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_title_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_today.png b/app/src/main/res/drawable-xhdpi/round_today.png
new file mode 100644
index 0000000..06fe89c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_today.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_today_white_18.png b/app/src/main/res/drawable-xhdpi/round_today_white_18.png
new file mode 100644
index 0000000..c9d08b5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_today_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_today_white_24.png b/app/src/main/res/drawable-xhdpi/round_today_white_24.png
new file mode 100644
index 0000000..a071f7f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_today_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_today_white_48.png b/app/src/main/res/drawable-xhdpi/round_today_white_48.png
new file mode 100644
index 0000000..1fe0374
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_today_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_translate.png b/app/src/main/res/drawable-xhdpi/round_translate.png
new file mode 100644
index 0000000..635499f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_translate.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_translate_white_18.png b/app/src/main/res/drawable-xhdpi/round_translate_white_18.png
new file mode 100644
index 0000000..1f83060
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_translate_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_translate_white_24.png b/app/src/main/res/drawable-xhdpi/round_translate_white_24.png
new file mode 100644
index 0000000..e809c8f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_translate_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_translate_white_36.png b/app/src/main/res/drawable-xhdpi/round_translate_white_36.png
new file mode 100644
index 0000000..146c995
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_translate_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_vpn_key_black_18.png b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_18.png
new file mode 100644
index 0000000..d9582aa
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_vpn_key_black_24.png b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_24.png
new file mode 100644
index 0000000..02109b3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_vpn_key_black_36.png b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_36.png
new file mode 100644
index 0000000..4045e56
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_vpn_key_black_48.png b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_48.png
new file mode 100644
index 0000000..3809792
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_vpn_key_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wallpaper_black_18.png b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_18.png
new file mode 100644
index 0000000..8265bcd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wallpaper_black_24.png b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_24.png
new file mode 100644
index 0000000..204700b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wallpaper_black_36.png b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_36.png
new file mode 100644
index 0000000..441dde7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wallpaper_black_48.png b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_48.png
new file mode 100644
index 0000000..8b05111
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wallpaper_black_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_auto.png b/app/src/main/res/drawable-xhdpi/round_wb_auto.png
new file mode 100644
index 0000000..93ffbb3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_auto.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_auto_white_18.png b/app/src/main/res/drawable-xhdpi/round_wb_auto_white_18.png
new file mode 100644
index 0000000..d76a59d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_auto_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_auto_white_24.png b/app/src/main/res/drawable-xhdpi/round_wb_auto_white_24.png
new file mode 100644
index 0000000..dd1458c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_auto_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_auto_white_36.png b/app/src/main/res/drawable-xhdpi/round_wb_auto_white_36.png
new file mode 100644
index 0000000..152acbb
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_auto_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_sunny.png b/app/src/main/res/drawable-xhdpi/round_wb_sunny.png
new file mode 100644
index 0000000..ff9c24e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_sunny.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_18.png b/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_18.png
new file mode 100644
index 0000000..835b3fc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_24.png b/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_24.png
new file mode 100644
index 0000000..5de28e3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_36.png b/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_36.png
new file mode 100644
index 0000000..cf449e2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_wb_sunny_white_36.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_widgets.png b/app/src/main/res/drawable-xhdpi/round_widgets.png
new file mode 100644
index 0000000..89b3c89
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_widgets.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_widgets_white_18.png b/app/src/main/res/drawable-xhdpi/round_widgets_white_18.png
new file mode 100644
index 0000000..b0ffc85
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_widgets_white_18.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_widgets_white_24.png b/app/src/main/res/drawable-xhdpi/round_widgets_white_24.png
new file mode 100644
index 0000000..4d87c67
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_widgets_white_24.png differ
diff --git a/app/src/main/res/drawable-xhdpi/round_widgets_white_48.png b/app/src/main/res/drawable-xhdpi/round_widgets_white_48.png
new file mode 100644
index 0000000..de6d639
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_widgets_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_alarm.png b/app/src/main/res/drawable-xxhdpi/ic_action_alarm.png
deleted file mode 100644
index 53e664c..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_alarm.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_alert.png b/app/src/main/res/drawable-xxhdpi/ic_action_alert.png
deleted file mode 100644
index 6d404c1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_alert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_aw.png b/app/src/main/res/drawable-xxhdpi/ic_action_aw.png
deleted file mode 100644
index 3f179c8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_aw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_calendar.png b/app/src/main/res/drawable-xxhdpi/ic_action_calendar.png
deleted file mode 100644
index e48ce06..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_calendar.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_close.png b/app/src/main/res/drawable-xxhdpi/ic_action_close.png
deleted file mode 100644
index d35469d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_code.png b/app/src/main/res/drawable-xxhdpi/ic_action_code.png
deleted file mode 100644
index fe1c16a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_code.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_dev.png b/app/src/main/res/drawable-xxhdpi/ic_action_dev.png
deleted file mode 100644
index f4a3989..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_dev.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_face.png b/app/src/main/res/drawable-xxhdpi/ic_action_face.png
deleted file mode 100644
index f4a3989..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_face.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_feedback.png b/app/src/main/res/drawable-xxhdpi/ic_action_feedback.png
deleted file mode 100644
index 0772d5b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_feedback.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_geolocation.png b/app/src/main/res/drawable-xxhdpi/ic_action_geolocation.png
deleted file mode 100644
index 2fb3918..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_geolocation.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_gift.png b/app/src/main/res/drawable-xxhdpi/ic_action_gift.png
deleted file mode 100644
index ca9bac6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_gift.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_gps.png b/app/src/main/res/drawable-xxhdpi/ic_action_gps.png
deleted file mode 100644
index 2fb3918..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_gps.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_hide_preview.png b/app/src/main/res/drawable-xxhdpi/ic_action_hide_preview.png
deleted file mode 100644
index 1073dab..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_hide_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_info.png b/app/src/main/res/drawable-xxhdpi/ic_action_info.png
deleted file mode 100644
index f1020b1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_info.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_library.png b/app/src/main/res/drawable-xxhdpi/ic_action_library.png
deleted file mode 100644
index 6fdd7f1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_library.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_location.png b/app/src/main/res/drawable-xxhdpi/ic_action_location.png
deleted file mode 100644
index b2678e5..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_location.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_menu.png
deleted file mode 100644
index ec25f34..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_next.png b/app/src/main/res/drawable-xxhdpi/ic_action_next.png
deleted file mode 100644
index 67ed754..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_next.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_paste.png b/app/src/main/res/drawable-xxhdpi/ic_action_paste.png
deleted file mode 100644
index 9703b48..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_paste.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_rate.png b/app/src/main/res/drawable-xxhdpi/ic_action_rate.png
deleted file mode 100644
index 600c811..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_rate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
deleted file mode 100644
index 614efcc..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_0.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh_0.png
deleted file mode 100644
index 2a3f745..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_0.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_1.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh_1.png
deleted file mode 100644
index 51b6a23..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_2.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh_2.png
deleted file mode 100644
index a8d0b32..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_3.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh_3.png
deleted file mode 100644
index 996b045..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_4.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh_4.png
deleted file mode 100644
index 07688b9..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_5.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh_5.png
deleted file mode 100644
index 15ad096..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh_5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_reset.png b/app/src/main/res/drawable-xxhdpi/ic_action_reset.png
deleted file mode 100644
index 0e22581..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_reset.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_save.png b/app/src/main/res/drawable-xxhdpi/ic_action_save.png
deleted file mode 100644
index 0696468..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png
deleted file mode 100644
index 4b473b7..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_share.png
deleted file mode 100644
index 8d25ace..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_show_preview.png b/app/src/main/res/drawable-xxhdpi/ic_action_show_preview.png
deleted file mode 100644
index 2563a5b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_show_preview.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_sms.png b/app/src/main/res/drawable-xxhdpi/ic_action_sms.png
deleted file mode 100644
index 5863c6d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_sms.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_sync.png b/app/src/main/res/drawable-xxhdpi/ic_action_sync.png
deleted file mode 100644
index c395f5f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_translate.png b/app/src/main/res/drawable-xxhdpi/ic_action_translate.png
deleted file mode 100644
index 6238432..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_translate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_splash_logo.png b/app/src/main/res/drawable-xxhdpi/ic_splash_logo.png
new file mode 100644
index 0000000..850f614
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_splash_logo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_name.png b/app/src/main/res/drawable-xxhdpi/ic_stat_name.png
deleted file mode 100644
index 4e553d3..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_name.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add.png b/app/src/main/res/drawable-xxhdpi/round_add.png
new file mode 100644
index 0000000..4e86c2c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_18.png b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_18.png
new file mode 100644
index 0000000..b297c39
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_24.png b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_24.png
new file mode 100644
index 0000000..f6d7deb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_36.png b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_36.png
new file mode 100644
index 0000000..4316f09
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_48.png b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_48.png
new file mode 100644
index 0000000..41aa666
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_circle_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen.png b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen.png
new file mode 100644
index 0000000..f05e345
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_18.png b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_18.png
new file mode 100644
index 0000000..a7de700
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_24.png b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_24.png
new file mode 100644
index 0000000..1a44c1e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_48.png b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_48.png
new file mode 100644
index 0000000..aad9387
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_to_home_screen_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_white_18.png b/app/src/main/res/drawable-xxhdpi/round_add_white_18.png
new file mode 100644
index 0000000..0e07f0b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_white_24.png b/app/src/main/res/drawable-xxhdpi/round_add_white_24.png
new file mode 100644
index 0000000..b014e27
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_add_white_48.png b/app/src/main/res/drawable-xxhdpi/round_add_white_48.png
new file mode 100644
index 0000000..3c92e5e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_add_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_alarm.png b/app/src/main/res/drawable-xxhdpi/round_alarm.png
new file mode 100644
index 0000000..c48ee8e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_alarm.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_alarm_black_18.png b/app/src/main/res/drawable-xxhdpi/round_alarm_black_18.png
new file mode 100644
index 0000000..43c6103
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_alarm_black_24.png b/app/src/main/res/drawable-xxhdpi/round_alarm_black_24.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_alarm_black_36.png b/app/src/main/res/drawable-xxhdpi/round_alarm_black_36.png
new file mode 100644
index 0000000..04bd252
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_alarm_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_18.png b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_18.png
new file mode 100644
index 0000000..684e245
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_24.png b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_24.png
new file mode 100644
index 0000000..7553ab2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_36.png b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_36.png
new file mode 100644
index 0000000..7880c05
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_48.png b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_48.png
new file mode 100644
index 0000000..7ef1377
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_arrow_back_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_left.png b/app/src/main/res/drawable-xxhdpi/round_chevron_left.png
new file mode 100644
index 0000000..dc5653e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_left.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_24.png b/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_24.png
new file mode 100644
index 0000000..21f1766
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_36.png b/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_36.png
new file mode 100644
index 0000000..929f8d3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_48.png b/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_48.png
new file mode 100644
index 0000000..71c3054
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_left_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_right.png b/app/src/main/res/drawable-xxhdpi/round_chevron_right.png
new file mode 100644
index 0000000..1e1dc3f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_right.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_18.png b/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_18.png
new file mode 100644
index 0000000..6fb94b6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_24.png b/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_24.png
new file mode 100644
index 0000000..8f608d3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_48.png b/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_48.png
new file mode 100644
index 0000000..f732329
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_chevron_right_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_18.png b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_18.png
new file mode 100644
index 0000000..b4c341a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_24.png b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_24.png
new file mode 100644
index 0000000..52faf47
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_36.png b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_36.png
new file mode 100644
index 0000000..5fde789
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_48.png b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_48.png
new file mode 100644
index 0000000..3ebc2c0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_cloud_queue_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_date_range.png b/app/src/main/res/drawable-xxhdpi/round_date_range.png
new file mode 100644
index 0000000..e978d3d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_date_range.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_date_range_black_18.png b/app/src/main/res/drawable-xxhdpi/round_date_range_black_18.png
new file mode 100644
index 0000000..b151c9b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_date_range_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_date_range_black_36.png b/app/src/main/res/drawable-xxhdpi/round_date_range_black_36.png
new file mode 100644
index 0000000..38d0339
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_date_range_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_date_range_black_48.png b/app/src/main/res/drawable-xxhdpi/round_date_range_black_48.png
new file mode 100644
index 0000000..e2bca74
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_date_range_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_error_outline_white_18.png b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_18.png
new file mode 100644
index 0000000..e24bcfe
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_error_outline_white_24.png b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_24.png
new file mode 100644
index 0000000..906b7f7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_error_outline_white_36.png b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_36.png
new file mode 100644
index 0000000..3570686
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_error_outline_white_48.png b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_48.png
new file mode 100644
index 0000000..142bdbd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_error_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_busy.png b/app/src/main/res/drawable-xxhdpi/round_event_busy.png
new file mode 100644
index 0000000..1e38651
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_busy.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_busy_black_18.png b/app/src/main/res/drawable-xxhdpi/round_event_busy_black_18.png
new file mode 100644
index 0000000..83484ba
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_busy_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_busy_black_36.png b/app/src/main/res/drawable-xxhdpi/round_event_busy_black_36.png
new file mode 100644
index 0000000..97e61ab
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_busy_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_busy_black_48.png b/app/src/main/res/drawable-xxhdpi/round_event_busy_black_48.png
new file mode 100644
index 0000000..256cc31
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_busy_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_note.png b/app/src/main/res/drawable-xxhdpi/round_event_note.png
new file mode 100644
index 0000000..28e8a8b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_note.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_note_black_18.png b/app/src/main/res/drawable-xxhdpi/round_event_note_black_18.png
new file mode 100644
index 0000000..9138806
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_note_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_note_black_24.png b/app/src/main/res/drawable-xxhdpi/round_event_note_black_24.png
new file mode 100644
index 0000000..f8f0d4c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_note_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_event_note_black_36.png b/app/src/main/res/drawable-xxhdpi/round_event_note_black_36.png
new file mode 100644
index 0000000..096e337
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_event_note_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list.png b/app/src/main/res/drawable-xxhdpi/round_filter_list.png
new file mode 100644
index 0000000..7b33cc0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list_white_18.png b/app/src/main/res/drawable-xxhdpi/round_filter_list_white_18.png
new file mode 100644
index 0000000..5786f08
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list_white_24.png b/app/src/main/res/drawable-xxhdpi/round_filter_list_white_24.png
new file mode 100644
index 0000000..1690f23
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list_white_36.png b/app/src/main/res/drawable-xxhdpi/round_filter_list_white_36.png
new file mode 100644
index 0000000..b2e6701
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_font_download.png b/app/src/main/res/drawable-xxhdpi/round_font_download.png
new file mode 100644
index 0000000..d88939d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_font_download.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_font_download_white_18.png b/app/src/main/res/drawable-xxhdpi/round_font_download_white_18.png
new file mode 100644
index 0000000..13bd14c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_font_download_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_font_download_white_24.png b/app/src/main/res/drawable-xxhdpi/round_font_download_white_24.png
new file mode 100644
index 0000000..63524ee
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_font_download_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_font_download_white_36.png b/app/src/main/res/drawable-xxhdpi/round_font_download_white_36.png
new file mode 100644
index 0000000..9030c71
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_font_download_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_launch.png b/app/src/main/res/drawable-xxhdpi/round_launch.png
new file mode 100644
index 0000000..f1c2f28
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_launch.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_launch_white_18.png b/app/src/main/res/drawable-xxhdpi/round_launch_white_18.png
new file mode 100644
index 0000000..629942f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_launch_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_launch_white_24.png b/app/src/main/res/drawable-xxhdpi/round_launch_white_24.png
new file mode 100644
index 0000000..3a9026b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_launch_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_launch_white_48.png b/app/src/main/res/drawable-xxhdpi/round_launch_white_48.png
new file mode 100644
index 0000000..58f9612
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_launch_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_18.png b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_18.png
new file mode 100644
index 0000000..6ee1b30
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_24.png b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_24.png
new file mode 100644
index 0000000..545e85c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_36.png b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_36.png
new file mode 100644
index 0000000..8ff3625
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_48.png b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_48.png
new file mode 100644
index 0000000..e2c75db
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_local_cafe_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_low_priority.png b/app/src/main/res/drawable-xxhdpi/round_low_priority.png
new file mode 100644
index 0000000..4457aee
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_low_priority.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_low_priority_white_18.png b/app/src/main/res/drawable-xxhdpi/round_low_priority_white_18.png
new file mode 100644
index 0000000..c5d3cf0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_low_priority_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_low_priority_white_36.png b/app/src/main/res/drawable-xxhdpi/round_low_priority_white_36.png
new file mode 100644
index 0000000..40e5b4b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_low_priority_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_low_priority_white_48.png b/app/src/main/res/drawable-xxhdpi/round_low_priority_white_48.png
new file mode 100644
index 0000000..6c492d2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_low_priority_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_more_vert.png b/app/src/main/res/drawable-xxhdpi/round_more_vert.png
new file mode 100644
index 0000000..0e20210
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_more_vert.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_more_vert_white_18.png b/app/src/main/res/drawable-xxhdpi/round_more_vert_white_18.png
new file mode 100644
index 0000000..efe49c9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_more_vert_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_more_vert_white_24.png b/app/src/main/res/drawable-xxhdpi/round_more_vert_white_24.png
new file mode 100644
index 0000000..70c6b7a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_more_vert_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_more_vert_white_36.png b/app/src/main/res/drawable-xxhdpi/round_more_vert_white_36.png
new file mode 100644
index 0000000..cc9b7a7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_more_vert_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_palette.png b/app/src/main/res/drawable-xxhdpi/round_palette.png
new file mode 100644
index 0000000..82b5d2d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_palette.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_palette_white_24.png b/app/src/main/res/drawable-xxhdpi/round_palette_white_24.png
new file mode 100644
index 0000000..3c5495b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_palette_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_palette_white_36.png b/app/src/main/res/drawable-xxhdpi/round_palette_white_36.png
new file mode 100644
index 0000000..21587cb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_palette_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_palette_white_48.png b/app/src/main/res/drawable-xxhdpi/round_palette_white_48.png
new file mode 100644
index 0000000..7c92b46
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_palette_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_place.png b/app/src/main/res/drawable-xxhdpi/round_place.png
new file mode 100644
index 0000000..56ea3ed
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_place.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_place_white_18.png b/app/src/main/res/drawable-xxhdpi/round_place_white_18.png
new file mode 100644
index 0000000..253b86e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_place_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_place_white_36.png b/app/src/main/res/drawable-xxhdpi/round_place_white_36.png
new file mode 100644
index 0000000..8a013d7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_place_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_place_white_48.png b/app/src/main/res/drawable-xxhdpi/round_place_white_48.png
new file mode 100644
index 0000000..b426019
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_place_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_redo.png b/app/src/main/res/drawable-xxhdpi/round_redo.png
new file mode 100644
index 0000000..47a9433
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_redo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_redo_white_18.png b/app/src/main/res/drawable-xxhdpi/round_redo_white_18.png
new file mode 100644
index 0000000..a52701d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_redo_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_redo_white_36.png b/app/src/main/res/drawable-xxhdpi/round_redo_white_36.png
new file mode 100644
index 0000000..fce8027
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_redo_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_redo_white_48.png b/app/src/main/res/drawable-xxhdpi/round_redo_white_48.png
new file mode 100644
index 0000000..62face3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_redo_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_refresh_black_18.png b/app/src/main/res/drawable-xxhdpi/round_refresh_black_18.png
new file mode 100644
index 0000000..939d83c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_refresh_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_refresh_black_24.png b/app/src/main/res/drawable-xxhdpi/round_refresh_black_24.png
new file mode 100644
index 0000000..f000d3a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_refresh_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_refresh_black_36.png b/app/src/main/res/drawable-xxhdpi/round_refresh_black_36.png
new file mode 100644
index 0000000..09938a7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_refresh_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_refresh_black_48.png b/app/src/main/res/drawable-xxhdpi/round_refresh_black_48.png
new file mode 100644
index 0000000..4f21ed2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_refresh_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_schedule.png b/app/src/main/res/drawable-xxhdpi/round_schedule.png
new file mode 100644
index 0000000..6441ec1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_schedule.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_schedule_white_18.png b/app/src/main/res/drawable-xxhdpi/round_schedule_white_18.png
new file mode 100644
index 0000000..4e9a74e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_schedule_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_schedule_white_24.png b/app/src/main/res/drawable-xxhdpi/round_schedule_white_24.png
new file mode 100644
index 0000000..25d30a8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_schedule_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_schedule_white_36.png b/app/src/main/res/drawable-xxhdpi/round_schedule_white_36.png
new file mode 100644
index 0000000..158810b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_schedule_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_schedule_white_48.png b/app/src/main/res/drawable-xxhdpi/round_schedule_white_48.png
new file mode 100644
index 0000000..6441ec1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_schedule_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_settings.png b/app/src/main/res/drawable-xxhdpi/round_settings.png
new file mode 100644
index 0000000..5b25ac4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_settings.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_settings_white_18.png b/app/src/main/res/drawable-xxhdpi/round_settings_white_18.png
new file mode 100644
index 0000000..483ccb8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_settings_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_settings_white_36.png b/app/src/main/res/drawable-xxhdpi/round_settings_white_36.png
new file mode 100644
index 0000000..47018ac
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_settings_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_settings_white_48.png b/app/src/main/res/drawable-xxhdpi/round_settings_white_48.png
new file mode 100644
index 0000000..270e12d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_settings_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_fields.png b/app/src/main/res/drawable-xxhdpi/round_text_fields.png
new file mode 100644
index 0000000..e372ab3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_fields.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_fields_white_24.png b/app/src/main/res/drawable-xxhdpi/round_text_fields_white_24.png
new file mode 100644
index 0000000..7947a39
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_fields_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_fields_white_36.png b/app/src/main/res/drawable-xxhdpi/round_text_fields_white_36.png
new file mode 100644
index 0000000..5e2fde2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_fields_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_fields_white_48.png b/app/src/main/res/drawable-xxhdpi/round_text_fields_white_48.png
new file mode 100644
index 0000000..e643d7f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_fields_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_format.png b/app/src/main/res/drawable-xxhdpi/round_text_format.png
new file mode 100644
index 0000000..f9da7d3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_format.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_format_white_18.png b/app/src/main/res/drawable-xxhdpi/round_text_format_white_18.png
new file mode 100644
index 0000000..aeb0237
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_format_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_format_white_24.png b/app/src/main/res/drawable-xxhdpi/round_text_format_white_24.png
new file mode 100644
index 0000000..1d4ccbe
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_format_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_text_format_white_36.png b/app/src/main/res/drawable-xxhdpi/round_text_format_white_36.png
new file mode 100644
index 0000000..cfa9f84
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_text_format_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_texture.png b/app/src/main/res/drawable-xxhdpi/round_texture.png
new file mode 100644
index 0000000..f644c56
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_texture.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_texture_white_18.png b/app/src/main/res/drawable-xxhdpi/round_texture_white_18.png
new file mode 100644
index 0000000..f79fc6d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_texture_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_texture_white_24.png b/app/src/main/res/drawable-xxhdpi/round_texture_white_24.png
new file mode 100644
index 0000000..7241210
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_texture_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_texture_white_36.png b/app/src/main/res/drawable-xxhdpi/round_texture_white_36.png
new file mode 100644
index 0000000..307630b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_texture_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_title.png b/app/src/main/res/drawable-xxhdpi/round_title.png
new file mode 100644
index 0000000..b64e752
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_title.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_title_white_18.png b/app/src/main/res/drawable-xxhdpi/round_title_white_18.png
new file mode 100644
index 0000000..565c8b3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_title_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_title_white_36.png b/app/src/main/res/drawable-xxhdpi/round_title_white_36.png
new file mode 100644
index 0000000..f79e126
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_title_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_title_white_48.png b/app/src/main/res/drawable-xxhdpi/round_title_white_48.png
new file mode 100644
index 0000000..752bbcb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_title_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_today.png b/app/src/main/res/drawable-xxhdpi/round_today.png
new file mode 100644
index 0000000..bd83821
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_today.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_today_white_18.png b/app/src/main/res/drawable-xxhdpi/round_today_white_18.png
new file mode 100644
index 0000000..b359d42
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_today_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_today_white_24.png b/app/src/main/res/drawable-xxhdpi/round_today_white_24.png
new file mode 100644
index 0000000..06fe89c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_today_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_today_white_48.png b/app/src/main/res/drawable-xxhdpi/round_today_white_48.png
new file mode 100644
index 0000000..88ebc44
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_today_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_translate.png b/app/src/main/res/drawable-xxhdpi/round_translate.png
new file mode 100644
index 0000000..32943b9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_translate.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_translate_white_18.png b/app/src/main/res/drawable-xxhdpi/round_translate_white_18.png
new file mode 100644
index 0000000..d75bef9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_translate_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_translate_white_24.png b/app/src/main/res/drawable-xxhdpi/round_translate_white_24.png
new file mode 100644
index 0000000..146c995
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_translate_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_translate_white_36.png b/app/src/main/res/drawable-xxhdpi/round_translate_white_36.png
new file mode 100644
index 0000000..fc45b01
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_translate_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_18.png b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_18.png
new file mode 100644
index 0000000..0b728f6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_24.png b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_24.png
new file mode 100644
index 0000000..4045e56
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_36.png b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_36.png
new file mode 100644
index 0000000..e02b965
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_48.png b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_48.png
new file mode 100644
index 0000000..254cc5a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_vpn_key_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_18.png b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_18.png
new file mode 100644
index 0000000..c93f35b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_24.png b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_24.png
new file mode 100644
index 0000000..441dde7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_36.png b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_36.png
new file mode 100644
index 0000000..2e81e15
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_48.png b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_48.png
new file mode 100644
index 0000000..d11a21b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wallpaper_black_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_auto.png b/app/src/main/res/drawable-xxhdpi/round_wb_auto.png
new file mode 100644
index 0000000..493bc5e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_auto.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_18.png b/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_18.png
new file mode 100644
index 0000000..a859588
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_24.png b/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_24.png
new file mode 100644
index 0000000..152acbb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_36.png b/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_36.png
new file mode 100644
index 0000000..7d72a59
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_auto_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_sunny.png b/app/src/main/res/drawable-xxhdpi/round_wb_sunny.png
new file mode 100644
index 0000000..3d17310
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_sunny.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_18.png b/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_18.png
new file mode 100644
index 0000000..2b4502a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_24.png b/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_24.png
new file mode 100644
index 0000000..cf449e2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_36.png b/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_36.png
new file mode 100644
index 0000000..0fff87f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_wb_sunny_white_36.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_widgets.png b/app/src/main/res/drawable-xxhdpi/round_widgets.png
new file mode 100644
index 0000000..5023107
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_widgets.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_widgets_white_18.png b/app/src/main/res/drawable-xxhdpi/round_widgets_white_18.png
new file mode 100644
index 0000000..a33317f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_widgets_white_18.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_widgets_white_24.png b/app/src/main/res/drawable-xxhdpi/round_widgets_white_24.png
new file mode 100644
index 0000000..89b3c89
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_widgets_white_24.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/round_widgets_white_48.png b/app/src/main/res/drawable-xxhdpi/round_widgets_white_48.png
new file mode 100644
index 0000000..8ff704f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_widgets_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash_logo.png b/app/src/main/res/drawable-xxxhdpi/ic_splash_logo.png
new file mode 100644
index 0000000..a724645
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_splash_logo.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add.png b/app/src/main/res/drawable-xxxhdpi/round_add.png
new file mode 100644
index 0000000..3c92e5e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_18.png
new file mode 100644
index 0000000..f6d7deb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_24.png
new file mode 100644
index 0000000..4c91893
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_36.png
new file mode 100644
index 0000000..41aa666
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_48.png
new file mode 100644
index 0000000..47630c6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_circle_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen.png b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen.png
new file mode 100644
index 0000000..aad9387
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_18.png
new file mode 100644
index 0000000..1a44c1e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_24.png
new file mode 100644
index 0000000..aa4c5b1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_48.png
new file mode 100644
index 0000000..0a76f0f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_to_home_screen_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_add_white_18.png
new file mode 100644
index 0000000..b014e27
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_add_white_24.png
new file mode 100644
index 0000000..5604bb1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_add_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_add_white_48.png
new file mode 100644
index 0000000..9920eb3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_add_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_alarm.png b/app/src/main/res/drawable-xxxhdpi/round_alarm.png
new file mode 100644
index 0000000..0345947
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_alarm.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_alarm_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_alarm_black_18.png
new file mode 100644
index 0000000..27f2e34
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_alarm_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_alarm_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_alarm_black_24.png
new file mode 100644
index 0000000..ff59ea8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_alarm_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_alarm_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_alarm_black_36.png
new file mode 100644
index 0000000..c48ee8e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_alarm_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_18.png
new file mode 100644
index 0000000..7553ab2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_24.png
new file mode 100644
index 0000000..ad6b82b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_36.png
new file mode 100644
index 0000000..7ef1377
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_48.png
new file mode 100644
index 0000000..cf29957
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_arrow_back_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_left.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_left.png
new file mode 100644
index 0000000..21f1766
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_left.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_24.png
new file mode 100644
index 0000000..42ddf42
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_36.png
new file mode 100644
index 0000000..71c3054
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_48.png
new file mode 100644
index 0000000..086dad4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_left_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_right.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_right.png
new file mode 100644
index 0000000..f732329
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_right.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_18.png
new file mode 100644
index 0000000..8f608d3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_24.png
new file mode 100644
index 0000000..5f2593e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_48.png
new file mode 100644
index 0000000..f9f3e3d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_chevron_right_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_18.png
new file mode 100644
index 0000000..52faf47
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_24.png
new file mode 100644
index 0000000..61f8024
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_36.png
new file mode 100644
index 0000000..3ebc2c0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_48.png
new file mode 100644
index 0000000..de2dc97
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_cloud_queue_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_date_range.png b/app/src/main/res/drawable-xxxhdpi/round_date_range.png
new file mode 100644
index 0000000..de3c84f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_date_range.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_date_range_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_date_range_black_18.png
new file mode 100644
index 0000000..e978d3d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_date_range_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_date_range_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_date_range_black_36.png
new file mode 100644
index 0000000..e2bca74
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_date_range_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_date_range_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_date_range_black_48.png
new file mode 100644
index 0000000..038c849
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_date_range_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_18.png
new file mode 100644
index 0000000..906b7f7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_24.png
new file mode 100644
index 0000000..35d90a6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_36.png
new file mode 100644
index 0000000..142bdbd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_48.png
new file mode 100644
index 0000000..3e19fe6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_error_outline_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_busy.png b/app/src/main/res/drawable-xxxhdpi/round_event_busy.png
new file mode 100644
index 0000000..eaa5080
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_busy.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_18.png
new file mode 100644
index 0000000..1e38651
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_36.png
new file mode 100644
index 0000000..256cc31
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_48.png
new file mode 100644
index 0000000..e8078f4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_busy_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_note.png b/app/src/main/res/drawable-xxxhdpi/round_event_note.png
new file mode 100644
index 0000000..192ee6f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_note.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_note_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_event_note_black_18.png
new file mode 100644
index 0000000..f8f0d4c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_note_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_note_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_event_note_black_24.png
new file mode 100644
index 0000000..ea04285
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_note_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_event_note_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_event_note_black_36.png
new file mode 100644
index 0000000..28e8a8b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_event_note_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list.png
new file mode 100644
index 0000000..c4785ec
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_18.png
new file mode 100644
index 0000000..1690f23
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_24.png
new file mode 100644
index 0000000..38c246b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_36.png
new file mode 100644
index 0000000..7b33cc0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_font_download.png b/app/src/main/res/drawable-xxxhdpi/round_font_download.png
new file mode 100644
index 0000000..0f89979
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_font_download.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_font_download_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_font_download_white_18.png
new file mode 100644
index 0000000..63524ee
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_font_download_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_font_download_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_font_download_white_24.png
new file mode 100644
index 0000000..6614068
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_font_download_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_font_download_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_font_download_white_36.png
new file mode 100644
index 0000000..d88939d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_font_download_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_launch.png b/app/src/main/res/drawable-xxxhdpi/round_launch.png
new file mode 100644
index 0000000..58f9612
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_launch.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_launch_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_launch_white_18.png
new file mode 100644
index 0000000..3a9026b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_launch_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_launch_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_launch_white_24.png
new file mode 100644
index 0000000..d1ed708
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_launch_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_launch_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_launch_white_48.png
new file mode 100644
index 0000000..e8c9e66
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_launch_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_18.png
new file mode 100644
index 0000000..545e85c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_24.png
new file mode 100644
index 0000000..ebc6ab4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_36.png
new file mode 100644
index 0000000..e2c75db
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_48.png
new file mode 100644
index 0000000..ed696a4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_local_cafe_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_low_priority.png b/app/src/main/res/drawable-xxxhdpi/round_low_priority.png
new file mode 100644
index 0000000..a2ecef8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_low_priority.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_18.png
new file mode 100644
index 0000000..4457aee
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_36.png
new file mode 100644
index 0000000..6c492d2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_48.png
new file mode 100644
index 0000000..9fb45a2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_low_priority_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_more_vert.png b/app/src/main/res/drawable-xxxhdpi/round_more_vert.png
new file mode 100644
index 0000000..1b8f40c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_more_vert.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_18.png
new file mode 100644
index 0000000..70c6b7a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_24.png
new file mode 100644
index 0000000..df7b446
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_36.png
new file mode 100644
index 0000000..0e20210
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_more_vert_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_palette.png b/app/src/main/res/drawable-xxxhdpi/round_palette.png
new file mode 100644
index 0000000..3c5495b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_palette.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_palette_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_palette_white_24.png
new file mode 100644
index 0000000..b979d4e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_palette_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_palette_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_palette_white_36.png
new file mode 100644
index 0000000..7c92b46
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_palette_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_palette_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_palette_white_48.png
new file mode 100644
index 0000000..1980284
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_palette_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_place.png b/app/src/main/res/drawable-xxxhdpi/round_place.png
new file mode 100644
index 0000000..ed7dbce
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_place.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_place_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_place_white_18.png
new file mode 100644
index 0000000..56ea3ed
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_place_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_place_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_place_white_36.png
new file mode 100644
index 0000000..b426019
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_place_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_place_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_place_white_48.png
new file mode 100644
index 0000000..5ad3934
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_place_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_redo.png b/app/src/main/res/drawable-xxxhdpi/round_redo.png
new file mode 100644
index 0000000..3808eb1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_redo.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_redo_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_redo_white_18.png
new file mode 100644
index 0000000..47a9433
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_redo_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_redo_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_redo_white_36.png
new file mode 100644
index 0000000..62face3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_redo_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_redo_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_redo_white_48.png
new file mode 100644
index 0000000..73e9378
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_redo_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_refresh_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_18.png
new file mode 100644
index 0000000..f000d3a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_refresh_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_24.png
new file mode 100644
index 0000000..fa2319e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_refresh_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_36.png
new file mode 100644
index 0000000..4f21ed2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_refresh_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_48.png
new file mode 100644
index 0000000..b24699e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_refresh_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_schedule.png b/app/src/main/res/drawable-xxxhdpi/round_schedule.png
new file mode 100644
index 0000000..25926fd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_schedule.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_schedule_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_18.png
new file mode 100644
index 0000000..25d30a8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_schedule_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_24.png
new file mode 100644
index 0000000..196a738
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_schedule_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_36.png
new file mode 100644
index 0000000..6441ec1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_schedule_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_48.png
new file mode 100644
index 0000000..25926fd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_schedule_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_settings.png b/app/src/main/res/drawable-xxxhdpi/round_settings.png
new file mode 100644
index 0000000..d3fb358
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_settings.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_settings_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_settings_white_18.png
new file mode 100644
index 0000000..5b25ac4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_settings_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_settings_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_settings_white_36.png
new file mode 100644
index 0000000..270e12d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_settings_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_settings_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_settings_white_48.png
new file mode 100644
index 0000000..469d1d3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_settings_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_fields.png b/app/src/main/res/drawable-xxxhdpi/round_text_fields.png
new file mode 100644
index 0000000..7947a39
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_fields.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_24.png
new file mode 100644
index 0000000..cab1351
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_36.png
new file mode 100644
index 0000000..e643d7f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_48.png
new file mode 100644
index 0000000..954be6e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_fields_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_format.png b/app/src/main/res/drawable-xxxhdpi/round_text_format.png
new file mode 100644
index 0000000..60702ab
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_format.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_format_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_text_format_white_18.png
new file mode 100644
index 0000000..1d4ccbe
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_format_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_format_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_text_format_white_24.png
new file mode 100644
index 0000000..5188d9c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_format_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_text_format_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_text_format_white_36.png
new file mode 100644
index 0000000..f9da7d3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_text_format_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_texture.png b/app/src/main/res/drawable-xxxhdpi/round_texture.png
new file mode 100644
index 0000000..a146582
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_texture.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_texture_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_texture_white_18.png
new file mode 100644
index 0000000..7241210
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_texture_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_texture_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_texture_white_24.png
new file mode 100644
index 0000000..7b818a4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_texture_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_texture_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_texture_white_36.png
new file mode 100644
index 0000000..f644c56
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_texture_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_title.png b/app/src/main/res/drawable-xxxhdpi/round_title.png
new file mode 100644
index 0000000..e24589a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_title.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_title_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_title_white_18.png
new file mode 100644
index 0000000..b64e752
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_title_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_title_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_title_white_36.png
new file mode 100644
index 0000000..752bbcb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_title_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_title_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_title_white_48.png
new file mode 100644
index 0000000..b470d66
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_title_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_today.png b/app/src/main/res/drawable-xxxhdpi/round_today.png
new file mode 100644
index 0000000..88ebc44
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_today.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_today_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_today_white_18.png
new file mode 100644
index 0000000..06fe89c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_today_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_today_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_today_white_24.png
new file mode 100644
index 0000000..1fe0374
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_today_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_today_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_today_white_48.png
new file mode 100644
index 0000000..1618af9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_today_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_translate.png b/app/src/main/res/drawable-xxxhdpi/round_translate.png
new file mode 100644
index 0000000..b519a61
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_translate.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_translate_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_translate_white_18.png
new file mode 100644
index 0000000..146c995
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_translate_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_translate_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_translate_white_24.png
new file mode 100644
index 0000000..635499f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_translate_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_translate_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_translate_white_36.png
new file mode 100644
index 0000000..32943b9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_translate_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_18.png
new file mode 100644
index 0000000..4045e56
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_24.png
new file mode 100644
index 0000000..3809792
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_36.png
new file mode 100644
index 0000000..254cc5a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_48.png
new file mode 100644
index 0000000..e96734a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_vpn_key_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_18.png
new file mode 100644
index 0000000..441dde7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_24.png
new file mode 100644
index 0000000..8b05111
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_36.png
new file mode 100644
index 0000000..d11a21b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_48.png
new file mode 100644
index 0000000..f6494b2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wallpaper_black_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_auto.png b/app/src/main/res/drawable-xxxhdpi/round_wb_auto.png
new file mode 100644
index 0000000..cee5145
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_auto.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_18.png
new file mode 100644
index 0000000..152acbb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_24.png
new file mode 100644
index 0000000..93ffbb3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_36.png
new file mode 100644
index 0000000..493bc5e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_auto_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_sunny.png b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny.png
new file mode 100644
index 0000000..3fc51e0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_18.png
new file mode 100644
index 0000000..cf449e2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_24.png
new file mode 100644
index 0000000..ff9c24e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_36.png b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_36.png
new file mode 100644
index 0000000..3d17310
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_wb_sunny_white_36.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_widgets.png b/app/src/main/res/drawable-xxxhdpi/round_widgets.png
new file mode 100644
index 0000000..8ff704f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_widgets.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_widgets_white_18.png b/app/src/main/res/drawable-xxxhdpi/round_widgets_white_18.png
new file mode 100644
index 0000000..89b3c89
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_widgets_white_18.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_widgets_white_24.png b/app/src/main/res/drawable-xxxhdpi/round_widgets_white_24.png
new file mode 100644
index 0000000..de6d639
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_widgets_white_24.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/round_widgets_white_48.png b/app/src/main/res/drawable-xxxhdpi/round_widgets_white_48.png
new file mode 100644
index 0000000..c75cc28
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_widgets_white_48.png differ
diff --git a/app/src/main/res/drawable/background_splash_screen.xml b/app/src/main/res/drawable/background_splash_screen.xml
new file mode 100644
index 0000000..eab4b9a
--- /dev/null
+++ b/app/src/main/res/drawable/background_splash_screen.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/colorPrimary" />
+        </shape>
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center_horizontal"
+            android:src="@drawable/ic_splash_logo"/>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_bottom_sheet_dialog.xml b/app/src/main/res/drawable/bg_bottom_sheet_dialog.xml
new file mode 100644
index 0000000..b0d19d9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_bottom_sheet_dialog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+    <padding android:top="12dp" />
+    <solid android:color="@color/colorPrimary" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_tab_indicator.xml b/app/src/main/res/drawable/custom_tab_indicator.xml
new file mode 100644
index 0000000..53e2f14
--- /dev/null
+++ b/app/src/main/res/drawable/custom_tab_indicator.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:topLeftRadius="3dp"
+                android:topRightRadius="3dp" />
+            <solid android:color="@color/colorAccent" />
+            <size android:height="4dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_background.xml b/app/src/main/res/drawable/gradient_background.xml
index 8001332..f82b8a4 100644
--- a/app/src/main/res/drawable/gradient_background.xml
+++ b/app/src/main/res/drawable/gradient_background.xml
@@ -5,7 +5,7 @@
             <gradient
                 android:angle="90"
                 android:startColor="@color/colorNightDark"
-                android:endColor="@color/colorPrimary"
+                android:endColor="@color/colorPrimaryOld"
                 android:type="linear" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/ic_day_night.xml b/app/src/main/res/drawable/ic_day_night.xml
new file mode 100644
index 0000000..bd8184f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_day_night.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C16.968,3 21,7.032 21,12C21,16.968 16.968,21 12,21C7.032,21 3,16.968 3,12C3,7.032 7.032,3 12,3ZM10.6583,5.0212C7.4383,5.661 5,8.5402 5,12C5,15.4598 7.4383,18.339 10.6583,18.9788C11.3583,19.121 12,18.5285 12,17.8058L12,6.1942C12,5.4715 11.3583,4.879 10.6583,5.0212Z"
+      android:strokeWidth="1"
+      android:fillColor="#000000"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/menu_background.xml b/app/src/main/res/drawable/menu_background.xml
new file mode 100644
index 0000000..aab2489
--- /dev/null
+++ b/app/src/main/res/drawable/menu_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@color/colorAccent_op30" />
+    <item android:color="@color/colorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/menu_text_color.xml b/app/src/main/res/drawable/menu_text_color.xml
new file mode 100644
index 0000000..2893aa4
--- /dev/null
+++ b/app/src/main/res/drawable/menu_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@color/colorAccent" />
+    <item android:color="@color/colorSecondaryText" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_add_24.xml b/app/src/main/res/drawable/round_add_24.xml
new file mode 100644
index 0000000..24877ee
--- /dev/null
+++ b/app/src/main/res/drawable/round_add_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="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_add_circle.xml b/app/src/main/res/drawable/round_add_circle.xml
new file mode 100644
index 0000000..28bd03f
--- /dev/null
+++ b/app/src/main/res/drawable/round_add_circle.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,7c-0.55,0 -1,0.45 -1,1v3L8,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h3v3c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-3h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-3L13,8c0,-0.55 -0.45,-1 -1,-1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_add_to_home_screen_24.xml b/app/src/main/res/drawable/round_add_to_home_screen_24.xml
new file mode 100644
index 0000000..d39c485
--- /dev/null
+++ b/app/src/main/res/drawable/round_add_to_home_screen_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="M18,1.01L8,1c-1.1,0 -2,0.9 -2,2v3c0,0.55 0.45,1 1,1s1,-0.45 1,-1V5h10v14H8v-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM11,15c0.55,0 1,-0.45 1,-1V9c0,-0.55 -0.45,-1 -1,-1H6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h2.59L3.7,14.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L10,11.41V14c0,0.55 0.45,1 1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_alarm_24.xml b/app/src/main/res/drawable/round_alarm_24.xml
new file mode 100644
index 0000000..1aa074c
--- /dev/null
+++ b/app/src/main/res/drawable/round_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_arrow_back.xml b/app/src/main/res/drawable/round_arrow_back.xml
new file mode 100644
index 0000000..26d33e0
--- /dev/null
+++ b/app/src/main/res/drawable/round_arrow_back.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="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_cafe.xml b/app/src/main/res/drawable/round_cafe.xml
new file mode 100644
index 0000000..cb57dd5
--- /dev/null
+++ b/app/src/main/res/drawable/round_cafe.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,3L6,3c-1.1,0 -2,0.9 -2,2v8c0,2.21 1.79,4 4,4h6c2.21,0 4,-1.79 4,-4v-3h2c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,8h-2L18,5h2v3zM3,21h16c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L3,19c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_chevron_left_24.xml b/app/src/main/res/drawable/round_chevron_left_24.xml
new file mode 100644
index 0000000..19d7e41
--- /dev/null
+++ b/app/src/main/res/drawable/round_chevron_left_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="M14.71,6.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L8.71,11.3c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L10.83,12l3.88,-3.88c0.39,-0.39 0.38,-1.03 0,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_chevron_right_24.xml b/app/src/main/res/drawable/round_chevron_right_24.xml
new file mode 100644
index 0000000..005a561
--- /dev/null
+++ b/app/src/main/res/drawable/round_chevron_right_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.29,6.71c-0.39,0.39 -0.39,1.02 0,1.41L13.17,12l-3.88,3.88c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41L10.7,6.7c-0.38,-0.38 -1.02,-0.38 -1.41,0.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_cloud_queue.xml b/app/src/main/res/drawable/round_cloud_queue.xml
new file mode 100644
index 0000000..8f71d61
--- /dev/null
+++ b/app/src/main/res/drawable/round_cloud_queue.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="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_date_range_24.xml b/app/src/main/res/drawable/round_date_range_24.xml
new file mode 100644
index 0000000..ccabff0
--- /dev/null
+++ b/app/src/main/res/drawable/round_date_range_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="M19,4h-1L18,3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L8,4L8,3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,19c0,0.55 -0.45,1 -1,1L6,20c-0.55,0 -1,-0.45 -1,-1L5,9h14v10zM7,11h2v2L7,13zM11,11h2v2h-2zM15,11h2v2h-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_error.xml b/app/src/main/res/drawable/round_error.xml
new file mode 100644
index 0000000..53237a2
--- /dev/null
+++ b/app/src/main/res/drawable/round_error.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,7c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,8c0,-0.55 0.45,-1 1,-1zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM13,17h-2v-2h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_event_busy_24.xml b/app/src/main/res/drawable/round_event_busy_24.xml
new file mode 100644
index 0000000..b0bda77
--- /dev/null
+++ b/app/src/main/res/drawable/round_event_busy_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.84,16.47l1.91,-1.91 1.91,1.91c0.29,0.29 0.77,0.29 1.06,0 0.29,-0.29 0.29,-0.77 0,-1.06l-1.91,-1.91 1.91,-1.91c0.29,-0.29 0.29,-0.77 0,-1.06 -0.29,-0.29 -0.77,-0.29 -1.06,0l-1.91,1.91 -1.91,-1.91c-0.29,-0.29 -0.77,-0.29 -1.06,0 -0.29,0.29 -0.29,0.77 0,1.06l1.91,1.91 -1.91,1.91c-0.29,0.29 -0.29,0.77 0,1.06 0.29,0.29 0.77,0.29 1.06,0zM19,3h-1L18,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L8,3L8,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM18,19L6,19c-0.55,0 -1,-0.45 -1,-1L5,8h14v10c0,0.55 -0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_event_note_24.xml b/app/src/main/res/drawable/round_event_note_24.xml
new file mode 100644
index 0000000..bb5a86b
--- /dev/null
+++ b/app/src/main/res/drawable/round_event_note_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="M16,10L8,10c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h8c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM19,3h-1L18,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L8,3L8,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM18,19L6,19c-0.55,0 -1,-0.45 -1,-1L5,8h14v10c0,0.55 -0.45,1 -1,1zM13,14L8,14c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_filter_list_24.xml b/app/src/main/res/drawable/round_filter_list_24.xml
new file mode 100644
index 0000000..32f752b
--- /dev/null
+++ b/app/src/main/res/drawable/round_filter_list_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="M11,18h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-2c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM3,7c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,6c-0.55,0 -1,0.45 -1,1zM7,13h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L7,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_font_download_24.xml b/app/src/main/res/drawable/round_font_download_24.xml
new file mode 100644
index 0000000..e437cc5
--- /dev/null
+++ b/app/src/main/res/drawable/round_font_download_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.93,13.5h4.14L12,7.98 9.93,13.5zM20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM15.71,17.88l-0.9,-2.38L9.17,15.5l-0.89,2.37c-0.14,0.38 -0.5,0.63 -0.91,0.63 -0.68,0 -1.15,-0.69 -0.9,-1.32l4.25,-10.81c0.22,-0.53 0.72,-0.87 1.28,-0.87s1.06,0.34 1.27,0.87l4.25,10.81c0.25,0.63 -0.22,1.32 -0.9,1.32 -0.4,0 -0.76,-0.25 -0.91,-0.62z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_launch_24.xml b/app/src/main/res/drawable/round_launch_24.xml
new file mode 100644
index 0000000..1621a4f
--- /dev/null
+++ b/app/src/main/res/drawable/round_launch_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="M18,19H6c-0.55,0 -1,-0.45 -1,-1V6c0,-0.55 0.45,-1 1,-1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v5c0,0.55 -0.45,1 -1,1zM14,4c0,0.55 0.45,1 1,1h2.59l-9.13,9.13c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L19,6.41V9c0,0.55 0.45,1 1,1s1,-0.45 1,-1V3h-6c-0.55,0 -1,0.45 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_low_priority_24.xml b/app/src/main/res/drawable/round_low_priority_24.xml
new file mode 100644
index 0000000..2cab168
--- /dev/null
+++ b/app/src/main/res/drawable/round_low_priority_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,5h6c0.55,0 1,0.45 1,1s-0.45,1 -1,1h-6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1zM15,10.5h6c0.55,0 1,0.45 1,1s-0.45,1 -1,1h-6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1zM15,16h6c0.55,0 1,0.45 1,1s-0.45,1 -1,1h-6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1zM9.85,19.15l1.79,-1.79c0.2,-0.2 0.2,-0.51 0,-0.71l-1.79,-1.79c-0.31,-0.32 -0.85,-0.1 -0.85,0.35v3.59c0,0.44 0.54,0.66 0.85,0.35zM9,16h-0.3c-2.35,0 -4.45,-1.71 -4.68,-4.05C3.76,9.27 5.87,7 8.5,7L11,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L8.5,5c-3.86,0 -6.96,3.4 -6.44,7.36C2.48,15.64 5.43,18 8.73,18L9,18"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_more_vert_24.xml b/app/src/main/res/drawable/round_more_vert_24.xml
new file mode 100644
index 0000000..34b93ec
--- /dev/null
+++ b/app/src/main/res/drawable/round_more_vert_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,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_palette_24.xml b/app/src/main/res/drawable/round_palette_24.xml
new file mode 100644
index 0000000..4bf1550
--- /dev/null
+++ b/app/src/main/res/drawable/round_palette_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,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_place_24.xml b/app/src/main/res/drawable/round_place_24.xml
new file mode 100644
index 0000000..7c83d37
--- /dev/null
+++ b/app/src/main/res/drawable/round_place_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,12c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,2c4.2,0 8,3.22 8,8.2 0,3.18 -2.45,6.92 -7.34,11.23 -0.38,0.33 -0.95,0.33 -1.33,0C6.45,17.12 4,13.38 4,10.2 4,5.22 7.8,2 12,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_redo_24.xml b/app/src/main/res/drawable/round_redo_24.xml
new file mode 100644
index 0000000..fad4283
--- /dev/null
+++ b/app/src/main/res/drawable/round_redo_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="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.16,0 -7.74,2.42 -9.44,5.93 -0.32,0.67 0.04,1.47 0.75,1.71 0.59,0.2 1.23,-0.08 1.5,-0.64 1.3,-2.66 4.03,-4.5 7.19,-4.5 1.95,0 3.73,0.72 5.12,1.88l-1.91,1.91c-0.63,0.63 -0.19,1.71 0.7,1.71H21c0.55,0 1,-0.45 1,-1V9.41c0,-0.89 -1.08,-1.34 -1.71,-0.71l-1.89,1.9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_refresh.xml b/app/src/main/res/drawable/round_refresh.xml
new file mode 100644
index 0000000..5cdbeb0
--- /dev/null
+++ b/app/src/main/res/drawable/round_refresh.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="M17.65,6.35c-1.63,-1.63 -3.94,-2.57 -6.48,-2.31 -3.67,0.37 -6.69,3.35 -7.1,7.02C3.52,15.91 7.27,20 12,20c3.19,0 5.93,-1.87 7.21,-4.56 0.32,-0.67 -0.16,-1.44 -0.9,-1.44 -0.37,0 -0.72,0.2 -0.88,0.53 -1.13,2.43 -3.84,3.97 -6.8,3.31 -2.22,-0.49 -4.01,-2.3 -4.48,-4.52C5.31,9.44 8.26,6 12,6c1.66,0 3.14,0.69 4.22,1.78l-1.51,1.51c-0.63,0.63 -0.19,1.71 0.7,1.71H19c0.55,0 1,-0.45 1,-1V6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71l-0.64,0.65z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_schedule_24.xml b/app/src/main/res/drawable/round_schedule_24.xml
new file mode 100644
index 0000000..07b7ee3
--- /dev/null
+++ b/app/src/main/res/drawable/round_schedule_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="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM11.78,7h-0.06c-0.4,0 -0.72,0.32 -0.72,0.72v4.72c0,0.35 0.18,0.68 0.49,0.86l4.15,2.49c0.34,0.2 0.78,0.1 0.98,-0.24 0.21,-0.34 0.1,-0.79 -0.25,-0.99l-3.87,-2.3L12.5,7.72c0,-0.4 -0.32,-0.72 -0.72,-0.72z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_settings_24.xml b/app/src/main/res/drawable/round_settings_24.xml
new file mode 100644
index 0000000..6da10fa
--- /dev/null
+++ b/app/src/main/res/drawable/round_settings_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="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_text_fields_24.xml b/app/src/main/res/drawable/round_text_fields_24.xml
new file mode 100644
index 0000000..9a62f73
--- /dev/null
+++ b/app/src/main/res/drawable/round_text_fields_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="M2.5,5.5C2.5,6.33 3.17,7 4,7h3.5v10.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5V7H14c0.83,0 1.5,-0.67 1.5,-1.5S14.83,4 14,4H4c-0.83,0 -1.5,0.67 -1.5,1.5zM20,9h-6c-0.83,0 -1.5,0.67 -1.5,1.5S13.17,12 14,12h1.5v5.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5V12H20c0.83,0 1.5,-0.67 1.5,-1.5S20.83,9 20,9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_text_format_24.xml b/app/src/main/res/drawable/round_text_format_24.xml
new file mode 100644
index 0000000..a4c6756
--- /dev/null
+++ b/app/src/main/res/drawable/round_text_format_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="M5,18c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,17c-0.55,0 -1,0.45 -1,1zM9.5,12.8h5l0.66,1.6c0.15,0.36 0.5,0.6 0.89,0.6 0.69,0 1.15,-0.71 0.88,-1.34l-3.88,-8.97C12.87,4.27 12.46,4 12,4c-0.46,0 -0.87,0.27 -1.05,0.69l-3.88,8.97c-0.27,0.63 0.2,1.34 0.89,1.34 0.39,0 0.74,-0.24 0.89,-0.6l0.65,-1.6zM12,5.98L13.87,11h-3.74L12,5.98z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_texture_24.xml b/app/src/main/res/drawable/round_texture_24.xml
new file mode 100644
index 0000000..47894fc
--- /dev/null
+++ b/app/src/main/res/drawable/round_texture_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="M19.58,3.08L3.15,19.51c0.09,0.34 0.27,0.65 0.51,0.9 0.25,0.24 0.56,0.42 0.9,0.51L21,4.49c-0.19,-0.69 -0.73,-1.23 -1.42,-1.41zM11.95,3l-8.88,8.88v2.83L14.78,3h-2.83zM5.07,3c-1.1,0 -2,0.9 -2,2v2l4,-4h-2zM19.07,21c0.55,0 1.05,-0.22 1.41,-0.59 0.37,-0.36 0.59,-0.86 0.59,-1.41v-2l-4,4h2zM9.36,21h2.83l8.88,-8.88L21.07,9.29L9.36,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_title_24.xml b/app/src/main/res/drawable/round_title_24.xml
new file mode 100644
index 0000000..1daddf2
--- /dev/null
+++ b/app/src/main/res/drawable/round_title_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="M5,5.5C5,6.33 5.67,7 6.5,7h4v10.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5V7h4c0.83,0 1.5,-0.67 1.5,-1.5S18.33,4 17.5,4h-11C5.67,4 5,4.67 5,5.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_today_24.xml b/app/src/main/res/drawable/round_today_24.xml
new file mode 100644
index 0000000..5d633eb
--- /dev/null
+++ b/app/src/main/res/drawable/round_today_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="M19,3h-1L18,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L8,3L8,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM18,19L6,19c-0.55,0 -1,-0.45 -1,-1L5,8h14v10c0,0.55 -0.45,1 -1,1zM8,10h3c0.55,0 1,0.45 1,1v3c0,0.55 -0.45,1 -1,1L8,15c-0.55,0 -1,-0.45 -1,-1v-3c0,-0.55 0.45,-1 1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_translate_24.xml b/app/src/main/res/drawable/round_translate_24.xml
new file mode 100644
index 0000000..c8a3b46
--- /dev/null
+++ b/app/src/main/res/drawable/round_translate_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.65,15.67c0.14,-0.36 0.05,-0.77 -0.23,-1.05l-2.09,-2.06 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53h1.94c0.54,0 0.99,-0.45 0.99,-0.99v-0.02c0,-0.54 -0.45,-0.99 -0.99,-0.99L10,4L10,3c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L1.99,4c-0.54,0 -0.99,0.45 -0.99,0.99 0,0.55 0.45,0.99 0.99,0.99h10.18C11.5,7.92 10.44,9.75 9,11.35c-0.81,-0.89 -1.49,-1.86 -2.06,-2.88 -0.16,-0.29 -0.45,-0.47 -0.78,-0.47 -0.69,0 -1.13,0.75 -0.79,1.35 0.63,1.13 1.4,2.21 2.3,3.21L3.3,16.87c-0.4,0.39 -0.4,1.03 0,1.42 0.39,0.39 1.02,0.39 1.42,0L9,14l2.02,2.02c0.51,0.51 1.38,0.32 1.63,-0.35zM17.5,10c-0.6,0 -1.14,0.37 -1.35,0.94l-3.67,9.8c-0.24,0.61 0.22,1.26 0.87,1.26 0.39,0 0.74,-0.24 0.88,-0.61l0.89,-2.39h4.75l0.9,2.39c0.14,0.36 0.49,0.61 0.88,0.61 0.65,0 1.11,-0.65 0.88,-1.26l-3.67,-9.8c-0.22,-0.57 -0.76,-0.94 -1.36,-0.94zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_vpn_key.xml b/app/src/main/res/drawable/round_vpn_key.xml
new file mode 100644
index 0000000..7c52a71
--- /dev/null
+++ b/app/src/main/res/drawable/round_vpn_key.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.65,10C11.7,7.31 8.9,5.5 5.77,6.12c-2.29,0.46 -4.15,2.29 -4.63,4.58C0.32,14.57 3.26,18 7,18c2.61,0 4.83,-1.67 5.65,-4H17v2c0,1.1 0.9,2 2,2s2,-0.9 2,-2v-2c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2h-8.35zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_wallpaper.xml b/app/src/main/res/drawable/round_wallpaper.xml
new file mode 100644
index 0000000..07ff9cd
--- /dev/null
+++ b/app/src/main/res/drawable/round_wallpaper.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="M4,5c0,-0.55 0.45,-1 1,-1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,2c-1.1,0 -2,0.9 -2,2v6c0,0.55 0.45,1 1,1s1,-0.45 1,-1L4,5zM9.61,13.49l-2.96,3.7c-0.26,0.33 -0.03,0.81 0.39,0.81L17,18c0.41,0 0.65,-0.47 0.4,-0.8l-2,-2.67c-0.2,-0.27 -0.6,-0.27 -0.8,0l-1.63,2.18 -2.58,-3.22c-0.2,-0.25 -0.58,-0.25 -0.78,0zM17,8.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S14,7.67 14,8.5s0.67,1.5 1.5,1.5S17,9.33 17,8.5zM20,2h-6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h5c0.55,0 1,0.45 1,1v5c0,0.55 0.45,1 1,1s1,-0.45 1,-1L22,4c0,-1.1 -0.9,-2 -2,-2zM20,19c0,0.55 -0.45,1 -1,1h-5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h6c1.1,0 2,-0.9 2,-2v-6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v5zM3,13c-0.55,0 -1,0.45 -1,1v6c0,1.1 0.9,2 2,2h6c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L5,20c-0.55,0 -1,-0.45 -1,-1v-5c0,-0.55 -0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_wb_auto_24.xml b/app/src/main/res/drawable/round_wb_auto_24.xml
new file mode 100644
index 0000000..dff90b8
--- /dev/null
+++ b/app/src/main/res/drawable/round_wb_auto_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="M6.85,12.65h2.3L8,9zM22.72,7c-0.42,0 -0.77,0.3 -0.85,0.7l-1.07,5.59 -1.31,-5.51c-0.11,-0.46 -0.52,-0.78 -0.99,-0.78s-0.88,0.32 -0.98,0.78l-1.31,5.51 -1.07,-5.59c-0.08,-0.4 -0.44,-0.7 -0.85,-0.7 -0.01,0 -0.03,0.01 -0.04,0.01C12.78,5.18 10.53,4 8,4c-4.42,0 -8,3.58 -8,8s3.58,8 8,8c3.17,0 5.9,-1.85 7.2,-4.52 0.2,0.32 0.55,0.52 0.94,0.52 0.51,0 0.95,-0.35 1.07,-0.84L18.5,9.9l1.29,5.26c0.12,0.49 0.57,0.84 1.07,0.84 0.52,0 0.96,-0.36 1.08,-0.86l1.61,-7.08c0.13,-0.54 -0.28,-1.06 -0.83,-1.06zM10.93,16c-0.38,0 -0.72,-0.24 -0.84,-0.6L9.6,14L6.4,14l-0.49,1.4c-0.13,0.36 -0.46,0.6 -0.84,0.6 -0.62,0 -1.05,-0.61 -0.84,-1.19l2.44,-6.86C6.87,7.38 7.4,7 8,7s1.13,0.38 1.34,0.94l2.44,6.86c0.2,0.59 -0.23,1.2 -0.85,1.2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_wb_sunny_24.xml b/app/src/main/res/drawable/round_wb_sunny_24.xml
new file mode 100644
index 0000000..558f9ba
--- /dev/null
+++ b/app/src/main/res/drawable/round_wb_sunny_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="M6.05,4.14l-0.39,-0.39c-0.39,-0.39 -1.02,-0.38 -1.4,0l-0.01,0.01c-0.39,0.39 -0.39,1.02 0,1.4l0.39,0.39c0.39,0.39 1.01,0.39 1.4,0l0.01,-0.01c0.39,-0.38 0.39,-1.02 0,-1.4zM3.01,10.5L1.99,10.5c-0.55,0 -0.99,0.44 -0.99,0.99v0.01c0,0.55 0.44,0.99 0.99,0.99L3,12.49c0.56,0.01 1,-0.43 1,-0.98v-0.01c0,-0.56 -0.44,-1 -0.99,-1zM12.01,0.55L12,0.55c-0.56,0 -1,0.44 -1,0.99v0.96c0,0.55 0.44,0.99 0.99,0.99L12,3.49c0.56,0.01 1,-0.43 1,-0.98v-0.97c0,-0.55 -0.44,-0.99 -0.99,-0.99zM19.75,3.76c-0.39,-0.39 -1.02,-0.39 -1.41,-0.01l-0.39,0.39c-0.39,0.39 -0.39,1.02 0,1.4l0.01,0.01c0.39,0.39 1.02,0.39 1.4,0l0.39,-0.39c0.39,-0.39 0.39,-1.01 0,-1.4zM17.94,18.86l0.39,0.39c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41l-0.39,-0.39c-0.39,-0.39 -1.02,-0.38 -1.4,0 -0.4,0.4 -0.4,1.02 -0.01,1.41zM20,11.49v0.01c0,0.55 0.44,0.99 0.99,0.99L22,12.49c0.55,0 0.99,-0.44 0.99,-0.99v-0.01c0,-0.55 -0.44,-0.99 -0.99,-0.99h-1.01c-0.55,0 -0.99,0.44 -0.99,0.99zM12,5.5c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6zM11.99,22.45L12,22.45c0.55,0 0.99,-0.44 0.99,-0.99v-0.96c0,-0.55 -0.44,-0.99 -0.99,-0.99h-0.01c-0.55,0 -0.99,0.44 -0.99,0.99v0.96c0,0.55 0.44,0.99 0.99,0.99zM4.25,19.24c0.39,0.39 1.02,0.39 1.41,0l0.39,-0.39c0.39,-0.39 0.38,-1.02 0,-1.4l-0.01,-0.01c-0.39,-0.39 -1.02,-0.39 -1.41,0l-0.39,0.39c-0.38,0.4 -0.38,1.02 0.01,1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_widgets_24.xml b/app/src/main/res/drawable/round_widgets_24.xml
new file mode 100644
index 0000000..1b7a115
--- /dev/null
+++ b/app/src/main/res/drawable/round_widgets_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="M13,14v6c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1h-6c-0.55,0 -1,0.45 -1,1zM4,21h6c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1L4,13c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1zM3,4v6c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L11,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1zM15.95,2.4L11.7,6.64c-0.39,0.39 -0.39,1.02 0,1.41l4.25,4.25c0.39,0.39 1.02,0.39 1.41,0l4.25,-4.25c0.39,-0.39 0.39,-1.02 0,-1.41L17.37,2.4c-0.39,-0.39 -1.03,-0.39 -1.42,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/widget_preview.png b/app/src/main/res/drawable/widget_preview.png
new file mode 100644
index 0000000..e5c79c1
Binary files /dev/null and b/app/src/main/res/drawable/widget_preview.png differ
diff --git a/app/src/main/res/layout/activity_choose_application.xml b/app/src/main/res/layout/activity_choose_application.xml
index b596008..e8031eb 100644
--- a/app/src/main/res/layout/activity_choose_application.xml
+++ b/app/src/main/res/layout/activity_choose_application.xml
@@ -1,117 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/gradient_background"
-    tools:context="com.tommasoberlose.anotherwidget.ui.activity.ChooseApplicationActivity">
-    <LinearLayout
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.ChooseApplicationViewModel" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_margin="32dp"
-        android:id="@+id/toolbar"
-        android:gravity="center_vertical">
-        <TextView
+        android:background="@color/colorPrimaryDark"
+        tools:context="com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity">
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/main_pre_title"
-            android:alpha="0.6"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Subtitle"
-            android:textAllCaps="true"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Title"
-            android:textAllCaps="true"/>
-    </LinearLayout>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        app:cardCornerRadius="3dp"
-        android:layout_below="@+id/toolbar"
-        android:layout_above="@+id/bottom_buttons"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:id="@+id/toolbar"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
-                <EditText
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/white"
-                    android:padding="16dp"
-                    android:inputType="textCapWords"
-                    android:id="@+id/location"
-                    android:textStyle="bold"
-                    android:gravity="center_vertical"
-                    android:hint="@string/action_choose_application"/>
-                <ImageView
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="48dp"
                     android:layout_height="48dp"
-                    android:padding="12dp"
+                    android:padding="10dp"
+                    android:foreground="?attr/selectableItemBackgroundBorderless"
+                    android:layout_centerVertical="true"
                     android:id="@+id/action_back"
-                    android:src="@drawable/ic_action_close"
-                    android:tint="@android:color/black"/>
-            </LinearLayout>
-            <LinearLayout
+                    android:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_arrow_back" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:text="@string/action_choose_application"
+                    android:gravity="center"
+                    style="@style/AnotherWidget.Main.Title"/>
+            </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/black_10"/>
-            <android.support.v7.widget.RecyclerView
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/colorPrimaryDark"
+                app:cardCornerRadius="9dp"
+                app:cardElevation="0dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="16dp">
+                <EditText
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@color/colorPrimaryDark"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:inputType="textCapWords"
+                    android:id="@+id/search"
+                    android:gravity="center_vertical"
+                    android:hint="@string/search"
+                    android:text="@={viewModel.searchInput}"
+                    android:autofillHints="" />
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.card.MaterialCardView>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:indeterminateTint="@color/colorAccent"
+                android:layout_marginTop="-7dp"
+                android:id="@+id/loader"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+            <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:id="@+id/list_view" />
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="3dp"
-        android:id="@+id/bottom_buttons"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:layout_alignParentBottom="true"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="?android:attr/actionBarSize"
-                android:text="@string/action_default"
-                android:id="@+id/action_default"
-                android:textColor="@android:color/black"
-                style="@style/AnotherWidget.Main.Button"/>
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="?android:attr/actionBarSize"
-                android:text="@string/action_none"
-                android:id="@+id/action_none"
-                android:textColor="@android:color/black"
-                style="@style/AnotherWidget.Main.Button"/>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-</RelativeLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_custom_location.xml b/app/src/main/res/layout/activity_custom_location.xml
index 968886a..e44bd7a 100644
--- a/app/src/main/res/layout/activity_custom_location.xml
+++ b/app/src/main/res/layout/activity_custom_location.xml
@@ -1,82 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/gradient_background"
-    tools:context="com.tommasoberlose.anotherwidget.ui.activity.CustomLocationActivity">
-    <LinearLayout
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.CustomLocationViewModel" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_margin="32dp"
-        android:id="@+id/toolbar"
-        android:gravity="center_vertical">
-        <TextView
+        android:background="@color/colorPrimaryDark"
+        tools:context="com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity">
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/main_pre_title"
-            android:alpha="0.6"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Subtitle"
-            android:textAllCaps="true"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Title"
-            android:textAllCaps="true"/>
-    </LinearLayout>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        app:cardCornerRadius="3dp"
-        android:layout_margin="16dp"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:id="@+id/toolbar"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
-                <EditText
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@android:color/white"
-                    android:padding="16dp"
-                    android:inputType="textCapWords"
-                    android:id="@+id/location"
-                    android:textStyle="bold"
-                    android:gravity="center_vertical"
-                    android:hint="@string/settings_custom_location_title"/>
-                <ImageView
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="48dp"
                     android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:contentDescription="@string/custom_location_gps"
-                    android:id="@+id/action_geolocation"
-                    android:src="@drawable/ic_action_gps"
-                    android:tint="@android:color/black"/>
-            </LinearLayout>
-            <LinearLayout
+                    android:padding="10dp"
+                    android:foreground="?attr/selectableItemBackgroundBorderless"
+                    android:layout_centerVertical="true"
+                    android:id="@+id/action_back"
+                    android:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_arrow_back" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:text="@string/settings_custom_location_title"
+                    android:gravity="center"
+                    style="@style/AnotherWidget.Main.Title"/>
+            </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/black_10"/>
-            <ListView
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/colorPrimaryDark"
+                app:cardCornerRadius="9dp"
+                app:cardElevation="0dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="16dp">
+                <EditText
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@color/colorPrimaryDark"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:inputType="textCapWords"
+                    android:id="@+id/location"
+                    android:gravity="center_vertical"
+                    android:hint="@string/search"
+                    android:text="@={viewModel.locationInput}"
+                    android:autofillHints="" />
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.card.MaterialCardView>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:indeterminateTint="@color/colorAccent"
+                android:layout_marginTop="-7dp"
+                android:id="@+id/loader"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+            <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:id="@+id/list_view" />
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-</LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 999c9f1..562cc96 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,806 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="com.tommasoberlose.anotherwidget.ui.activity.MainActivity"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:background="?android:attr/colorPrimary"
+    tools:context=".ui.activities.MainActivity">
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/gradient_background"
-        android:orientation="vertical">
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:cardElevation="2dp"
+        app:cardCornerRadius="0dp"
+        android:id="@+id/toolbar"
+        app:cardBackgroundColor="@color/colorPrimary">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_margin="32dp"
-            android:id="@+id/toolbar"
-            android:gravity="center_vertical">
-            <TextView
+            android:orientation="vertical">
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/main_pre_title"
-                android:alpha="0.6"
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:text="@string/app_name"
+                    android:gravity="center"
+                    style="@style/AnotherWidget.Main.Title"/>
+            </RelativeLayout>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:id="@+id/preview"
+                android:animateLayoutChanges="true"
+                app:cardBackgroundColor="@color/colorPrimary"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginLeft="16dp"
+                app:cardCornerRadius="9dp"
+                app:cardElevation="0dp">
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        android:id="@+id/widget_bg" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:layout_gravity="center"
+                        android:orientation="vertical"
+                        android:id="@+id/widget"
+                        android:gravity="center">
+                        <TextClock
+                            android:id="@+id/clock"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:lineSpacingMultiplier="1"
+                            android:lineSpacingExtra="0dp"
+                            android:includeFontPadding="false"
+                            android:visibility="gone"
+                            android:padding="0dp"
+                            style="@style/AnotherWidget.Title" />
+                        <ImageView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/widget_bitmap"
+                            tools:ignore="ContentDescription" />
+                    </LinearLayout>
+                </RelativeLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                app:tabGravity="center"
+                app:tabIndicatorColor="@color/colorAccent"
+                app:tabBackground="@color/colorPrimary"
+                app:tabIndicatorFullWidth="false"
+                app:tabMode="scrollable"
+                app:tabIndicatorHeight="3dp"
+                app:tabUnboundedRipple="true"
+                app:tabRippleColor="@color/colorPrimary"
+                app:tabTextColor="@color/colorSecondaryText"
+                app:tabSelectedTextColor="@color/colorAccent"
+                app:tabIndicator="@drawable/custom_tab_indicator"
+                app:tabPadding="16dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
-                android:gravity="center_vertical"
-                style="@style/AnotherWidget.Main.Subtitle"
-                android:textAllCaps="true"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:gravity="center_vertical"
-                style="@style/AnotherWidget.Main.Title"
-                android:textAllCaps="true"/>
+                android:clipToPadding="false"
+                app:tabMinWidth="110dp"
+                android:background="@color/colorPrimary"
+                app:tabTextAppearance="@style/AnotherWidget.Settings.Header" />
         </LinearLayout>
-        <RelativeLayout
+    </com.google.android.material.card.MaterialCardView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="vertical">
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/pager"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:id="@+id/widget">
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                android:id="@+id/widget_bg"/>
-            <include
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                layout="@layout/the_widget"/>
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:id="@+id/widget_bitmap"/>
-        </RelativeLayout>
-        <TextView
+            android:elevation="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:text="@string/add_widget"
+            android:layout_height="56dp"
             android:visibility="gone"
-            android:gravity="center"
-            android:background="@color/black_30"
-            android:foreground="?android:attr/selectableItemBackground"
-            android:id="@+id/action_add_widget"
-            style="@style/AnotherWidget.Main.Button"/>
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/all_set_container">
-            <LinearLayout
+            app:cardBackgroundColor="@color/colorAccent"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="4dp">
+            <com.google.android.material.button.MaterialButton
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"
-                    android:text="@string/settings_general_title"
-                    style="@style/AnotherWidget.Settings.Header"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_main_text_size"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/title_main_text_size"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/main_text_size_label"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_second_text_size"
-                    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
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_font_color"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/settings_font_color_title"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/font_color_label"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_custom_font"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/settings_custom_font_title"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/custom_font_label"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_text_shadow"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/title_text_shadow"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/text_shadow_label"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:background="@color/black_10"
-                    android:alpha="0.5"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"
-                    android:text="@string/settings_clock_title"
-                    style="@style/AnotherWidget.Settings.Header"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_show_clock"
-                    android:orientation="horizontal">
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/title_show_clock"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/show_clock_label"
-                            android:text="@string/description_show_clock"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/beta"
-                        android:layout_marginLeft="8dp"
-                        android:layout_gravity="center_vertical|right"
-                        style="@style/AnotherWidget.Settings.Header"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/clock_settings"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_clock_text_size"
-                        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_size_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/clock_text_size_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_hour_format"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_hour_format_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/hour_format_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_clock_app"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_clock_app_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/clock_app_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:background="@color/black_10"
-                    android:alpha="0.5"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"
-                    android:text="@string/settings_calendar_title"
-                    style="@style/AnotherWidget.Settings.Header"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_show_events"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/title_permission_calendar"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/show_events_label"
-                        android:text="@string/description_permission_calendar"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/calendar_settings"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_date_format"
-                        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
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_filter_calendar"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_filter_calendar_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/settings_filter_calendar_subtitle"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_show_all_day"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_all_day_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/all_day_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_show_declined_events"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_show_declined_events_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/show_declined_events_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_show_until"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_show_until_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/show_until_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_show_multiple_events"
-                        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
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_show_diff_time"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_show_diff_time_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/show_diff_time_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_second_row_info"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_second_row_info_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/second_row_info_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_calendar_app"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_calendar_app_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/calendar_app_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_event_app"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_event_app_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/event_app_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    android:background="@color/black_10"
-                    android:alpha="0.5"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_weather_title"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
-                    style="@style/AnotherWidget.Settings.Header"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:paddingLeft="32dp"
-                    android:paddingRight="32dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_show_weather"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="@style/AnotherWidget.Settings.Title"
-                        android:text="@string/title_permission_location"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/show_weather_label"
-                        android:text="@string/description_permission_location"
-                        style="@style/AnotherWidget.Settings.Subtitle"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/weather_settings"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_weather_provider_api_key"
-                        android:orientation="horizontal">
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="2"
-                            android:orientation="vertical">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                style="@style/AnotherWidget.Settings.Title"
-                                android:text="@string/settings_weather_provider_api_key_title"/>
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:id="@+id/label_weather_provider_api_key"
-                                style="@style/AnotherWidget.Settings.Subtitle"/>
-                        </LinearLayout>
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:id="@+id/alert_icon"
-                            android:visibility="gone"
-                            android:src="@drawable/ic_action_alert"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_custom_location"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_custom_location_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/label_custom_location"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_change_unit"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_unit_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/temp_unit"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_weather_refresh_period"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_weather_refresh_period_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/label_weather_refresh_period"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingLeft="32dp"
-                        android:paddingRight="32dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_weather_app"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_weather_app_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/weather_app_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-        </ScrollView>
+                android:layout_height="match_parent"
+                android:text="@string/add_widget"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:id="@+id/action_add_widget"
+                app:cornerRadius="0dp"
+                style="@style/Widget.MaterialComponents.Button.TextButton"/>
+        </com.google.android.material.card.MaterialCardView>
+
     </LinearLayout>
-    <ImageView
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:padding="4dp"
-        android:id="@+id/action_menu"
-        android:layout_marginTop="28dp"
-        android:layout_marginRight="16dp"
-        android:layout_alignParentRight="true"
-        android:src="@drawable/ic_action_menu"/>
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_support_dev.xml b/app/src/main/res/layout/activity_support_dev.xml
index bd38565..135a657 100644
--- a/app/src/main/res/layout/activity_support_dev.xml
+++ b/app/src/main/res/layout/activity_support_dev.xml
@@ -1,372 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/gradient_background"
-    android:orientation="vertical"
-    tools:context="com.tommasoberlose.anotherwidget.ui.activity.SupportDevActivity">
-    <LinearLayout
+
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.CustomLocationViewModel" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_margin="32dp"
-        android:id="@+id/toolbar"
-        android:gravity="center_vertical">
-        <TextView
+        android:background="@color/colorPrimaryDark"
+        tools:context="com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity">
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/main_pre_title"
-            android:alpha="0.6"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Subtitle"
-            android:textAllCaps="true"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/support_custom_app_name"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Title"
-            android:textAllCaps="true"/>
-    </LinearLayout>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="3dp"
-        android:id="@+id/products_card"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="8dp"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:orientation="vertical">
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:id="@+id/toolbar"
+            app:cardBackgroundColor="@color/colorPrimary">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-                <ImageView
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:padding="8dp"
-                    android:src="@drawable/ic_action_gift"
-                    android:tint="@color/dark_grey"/>
-                <LinearLayout
+                android:orientation="vertical">
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="56dp"
                     android:gravity="center_vertical"
-                    android:orientation="vertical">
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/support_main_title"
-                        android:textColor="@android:color/black"
-                        android:fontFamily="sans-serif-medium"
-                        android:padding="8dp"
-                        android:layout_marginTop="2dp"
-                        android:layout_marginBottom="4dp"
-                        android:textAppearance="?android:textAppearanceListItem"/>
-                </LinearLayout>
-            </LinearLayout>
-            <ProgressBar
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:id="@+id/loader"
-                android:layout_margin="16dp"/>
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/products_list"
                     android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:visibility="gone"
-                    android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_donation_coffee"
-                        android:orientation="horizontal"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp">
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:text="@string/donation_coffee"
-                            android:paddingRight="8dp"
-                            android:paddingLeft="40dp"
-                            android:textColor="@color/dark_grey"
-                            android:textAppearance="?android:textAppearanceButton"/>
+                    android:paddingRight="8dp">
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="10dp"
+                        android:foreground="?attr/selectableItemBackgroundBorderless"
+                        android:layout_centerVertical="true"
+                        android:id="@+id/action_back"
+                        android:tint="@color/colorPrimaryText"
+                        android:src="@drawable/round_arrow_back" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_centerInParent="true"
+                        android:text="@string/support_main_title"
+                        android:gravity="center"
+                        style="@style/AnotherWidget.Main.Title"/>
+                </RelativeLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="20dp"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textSize="16sp"
+                    android:gravity="center"
+                    android:text="This is a single developer project,\nso thank you for the support!" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
-                        <android.support.v7.widget.CardView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:cardCornerRadius="2dp"
-                            app:cardElevation="0dp"
-                            app:cardBackgroundColor="@color/black_10"
-                            app:cardPreventCornerOverlap="true">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="6dp"
-                                android:paddingRight="6dp"
-                                android:paddingBottom="4dp"
-                                android:paddingTop="4dp"
-                                android:textColor="@color/black_50"
-                                android:id="@+id/import_donation_coffee"
-                                android:textSize="12sp"/>
-                        </android.support.v7.widget.CardView>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_donation_donuts"
-                        android:orientation="horizontal"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp">
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:text="@string/donation_donuts"
-                            android:paddingRight="8dp"
-                            android:paddingLeft="40dp"
-                            android:textColor="@color/dark_grey"
-                            android:textAppearance="?android:textAppearanceButton"/>
-
-                        <android.support.v7.widget.CardView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:cardCornerRadius="2dp"
-                            app:cardElevation="0dp"
-                            app:cardBackgroundColor="@color/black_10"
-                            app:cardPreventCornerOverlap="true">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="6dp"
-                                android:paddingRight="6dp"
-                                android:paddingBottom="4dp"
-                                android:paddingTop="4dp"
-                                android:textColor="@color/black_50"
-                                android:id="@+id/import_donation_donuts"
-                                android:textSize="12sp"/>
-                        </android.support.v7.widget.CardView>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_donation_breakfast"
-                        android:orientation="horizontal"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp">
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:text="@string/donation_breakfast"
-                            android:paddingRight="8dp"
-                            android:paddingLeft="40dp"
-                            android:textColor="@color/dark_grey"
-                            android:textAppearance="?android:textAppearanceButton"/>
-
-                        <android.support.v7.widget.CardView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:cardCornerRadius="2dp"
-                            app:cardElevation="0dp"
-                            app:cardBackgroundColor="@color/black_10"
-                            app:cardPreventCornerOverlap="true">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="6dp"
-                                android:paddingRight="6dp"
-                                android:paddingBottom="4dp"
-                                android:paddingTop="4dp"
-                                android:textColor="@color/black_50"
-                                android:id="@+id/import_donation_breakfast"
-                                android:textSize="12sp"/>
-                        </android.support.v7.widget.CardView>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_donation_lunch"
-                        android:orientation="horizontal"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp">
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:text="@string/donation_lunch"
-                            android:paddingRight="8dp"
-                            android:paddingLeft="40dp"
-                            android:textColor="@color/dark_grey"
-                            android:textAppearance="?android:textAppearanceButton"/>
-
-                        <android.support.v7.widget.CardView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:cardCornerRadius="2dp"
-                            app:cardElevation="0dp"
-                            app:cardBackgroundColor="@color/black_10"
-                            app:cardPreventCornerOverlap="true">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="6dp"
-                                android:paddingRight="6dp"
-                                android:paddingBottom="4dp"
-                                android:paddingTop="4dp"
-                                android:textColor="@color/black_50"
-                                android:id="@+id/import_donation_lunch"
-                                android:textSize="12sp"/>
-                        </android.support.v7.widget.CardView>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_donation_dinner"
-                        android:orientation="horizontal"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp">
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="0.8"
-                            android:text="@string/donation_dinner"
-                            android:paddingRight="8dp"
-                            android:paddingLeft="40dp"
-                            android:textColor="@color/dark_grey"
-                            android:textAppearance="?android:textAppearanceButton"/>
-
-                        <android.support.v7.widget.CardView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:cardCornerRadius="2dp"
-                            app:cardElevation="0dp"
-                            app:cardBackgroundColor="@color/black_10"
-                            app:cardPreventCornerOverlap="true">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="6dp"
-                                android:paddingRight="6dp"
-                                android:paddingBottom="4dp"
-                                android:paddingTop="4dp"
-                                android:textColor="@color/black_50"
-                                android:id="@+id/import_donation_dinner"
-                                android:textSize="12sp"/>
-                        </android.support.v7.widget.CardView>
-                    </LinearLayout>
-                </LinearLayout>
-            </ScrollView>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="3dp"
-        android:id="@+id/action_translate"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="8dp"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:orientation="horizontal">
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_translate"
-                android:tint="@color/dark_grey"/>
-            <LinearLayout
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <androidx.core.widget.ContentLoadingProgressBar
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingRight="8dp"
-                android:paddingLeft="8dp"
-                android:orientation="vertical">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/support_translations_title"
-                    android:textColor="@color/dark_grey"
-                    style="@style/AnotherWidget.Settings.Title"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/support_translations_subtitle"
-                    android:textColor="@android:color/black"
-                    style="@style/AnotherWidget.Settings.Subtitle"/>
-            </LinearLayout>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cardCornerRadius="3dp"
-        android:id="@+id/action_website"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:padding="8dp"
-            android:orientation="horizontal">
-            <ImageView
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_dev"
-                android:tint="@color/dark_grey"/>
-            <LinearLayout
+                android:indeterminate="true"
+                android:indeterminateTint="@color/colorAccent"
+                android:layout_marginTop="-7dp"
+                android:id="@+id/loader"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+            <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingRight="8dp"
-                android:paddingLeft="8dp"
-                android:orientation="vertical">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/support_website_title"
-                    android:textColor="@color/dark_grey"
-                    style="@style/AnotherWidget.Settings.Title"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/support_website_subtitle"
-                    android:textColor="@android:color/black"
-                    style="@style/AnotherWidget.Settings.Subtitle"/>
-            </LinearLayout>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-</LinearLayout>
+                android:layout_height="match_parent"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:clipToPadding="false"
+                android:id="@+id/list_view" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_weather_provider.xml b/app/src/main/res/layout/activity_weather_provider.xml
index bcccd8e..b7fca15 100644
--- a/app/src/main/res/layout/activity_weather_provider.xml
+++ b/app/src/main/res/layout/activity_weather_provider.xml
@@ -5,206 +5,154 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/gradient_background"
-    tools:context="com.tommasoberlose.anotherwidget.ui.activity.WeatherProviderActivity">
-    <LinearLayout
+    android:background="@color/colorPrimaryDark"
+    tools:context="com.tommasoberlose.anotherwidget.ui.activities.WeatherProviderActivity">
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_margin="32dp"
-        android:id="@+id/toolbar"
-        android:gravity="center_vertical">
-        <TextView
+        app:cardElevation="2dp"
+        app:cardCornerRadius="0dp"
+        app:cardBackgroundColor="@color/colorPrimary">
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/main_pre_title"
-            android:alpha="0.6"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
+            android:layout_height="56dp"
             android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Subtitle"
-            android:textAllCaps="true"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:gravity="center_vertical"
-            style="@style/AnotherWidget.Main.Title"
-            android:textAllCaps="true"/>
-    </LinearLayout>
-    <android.support.v7.widget.CardView
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp">
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:padding="10dp"
+                android:foreground="?attr/selectableItemBackgroundBorderless"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:id="@+id/action_back"
+                android:tint="@color/colorPrimaryText"
+                android:src="@drawable/round_arrow_back" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:text="@string/settings_weather_provider_api_key_title"
+                android:gravity="center"
+                style="@style/AnotherWidget.Main.Title"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/action_save"
+                android:gravity="center"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:padding="16dp"
+                android:textColor="@color/colorAccent"
+                android:id="@+id/action_save"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Button"/>
+        </RelativeLayout>
+    </com.google.android.material.card.MaterialCardView>
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        app:cardCornerRadius="3dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="@android:color/white"
-        app:cardBackgroundColor="@android:color/white">
+        android:layout_height="wrap_content">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="24dp">
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:orientation="vertical"
-                android:descendantFocusability="beforeDescendants"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:id="@+id/action_change_provider"
-                android:background="@android:color/white"
-                android:foreground="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Settings.Title"
-                    android:text="@string/settings_weather_provider_api_key_title"
-                    android:textColor="@android:color/black"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/label_weather_provider"
-                    style="@style/AnotherWidget.Settings.Subtitle"
-                    android:textColor="@android:color/black"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/black_10"/>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:descendantFocusability="beforeDescendants"
                 android:focusable="true"
                 android:id="@+id/api_key_container"
                 android:focusableInTouchMode="true"
                 android:gravity="center_vertical">
-                <EditText
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@android:color/white"
-                    android:padding="16dp"
-                    android:inputType="textCapWords"
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/api_key"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textCapWords"
                     android:textStyle="bold"
                     android:nextFocusUp="@id/api_key"
                     android:nextFocusLeft="@id/api_key"
                     android:gravity="center_vertical"
-                    android:hint="@string/api_key_hint"/>
+                    android:textColor="@color/colorPrimaryText"
+                    app:boxBackgroundColor="@color/colorPrimaryDark"
+                    app:boxStrokeColor="@color/colorAccent"
+                    app:hintTextColor="@color/colorAccent"
+                    android:hint="@string/api_key_hint"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        />
+                </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
+
             <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="32dp"
+                android:background="@color/disabledButtonBackground" />
+
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:id="@+id/button_container">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="?android:attr/actionBarSize"
-                    android:text="@string/action_save"
-                    android:gravity="center"
-                    android:background="@color/colorAccent"
-                    android:foreground="?android:attr/selectableItemBackground"
-                    android:id="@+id/action_save"
-                    style="@style/AnotherWidget.Main.Button"/>
-            </LinearLayout>
+                style="@style/AnotherWidget.Settings.Title"
+                android:text="@string/api_key_title_1"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Subtitle"
+                android:textSize="16sp"
+                android:gravity="start"
+                android:text="@string/api_key_subtitle_1"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Settings.Title"
+                android:layout_marginTop="12dp"
+                android:text="@string/api_key_title_2"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Subtitle"
+                android:textSize="16sp"
+                android:gravity="start"
+                android:text="@string/api_key_subtitle_2"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Settings.Title"
+                android:layout_marginTop="12dp"
+                android:text="@string/api_key_title_3"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Subtitle"
+                android:textSize="16sp"
+                android:gravity="start"
+                android:text="@string/api_key_subtitle_3"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Subtitle"
+                android:textSize="16sp"
+                android:gravity="start"
+                android:id="@+id/last_info"/>
+            <com.google.android.material.button.MaterialButton
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/colorAccent"
+                android:letterSpacing="0"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="start|center_vertical"
+                android:layout_marginStart="-8dp"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:textAllCaps="false"
+                android:id="@+id/action_open_provider"
+                android:text="@string/action_open_provider"/>
         </LinearLayout>
-    </android.support.v7.widget.CardView>
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusable="true"
-        android:id="@+id/content_info"
-        android:focusableInTouchMode="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp">
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/api_key_info_title"
-                    android:gravity="start"
-                    style="@style/AnotherWidget.Main.Title"
-                    android:textSize="20sp"
-                    android:textColor="@android:color/black"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorAccent"
-                    style="@style/AnotherWidget.Settings.Title"
-                    android:layout_marginTop="12dp"
-                    android:textAllCaps="true"
-                    android:text="@string/api_key_title_1"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
-                    style="@style/AnotherWidget.Main.Subtitle"
-                    android:textSize="16sp"
-                    android:gravity="start"
-                    android:text="@string/api_key_subtitle_1"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorPrimary"
-                    style="@style/AnotherWidget.Main.Button"
-                    android:layout_marginTop="12dp"
-                    android:id="@+id/action_open_provider"
-                    android:text="@string/action_open_provider"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorAccent"
-                    style="@style/AnotherWidget.Settings.Title"
-                    android:layout_marginTop="12dp"
-                    android:textAllCaps="true"
-                    android:text="@string/api_key_title_2"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
-                    style="@style/AnotherWidget.Main.Subtitle"
-                    android:textSize="16sp"
-                    android:gravity="start"
-                    android:text="@string/api_key_subtitle_2"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorAccent"
-                    style="@style/AnotherWidget.Settings.Title"
-                    android:layout_marginTop="12dp"
-                    android:textAllCaps="true"
-                    android:text="@string/api_key_title_3"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
-                    style="@style/AnotherWidget.Main.Subtitle"
-                    android:textSize="16sp"
-                    android:gravity="start"
-                    android:text="@string/api_key_subtitle_3"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
-                    style="@style/AnotherWidget.Main.Subtitle"
-                    android:textSize="16sp"
-                    android:gravity="start"
-                    android:id="@+id/last_info"/>
-            </LinearLayout>
-        </ScrollView>
-    </android.support.v7.widget.CardView>
+    </ScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/application_info_layout.xml b/app/src/main/res/layout/application_info_layout.xml
index 2f7885a..fa7cda0 100644
--- a/app/src/main/res/layout/application_info_layout.xml
+++ b/app/src/main/res/layout/application_info_layout.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
+    android:layout_height="64dp"
+    android:background="?attr/selectableItemBackground"
+    android:focusable="true"
+    android:clickable="true"
     android:orientation="horizontal"
+    android:id="@+id/item"
     android:gravity="center_vertical">
     <ImageView
         android:layout_width="48dp"
@@ -11,14 +16,16 @@
         android:padding="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
-        android:src="@mipmap/ic_generic_app"
-        android:id="@+id/icon"/>
+        android:src="@mipmap/ic_launcher_foreground"
+        android:contentDescription="icon"
+        android:id="@+id/icon"
+        tools:ignore="HardcodedText" />
     <TextView
         android:id="@+id/text"
         android:layout_width="0dp"
         android:layout_weight="2"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:textColor="@android:color/black"
+        android:textColor="@color/colorPrimaryText"
         style="@style/AnotherWidget.Settings.Title"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_menu.xml b/app/src/main/res/layout/bottom_sheet_menu.xml
new file mode 100644
index 0000000..9bc98bb
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_menu.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/header"
+        android:visibility="gone"
+        android:orientation="vertical">
+        <androidx.appcompat.widget.AppCompatTextView
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
+            app:textAllCaps="false"
+            android:letterSpacing="0"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp"
+            android:paddingBottom="8dp"
+            android:paddingLeft="32dp"
+            android:paddingRight="32dp"
+            android:textSize="16sp"
+            android:id="@+id/header_text"
+            android:text=""
+            android:textColor="@color/colorSecondaryText"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="12dp"
+            android:background="@color/disabledButtonBackground" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:id="@+id/menu"
+        android:background="@color/colorPrimary" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_menu_item.xml b/app/src/main/res/layout/bottom_sheet_menu_item.xml
new file mode 100644
index 0000000..f344b1f
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_marginBottom="16dp"
+    app:cardElevation="0dp"
+    app:cardBackgroundColor="@drawable/menu_background"
+    app:cardCornerRadius="8dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:layout_height="wrap_content">
+    <androidx.appcompat.widget.AppCompatTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Item"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:duplicateParentState="true"
+        android:id="@+id/label"
+        android:textSize="15sp"
+        android:textColor="@drawable/menu_text_color"
+        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+        app:textAllCaps="false" />
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_location_item.xml b/app/src/main/res/layout/custom_location_item.xml
index 732f707..b556a53 100644
--- a/app/src/main/res/layout/custom_location_item.xml
+++ b/app/src/main/res/layout/custom_location_item.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
+    android:id="@+id/text"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
+    android:layout_height="56dp"
     android:gravity="center_vertical"
     android:padding="16dp"
-    android:textColor="@android:color/black"
+    android:focusable="true"
+    android:clickable="true"
+    android:background="?attr/selectableItemBackground"
+    android:textColor="@color/colorPrimaryText"
     style="@style/AnotherWidget.Settings.Title"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_advanced_settings.xml b/app/src/main/res/layout/fragment_advanced_settings.xml
new file mode 100644
index 0000000..4e0b86d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_advanced_settings.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
+    </data>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView"
+        android:scrollbarThumbVertical="@color/colorPrimary"
+        android:background="@color/colorPrimaryDark">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:orientation="vertical">
+            <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_wallpaper"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_wallpaper"
+                    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_title_show_wallpaper"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/show_wallpaper_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_change_theme"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/ic_day_night"
+                    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_theme_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/theme"
+                        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_translate"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_translate"
+                    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/support_translations_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/second_text_size_label"
+                        android:text="@string/support_translations_subtitle"
+                        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_website"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_widgets"
+                    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/support_website_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/font_color_label"
+                        android:text="@string/support_website_subtitle"
+                        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_help_dev"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_cafe"
+                    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/support_main_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/support_main_subtitle"
+                        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_refresh_widget"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_refresh"
+                    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/action_refresh_widget"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/support_refresh_widget_subtitle"
+                        style="@style/AnotherWidget.Settings.Subtitle"
+                        tools:ignore="HardcodedText" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_calendar_settings.xml b/app/src/main/res/layout/fragment_calendar_settings.xml
new file mode 100644
index 0000000..145d41f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_calendar_settings.xml
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
+        <variable
+            name="isCalendarEnabled"
+            type="Boolean" />
+    </data>
+
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView"
+        android:scrollbarThumbVertical="@color/colorPrimary"
+        android:background="@color/colorPrimaryDark">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:orientation="vertical">
+            <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_events"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_today"
+                    android:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    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_permission_calendar"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/show_events_label"
+                        android:text="@string/description_permission_calendar"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:visibility="gone"
+                    android:id="@+id/read_calendar_permission_alert_icon"
+                    android:src="@drawable/round_error"
+                    android:tint="@color/errorColorText"/>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/calendar_settings"
+                android:alpha="@{isCalendarEnabled ? 1f : 0.2f, default=1}"
+                android:orientation="vertical">
+                <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_filter_calendar"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_filter_list"
+                        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_filter_calendar_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_filter_calendar_subtitle"
+                            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_all_day"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_date_range"
+                        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_all_day_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/all_day_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_show_declined_events"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_event_busy"
+                        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_declined_events_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/show_declined_events_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_show_multiple_events"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_event_note"
+                        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"
+                    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_until"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_redo"
+                        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_until_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/show_until_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_show_diff_time"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_schedule"
+                        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_diff_time_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/show_diff_time_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_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"
+                    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_row_info"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_low_priority"
+                        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_second_row_info_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/second_row_info_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_calendar_app"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_add_to_home_screen"
+                        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_calendar_app_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/calendar_app_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_event_app"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_add_to_home_screen"
+                        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_event_app_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/event_app_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_clock_settings.xml b/app/src/main/res/layout/fragment_clock_settings.xml
new file mode 100644
index 0000000..13f84e3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_clock_settings.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
+        <variable
+            name="isClockVisible"
+            type="Boolean" />
+    </data>
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView"
+        android:scrollbarThumbVertical="@color/colorPrimary"
+        android:background="@color/colorPrimaryDark">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:orientation="vertical">
+            <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_clock"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_schedule"
+                    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_show_clock"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/show_clock_label"
+                        android:text="@string/description_show_clock"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/clock_settings"
+                android:alpha="@{isClockVisible ? 1f : 0.2f, default=1}"
+                android:orientation="vertical">
+                <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_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/settings_clock_text_size_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/clock_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_show_next_alarm"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_alarm"
+                        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_next_alarm_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/show_next_alarm_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_clock_app"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_add_to_home_screen"
+                        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_app_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/clock_app_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
new file mode 100644
index 0000000..0a356c3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
+    </data>
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView"
+        android:scrollbarThumbVertical="@color/colorPrimary"
+        android:background="@color/colorPrimaryDark">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:orientation="vertical">
+            <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_main_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_main_text_size"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/main_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_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_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_font_color_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/font_color_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_text_shadow"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_texture"
+                    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_text_shadow"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/text_shadow_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_custom_font"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_font_download"
+                    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_custom_font_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/custom_font_label"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_weather_settings.xml b/app/src/main/res/layout/fragment_weather_settings.xml
new file mode 100644
index 0000000..200f7e8
--- /dev/null
+++ b/app/src/main/res/layout/fragment_weather_settings.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel" />
+        <variable
+            name="isWeatherVisible"
+            type="Boolean" />
+    </data>
+    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView"
+        android:scrollbarThumbVertical="@color/colorPrimary"
+        android:background="@color/colorPrimaryDark">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:orientation="vertical">
+            <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_weather"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="12dp"
+                    android:src="@drawable/round_wb_sunny"
+                    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_permission_location"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/show_weather_label"
+                        android:text="@string/description_permission_location"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/weather_settings"
+                android:alpha="@{isWeatherVisible ? 1f : 0.2f, default=1}"
+                android:orientation="vertical">
+                <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_provider_api_key"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_vpn_key"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        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_provider_api_key_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/label_weather_provider_api_key"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:visibility="gone"
+                        android:id="@+id/api_key_alert_icon"
+                        android:src="@drawable/round_error"
+                        android:tint="@color/errorColorText"/>
+                </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_custom_location"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_place"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        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_custom_location_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/label_custom_location"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:visibility="gone"
+                        android:id="@+id/location_permission_alert_icon"
+                        android:src="@drawable/round_error"
+                        android:tint="@color/errorColorText"/>
+                </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_change_unit"
+                    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_unit_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/temp_unit"
+                            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_refresh_period"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_schedule"
+                        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_refresh_period_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/label_weather_refresh_period"
+                            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_app"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_add_to_home_screen"
+                        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_app_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/weather_app_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/inapp_product_layout.xml b/app/src/main/res/layout/inapp_product_layout.xml
new file mode 100644
index 0000000..d0f901c
--- /dev/null
+++ b/app/src/main/res/layout/inapp_product_layout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center_vertical"
+    android:id="@+id/item"
+    android:clickable="true"
+    android:focusable="true"
+    android:background="?attr/selectableItemBackground"
+    android:orientation="horizontal"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingRight="20dp"
+    android:paddingLeft="20dp">
+    <androidx.appcompat.widget.AppCompatTextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/donation_coffee"
+        android:id="@+id/product_title"
+        android:paddingRight="8dp"
+        android:paddingLeft="8dp"
+        android:textAllCaps="false"
+        android:textSize="16sp"
+        android:textColor="@color/colorPrimaryText"
+        android:letterSpacing="0"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Button"/>
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        app:cardCornerRadius="15dp"
+        app:cardElevation="0dp"
+        app:cardBackgroundColor="@color/colorAccent_op30"
+        app:cardPreventCornerOverlap="true">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:gravity="center"
+            android:text="12.00$"
+            android:textColor="@color/colorAccent"
+            android:id="@+id/product_price"
+            android:textSize="14sp"/>
+    </com.google.android.material.card.MaterialCardView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/key_time_wait_layout.xml b/app/src/main/res/layout/key_time_wait_layout.xml
deleted file mode 100644
index cb6e8d0..0000000
--- a/app/src/main/res/layout/key_time_wait_layout.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="start"
-        android:id="@+id/title"
-        style="@style/AnotherWidget.Main.Title"
-        android:textSize="20sp"
-        android:textColor="@android:color/black"/>
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        style="@style/AnotherWidget.Main.Subtitle"
-        android:textSize="18sp"
-        android:layout_marginTop="16dp"
-        android:gravity="start"
-        android:id="@+id/text"/>
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="16dp"
-        android:gravity="center_vertical"
-        android:layout_gravity="end">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorAccent"
-            style="@style/AnotherWidget.Settings.Title"
-            android:textAllCaps="true"
-            android:layout_gravity="end"
-            android:id="@+id/action_close"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginBottom="8dp"
-            android:text="@android:string/ok"/>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_menu_layout.xml b/app/src/main/res/layout/main_menu_layout.xml
deleted file mode 100644
index bd3ac27..0000000
--- a/app/src/main/res/layout/main_menu_layout.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout app:layout_behavior="android.support.design.widget.BottomSheetBehavior"
-    android:id="@+id/fragment_history_menu_bottom"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:background="@android:color/white"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="16dp"
-        android:id="@+id/action_refresh"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="8dp"
-            android:tint="@android:color/black"
-            android:src="@drawable/ic_action_refresh"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/action_refresh_widget"
-            style="@style/AnotherWidget.Settings.Title"
-            android:background="@android:color/transparent"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textColor="@android:color/black" />
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="16dp"
-        android:textSize="14sp"
-        android:id="@+id/action_toggle_widget_preview"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="8dp"
-            android:id="@+id/widget_preview_icon"
-            android:tint="@android:color/black"
-            android:src="@drawable/ic_action_rate"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/action_hide_widget_preview"
-            style="@style/AnotherWidget.Settings.Title"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:id="@+id/widget_preview_label"
-            android:textColor="@android:color/black"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="16dp"
-        android:textSize="14sp"
-        android:id="@+id/action_rate"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="8dp"
-            android:tint="@android:color/black"
-            android:src="@drawable/ic_action_rate"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/action_rate"
-            style="@style/AnotherWidget.Settings.Title"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textColor="@android:color/black"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="16dp"
-        android:id="@+id/action_feedback"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="8dp"
-            android:tint="@android:color/black"
-            android:src="@drawable/ic_action_sms"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/action_feedback"
-            style="@style/AnotherWidget.Settings.Title"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textColor="@android:color/black"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="16dp"
-        android:id="@+id/action_share"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="8dp"
-            android:tint="@android:color/black"
-            android:src="@drawable/ic_action_share"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/action_share"
-            style="@style/AnotherWidget.Settings.Title"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textColor="@android:color/black"/>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="16dp"
-        android:id="@+id/action_support"
-        android:orientation="horizontal">
-        <ImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginLeft="8dp"
-            android:tint="@color/midnight_blue"
-            android:src="@drawable/ic_action_gift"/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/action_support"
-            style="@style/AnotherWidget.Settings.Title"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textColor="@color/colorNightDark"/>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/provider_info_layout.xml b/app/src/main/res/layout/provider_info_layout.xml
deleted file mode 100644
index 0b2b262..0000000
--- a/app/src/main/res/layout/provider_info_layout.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/api_key_info_start"
-        android:gravity="start"
-        style="@style/AnotherWidget.Main.Title"
-        android:textSize="20sp"
-        android:textColor="@android:color/black"/>
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        style="@style/AnotherWidget.Main.Subtitle"
-        android:textSize="18sp"
-        android:gravity="start"
-        android:id="@+id/text"/>
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="16dp"
-        android:gravity="center_vertical"
-        android:layout_gravity="end">
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:id="@+id/action_open_info_text"
-            android:tint="@color/colorAccent"
-            android:src="@drawable/ic_action_aw"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorAccent"
-            style="@style/AnotherWidget.Settings.Title"
-            android:textAllCaps="true"
-            android:layout_gravity="end"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:text="@string/signature"/>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/the_widget.xml b/app/src/main/res/layout/the_widget.xml
index 56f3862..ae3f9a8 100644
--- a/app/src/main/res/layout/the_widget.xml
+++ b/app/src/main/res/layout/the_widget.xml
@@ -1,28 +1,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:id="@+id/main_layout">
-    <TextView
-        android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
-        android:layout_marginTop="-8dp"
-        android:lineSpacingMultiplier="1"
-        android:lineSpacingExtra="0dp"
-        android:visibility="gone"
-        android:includeFontPadding="false"
-        android:padding="0dp"
-        style="@style/AnotherWidget.Title"
-        android:textSize="90sp"/>
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_centerInParent="true"
-        android:layout_below="@+id/time"
         android:orientation="horizontal"
         android:id="@+id/empty_layout">
         <TextView
@@ -30,6 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:lines="1"
+            android:textColor="@color/colorPrimary"
             android:maxLines="1"
             android:ellipsize="end"
             android:text="@string/loading_text"
@@ -40,8 +25,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:id="@+id/weather"
-            android:visibility="gone">
+            android:visibility="gone"
+            android:id="@+id/weather">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -71,15 +56,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:visibility="gone"
         android:layout_centerHorizontal="true"
-        android:layout_below="@+id/time"
         android:id="@+id/calendar_layout"
+        android:visibility="gone"
         android:gravity="center">
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
+            <ImageView
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center_vertical"
+                android:id="@+id/action_previous"
+                android:src="@drawable/round_chevron_left" />
             <TextView
                 android:id="@+id/next_event"
                 android:layout_width="0dp"
@@ -103,6 +93,12 @@
                     android:includeFontPadding="false"
                     style="@style/AnotherWidget.Title" />
             </LinearLayout>
+            <ImageView
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center_vertical"
+                android:id="@+id/action_next"
+                android:src="@drawable/round_chevron_right" />
         </LinearLayout>
         <LinearLayout
             android:layout_width="wrap_content"
@@ -114,6 +110,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
+                android:id="@+id/second_row"
                 android:orientation="horizontal">
                 <ImageView
                     android:layout_width="16dp"
@@ -121,7 +118,7 @@
                     android:layout_marginEnd="4dp"
                     android:layout_marginStart="4dp"
                     android:id="@+id/second_row_icon"
-                    android:src="@drawable/ic_action_calendar"/>
+                    android:src="@drawable/round_today"/>
                 <TextView
                     android:id="@+id/next_event_date"
                     android:layout_width="wrap_content"
@@ -132,17 +129,12 @@
                     android:layout_height="wrap_content"
                     style="@style/AnotherWidget.Subtitle" />
             </LinearLayout>
-            <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginLeft="6dp"
-                android:id="@+id/multiple_events"
-                android:src="@drawable/ic_action_next"/>
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
+                android:visibility="gone"
                 android:id="@+id/calendar_weather">
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/the_widget_sans.xml b/app/src/main/res/layout/the_widget_sans.xml
index 278d535..ba8ef2c 100644
--- a/app/src/main/res/layout/the_widget_sans.xml
+++ b/app/src/main/res/layout/the_widget_sans.xml
@@ -1,40 +1,110 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
     android:id="@+id/main_layout">
-    <ImageView
+    <TextClock
+        android:id="@+id/time"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:scaleType="centerCrop"
-        android:id="@+id/bitmap_container"/>
-    <LinearLayout
+        android:gravity="center"
+        android:lineSpacingMultiplier="1"
+        android:lineSpacingExtra="0dp"
+        android:includeFontPadding="false"
+        android:format12Hour="hh:mm"
+        android:padding="0dp"
+        android:visibility="gone"
+        android:lines="1"
+        android:maxLines="1"
+        android:layout_marginBottom="16dp"
+        style="@style/AnotherWidget.Title"/>
+    <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:alpha="0"
-        android:layout_centerInParent="true">
-        <include layout="@layout/the_widget"
-            android:layout_height="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:id="@+id/intent_container" />
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:alpha="0"
+            android:layout_centerHorizontal="true"
+            android:orientation="horizontal"
+            android:id="@+id/empty_layout_rect">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/empty_date_rect"/>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/weather_rect" />
+        </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="8dp"
-            android:visibility="gone"
-            android:id="@+id/bottom_divider_8"
-            android:orientation="vertical" />
-        <LinearLayout
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_centerHorizontal="true"
+            android:id="@+id/calendar_layout_rect"
+            android:alpha="0"
+            android:gravity="center">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/action_previous_rect" />
+                <ImageView
+                    android:layout_height="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:id="@+id/next_event_rect" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/next_event_difference_time_rect" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/action_next_rect" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center">
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/second_row_rect" />
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/calendar_weather_rect" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <ImageView
             android:layout_width="match_parent"
-            android:layout_height="16dp"
-            android:visibility="gone"
-            android:id="@+id/bottom_divider_16"
-            android:orientation="vertical" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="24dp"
-            android:visibility="gone"
-            android:id="@+id/bottom_divider_24"
-            android:orientation="vertical" />
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+            android:layout_height="wrap_content"
+            android:scaleType="centerCrop"
+            android:id="@+id/bitmap_container"/>
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/weather_layout.xml b/app/src/main/res/layout/weather_layout.xml
deleted file mode 100644
index 6fa9f71..0000000
--- a/app/src/main/res/layout/weather_layout.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:text="|"
-        style="@style/AnotherWidget.Subtitle"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/AnotherWidget.Date"
-        android:id="@+id/temp"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/weather_refresh_period_menu.xml b/app/src/main/res/menu/weather_refresh_period_menu.xml
index 82a6e18..734e1ed 100644
--- a/app/src/main/res/menu/weather_refresh_period_menu.xml
+++ b/app/src/main/res/menu/weather_refresh_period_menu.xml
@@ -2,22 +2,22 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:title="@string/settings_weather_refresh_period_subtitle_1"
-        android:icon="@drawable/ic_action_refresh_0"
+        android:icon="@drawable/ic_launcher_foreground"
         android:id="@+id/refresh_1" />
     <item
         android:title="@string/settings_weather_refresh_period_subtitle_2"
-        android:icon="@drawable/ic_action_refresh_1"
+        android:icon="@drawable/ic_launcher_foreground"
         android:id="@+id/refresh_2" />
     <item
         android:title="@string/settings_weather_refresh_period_subtitle_3"
-        android:icon="@drawable/ic_action_refresh_2"
+        android:icon="@drawable/ic_launcher_foreground"
         android:id="@+id/refresh_3" />
     <item
         android:title="@string/settings_weather_refresh_period_subtitle_4"
-        android:icon="@drawable/ic_action_refresh_3"
+        android:icon="@drawable/ic_launcher_foreground"
         android:id="@+id/refresh_4" />
     <item
         android:title="@string/settings_weather_refresh_period_subtitle_5"
-        android:icon="@drawable/ic_action_refresh_5"
+        android:icon="@drawable/ic_launcher_foreground"
         android:id="@+id/refresh_5" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_generic_app.xml b/app/src/main/res/mipmap-anydpi-v26/ic_generic_app.xml
deleted file mode 100644
index bbd3e02..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_generic_app.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_generic_app_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_generic_app_round.xml
deleted file mode 100644
index bbd3e02..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_generic_app_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index d42b387..4ae7d12 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/gradient_background"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index d42b387..4ae7d12 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/gradient_background"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_generic_app.png b/app/src/main/res/mipmap-hdpi/ic_generic_app.png
deleted file mode 100644
index ebae12c..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_generic_app.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 67003b7..8bd680e 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..8e51d29
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index bcfcb21..1a8b9dc 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 67003b7..8bd680e 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_generic_app.png b/app/src/main/res/mipmap-mdpi/ic_generic_app.png
deleted file mode 100644
index f1f8b4b..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_generic_app.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 078ad10..2a24b77 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..618108f
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index b90487f..aef9fb5 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 078ad10..2a24b77 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_generic_app.png b/app/src/main/res/mipmap-xhdpi/ic_generic_app.png
deleted file mode 100644
index 9ace2ee..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_generic_app.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 59c34d1..a0eb162 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..53754a4
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 6d536d9..405ea21 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 59c34d1..a0eb162 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_generic_app.png b/app/src/main/res/mipmap-xxhdpi/ic_generic_app.png
deleted file mode 100644
index 2ed8ddb..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_generic_app.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 9404420..6500dc5 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..d3c1cdb
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index a623d38..20ea04e 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 9404420..6500dc5 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_generic_app.png b/app/src/main/res/mipmap-xxxhdpi/ic_generic_app.png
deleted file mode 100644
index 57521ba..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_generic_app.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index c15ec1a..1f3a9b1 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..d68ded0
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index b3b777e..45b2671 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index c15ec1a..1f3a9b1 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 86%
rename from app/src/main/res/values-it-rIT/strings.xml
rename to app/src/main/res/values-it/strings.xml
index e3587dd..e137d3b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Another Widget</string>
-    <string name="add_widget">Aggiungi Widget</string>
+    <string name="add_widget">Aggiungi</string>
     <string name="main_pre_title">Just</string>
     <string name="button_request_permission">Concedi Accesso</string>
     <string name="all_set_btn">Rimani Aggiornato</string>
@@ -28,11 +28,11 @@
     <string name="settings_filter_calendar_subtitle">Scegli quali calendari vedere</string>
     <string name="settings_all_day_title">Eventi Giornalieri</string>
     <string name="settings_all_day_subtitle_visible">Visibili</string>
-    <string name="settings_all_day_subtitle_gone">Non Visibili</string>
+    <string name="settings_all_day_subtitle_gone">Non visibili</string>
     <string name="main_calendar">Calendario Account</string>
-    <string name="settings_calendar_title">Impostazioni Calendario</string>
-    <string name="settings_weather_title">Impostazioni Meteo</string>
-    <string name="settings_general_title">Impostazioni Generali</string>
+    <string name="settings_calendar_title">Calendario</string>
+    <string name="settings_weather_title">Meteo</string>
+    <string name="settings_general_title">Tipografia</string>
     <string name="calendar_settings_list_error">Errore nel caricamento della lista dei calendari</string>
     <string name="settings_hour_format_title">Formato Ora</string>
     <string name="settings_hour_format_subtitle_12">12 ore AM/PM</string>
@@ -46,12 +46,12 @@
     <string name="settings_weather_refresh_period_subtitle_3">6 Ore</string>
     <string name="settings_weather_refresh_period_subtitle_4">12 Ore</string>
     <string name="settings_weather_refresh_period_subtitle_5">24 Ore</string>
-    <string name="settings_custom_location_title">Località Meteo</string>
-    <string name="custom_location_gps">Geolocalizzazione</string>
+    <string name="settings_custom_location_title">Località</string>
+    <string name="custom_location_gps">Usa la geolocalizzazione</string>
     <string name="action_refresh_widget">Aggiorna Widget</string>
-    <string name="show_events_visible">Eventi Visibili</string>
-    <string name="show_events_not_visible">Eventi non Visibili</string>
-    <string name="show_weather_visible">Meteo Visibile</string>
+    <string name="show_events_visible">Eventi visibili</string>
+    <string name="show_events_not_visible">Eventi non visibili</string>
+    <string name="show_weather_visible">Meteo visibile</string>
     <string name="show_weather_not_visible">Meteo non Visibile</string>
     <string name="settings_show_until_subtitle_0">3 Ore dopo</string>
     <string name="settings_show_until_subtitle_1">6 Ore dopo</string>
@@ -68,7 +68,7 @@
     <string name="settings_weather_app_title">Il meteo apre</string>
     <string name="default_name">App Predefinita</string>
     <string name="action_choose_application">Scegli Applicazione</string>
-    <string name="settings_weather_provider_api_key_title">"Provider del Meteo "</string>
+    <string name="settings_weather_provider_api_key_title">Chiave API Meteo</string>
     <string name="settings_weather_provider_api_key_subtitle_all_set">Il provider meteo è configurato correttamente</string>
     <string name="settings_weather_provider_api_key_subtitle_not_set">Il provider meteo deve essere configurato</string>
     <string name="notification_gps_title">Riattiva la localizzazione</string>
@@ -93,7 +93,7 @@
     <string name="api_key_info_start">Ciao a tutti.</string>
     <string name="api_key_info_text"><![CDATA[Another widget è e rimarrà gratuita e senza banner pubblicitari.<BR /><BR />Però a causa del successo dell\'applicazione, sicuramente oltre ogni mia aspettativa, il provider del meteo non riesce a supportare il numero di richieste che arrivano (a causa dell\'utilizzo di un account gratuito).<BR /><BR />Sono costretto a chiedervi di registrarvi su OpenWeather.com; l\'operazione richiederà solo alcuni minuti e dopo non avrete più problemi con la fruizione delle informazioni sul meteo!<BR /><BR />Mi dispiace per l\'inconveniente ma continuate a supportarmi!!]]></string>
     <string name="well_done">Ben Fatto!</string>
-    <string name="api_key_info_all_set"><![CDATA[Posso essere necessari fino a <b>dieci minuti</b> prima che la tua chiave sia attivata.<BR />Quindi <i>rilassati</i>! Il meteo verrà aggiornato non appena sarà disponibile!]]></string>
+    <string name="api_key_info_all_set"><![CDATA[Posso essere necessari fino a <b>dieci minuti</b> prima che la tua chiave sia attivata. Il meteo verrà aggiornato non appena sarà disponibile!]]></string>
     <string name="hs_code">" ore"</string>
     <string name="tomorrow">Domani</string>
     <string name="today">Oggi</string>
@@ -105,18 +105,19 @@
     <string name="settings_font_color_title">Colore Testo</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">Impostazioni Orologio</string>
+    <string name="settings_clock_title">Orologio</string>
     <string name="settings_clock_app_title">L\'orologio apre</string>
     <string name="title_show_clock">Mostra Orologio</string>
     <string name="description_show_clock">Mostra l\'ora sopra eventi e meteo</string>
     <string name="show_clock_visible">Orologio visibile</string>
     <string name="show_clock_not_visible">Orologio non visibile</string>
     <string name="settings_clock_text_size_title">Dimensione Testo Orologio</string>
+    <string name="settings_show_next_alarm_title">Mostra prossimo allarme quando possibile</string>
     <string name="title_text_shadow">Ombra Testo</string>
     <string name="settings_text_shadow_subtitle_none">Nessuna</string>
     <string name="settings_text_shadow_subtitle_low">Bassa</string>
     <string name="settings_text_shadow_subtitle_high">Alta</string>
-    <string name="advanced_settings_title">Impostazioni Avanzate</string>
+    <string name="advanced_settings_title">Avanzate</string>
     <string name="beta">Beta</string>
     <string name="settings_product_sans_font_title">Font Product Sans</string>
     <string name="settings_product_sans_font_subtitle">L\'utilizzo del Product Sans disabilita i tap sugli elementi del widget. Ci sto attualmente lavorando.</string>
@@ -137,7 +138,7 @@
     <string name="settings_custom_font_title">Font Widget</string>
     <string name="action_go_to_next_event">Mostra Evento\nSuccessivo</string>
     <string name="settings_show_multiple_events_title">Contatore Eventi Multipli</string>
-    <string name="support_main_title">Supporta lo Sviluppatore con</string>
+    <string name="support_main_title">Supporta lo Sviluppatore</string>
     <string name="support_translations_title">Aiuta con le Traduzioni</string>
     <string name="support_translations_subtitle">Apri una pull request su GitHub</string>
     <string name="support_website_title">Scopri i miei progetti</string>
@@ -158,4 +159,14 @@
     <string name="open_location_settings">Impostazioni GPS</string>
     <string name="change_provider">Cambia Provider</string>
     <string name="disable_notification">Disabilita Notifica</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="support_main_subtitle">Agli sviluppatori fa sempre bene un caffè</string>
+    <string name="settings_subtitle_dark_theme_light">Chiaro</string>
+    <string name="settings_subtitle_dark_theme_dark">Scuro</string>
+    <string name="settings_subtitle_dark_theme_by_battery_saver">In base al risparmio energetico</string>
+    <string name="settings_subtitle_dark_theme_follow_system">Tema di sistema</string>
+    <string name="settings_subtitle_dark_theme_default">Default</string>
+    <string name="search">Cerca</string>
+    <string name="settings_title_show_wallpaper">Mostra wallpaper</string>
+    <string name="support_refresh_widget_subtitle">Ricarica tutti i servizi</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..d684a8b
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimaryOld">#0092ca</color>
+    <color name="colorPrimaryDarkOld">#0083B5</color>
+    <color name="colorNightDark">#124E96</color>
+    <color name="colorPrimaryLight">#DAEAF6</color>
+    <color name="black_50">#80000000</color>
+    <color name="black_30">#48000000</color>
+    <color name="black_10">#1A000000</color>
+    <color name="white_80">#CCFFFFFF</color>
+    <color name="white_50">#80FFFFFF</color>
+    <color name="midnight_blue">#204A85</color>
+    <color name="dark_grey">#222222</color>
+
+
+    <color name="colorPrimary">#202020</color>
+<!--    <color name="colorPrimary">#23374D</color>-->
+    <color name="colorPrimaryDark">#121212</color>
+<!--    <color name="colorPrimaryDark">#1D2C3D</color>-->
+    <color name="colorAccent">#0092ca</color>
+    <color name="colorAccent_op30">#4D1089FF</color>
+    <color name="colorTitle">#FFFFFF</color>
+    <color name="colorPrimaryText">#FFFFFF</color>
+    <color name="colorSecondaryText">#99FFFFFF</color>
+    <color name="disabledButtonBackground">#131D28</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/dark_theme_helper.xml b/app/src/main/res/values-night/dark_theme_helper.xml
new file mode 100644
index 0000000..dad87d3
--- /dev/null
+++ b/app/src/main/res/values-night/dark_theme_helper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="is_dark_theme">true</bool>
+    <bool name="is_not_dark_theme">false</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..479e2b5
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="grey">
+        <item name="grey_0">#FFFFFF</item>
+        <item name="grey_50">#FAFAFA</item>
+        <item name="grey_100">#F5F5F5</item>
+        <item name="grey_200">#EEEEEE</item>
+        <item name="grey_300">#E0E0E0</item>
+        <item name="grey_400">#BDBDBD</item>
+        <item name="grey_500">#9E9E9E</item>
+        <item name="grey_600">#757575</item>
+        <item name="grey_700">#616161</item>
+        <item name="grey_800">#424242</item>
+        <item name="grey_900">#212121</item>
+        <item name="grey_1000">#000000</item>
+    </array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e5ddaad..0740b90 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#0092ca</color>
-    <color name="colorPrimaryDark">#0083B5</color>
+
+    <color name="colorPrimaryOld">#0092ca</color>
+    <color name="colorPrimaryDarkOld">#0083B5</color>
     <color name="colorNightDark">#124E96</color>
-    <color name="colorAccent">#04507D</color>
     <color name="colorPrimaryLight">#DAEAF6</color>
     <color name="black_50">#80000000</color>
     <color name="black_30">#48000000</color>
@@ -12,4 +12,22 @@
     <color name="white_50">#80FFFFFF</color>
     <color name="midnight_blue">#204A85</color>
     <color name="dark_grey">#222222</color>
+
+
+    <color name="colorPrimary">#FFFFFF</color>
+    <color name="colorPrimaryDark">#F8F8F8</color>
+    <color name="colorAccent">#0092ca</color>
+    <color name="colorAccent_op30">#4D1089FF</color>
+    <color name="colorTitle">#1089FF</color>
+    <color name="black_op10">#1A000000</color>
+    <color name="black_op20">#33000000</color>
+    <color name="black_op50">#80000000</color>
+    <color name="black_op60">#99000000</color>
+    <color name="black_op80">#CC000000</color>
+    <color name="colorPrimaryText">#000000</color>
+    <color name="colorSecondaryText">#99000000</color>
+    <color name="errorColorBackground">#FBD8D8</color>
+    <color name="errorColorText">#E93B3B</color>
+    <color name="disabledButtonBackground">#efefef</color>
+
 </resources>
diff --git a/app/src/main/res/values/dark_theme_helper.xml b/app/src/main/res/values/dark_theme_helper.xml
new file mode 100644
index 0000000..552c9c4
--- /dev/null
+++ b/app/src/main/res/values/dark_theme_helper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="is_dark_theme">false</bool>
+    <bool name="is_not_dark_theme">true</bool>
+</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 129edb5..100b83c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">Another Widget</string>
-    <string name="add_widget">Add Widget</string>
+    <string name="add_widget">Add</string>
     <string name="main_pre_title">Just</string>
     <string name="button_request_permission">Grant Permission</string>
     <string name="title_permission_calendar">See your Events</string>
@@ -29,11 +29,11 @@
     <string name="settings_filter_calendar_subtitle">Change calendar visibility</string>
     <string name="settings_all_day_title">All Day Events</string>
     <string name="settings_all_day_subtitle_visible">Visible</string>
-    <string name="settings_all_day_subtitle_gone">Not Visible</string>
+    <string name="settings_all_day_subtitle_gone">Not visible</string>
     <string name="main_calendar">Account Calendar</string>
-    <string name="settings_calendar_title">Calendar Settings</string>
-    <string name="settings_weather_title">Weather Settings</string>
-    <string name="settings_general_title">General Settings</string>
+    <string name="settings_calendar_title">Calendar</string>
+    <string name="settings_weather_title">Weather</string>
+    <string name="settings_general_title">Typography</string>
     <string name="calendar_settings_list_error">Error loading the calendar list</string>
     <string name="settings_hour_format_title">Hour Format</string>
     <string name="settings_hour_format_subtitle_12">12 Hour AM/PM</string>
@@ -47,13 +47,13 @@
     <string name="settings_weather_refresh_period_subtitle_3">6 Hours</string>
     <string name="settings_weather_refresh_period_subtitle_4">12 Hours</string>
     <string name="settings_weather_refresh_period_subtitle_5">24 Hours</string>
-    <string name="settings_custom_location_title">Custom Location</string>
-    <string name="custom_location_gps">Geolocation</string>
+    <string name="settings_custom_location_title">Location</string>
+    <string name="custom_location_gps">Use geolocation</string>
     <string name="action_refresh_widget">Refresh Widget</string>
     <string name="show_events_visible">Events are Visible</string>
-    <string name="show_events_not_visible">Events are not Visible</string>
-    <string name="show_weather_visible">Weather Info is Visible</string>
-    <string name="show_weather_not_visible">Weather Info is not Visible</string>
+    <string name="show_events_not_visible">Events are not visible</string>
+    <string name="show_weather_visible">Weather Info is visible</string>
+    <string name="show_weather_not_visible">Weather Info are not visible</string>
     <string name="settings_show_until_subtitle_0">3 Hours later</string>
     <string name="settings_show_until_subtitle_1">6 Hours later</string>
     <string name="settings_show_until_subtitle_2">12 Hours later</string>
@@ -70,7 +70,7 @@
     <string name="settings_weather_app_title">Tap on weather opens</string>
     <string name="default_name">Default App</string>
     <string name="action_choose_application">Choose Application</string>
-    <string name="settings_weather_provider_api_key_title">Weather Provider</string>
+    <string name="settings_weather_provider_api_key_title">Weather API key</string>
     <string name="settings_weather_provider_api_key_subtitle_all_set">The weather provider is configured correctly</string>
     <string name="settings_weather_provider_api_key_subtitle_not_set">The weather provider must be configured</string>
     <string name="notification_gps_title">Turn location on</string>
@@ -94,7 +94,7 @@
     <string name="api_key_subtitle_3">Enter the key in this section and save it. Once the key is activated the weather will be visible.</string>
     <string name="api_key_info_start">Hi Everyone!</string>
     <string name="action_open_provider">Go to OpenWeather.com</string>
-    <string name="api_key_info_all_set"><![CDATA[It may take up to <b>ten minutes</b> before your API key is activated.<BR />So <i>relax</i>! The weather will be updated as soon as it is available!!]]></string>
+    <string name="api_key_info_all_set"><![CDATA[It may take up to <b>ten minutes</b> before your API key is activated. The weather will be updated as soon as it is available!]]></string>
     <string name="well_done">Well Done!</string>
     <string name="hs_code">h</string>
     <string name="tomorrow">Tomorrow</string>
@@ -109,21 +109,22 @@
     <string name="title_second_text_size">Second Row Text Size</string>
     <string name="provider_open_weather" translatable="false">OpenWeather</string>
     <string name="provider_google_awareness" translatable="false">Google Awareness</string>
-    <string name="settings_clock_title">Clock Settings</string>
+    <string name="settings_clock_title">Clock</string>
     <string name="settings_clock_app_title">Tap on clock opens</string>
     <string name="title_show_clock">Show Clock</string>
     <string name="description_show_clock">View the time over events and weather</string>
     <string name="show_clock_visible">Clock is visible</string>
     <string name="show_clock_not_visible">Clock is not visible</string>
     <string name="settings_clock_text_size_title">Clock Text Size</string>
+    <string name="settings_show_next_alarm_title">Show next alarm when possible</string>
     <string name="title_text_shadow">Text Shadow</string>
     <string name="settings_text_shadow_subtitle_none">None</string>
     <string name="settings_text_shadow_subtitle_low">Low</string>
     <string name="settings_text_shadow_subtitle_high">High</string>
-    <string name="advanced_settings_title">Advanced Settings</string>
+    <string name="advanced_settings_title">Advanced</string>
     <string name="beta">Beta</string>
     <string name="settings_product_sans_font_title">Product Sans Font</string>
-    <string name="settings_product_sans_font_subtitle">Using Product Sans disabled the possibilty to tap widget elements. I\'m working on it.</string>
+    <string name="settings_product_sans_font_subtitle">Using Product Sans disabled the possibility to tap widget elements. I\'m working on it.</string>
     <string name="settings_show_diff_time_title">Time left for the event</string>
     <string name="settings_visible">Visible</string>
     <string name="settings_not_visible">Not Visible</string>
@@ -141,19 +142,19 @@
     <string name="custom_font_subtitle_1">Product Sans</string>
     <string name="action_go_to_next_event">Show Next\nEvent</string>
     <string name="settings_show_multiple_events_title">Multiple Events Counter</string>
-    <string name="support_custom_app_name" translatable="false">Another Developer</string>
-    <string name="support_main_title">Support the Developer with</string>
+    <string name="support_custom_app_name" translatable="false">\"Another\" Developer</string>
+    <string name="support_main_title">Support the Developer</string>
     <string name="support_translations_title">Help with translations</string>
     <string name="support_translations_subtitle">Open a pull request on GitHub</string>
     <string name="support_website_title">Find out my projects</string>
     <string name="support_website_subtitle">Same developer, more possibilities</string>
     <string name="error">Ops, something went wrong!</string>
-    <string name="thanks">Thanks for support me!</string>
-    <string name="donation_coffee">An Italian Coffee</string>
-    <string name="donation_donuts">Some Glazed Donuts</string>
-    <string name="donation_dinner">An Expensive Dinner</string>
-    <string name="donation_breakfast">An English Breakfast</string>
-    <string name="donation_lunch">A Quick Lunch</string>
+    <string name="thanks">Thanks for supporting me!</string>
+    <string name="donation_coffee">An italian coffee</string>
+    <string name="donation_donuts">Some glazed donuts</string>
+    <string name="donation_dinner">An expensive dinner</string>
+    <string name="donation_breakfast">An english breakfast</string>
+    <string name="donation_lunch">A quick lunch</string>
     <string name="background_service_title">Another Widget is Running</string>
     <string name="background_service_subtitle">AW is running in the background</string>
     <string name="action_show_widget_preview">Show Widget Preview</string>
@@ -163,4 +164,14 @@
     <string name="open_location_settings">Location Settings</string>
     <string name="change_provider">Change Provider</string>
     <string name="disable_notification">Disable Notification</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="support_main_subtitle">Devs always need a lot of coffee</string>
+    <string name="settings_subtitle_dark_theme_light">Light</string>
+    <string name="settings_subtitle_dark_theme_dark">Dark</string>
+    <string name="settings_subtitle_dark_theme_by_battery_saver">Set by Battery Saver</string>
+    <string name="settings_subtitle_dark_theme_follow_system">Follow the system theme</string>
+    <string name="settings_subtitle_dark_theme_default">Default</string>
+    <string name="search">Search</string>
+    <string name="settings_title_show_wallpaper">Show wallpaper</string>
+    <string name="support_refresh_widget_subtitle">Restart the widget service</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7eb17dd..7929032 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,33 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:windowAnimationStyle">@null</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
+        <item name="android:windowLightStatusBar">@bool/is_not_dark_theme</item>
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:colorControlActivated">@color/colorAccent</item>
+        <item  name="android:windowActivityTransitions">true</item>
     </style>
 
-    <style name="AnotherWidget.Main.Title" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">28sp</item>
+    <style name="AppTheme.Main" parent="AppTheme">
+        <item name="android:windowBackground">@drawable/background_splash_screen</item>
+    </style>
+
+    <style name="AnotherWidget.Main.Title" parent="TextAppearance.AppCompat.Button">
+        <item name="android:textColor">@color/colorPrimaryText</item>
+        <item name="android:textSize">18sp</item>
+        <item name="textAllCaps">false</item>
         <item name="android:gravity">center</item>
-        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="AnotherWidget.Main.Subtitle" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/colorSecondaryText</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:gravity">center</item>
     </style>
 
     <style name="AnotherWidget.Main.Description" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
         <item name="android:alpha">0.6</item>
     </style>
 
     <style name="AnotherWidget.Main.Button" parent="TextAppearance.AppCompat.Button">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">8dp</item>
         <item name="android:background">@drawable/card_background</item>
@@ -37,7 +48,7 @@
     </style>
 
     <style name="AnotherWidget.Main.Button.Dark" parent="TextAppearance.AppCompat.Button">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">8dp</item>
         <item name="android:background">@drawable/dark_card_background</item>
@@ -48,48 +59,40 @@
     </style>
 
     <style name="AnotherWidget.Main.Button.TabBar" parent="TextAppearance.AppCompat.Button">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">8dp</item>
         <item name="android:textSize">12sp</item>
     </style>
 
-    <style name="AnotherWidget.Settings.Header" parent="TextAppearance.AppCompat.Button">
-        <item name="android:textSize">10sp</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:paddingRight">6dp</item>
-        <item name="android:paddingLeft">6dp</item>
-        <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingBottom">4dp</item>
-        <item name="android:background">@drawable/dark_card_background</item>
+    <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:textStyle">bold</item>
     </style>
 
     <style name="AnotherWidget.Settings.Title" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="AnotherWidget.Settings.Subtitle" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:alpha">0.8</item>
+    <style name="AnotherWidget.Settings.Subtitle" parent="TextAppearance.AppCompat.Medium">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/colorSecondaryText</item>
     </style>
 
     <style name="AnotherWidget.Title" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:padding">4dp</item>
         <item name="android:textSize">24sp</item>
-        <item name="android:shadowColor">@color/black_50</item>
         <item name="android:shadowRadius">5</item>
         <item name="android:gravity">center</item>
     </style>
 
     <style name="AnotherWidget.Subtitle" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColor">@color/colorAccent</item>
         <item name="android:textSize">16sp</item>
-        <item name="android:shadowColor">@color/black_50</item>
-        <item name="android:shadowRadius">5</item>
         <item name="android:gravity">center_horizontal</item>
     </style>
 
@@ -100,4 +103,14 @@
         <item name="android:textSize">22sp</item>
     </style>
 
-</resources>
+    <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/bg_bottom_sheet_dialog</item>
+    </style>
+
+    <style name="BaseBottomSheetDialog" parent="@style/Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/BottomSheet</item>
+    </style>
+
+    <style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog" />
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml-v21/the_widget_info.xml b/app/src/main/res/xml-v21/the_widget_info.xml
deleted file mode 100644
index 802913f..0000000
--- a/app/src/main/res/xml-v21/the_widget_info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialKeyguardLayout="@layout/the_widget"
-    android:initialLayout="@layout/the_widget"
-    android:minHeight="50dp"
-    android:minWidth="300dp"
-    android:configure="com.tommasoberlose.anotherwidget.ui.activity.MainActivity"
-    android:minResizeHeight="50dp"
-    android:minResizeWidth="300dp"
-    android:previewImage="@drawable/widget_preview"
-    android:resizeMode="vertical|horizontal"
-    android:updatePeriodMillis="60000"
-    android:widgetCategory="home_screen" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/the_widget_info.xml b/app/src/main/res/xml/the_widget_info.xml
index f3cc02b..f7e88bc 100644
--- a/app/src/main/res/xml/the_widget_info.xml
+++ b/app/src/main/res/xml/the_widget_info.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialKeyguardLayout="@layout/the_widget"
     android:initialLayout="@layout/the_widget"
     android:minHeight="50dp"
     android:minWidth="300dp"
+    android:configure="com.tommasoberlose.anotherwidget.ui.activities.MainActivity"
     android:minResizeHeight="50dp"
     android:minResizeWidth="300dp"
     android:previewImage="@drawable/widget_preview"
diff --git a/app/src/test/java/com/tommasoberlose/anotherwidget/ExampleUnitTest.kt b/app/src/test/java/com/tommasoberlose/anotherwidget/ExampleUnitTest.kt
index 7d9054a..03dc9c5 100644
--- a/app/src/test/java/com/tommasoberlose/anotherwidget/ExampleUnitTest.kt
+++ b/app/src/test/java/com/tommasoberlose/anotherwidget/ExampleUnitTest.kt
@@ -10,8 +10,8 @@ import org.junit.Assert.*
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
+  @Test
+  fun addition_isCorrect() {
+    assertEquals(4, 2 + 2)
+  }
 }
diff --git a/build.gradle b/build.gradle
index 0247a77..1b5d78f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.60'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
         mavenCentral()
-        maven { url 'https://maven.fabric.io/public' }
+        
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'io.fabric.tools:gradle:1.24.4'
+        classpath 'com.google.gms:google-services:4.3.3'
+
+        // Add the Crashlytics Gradle plugin.
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0'
+
         classpath 'io.realm:realm-gradle-plugin:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -24,10 +29,11 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://jitpack.io' }
-        maven { url 'https://maven.fabric.io/public' }
+        mavenCentral()
+        
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..23339e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,21 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372ae..f6b961f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e9bc18c..d49b258 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 05 09:43:50 CEST 2017
+#Fri Apr 17 19:52:28 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/gradlew b/gradlew
index 9d82f78..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,42 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -60,6 +24,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/settings.gradle b/settings.gradle
index e7b4def..9ab0d5f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
+rootProject.name='Another Widget'
 include ':app'