diff --git a/app/build.gradle b/app/build.gradle
index 86e2ed8fc96768c2b251b3454cb86c7926ba023d..9b1e2e6303ec05f0b938d45c70611bfc1a3c365e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.google.android.gms:play-services-location:11.8.0'
     implementation 'com.google.android.gms:play-services-maps:11.8.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dd56a68421bcff7cb08947d55fd4fe212ad498da..bcebf7067aad3a5bf34be5f3e67a1ac4497bfc57 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.simplemobiletools.calendar"
     android:installLocation="auto">
 
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <uses-permission android:name='android.permission.WAKE_LOCK'/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission
         android:name="android.permission.USE_FINGERPRINT"
-        tools:node="remove"/>
+        tools:node="remove" />
 
     <application
         android:name=".App"
@@ -24,181 +23,14 @@
         android:label="@string/app_launcher_name"
         android:roundIcon="@mipmap/ic_launcher"
         android:theme="@style/AppTheme">
-
         <activity
             android:name=".activities.SplashActivity"
             android:launchMode="singleTask"
             android:theme="@style/SplashTheme">
             <intent-filter>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".activities.MainActivity"
-            android:launchMode="singleTask">
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:resource="@xml/searchable"/>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-
-                <data android:scheme="content"/>
-                <data android:scheme="file"/>
-                <data android:mimeType="text/x-vcalendar"/>
-                <data android:mimeType="text/calendar"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-
-                <data android:mimeType="time/epoch"/>
-                <data android:host="com.android.calendar"/>
-                <data android:scheme="content"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="vnd.android.cursor.item/event"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".activities.WidgetMonthlyConfigureActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/MyWidgetConfigTheme">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".activities.WidgetListConfigureActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/MyWidgetConfigTheme">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="com.simplemobiletools.commons.activities.AboutActivity"
-            android:label="@string/about"
-            android:parentActivityName=".activities.MainActivity"/>
-
-        <activity
-            android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
-            android:label="@string/customize_colors"
-            android:parentActivityName=".activities.SettingsActivity"/>
-
-        <activity
-            android:name="com.simplemobiletools.commons.activities.LicenseActivity"
-            android:label="@string/third_party_licences"
-            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
-
-        <activity
-            android:name="com.simplemobiletools.commons.activities.FAQActivity"
-            android:label="@string/frequently_asked_questions"
-            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
-
-        <activity
-            android:name=".activities.EventActivity"
-            android:parentActivityName=".activities.MainActivity">
-
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT"/>
-                <action android:name="android.intent.action.INSERT"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="vnd.android.cursor.item/event"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT"/>
-                <action android:name="android.intent.action.INSERT"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="vnd.android.cursor.dir/event"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".activities.SettingsActivity"
-            android:label="@string/settings"
-            android:parentActivityName=".activities.MainActivity"/>
-
-        <activity
-            android:name=".activities.ManageEventTypesActivity"
-            android:label="@string/event_types"
-            android:parentActivityName=".activities.SettingsActivity"/>
-
-        <activity
-            android:name=".activities.SnoozeReminderActivity"
-            android:theme="@style/Theme.Transparent"/>
-
-        <receiver
-            android:name=".helpers.MyWidgetMonthlyProvider"
-            android:icon="@drawable/img_widget_monthly_preview"
-            android:label="@string/widget_monthly">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_monthly_info"/>
-        </receiver>
-
-        <receiver
-            android:name=".helpers.MyWidgetListProvider"
-            android:icon="@drawable/img_widget_list_preview"
-            android:label="@string/widget_list">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_list_info"/>
-        </receiver>
-
-        <service
-            android:name=".services.WidgetService"
-            android:permission="android.permission.BIND_REMOTEVIEWS"/>
-
-        <service android:name=".services.SnoozeService"/>
-
-        <receiver android:name=".receivers.NotificationReceiver"/>
-
-        <receiver android:name=".receivers.CalDAVSyncReceiver"/>
-
-        <receiver android:name=".receivers.BootCompletedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.intent.action.QUICKBOOT_POWERON"/>
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
-            </intent-filter>
-        </receiver>
-
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
-        </provider>
-
-        <!-- Do not append ".Orange" to the default alias "name", it would remove the old homescreen launcher of users at upgrade -->
+        </activity> <!-- Do not append ".Orange" to the default alias "name", it would remove the old homescreen launcher of users at upgrade -->
         <activity-alias
             android:name=".activities.SplashActivity"
             android:enabled="true"
@@ -206,243 +38,381 @@
             android:roundIcon="@mipmap/ic_launcher"
             android:targetActivity=".activities.SplashActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Red"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_red"
             android:roundIcon="@mipmap/ic_launcher_red"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Pink"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_pink"
             android:roundIcon="@mipmap/ic_launcher_pink"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Purple"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_purple"
             android:roundIcon="@mipmap/ic_launcher_purple"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Deep_purple"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_deep_purple"
             android:roundIcon="@mipmap/ic_launcher_deep_purple"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Indigo"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_indigo"
             android:roundIcon="@mipmap/ic_launcher_indigo"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Blue"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_blue"
             android:roundIcon="@mipmap/ic_launcher_blue"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Light_blue"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_light_blue"
             android:roundIcon="@mipmap/ic_launcher_light_blue"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Cyan"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_cyan"
             android:roundIcon="@mipmap/ic_launcher_cyan"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Teal"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_teal"
             android:roundIcon="@mipmap/ic_launcher_teal"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Green"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_green"
             android:roundIcon="@mipmap/ic_launcher_green"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Light_green"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_light_green"
             android:roundIcon="@mipmap/ic_launcher_light_green"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Lime"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_lime"
             android:roundIcon="@mipmap/ic_launcher_lime"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Yellow"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_yellow"
             android:roundIcon="@mipmap/ic_launcher_yellow"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Amber"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_amber"
             android:roundIcon="@mipmap/ic_launcher_amber"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Deep_orange"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_deep_orange"
             android:roundIcon="@mipmap/ic_launcher_deep_orange"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Brown"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_brown"
             android:roundIcon="@mipmap/ic_launcher_brown"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Blue_grey"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_blue_grey"
             android:roundIcon="@mipmap/ic_launcher_blue_grey"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
-
         <activity-alias
             android:name=".activities.SplashActivity.Grey_black"
             android:enabled="false"
             android:icon="@mipmap/ic_launcher_grey_black"
             android:roundIcon="@mipmap/ic_launcher_grey_black"
             android:targetActivity=".activities.SplashActivity">
-
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
+
+        <activity
+            android:name=".activities.MainActivity"
+            android:launchMode="singleTask">
+            <meta-data
+                android:name="android.app.default_searchable"
+                android:resource="@xml/searchable" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+                <data android:mimeType="text/x-vcalendar" />
+                <data android:mimeType="text/calendar" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="time/epoch" />
+                <data android:host="com.android.calendar" />
+                <data android:scheme="content" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="vnd.android.cursor.item/event" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activities.WidgetMonthlyConfigureActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/MyWidgetConfigTheme">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activities.WidgetListConfigureActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/MyWidgetConfigTheme">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:label="@string/about"
+            android:parentActivityName=".activities.MainActivity" />
+        <activity
+            android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            android:label="@string/customize_colors"
+            android:parentActivityName=".activities.SettingsActivity" />
+        <activity
+            android:name="com.simplemobiletools.commons.activities.LicenseActivity"
+            android:label="@string/third_party_licences"
+            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
+        <activity
+            android:name="com.simplemobiletools.commons.activities.FAQActivity"
+            android:label="@string/frequently_asked_questions"
+            android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
+        <activity
+            android:name=".activities.EventActivity"
+            android:parentActivityName=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.EDIT" />
+                <action android:name="android.intent.action.INSERT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="vnd.android.cursor.item/event" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.EDIT" />
+                <action android:name="android.intent.action.INSERT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="vnd.android.cursor.dir/event" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".activities.SettingsActivity"
+            android:label="@string/settings"
+            android:parentActivityName=".activities.MainActivity" />
+        <activity
+            android:name=".activities.ManageEventTypesActivity"
+            android:label="@string/event_types"
+            android:parentActivityName=".activities.SettingsActivity" />
+        <activity
+            android:name=".activities.SnoozeReminderActivity"
+            android:theme="@style/Theme.Transparent" />
+
+        <receiver
+            android:name=".helpers.MyWidgetMonthlyProvider"
+            android:icon="@drawable/img_widget_monthly_preview"
+            android:label="@string/widget_monthly">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_monthly_info" />
+        </receiver>
+        <receiver
+            android:name=".helpers.MyWidgetListProvider"
+            android:icon="@drawable/img_widget_list_preview"
+            android:label="@string/widget_list">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_list_info" />
+        </receiver>
+
+        <service
+            android:name=".services.WidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service android:name=".services.SnoozeService" />
+
+        <receiver android:name=".receivers.NotificationReceiver" />
+        <receiver android:name=".receivers.CalDAVSyncReceiver" />
+        <receiver android:name=".receivers.BootCompletedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
+        </receiver>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+        <activity android:name=".debug.AccountActivity" />
+        <activity android:name=".activities.CountActivity"></activity>
     </application>
+
 </manifest>
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/CountActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/CountActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fe2f8b082d4e87b532f643ea0e8594013c75d31e
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/CountActivity.kt
@@ -0,0 +1,42 @@
+package com.simplemobiletools.calendar.activities
+
+import android.content.Intent
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import com.simplemobiletools.calendar.R
+import kotlinx.android.synthetic.main.activity_count.*
+
+private var allNum : Int =0
+
+class CountActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_count)
+
+
+
+        var sumNum : String
+
+        btn_result.setOnClickListener {
+            val num01: Int = Integer.parseInt(edt_01.text.toString())
+            val num02 = Integer.parseInt(edt_02.text.toString())
+
+            sumNum = end(num01 ,num02).toString()
+            txt_present.text = allNum.toString()
+            allNum += sumNum.toInt()
+
+            txt_result.text = allNum.toString()
+
+
+
+
+        }
+
+
+    }
+    fun end(a: Int, b: Int):Int{
+
+        return (a+b)
+    }
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 461c5e59b66422fcb84b6f3a8726a30fc5fdcdc2..59699a3edb727fd157f2b14a9a0f2c70e3fe84a3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -179,8 +179,6 @@ class EventActivity : SimpleActivity() {
             event_title.setText(intent.getStringExtra("title"))
             event_location.setText(intent.getStringExtra("eventLocation"))
             event_description.setText(intent.getStringExtra("description"))
-            event_account.setInputExtras(intent.getIntExtra("account",event_account.inputType))
-            event_account.setText(intent.getStringExtra("account"))
             event_description.movementMethod = LinkMovementMethod.getInstance()
 
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index a68a89b4717660cf1e65543aa2e4b3237ba390dd..4cce946fcb2e399cafff9ea183743f4b5d7b5389 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -64,6 +64,7 @@ import com.google.android.gms.location.LocationServices
 import kotlinx.android.synthetic.main.activity_main.*
 import android.location.Address
 import android.util.Log
+import android.widget.Button
 import java.io.IOException
 
 class MainActivity : SimpleActivity(), RefreshRecyclerViewListener , com.google.android.gms.location.LocationListener{
@@ -96,7 +97,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener , com.google.
     private var mStoredIsSundayFirst = false
     private var mStoredUse24HourFormat = false
     private var mStoredDimPastEvents = true
-
+    private var allNum =0
     override fun onLocationChanged(location: Location?) {
         // You can now create a LatLng Object for use with maps
         // val latLng = LatLng(location.latitude, location.longitude)
@@ -130,6 +131,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener , com.google.
     }
 
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         buildGoogleApiClient()
@@ -146,13 +148,15 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener , com.google.
             launchNewEventIntent(currentFragments.last().getNewEventDayCode())
         }
 
-//        calendar_count.beVisibleIf(config.storedView != YEARLY_VIEW)
-//        calendar_count.setOnClickListener {
-//
-//
-//           launchNewEventIntent(currentFragments.last().getNewEventDayCode())
-//            //setContentView(R.layout.activity_account)
-//        }
+
+        calendar_count.setOnClickListener{
+
+
+            val intent = Intent(this, CountActivity::class.java)
+
+            startActivity(intent)
+        }
+
 
         storeStateVariables()
         if (resources.getBoolean(R.bool.portrait_only)) {
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
deleted file mode 100644
index 683c701fa11979ea569f62b4a4ca535b579feb23..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/activity_account.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    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:id="@+id/event_scrollview"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <RelativeLayout
-        android:id="@+id/event_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/event_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
-            android:layout_marginTop="@dimen/activity_margin"
-            android:hint="@string/account"
-            android:inputType="textCapSentences"
-            android:maxLength="80"
-            android:maxLines="1"
-            android:minEms="20"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/day_text_size"/>
-
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/event_location"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/event_title"
-            android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginTop="@dimen/activity_margin"
-            android:layout_toLeftOf="@+id/event_show_on_map"
-            android:hint="money"
-            android:inputType="number"
-            android:maxLength="80"
-            android:maxLines="1"
-            android:minEms="20"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/day_text_size"/>
-
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/event_description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/event_location"
-            android:layout_marginLeft="@dimen/activity_margin"
-            android:layout_marginRight="@dimen/activity_margin"
-            android:layout_marginTop="@dimen/activity_margin"
-            android:autoLink="all"
-            android:gravity="top"
-            android:hint="class"
-            android:inputType="textCapSentences|textMultiLine"
-            android:linksClickable="true"
-            android:minEms="20"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/day_text_size"/>
-
-        <ImageView
-            android:id="@+id/event_description_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_below="@+id/event_description"
-            android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_marginTop="@dimen/activity_margin"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no"/>
-
-        ImageView
-            android:id="@+id/event_date_time_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_below="@+id/event_end_date"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no"/>
-
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/event_reminder_2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_reminder_1"
-            android:layout_alignStart="@+id/event_reminder_1"
-            android:layout_below="@+id/event_reminder_1"
-            android:alpha="0.4"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:text="@string/add_another_reminder"
-            android:textSize="@dimen/day_text_size"
-            android:visibility="gone"/>
-
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/event_reminder_3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_reminder_1"
-            android:layout_alignStart="@+id/event_reminder_1"
-            android:layout_below="@+id/event_reminder_2"
-            android:alpha="0.4"
-            android:background="?attr/selectableItemBackground"
-            android:paddingBottom="@dimen/activity_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:text="@string/add_another_reminder"
-            android:textSize="@dimen/day_text_size"
-            android:visibility="gone"/>
-
-        <RelativeLayout
-            android:id="@+id/event_repetition_rule_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_repetition"
-            android:layout_alignStart="@+id/event_repetition"
-            android:layout_below="@+id/event_repetition"
-            android:background="?attr/selectableItemBackground"
-            android:visibility="gone">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/event_repetition_rule_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:clickable="false"
-                android:paddingBottom="@dimen/activity_margin"
-                android:paddingTop="@dimen/activity_margin"
-                android:text="@string/repeat_on"
-                android:textSize="@dimen/day_text_size"/>
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/event_repetition_rule"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_toEndOf="@+id/event_repetition_rule_label"
-                android:layout_toRightOf="@+id/event_repetition_rule_label"
-                android:clickable="false"
-                android:gravity="end"
-                android:padding="@dimen/activity_margin"
-                android:text="@string/every_day"
-                android:textSize="@dimen/day_text_size"/>
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/event_repetition_limit_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/event_repetition"
-            android:layout_alignStart="@+id/event_repetition"
-            android:layout_below="@+id/event_repetition_rule_holder"
-            android:background="?attr/selectableItemBackground"
-            android:visibility="gone">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/event_repetition_limit_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@+id/event_repetition_limit"
-                android:layout_toStartOf="@+id/event_repetition_limit"
-                android:clickable="false"
-                android:paddingBottom="@dimen/activity_margin"
-                android:paddingTop="@dimen/activity_margin"
-                android:text="@string/repeat_till"
-                android:textSize="@dimen/day_text_size"/>
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/event_repetition_limit"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:clickable="false"
-                android:padding="@dimen/activity_margin"
-                android:text="@string/forever"
-                android:textSize="@dimen/day_text_size"/>
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/event_caldav_calendar_image"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/event_caldav_calendar_holder"
-            android:layout_alignTop="@+id/event_caldav_calendar_holder"
-            android:layout_below="@+id/event_repetition_divider"
-            android:layout_marginLeft="@dimen/normal_margin"
-            android:layout_marginStart="@dimen/normal_margin"
-            android:alpha="0.8"
-            android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_calendar"
-            android:visibility="gone"/>
-
-        <RelativeLayout
-            android:id="@+id/event_caldav_calendar_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/event_repetition_divider"
-            android:layout_toEndOf="@+id/event_caldav_calendar_image"
-            android:layout_toRightOf="@+id/event_caldav_calendar_image"
-            android:background="?attr/selectableItemBackground"
-            android:visibility="gone">
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/event_caldav_calendar_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/small_margin"
-                android:layout_marginStart="@dimen/small_margin"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingBottom="@dimen/tiny_margin"
-                android:paddingTop="@dimen/medium_margin"
-                android:textSize="@dimen/day_text_size"
-                tools:text="My calendar"/>
-
-            <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/event_caldav_calendar_email"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/event_caldav_calendar_name"
-                android:layout_marginLeft="@dimen/small_margin"
-                android:layout_marginStart="@dimen/small_margin"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingBottom="@dimen/medium_margin"
-                android:textSize="@dimen/meta_text_size"
-                tools:text="hello@simplemobiletools.com"/>
-
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/event_caldav_calendar_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_below="@+id/event_caldav_calendar_holder"
-            android:background="@color/divider_grey"
-            android:importantForAccessibility="no"
-            android:visibility="gone"/>
-
-    </RelativeLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/activity_count.xml b/app/src/main/res/layout/activity_count.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12496b4c478a2c8a8a0dc04c8e1630a79bbd465c
--- /dev/null
+++ b/app/src/main/res/layout/activity_count.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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"
+    tools:context=".CountActivity">
+
+    <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"
+        tools:context="com.kotlin_test.Activity.FunctionActivity">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:orientation="horizontal"
+            android:weightSum="4">
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="첫 번째 :"
+                android:gravity="center"/>
+            <EditText
+                android:id="@+id/edt_01"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:inputType="number"/>
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="두 번째 :"
+                android:gravity="center"/>
+            <EditText
+                android:id="@+id/edt_02"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:inputType="number"/>
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/btn_result"
+            style="@style/Widget.AppCompat.Button"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:text="END" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="이전 합계" />
+
+        <TextView
+            android:id="@+id/txt_present"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="최신 합계" />
+
+        <TextView
+            android:id="@+id/txt_result"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index 2dc553ff75beb22a1cbd4054bf2d82ab1755c95e..fac0e585856c1b1cce1e0a367551826fa821ba60 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -75,7 +75,15 @@
             android:textCursorDrawable="@null"
             android:textSize="@dimen/day_text_size"/>
 
-        
+        <ImageView
+            android:id="@+id/event_description_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_below="@+id/event_description"
+            android:layout_marginBottom="@dimen/normal_margin"
+            android:layout_marginTop="@dimen/activity_margin"
+            android:background="@color/divider_grey"
+            android:importantForAccessibility="no"/>
 
         <ImageView
             android:id="@+id/event_time_image"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cb00b63a20a775d515e2b0fcad39c5f6d8299d07..d75ded85fcd869dd4d4688f65b6dde83c0ccd589 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,16 +21,21 @@
         app:backgroundTint="@color/color_primary"
         app:rippleColor="@color/pressed_item_foreground" />
 
-    <!--<com.simplemobiletools.commons.views.MyFloatingActionButton-->
-        <!--android:id="@+id/calendar_count"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_gravity="bottom"-->
-        <!--android:layout_margin="@dimen/activity_margin"-->
-        <!--android:contentDescription="@string/account"-->
-        <!--android:src="@drawable/ic_plus"-->
-        <!--app:backgroundTint="#0366fc"-->
-        <!--app:rippleColor="@color/pressed_item_foreground" />-->
+
+    <com.simplemobiletools.commons.views.MyFloatingActionButton
+        android:id="@+id/calendar_count"
+        style="@style/Widget.AppCompat.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_margin="@dimen/activity_margin"
+        android:contentDescription="@string/account"
+        android:src="@drawable/ic_plus"
+        app:backgroundTint="#0366fc"
+        app:rippleColor="@color/pressed_item_foreground" />
+
+
+
 
 
     <RelativeLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad533e1f6d5ac375cbc3f570d70f5ace4a74426a..53c85cb1e9b0c332791e280f3ea1d1b4266fa5af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="event">이벤트</string>
     <string name="edit_event">이벤트 수정</string>
     <string name="new_event">새 이벤트</string>
-    <string name= "account">가계부</string>>
+    <string name="account">가계부</string>>
     <string name="create_new_event">Create a new event</string>
     <string name="duplicate_event">Duplicate event</string>
     <string name="title_empty">제목을 입력해주세요</string>
diff --git a/build.gradle b/build.gradle
index c77a0a0127ec6dd8c4f7a0f1fab7b666a8ea7245..83c04258c5cbe7cbc5168bbd2905621803230963 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"