Merge pull request #9 from SimpleMobileTools/master

upd
2018-05-11 09:25:39 +03:00 · 2018-05-11 09:25:39 +03:00 · ead8f0d5d4
commit ead8f0d5d4
parent 7cb896ac25 f8acc3c794
15 changed files with 123 additions and 1037 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,19 @@
 Changelog
 ==========

+Version 4.0.0 *(2018-05-10)*
+----------------------------
+
+ * Allow changing the app launcher color
+ * Allow setting reminder looping till dismissed
+ * Added a button in Settings for changing widget colors without recreating them
+ * Added optional dimming of past events
+ * Make Event List view an endless scrollview
+ * Added some more advanced yearly repetition rules
+ * Improved some country holidays
+ * Many CalDAV related improvements
+ * Many other smaller bugfixes and performance/UX improvements
+
 Version 3.4.2 *(2018-04-13)*
 ----------------------------

--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,8 +10,8 @@ android {
        applicationId "com.simplemobiletools.calendar"
        minSdkVersion 16
        targetSdkVersion 27
-        versionCode 118
-        versionName "3.4.2"
+        versionCode 119
+        versionName "4.0.0"
        multiDexEnabled true
        setProperty("archivesBaseName", "calendar")
    }
@ -46,7 +46,7 @@ ext {
 }

 dependencies {
-    implementation 'com.simplemobiletools:commons:4.0.1'
+    implementation 'com.simplemobiletools:commons:4.0.3'
    implementation 'joda-time:joda-time:2.9.9'
    implementation 'com.facebook.stetho:stetho:1.5.0'
    implementation 'com.android.support:multidex:1.0.3'
--- a/app/src/main/assets/germany.ics
+++ b/app/src/main/assets/germany.ics
@ -7,13 +7,6 @@ DTEND;VALUE=DATE:20170526
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:55d7b48b-f4ac-4d4f-9f7a-c750cd836fb9
-DTSTART;VALUE=DATE:20170604
-DTEND;VALUE=DATE:20170605
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:0763c01f-245e-4ebf-acff-45597e999a01
 DTSTART;VALUE=DATE:20170605
@ -35,13 +28,6 @@ DTEND;VALUE=DATE:20171120
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:e2e10823-b9cd-4c10-931c-38f2b0853844
-DTSTART;VALUE=DATE:20171122
-DTEND;VALUE=DATE:20171123
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:3d292c6c-c482-4a6a-8ec3-18dae2c57aa0
 DTSTART;VALUE=DATE:20171126
@ -49,48 +35,6 @@ DTEND;VALUE=DATE:20171127
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:f31f4c45-3d27-4992-88b7-8ed6e269069a
-DTSTART;VALUE=DATE:20171203
-DTEND;VALUE=DATE:20171204
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:4f5ceb8a-4fdf-471b-873d-7b6d74ce1527
-DTSTART;VALUE=DATE:20171210
-DTEND;VALUE=DATE:20171211
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:13fc6d4f-c378-478e-b4d1-98578060b359
-DTSTART;VALUE=DATE:20171217
-DTEND;VALUE=DATE:20171218
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:71807f5d-ea0a-4c85-954d-301490a4db78
-DTSTART;VALUE=DATE:20171224
-DTEND;VALUE=DATE:20171225
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:16a1f889-913e-4d6c-ae41-63d05096af02
-DTSTART;VALUE=DATE:20180212
-DTEND;VALUE=DATE:20180213
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:553ebbee-4e98-4979-9fb4-f16de19b78c9
-DTSTART;VALUE=DATE:20180214
-DTEND;VALUE=DATE:20180215
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:00fa1ea2-c91d-4d5b-89c5-1102259e1d24
 DTSTART;VALUE=DATE:20180330
@ -98,13 +42,6 @@ DTEND;VALUE=DATE:20180331
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:3a6ff1ad-1215-462e-bc6e-31ff03cab1fe
-DTSTART;VALUE=DATE:20180401
-DTEND;VALUE=DATE:20180402
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:0ab12047-4716-4307-9d41-025db2534867
 DTSTART;VALUE=DATE:20180402
@ -119,20 +56,6 @@ DTEND;VALUE=DATE:20180511
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:01e33d81-7688-4b5f-a448-8f30936d53c5
-DTSTART;VALUE=DATE:20180513
-DTEND;VALUE=DATE:20180514
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:e6891ff2-4e97-4163-8b68-2711a9395a2b
-DTSTART;VALUE=DATE:20180520
-DTEND;VALUE=DATE:20180521
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:01da1f59-2a95-4528-84b7-45c420d73130
 DTSTART;VALUE=DATE:20180521
@ -154,13 +77,6 @@ DTEND;VALUE=DATE:20181119
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:8f011c35-0bc0-4ce7-983c-3f5107105089
-DTSTART;VALUE=DATE:20181121
-DTEND;VALUE=DATE:20181122
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:5ce3351e-8a46-4a6a-86c1-9d6a4691d69c
 DTSTART;VALUE=DATE:20181125
@ -168,55 +84,6 @@ DTEND;VALUE=DATE:20181126
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:54af4894-22f2-4d6f-afec-b41a4773a7c1
-DTSTART;VALUE=DATE:20181202
-DTEND;VALUE=DATE:20181203
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:075866e7-e5a4-4e28-9e7b-da1668457f12
-DTSTART;VALUE=DATE:20181209
-DTEND;VALUE=DATE:20181210
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:859543e9-8310-4c39-a953-55d01afb95d5
-DTSTART;VALUE=DATE:20181216
-DTEND;VALUE=DATE:20181217
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:86472732-c54c-454c-8c46-60dc8d872f22
-DTSTART;VALUE=DATE:20181223
-DTEND;VALUE=DATE:20181224
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:d37799d7-4c4e-49a1-8132-3b41ffdc650e
-DTSTART;VALUE=DATE:20190304
-DTEND;VALUE=DATE:20190305
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:59874060-e592-493d-beb3-7710a4c8a4c4
-DTSTART;VALUE=DATE:20190306
-DTEND;VALUE=DATE:20190307
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palmsonntag
-UID:f69b0d53-6039-4f44-993e-dfed2988dbbb
-DTSTART;VALUE=DATE:20190414
-DTEND;VALUE=DATE:20190415
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:0aaa7d21-c168-4dbb-a9ca-311c83c0840d
 DTSTART;VALUE=DATE:20190419
@ -224,13 +91,6 @@ DTEND;VALUE=DATE:20190420
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:c6ae2cd0-f9dc-4936-ac69-7f43a8d5c454
-DTSTART;VALUE=DATE:20190421
-DTEND;VALUE=DATE:20190422
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:b0300aa9-c14b-482c-b9d9-be81d9475123
 DTSTART;VALUE=DATE:20190422
@ -238,13 +98,6 @@ DTEND;VALUE=DATE:20190423
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:1cbb64eb-c8c1-4f49-bc4e-e11190c37f42
-DTSTART;VALUE=DATE:20190512
-DTEND;VALUE=DATE:20190513
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Christi Himmelfahrt
 UID:54b3d09c-99f7-4f27-9253-d1fe8e358c50
 DTSTART;VALUE=DATE:20190530
@ -252,13 +105,6 @@ DTEND;VALUE=DATE:20190531
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:4154d812-6a09-4bb1-9b39-9654af771086
-DTSTART;VALUE=DATE:20190609
-DTEND;VALUE=DATE:20190610
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:68095b69-e62a-4a0a-be4a-c9a68844a341
 DTSTART;VALUE=DATE:20190610
@ -280,13 +126,6 @@ DTEND;VALUE=DATE:20191118
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:29bcda47-bb53-40ef-8d23-5f96e87d7b11
-DTSTART;VALUE=DATE:20191120
-DTEND;VALUE=DATE:20191121
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:55f73cbf-979c-4947-9245-1f39720f017a
 DTSTART;VALUE=DATE:20191124
@ -294,55 +133,6 @@ DTEND;VALUE=DATE:20191125
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:f88e5652-cc2c-4e29-8d7a-aaf2b839ca87
-DTSTART;VALUE=DATE:20191201
-DTEND;VALUE=DATE:20191202
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:6a1e6f6b-4a86-45cf-ae59-e73968a4f094
-DTSTART;VALUE=DATE:20191208
-DTEND;VALUE=DATE:20191209
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:59ab9870-918f-49ef-a3c5-ac1b79c12e43
-DTSTART;VALUE=DATE:20191215
-DTEND;VALUE=DATE:20191216
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:cc5ff7ef-7d49-49ab-ab20-b2fcfb9d5c8a
-DTSTART;VALUE=DATE:20191222
-DTEND;VALUE=DATE:20191223
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:f10cb9c7-e9c6-40da-9799-e9f7defc8706
-DTSTART;VALUE=DATE:20200224
-DTEND;VALUE=DATE:20200225
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:d263556d-11f7-41dd-9b87-e7e33b5e0cd7
-DTSTART;VALUE=DATE:20200226
-DTEND;VALUE=DATE:20200227
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palmsonntag
-UID:e7d82cc8-29d3-4b46-8c64-6d0514ff01a3
-DTSTART;VALUE=DATE:20200405
-DTEND;VALUE=DATE:20200406
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:84fb596d-f62c-4f0c-be11-7d96e7883e97
 DTSTART;VALUE=DATE:20200410
@ -350,13 +140,6 @@ DTEND;VALUE=DATE:20200411
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:b65c108f-5eea-4065-a4cd-8f5cc869666b
-DTSTART;VALUE=DATE:20200412
-DTEND;VALUE=DATE:20200413
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:12013b62-6924-4457-89ff-3a8ba947bd5e
 DTSTART;VALUE=DATE:20200413
@ -364,13 +147,6 @@ DTEND;VALUE=DATE:20200414
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:b3a25d49-3ae0-4941-a0a3-605a0aa013a3
-DTSTART;VALUE=DATE:20200510
-DTEND;VALUE=DATE:20200511
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Christi Himmelfahrt
 UID:20b3805d-d325-478b-bcee-c8f1f87f7e2d
 DTSTART;VALUE=DATE:20200521
@ -378,13 +154,6 @@ DTEND;VALUE=DATE:20200522
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:b394de73-9c84-425c-8f43-acb3f08988fb
-DTSTART;VALUE=DATE:20200531
-DTEND;VALUE=DATE:20200601
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:279144b9-b220-4b4d-972b-97cf5ec2d3cf
 DTSTART;VALUE=DATE:20200601
@ -406,13 +175,6 @@ DTEND;VALUE=DATE:20201116
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:fbda2175-0043-463e-9559-75846f246604
-DTSTART;VALUE=DATE:20201118
-DTEND;VALUE=DATE:20201119
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:0cc4f56c-7eb8-4de7-ae2a-99b293b25f97
 DTSTART;VALUE=DATE:20201122
@ -420,48 +182,6 @@ DTEND;VALUE=DATE:20201123
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:af547b9d-c9fb-4b2c-a9ee-1883a246fb4a
-DTSTART;VALUE=DATE:20201129
-DTEND;VALUE=DATE:20201130
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:9be17f09-8386-4d4a-b611-ea5b8aaca4d1
-DTSTART;VALUE=DATE:20201206
-DTEND;VALUE=DATE:20201207
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:7b494bd1-ed8b-4278-985e-f974481b1574
-DTSTART;VALUE=DATE:20201213
-DTEND;VALUE=DATE:20201214
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:1b11acb7-0340-4958-9225-cfc14f4a478f
-DTSTART;VALUE=DATE:20201220
-DTEND;VALUE=DATE:20201221
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:2a024898-6e15-448b-83f5-c994fb1e4aa1
-DTSTART;VALUE=DATE:20210215
-DTEND;VALUE=DATE:20210216
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:82dc191a-e513-407e-99e3-9cb98483715d
-DTSTART;VALUE=DATE:20210217
-DTEND;VALUE=DATE:20210218
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:4c8899f1-6694-4804-bdaf-dd13f837c8d5
 DTSTART;VALUE=DATE:20210402
@ -469,13 +189,6 @@ DTEND;VALUE=DATE:20210403
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:7de1ada4-4e88-417e-91a1-86a219184830
-DTSTART;VALUE=DATE:20210404
-DTEND;VALUE=DATE:20210405
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:3ab2214a-92e4-4fca-87b6-77d92c142631
 DTSTART;VALUE=DATE:20210405
@ -483,13 +196,6 @@ DTEND;VALUE=DATE:20210406
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:d6cfc602-b0ec-4cb7-a066-4fed1804dc2e
-DTSTART;VALUE=DATE:20210509
-DTEND;VALUE=DATE:20210510
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Christi Himmelfahrt
 UID:65fd8793-c12f-4c51-b392-a40b8b434fee
 DTSTART;VALUE=DATE:20210513
@ -497,13 +203,6 @@ DTEND;VALUE=DATE:20210514
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:6b058d52-a7c5-40e4-9c49-9b2cf6994053
-DTSTART;VALUE=DATE:20210523
-DTEND;VALUE=DATE:20210524
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:8a560aec-1ad3-4116-b0c0-f345345f8112
 DTSTART;VALUE=DATE:20210524
@ -525,13 +224,6 @@ DTEND;VALUE=DATE:20211115
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:b495650e-002d-4c02-b9d3-52c26b204bf0
-DTSTART;VALUE=DATE:20211117
-DTEND;VALUE=DATE:20211118
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:f0a7eadd-30e7-46c1-bce0-37616e68ac13
 DTSTART;VALUE=DATE:20211121
@ -539,55 +231,6 @@ DTEND;VALUE=DATE:20211122
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:03e79870-f2e5-414e-ac71-a41f73acd5c8
-DTSTART;VALUE=DATE:20211128
-DTEND;VALUE=DATE:20211129
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:79ba8671-3780-461a-a884-c23a64cf7930
-DTSTART;VALUE=DATE:20211205
-DTEND;VALUE=DATE:20211206
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:7128bd77-e61e-48ec-baca-adc12c869c87
-DTSTART;VALUE=DATE:20211212
-DTEND;VALUE=DATE:20211213
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:b73f7d0d-0d10-4d42-96d7-d3256415d1b9
-DTSTART;VALUE=DATE:20211219
-DTEND;VALUE=DATE:20211220
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:28273646-1658-430a-836f-90b3079ab56c
-DTSTART;VALUE=DATE:20220228
-DTEND;VALUE=DATE:20220301
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:642134b6-db26-4c84-9055-88f1e350ef4e
-DTSTART;VALUE=DATE:20220302
-DTEND;VALUE=DATE:20220303
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palmsonntag
-UID:70683648-440f-45aa-9460-10d1ffced6e1
-DTSTART;VALUE=DATE:20220410
-DTEND;VALUE=DATE:20220411
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:018fdbdd-e2c5-48aa-bf6e-4f802d757d52
 DTSTART;VALUE=DATE:20220415
@ -595,13 +238,6 @@ DTEND;VALUE=DATE:20220416
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:fca22c3c-3e5a-4aec-b1f8-14b146ec71ef
-DTSTART;VALUE=DATE:20220417
-DTEND;VALUE=DATE:20220418
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:402857cd-1eb5-48ef-9b8c-fd0eb188dec6
 DTSTART;VALUE=DATE:20220418
@ -609,13 +245,6 @@ DTEND;VALUE=DATE:20220419
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:ff344166-2d62-43c5-9ded-53a300f684b9
-DTSTART;VALUE=DATE:20220508
-DTEND;VALUE=DATE:20220509
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Christi Himmelfahrt
 UID:c90fd01f-5521-4973-b0bb-11c3b16dd9ff
 DTSTART;VALUE=DATE:20220526
@ -623,13 +252,6 @@ DTEND;VALUE=DATE:20220527
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:0d0106e9-1335-464e-b463-5cb142db5f1a
-DTSTART;VALUE=DATE:20220605
-DTEND;VALUE=DATE:20220606
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:a22fa187-185b-4cf1-93c1-82bdca14fd0e
 DTSTART;VALUE=DATE:20220606
@ -651,13 +273,6 @@ DTEND;VALUE=DATE:20221114
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:590b067f-31f8-4c6f-bafb-accf22a6cf89
-DTSTART;VALUE=DATE:20221116
-DTEND;VALUE=DATE:20221117
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:f3b740a9-5fe6-42f8-8ea1-0a24c3b7947c
 DTSTART;VALUE=DATE:20221120
@ -665,55 +280,6 @@ DTEND;VALUE=DATE:20221121
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:9b5a13c3-6abe-458e-bcbe-f1d6cdcdd02d
-DTSTART;VALUE=DATE:20221127
-DTEND;VALUE=DATE:20221128
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:1a7f91ae-5850-4e72-bdd1-1108c812d6fb
-DTSTART;VALUE=DATE:20221204
-DTEND;VALUE=DATE:20221205
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:a7d53387-8173-4a44-8d67-b64563dff278
-DTSTART;VALUE=DATE:20221211
-DTEND;VALUE=DATE:20221212
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:220094a1-08c4-4a0d-bd30-40d071682395
-DTSTART;VALUE=DATE:20221218
-DTEND;VALUE=DATE:20221219
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:5f7513bd-0978-4ed8-8022-7280645c3186
-DTSTART;VALUE=DATE:20230220
-DTEND;VALUE=DATE:20230221
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:956d4b66-1b2c-418e-ae7d-3cffad30eae7
-DTSTART;VALUE=DATE:20230222
-DTEND;VALUE=DATE:20230223
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palmsonntag
-UID:0b5571a1-a813-4f47-bef7-dc28569de753
-DTSTART;VALUE=DATE:20230402
-DTEND;VALUE=DATE:20230403
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:ffaf8199-f853-45c8-b635-5f0e302f13fe
 DTSTART;VALUE=DATE:20230407
@ -721,13 +287,6 @@ DTEND;VALUE=DATE:20230408
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:a379dcf3-85eb-401f-b8cf-7f02da344d11
-DTSTART;VALUE=DATE:20230409
-DTEND;VALUE=DATE:20230410
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:bb40c59f-7f00-44b7-98fc-e5fd5e0c9c27
 DTSTART;VALUE=DATE:20230410
@ -735,13 +294,6 @@ DTEND;VALUE=DATE:20230411
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:8a0d77ba-30f9-4238-83b5-adcab7a3badb
-DTSTART;VALUE=DATE:20230514
-DTEND;VALUE=DATE:20230515
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Christi Himmelfahrt
 UID:f91d0e50-3550-46f4-959e-4c0837d122b3
 DTSTART;VALUE=DATE:20230518
@ -749,13 +301,6 @@ DTEND;VALUE=DATE:20230519
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:888f86d6-9809-4b2c-948b-1443edac5e8e
-DTSTART;VALUE=DATE:20230528
-DTEND;VALUE=DATE:20230529
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:4eebf391-9bab-4c47-9828-9f102779600a
 DTSTART;VALUE=DATE:20230529
@ -777,13 +322,6 @@ DTEND;VALUE=DATE:20231120
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:ba67b1dd-5db8-4536-af86-5ac01e6db382
-DTSTART;VALUE=DATE:20231122
-DTEND;VALUE=DATE:20231123
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:0eae032b-ae56-42ba-9d9b-42893d74dfb2
 DTSTART;VALUE=DATE:20231126
@ -791,55 +329,6 @@ DTEND;VALUE=DATE:20231127
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:42a5ae0f-030c-4e61-a16a-168e3644c61a
-DTSTART;VALUE=DATE:20231203
-DTEND;VALUE=DATE:20231204
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:3568cc04-205f-43ce-981f-5f695f0ffb89
-DTSTART;VALUE=DATE:20231210
-DTEND;VALUE=DATE:20231211
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:c706891d-2560-4b11-b165-01b1810f36a3
-DTSTART;VALUE=DATE:20231217
-DTEND;VALUE=DATE:20231218
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:966f4e2f-a485-4617-be7b-fc1bfed38d05
-DTSTART;VALUE=DATE:20231224
-DTEND;VALUE=DATE:20231225
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:28ff27ae-6c43-4241-8e19-b859d3bacbbd
-DTSTART;VALUE=DATE:20240212
-DTEND;VALUE=DATE:20240213
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:99af362f-b9b1-4452-896d-648906ae4920
-DTSTART;VALUE=DATE:20240214
-DTEND;VALUE=DATE:20240215
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palmsonntag
-UID:aabf87df-8b3b-469d-b731-fd8ee5c851da
-DTSTART;VALUE=DATE:20240324
-DTEND;VALUE=DATE:20240325
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:179a8a7f-6ebc-427f-89c8-dfd87f770bf9
 DTSTART;VALUE=DATE:20240329
@ -861,20 +350,6 @@ DTEND;VALUE=DATE:20240510
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:23fa06d1-ccfe-40bf-81e8-d558ed1bf420
-DTSTART;VALUE=DATE:20240512
-DTEND;VALUE=DATE:20240513
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:7075eb28-7dde-4b96-8aad-76083ac8682b
-DTSTART;VALUE=DATE:20240519
-DTEND;VALUE=DATE:20240520
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:aa76019e-b3b6-4488-8bbf-31dc09fb1764
 DTSTART;VALUE=DATE:20240520
@ -896,13 +371,6 @@ DTEND;VALUE=DATE:20241118
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:dcf3f9a7-086c-4e3e-805f-adaaec6fda2e
-DTSTART;VALUE=DATE:20241120
-DTEND;VALUE=DATE:20241121
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:546e46fb-ec99-4ddd-aa9d-6ec619b96dc0
 DTSTART;VALUE=DATE:20241124
@ -910,55 +378,6 @@ DTEND;VALUE=DATE:20241125
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Erster Advent
-UID:0b6285cb-89f9-4b85-8de0-a42bd18589c9
-DTSTART;VALUE=DATE:20241201
-DTEND;VALUE=DATE:20241202
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Zweiter Advent
-UID:4ad38de2-8fce-4344-a208-979f1916b835
-DTSTART;VALUE=DATE:20241208
-DTEND;VALUE=DATE:20241209
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Dritter Advent
-UID:b49431ca-7be4-4b79-bbb2-5f6a1248ef93
-DTSTART;VALUE=DATE:20241215
-DTEND;VALUE=DATE:20241216
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Vierter Advent
-UID:6b46edc1-b54b-430b-9028-759a11d582c7
-DTSTART;VALUE=DATE:20241222
-DTEND;VALUE=DATE:20241223
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Rosenmontag
-UID:749e7d53-b90e-4e4c-8375-10bc41996985
-DTSTART;VALUE=DATE:20250303
-DTEND;VALUE=DATE:20250304
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Aschermittwoch
-UID:0c4a90fc-4651-4a12-886c-0659eb26d299
-DTSTART;VALUE=DATE:20250305
-DTEND;VALUE=DATE:20250306
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palmsonntag
-UID:1c33e111-bb08-4f3d-992e-4e4712ab7118
-DTSTART;VALUE=DATE:20250413
-DTEND;VALUE=DATE:20250414
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Karfreitag
 UID:e9a51e52-0956-4d0f-be18-c5ce39dae024
 DTSTART;VALUE=DATE:20250418
@ -966,13 +385,6 @@ DTEND;VALUE=DATE:20250419
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Ostern
-UID:efacb91a-6c19-4f00-bda9-cd6b8cfc4ce0
-DTSTART;VALUE=DATE:20250420
-DTEND;VALUE=DATE:20250421
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Ostermontag
 UID:457982d2-a038-49d2-9b27-6f9708a16206
 DTSTART;VALUE=DATE:20250421
@ -980,13 +392,6 @@ DTEND;VALUE=DATE:20250422
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Muttertag
-UID:1b9ecb65-b7ff-4388-b20c-64a5f90ff83f
-DTSTART;VALUE=DATE:20250511
-DTEND;VALUE=DATE:20250512
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Christi Himmelfahrt
 UID:0705f107-eef7-4929-ac93-a9d7a645e7f8
 DTSTART;VALUE=DATE:20250529
@ -994,13 +399,6 @@ DTEND;VALUE=DATE:20250530
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Pfingsten
-UID:49fa3924-037e-46aa-985b-29f0f886ef8c
-DTSTART;VALUE=DATE:20250608
-DTEND;VALUE=DATE:20250609
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Pfingstmontag
 UID:082092fe-3345-4652-b5f9-d5aeee66328f
 DTSTART;VALUE=DATE:20250609
@ -1022,13 +420,6 @@ DTEND;VALUE=DATE:20251117
 STATUS:CONFIRMED
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Buß- und Bettag
-UID:b2e0c62b-d371-414a-9f14-bdd0fa5a3eb9
-DTSTART;VALUE=DATE:20251119
-DTEND;VALUE=DATE:20251120
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Totensonntag
 UID:54c731a4-2052-44f7-be17-7976de70f144
 DTSTART;VALUE=DATE:20251123
@ -1080,14 +471,6 @@ STATUS:CONFIRMED
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Valentinstag
-UID:959125914
-DTSTART;VALUE=DATE:20060214
-DTEND;VALUE=DATE:20060215
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Tag der Arbeit
 UID:999463355
 DTSTART;VALUE=DATE:20060501
@ -1120,14 +503,6 @@ STATUS:CONFIRMED
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Reformationstag
-UID:996398531
-DTSTART;VALUE=DATE:20061031
-DTEND;VALUE=DATE:20061101
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Allerheiligen
 UID:970745861
 DTSTART;VALUE=DATE:20061101
@ -1136,22 +511,6 @@ STATUS:CONFIRMED
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Nikolaus
-UID:915905148
-DTSTART;VALUE=DATE:20061206
-DTEND;VALUE=DATE:20061207
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Heiliger Abend
-UID:031bd550-c8d9-11da-9d0c-a4805e40b203
-DTSTART;VALUE=DATE:20061224
-DTEND;VALUE=DATE:20061225
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:1. Weihnachtstag
 UID:982967580
 DTSTART;VALUE=DATE:20061225
--- a/app/src/main/assets/unitedstates.ics
+++ b/app/src/main/assets/unitedstates.ics
@ -1,409 +1,83 @@
 BEGIN:VCALENDAR
+VERSION:2.0
 BEGIN:VEVENT
-SUMMARY:Ascension Day
-UID:7c8351e3-e3fd-4c0b-a60c-f558aa31df55
-DTSTART;VALUE=DATE:20170525
-DTEND;VALUE=DATE:20170526
+DTSTART;VALUE=DATE:20170101
+DTEND;VALUE=DATE:20170102
+UID:5a4b1ab2e4a3b@calendarlabs.com
 STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Pentecost
-UID:452c678d-0b42-4a89-a347-a0b8e12c4fd6
-DTSTART;VALUE=DATE:20170604
-DTEND;VALUE=DATE:20170605
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Trinity Sunday
-UID:83608056-f721-4564-88ed-3cc5d12b01fb
-DTSTART;VALUE=DATE:20170611
-DTEND;VALUE=DATE:20170612
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Martin Luther King, Jr. Day
-UID:6eff84ea-6763-46d3-9c64-b847376fasvw
-DTSTART;VALUE=DATE:20180115
-DTEND;VALUE=DATE:20180116
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Ash Wednesday
-UID:6eff84ea-6763-46d3-9c64-b847376f3e34
-DTSTART;VALUE=DATE:20180214
-DTEND;VALUE=DATE:20180215
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Good Friday
-UID:19fb2499-97ae-457f-8d41-6ec76292c77f
-DTSTART;VALUE=DATE:20180330
-DTEND;VALUE=DATE:20180331
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Easter Sunday
-UID:d869e442-0b4d-40c4-b34c-6780afce8c46
-DTSTART;VALUE=DATE:20180401
-DTEND;VALUE=DATE:20180402
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Ascension Day
-UID:db037aff-17bf-430b-b094-52e99879ba4e
-DTSTART;VALUE=DATE:20180510
-DTEND;VALUE=DATE:20180511
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Pentecost
-UID:01fec43b-b371-4f56-97cb-ef454132a74a
-DTSTART;VALUE=DATE:20180520
-DTEND;VALUE=DATE:20180521
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Trinity Sunday
-UID:cc92b242-3a24-471c-b1be-b8918fb8b6de
-DTSTART;VALUE=DATE:20180527
-DTEND;VALUE=DATE:20180528
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Ash Wednesday
-UID:e5d798cf-474f-42c3-83b8-0d1186c2c3ad
-DTSTART;VALUE=DATE:20190306
-DTEND;VALUE=DATE:20190307
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palm Sunday
-UID:334646f6-5fef-43a9-83bc-d2dd88c9ebe6
-DTSTART;VALUE=DATE:20190414
-DTEND;VALUE=DATE:20190415
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Good Friday
-UID:0a125549-300d-4bd9-af20-3fc28935946e
-DTSTART;VALUE=DATE:20190419
-DTEND;VALUE=DATE:20190420
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Easter Sunday
-UID:135738b2-b8d5-4e65-bf7c-736e22c6b8b1
-DTSTART;VALUE=DATE:20190421
-DTEND;VALUE=DATE:20190422
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Ascension Day
-UID:dddeea06-c165-474c-96aa-6c1b705c6b0a
-DTSTART;VALUE=DATE:20190530
-DTEND;VALUE=DATE:20190531
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Pentecost
-UID:697b8004-261c-4c0b-a15e-06c1af95ab9b
-DTSTART;VALUE=DATE:20190609
-DTEND;VALUE=DATE:20190610
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Trinity Sunday
-UID:006195b6-8021-4814-9635-f9f5bffa7a36
-DTSTART;VALUE=DATE:20190616
-DTEND;VALUE=DATE:20190617
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Ash Wednesday
-UID:9d17488f-12b8-474b-8790-d22e6786735e
-DTSTART;VALUE=DATE:20200226
-DTEND;VALUE=DATE:20200227
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Palm Sunday
-UID:7f9c6e82-610a-4485-b5fd-dde7f0dba4b8
-DTSTART;VALUE=DATE:20200405
-DTEND;VALUE=DATE:20200406
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Good Friday
-UID:50de218e-013d-4739-b8d4-f30f74a57168
-DTSTART;VALUE=DATE:20200410
-DTEND;VALUE=DATE:20200411
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Easter Sunday
-UID:7606494f-0019-46e6-9d47-ab9498569e5a
-DTSTART;VALUE=DATE:20200412
-DTEND;VALUE=DATE:20200413
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Ascension Day
-UID:09a3f71c-83df-4649-b7d1-4792ae2fb523
-DTSTART;VALUE=DATE:20200521
-DTEND;VALUE=DATE:20200522
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Pentecost
-UID:ac723797-16b2-4fd9-9d5e-2f55cc90dc22
-DTSTART;VALUE=DATE:20200531
-DTEND;VALUE=DATE:20200601
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Trinity Sunday
-UID:b60896ca-b1eb-4ec1-a9cd-67c7403c6335
-DTSTART;VALUE=DATE:20200607
-DTEND;VALUE=DATE:20200608
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:New Year's Day
-UID:b1f194fc-1dd1-11b2-a973-d219c68b95c4
-DTSTART;VALUE=DATE:20000101
-DTEND;VALUE=DATE:20000102
-STATUS:CONFIRMED
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Groundhog's Day
-UID:0c771532-1dd2-11b2-8dd9-8638db3aef63
-DTSTART;VALUE=DATE:20000202
-DTEND;VALUE=DATE:20000203
+DTSTART;VALUE=DATE:20170116
+DTEND;VALUE=DATE:20170117
+UID:5a4b1ab2e4b97@calendarlabs.com
 STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
+SUMMARY:M L King Day
+RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=1;BYDAY=3MO
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Abraham Lincoln's Birthday
-UID:4d5b843e-1dd2-11b2-a6c9-8ea942124d1b
-DTSTART;VALUE=DATE:20000212
-DTEND;VALUE=DATE:20000213
+DTSTART;VALUE=DATE:20170220
+DTEND;VALUE=DATE:20170221
+UID:5a4b1ab2e4c77@calendarlabs.com
 STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
+SUMMARY:Presidents' Day
+RRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3MO
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Valentine's Day
-UID:790b86e2-1dd2-11b2-9cb9-c905fa35c6f9
-DTSTART;VALUE=DATE:20000214
-DTEND;VALUE=DATE:20000215
+DTSTART;VALUE=DATE:20170529
+DTEND;VALUE=DATE:20170530
+UID:5a4b1ab2e4e43@calendarlabs.com
 STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:President's Day
-UID:9f3df592-1dd1-11b2-8b51-a8c49a575f97
-DTSTART;VALUE=DATE:20000221
-DTEND;VALUE=DATE:20000222
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:George Washington's Birthday (actual)
-UID:aff9f3c8-1dd1-11b2-8593-c63469762eb1
-DTSTART;VALUE=DATE:20000222
-DTEND;VALUE=DATE:20000223
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:St. Patrick's Day
-UID:bd6cfe4c-1dd1-11b2-b3dc-ebaab9302c26
-DTSTART;VALUE=DATE:20000317
-DTEND;VALUE=DATE:20000318
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:April Fool's Day
-UID:c981b858-1dd1-11b2-b69b-94d05f8bda66
-DTSTART;VALUE=DATE:20000401
-DTEND;VALUE=DATE:20000402
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Tax Day
-UID:e46086c2-1dd1-11b2-8a16-a2c99f1c525a
-DTSTART;VALUE=DATE:20000415
-DTEND;VALUE=DATE:20000416
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Earth Day
-UID:f1561106-1dd1-11b2-955f-ba14e5210f45
-DTSTART;VALUE=DATE:20000422
-DTEND;VALUE=DATE:20000423
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Arbor Day
-UID:e20f1b5c-8ac4-4bea-acf4-b4f2bfe95329
-DTSTART;VALUE=DATE:20000428
-DTEND;VALUE=DATE:20000429
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:National Day of Prayer
-UID:a44b8b6e-7ae4-4120-b7ad-14e91691be2a
-DTSTART;VALUE=DATE:20000504
-DTEND;VALUE=DATE:20000505
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Mother's Day
-UID:e0d4c156-1dd1-11b2-b6a4-dac750e0163e
-DTSTART;VALUE=DATE:20000514
-DTEND;VALUE=DATE:20000515
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Armed Forces Day
-UID:c2783248-1dd1-11b2-affa-ee50c39d8083
-DTSTART;VALUE=DATE:20000520
-DTEND;VALUE=DATE:20000521
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Memorial Day
-UID:d9706fa6-1dd1-11b2-a349-e97241bd4740
-DTSTART;VALUE=DATE:20000528
-DTEND;VALUE=DATE:20000529
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
+RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=-1MO
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Flag Day
-UID:e8022726-1dd1-11b2-aae6-9f73f16c0f01
-DTSTART;VALUE=DATE:20000614
-DTEND;VALUE=DATE:20000615
+DTSTART;VALUE=DATE:20170704
+DTEND;VALUE=DATE:20170705
+UID:5a4b1ab2e4f3d@calendarlabs.com
 STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Father's Day
-UID:cb90487e-1dd1-11b2-9e06-d1a12cc963dc
-DTSTART;VALUE=DATE:20000618
-DTEND;VALUE=DATE:20000619
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Independence Day
-UID:f669a974-1dd1-11b2-9fac-f44d91c657af
-DTSTART;VALUE=DATE:20000704
-DTEND;VALUE=DATE:20000705
-STATUS:CONFIRMED
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Parents' Day
-UID:46e6845c-1dd2-11b2-bd3d-d8755a1a171f
-DTSTART;VALUE=DATE:20000723
-DTEND;VALUE=DATE:20000724
+DTSTART;VALUE=DATE:20170904
+DTEND;VALUE=DATE:20170905
+UID:5a4b1ab2e4fd4@calendarlabs.com
 STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Labor Day
-UID:0726ea42-1dd2-11b2-9fe6-dda3d063fb50
-DTSTART;VALUE=DATE:20000904
-DTEND;VALUE=DATE:20000905
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1MO
+END:VEVENT
+BEGIN:VEVENT
+DTSTART;VALUE=DATE:20171009
+DTEND;VALUE=DATE:20171010
+UID:5a4b1ab2e502a@calendarlabs.com
 STATUS:CONFIRMED
+SUMMARY:Columbus Day
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=2MO
+END:VEVENT
+BEGIN:VEVENT
+DTSTART;VALUE=DATE:20171111
+DTEND;VALUE=DATE:20171112
+UID:5a4b1ab2e515a@calendarlabs.com
+STATUS:CONFIRMED
+SUMMARY:Veterans Day
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Constitution Day\, Citizenship Day
-UID:d3c521e1-ffab-414c-8cfa-99e76758d8c8
-DTSTART;VALUE=DATE:20000917
-DTEND;VALUE=DATE:20000918
+DTSTART;VALUE=DATE:20171123
+DTEND;VALUE=DATE:20171124
+UID:5a4b1ab2e51ca@calendarlabs.com
 STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:United Nations Day
-UID:8a05b5d3-6b97-4fe1-b26e-b258a073c5e0
-DTSTART;VALUE=DATE:20001024
-DTEND;VALUE=DATE:20001025
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Halloween
-UID:7d4402f4-1dd2-11b2-9790-b6193cfa4349
-DTSTART;VALUE=DATE:20001031
-DTEND;VALUE=DATE:20001101
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Veteran's Day
-UID:2c7ba10c-1dd2-11b2-b0b7-96f89f288199
-DTSTART;VALUE=DATE:20001111
-DTEND;VALUE=DATE:20001112
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
 SUMMARY:Thanksgiving Day
-UID:4299a358-1dd2-11b2-a228-d062222b6f88
-DTSTART;VALUE=DATE:20181122
-DTEND;VALUE=DATE:20181123
-STATUS:CONFIRMED
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=4TH
 END:VEVENT
 BEGIN:VEVENT
-SUMMARY:Christmas Day
-UID:54f392fa-1dd2-11b2-8ecb-9ae0a7fcebd1
-DTSTART;VALUE=DATE:20001225
-DTEND;VALUE=DATE:20001226
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:New Year's Eve
-UID:a2cbca9c-1dd1-11b2-83e2-abab36f0506d
-DTSTART;VALUE=DATE:20001231
-DTEND;VALUE=DATE:20010101
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Inauguration Day
-UID:088031d1-abea-47ed-978d-39c6319e8bf2
-DTSTART;VALUE=DATE:20010120
-DTEND;VALUE=DATE:20010121
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=4
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Daylight Saving Time begins
-UID:e462881a-20b8-4b70-ab3c-cf38016d3398
-DTSTART;VALUE=DATE:20070311
-DTEND;VALUE=DATE:20070312
-STATUS:CONFIRMED
-RRULE:FREQ=YEARLY;INTERVAL=1
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Daylight Saving Time ends
-UID:13f83ed2-1dd2-11b2-a0de-ee8645423959
-DTSTART;VALUE=DATE:20071104
-DTEND;VALUE=DATE:20071105
+DTSTART;VALUE=DATE:20171225
+DTEND;VALUE=DATE:20171226
+UID:5a4b1ab2e5265@calendarlabs.com
 STATUS:CONFIRMED
+SUMMARY:Christmas
 RRULE:FREQ=YEARLY;INTERVAL=1
 END:VEVENT
 END:VCALENDAR
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@ -218,10 +218,10 @@ class EventActivity : SimpleActivity() {
        updateRepetitionText()
        checkRepeatTexts(interval)

-        if (mRepeatInterval.isXWeeklyRepetition()) {
-            setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt())
-        } else if (mRepeatInterval.isXMonthlyRepetition()) {
-            setRepeatRule(REPEAT_SAME_DAY)
+        when {
+            mRepeatInterval.isXWeeklyRepetition() -> setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt())
+            mRepeatInterval.isXMonthlyRepetition() -> setRepeatRule(REPEAT_SAME_DAY)
+            mRepeatInterval.isXYearlyRepetition() -> setRepeatRule(REPEAT_SAME_DAY)
        }
    }

@ -307,7 +307,20 @@ class EventActivity : SimpleActivity() {
    }

    private fun getAvailableYearlyRepetitionRules(): ArrayList<RadioItem> {
-        val items = arrayListOf(RadioItem(REPEAT_SAME_DAY, getString(R.string.repeat_on_the_same_day_monthly)))
+        val items = arrayListOf(RadioItem(REPEAT_SAME_DAY, getString(R.string.repeat_on_the_same_day_yearly)))
+
+        if (isLastWeekDayOfMonth()) {
+            val order = (mEventStartDateTime.dayOfMonth - 1) / 7 + 1
+            if (order == 4) {
+                items.add(RadioItem(REPEAT_ORDER_WEEKDAY, getRepeatXthDayInMonthString(true, REPEAT_ORDER_WEEKDAY)))
+                items.add(RadioItem(REPEAT_ORDER_WEEKDAY_USE_LAST, getRepeatXthDayInMonthString(true, REPEAT_ORDER_WEEKDAY_USE_LAST)))
+            } else if (order == 5) {
+                items.add(RadioItem(REPEAT_ORDER_WEEKDAY_USE_LAST, getRepeatXthDayInMonthString(true, REPEAT_ORDER_WEEKDAY_USE_LAST)))
+            }
+        } else {
+            items.add(RadioItem(REPEAT_ORDER_WEEKDAY, getRepeatXthDayInMonthString(true, REPEAT_ORDER_WEEKDAY)))
+        }
+
        return items
    }

@ -367,6 +380,12 @@ class EventActivity : SimpleActivity() {
        })
    }

+    private fun getRepeatXthDayInMonthString(includeBase: Boolean, repeatRule: Int): String {
+        val weekDayString = getRepeatXthDayString(includeBase, repeatRule)
+        val monthString = resources.getStringArray(R.array.in_months)[mEventStartDateTime.monthOfYear - 1]
+        return "$weekDayString $monthString"
+    }
+
    private fun setRepeatRule(rule: Int) {
        mRepeatRule = rule
        checkRepetitionRuleText()
@ -405,7 +424,7 @@ class EventActivity : SimpleActivity() {

    private fun getYearlyRepetitionRuleText() = when (mRepeatRule) {
        REPEAT_SAME_DAY -> getString(R.string.the_same_day)
-        else -> ""
+        else -> getRepeatXthDayInMonthString(false, mRepeatRule)
    }

    private fun showEventTypeDialog() {
@ -834,7 +853,7 @@ class EventActivity : SimpleActivity() {
            if (day == MONDAY_BIT || day == TUESDAY_BIT || day == WEDNESDAY_BIT || day == THURSDAY_BIT || day == FRIDAY_BIT || day == SATURDAY_BIT || day == SUNDAY_BIT) {
                setRepeatRule(Math.pow(2.0, (mEventStartDateTime.dayOfWeek - 1).toDouble()).toInt())
            }
-        } else if (mRepeatInterval.isXMonthlyRepetition()) {
+        } else if (mRepeatInterval.isXMonthlyRepetition() || mRepeatInterval.isXYearlyRepetition()) {
            if (mRepeatRule == REPEAT_LAST_DAY && !isLastDayOfTheMonth())
                mRepeatRule = REPEAT_SAME_DAY
            checkRepetitionRuleText()
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@ -835,6 +835,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
            add(Release(88, R.string.release_88))
            add(Release(98, R.string.release_98))
            add(Release(117, R.string.release_117))
+            add(Release(119, R.string.release_119))
            checkWhatsNew(this, BuildConfig.VERSION_CODE)
        }
    }
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@ -53,7 +53,7 @@ const val IS_CUSTOMIZING_COLORS = "is_customizing_colors"
 const val LOOP_REMINDERS = "loop_reminders"
 const val DIM_PAST_EVENTS = "dim_past_events"

-// repeat_rule for monthly repetition
+// repeat_rule for monthly and yearly repetition
 const val REPEAT_SAME_DAY = 1                           // i.e. 25th every month, or 3rd june (if yearly repetition)
 const val REPEAT_ORDER_WEEKDAY_USE_LAST = 2             // i.e. every last sunday. 4th if a month has 4 sundays, 5th if 5 (or last sunday in june, if yearly)
 const val REPEAT_LAST_DAY = 3                           // i.e. every last day of the month
@ -86,6 +86,7 @@ const val STATUS = "STATUS:"
 const val EXDATE = "EXDATE"
 const val BYDAY = "BYDAY"
 const val BYMONTHDAY = "BYMONTHDAY"
+const val BYMONTH = "BYMONTH"
 const val LOCATION = "LOCATION"

 // this tag isn't a standard ICS tag, but there's no official way of adding a category color in an ics file
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
@ -914,7 +914,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
                        ArrayList()
                    }

-                    if (repeatInterval > 0 && repeatInterval % MONTH == 0 && repeatRule == 0) {
+                    if (repeatInterval > 0 && repeatRule == 0 && (repeatInterval % MONTH == 0 || repeatInterval % YEAR == 0)) {
                        repeatRule = REPEAT_SAME_DAY
                    }

--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Parser.kt
@ -2,6 +2,7 @@ package com.simplemobiletools.calendar.helpers

 import com.simplemobiletools.calendar.extensions.isXMonthlyRepetition
 import com.simplemobiletools.calendar.extensions.isXWeeklyRepetition
+import com.simplemobiletools.calendar.extensions.isXYearlyRepetition
 import com.simplemobiletools.calendar.extensions.seconds
 import com.simplemobiletools.calendar.models.Event
 import com.simplemobiletools.calendar.models.RepeatRule
@ -29,7 +30,7 @@ class Parser {
                if (value == WEEKLY) {
                    val start = Formatter.getDateTimeFromTS(startTS)
                    repeatRule = Math.pow(2.0, (start.dayOfWeek - 1).toDouble()).toInt()
-                } else if (value == MONTHLY) {
+                } else if (value == MONTHLY || value == YEARLY) {
                    repeatRule = REPEAT_SAME_DAY
                }
            } else if (key == COUNT) {
@ -41,7 +42,7 @@ class Parser {
            } else if (key == BYDAY) {
                if (repeatInterval.isXWeeklyRepetition()) {
                    repeatRule = handleRepeatRule(value)
-                } else if (repeatInterval.isXMonthlyRepetition()) {
+                } else if (repeatInterval.isXMonthlyRepetition() || repeatInterval.isXYearlyRepetition()) {
                    repeatRule = if (value.startsWith("-1")) REPEAT_ORDER_WEEKDAY_USE_LAST else REPEAT_ORDER_WEEKDAY
                }
            } else if (key == BYMONTHDAY && value.toInt() == -1) {
@ -103,8 +104,9 @@ class Parser {
        val freq = getFreq(repeatInterval)
        val interval = getInterval(repeatInterval)
        val repeatLimit = getRepeatLimitString(event)
+        val byMonth = getByMonth(event)
        val byDay = getByDay(event)
-        return "$FREQ=$freq;$INTERVAL=$interval$repeatLimit$byDay"
+        return "$FREQ=$freq;$INTERVAL=$interval$repeatLimit$byMonth$byDay"
    }

    private fun getFreq(interval: Int) = when {
@ -127,12 +129,20 @@ class Parser {
        else -> ";$UNTIL=${Formatter.getDayCodeFromTS(event.repeatLimit)}"
    }

+    private fun getByMonth(event: Event) = when {
+        event.repeatInterval.isXYearlyRepetition() -> {
+            val start = Formatter.getDateTimeFromTS(event.startTS)
+            ";$BYMONTH=${start.monthOfYear}"
+        }
+        else -> ""
+    }
+
    private fun getByDay(event: Event) = when {
        event.repeatInterval.isXWeeklyRepetition() -> {
            val days = getByDayString(event.repeatRule)
            ";$BYDAY=$days"
        }
-        event.repeatInterval.isXMonthlyRepetition() -> when (event.repeatRule) {
+        event.repeatInterval.isXMonthlyRepetition() || event.repeatInterval.isXYearlyRepetition() -> when (event.repeatRule) {
            REPEAT_LAST_DAY -> ";$BYMONTHDAY=-1"
            REPEAT_ORDER_WEEKDAY_USE_LAST, REPEAT_ORDER_WEEKDAY -> {
                val start = Formatter.getDateTimeFromTS(event.startTS)
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt
@ -17,7 +17,7 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
    : Serializable {

    companion object {
-        private val serialVersionUID = -32456795132345616L
+        private const val serialVersionUID = -32456795132345616L
    }

    fun addIntervalTime(original: Event) {
@ -29,11 +29,15 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
            else -> {
                val currStart = Formatter.getDateTimeFromTS(startTS)
                val newStart = when {
-                    repeatInterval % YEAR == 0 -> currStart.plusYears(repeatInterval / YEAR)
+                    repeatInterval % YEAR == 0 -> when (repeatRule) {
+                        REPEAT_ORDER_WEEKDAY -> addXthDayInterval(currStart, original, false)
+                        REPEAT_ORDER_WEEKDAY_USE_LAST -> addXthDayInterval(currStart, original, true)
+                        else -> currStart.plusYears(repeatInterval / YEAR)
+                    }
                    repeatInterval % MONTH == 0 -> when (repeatRule) {
                        REPEAT_SAME_DAY -> addMonthsWithSameDay(currStart, original)
-                        REPEAT_ORDER_WEEKDAY_USE_LAST -> addXthDayInterval(currStart, original, true)
                        REPEAT_ORDER_WEEKDAY -> addXthDayInterval(currStart, original, false)
+                        REPEAT_ORDER_WEEKDAY_USE_LAST -> addXthDayInterval(currStart, original, true)
                        else -> currStart.plusMonths(repeatInterval / MONTH).dayOfMonth().withMaximumValue()
                    }
                    repeatInterval % WEEK == 0 -> {
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@ -304,9 +304,7 @@
                android:layout_toEndOf="@+id/event_repetition_rule_label"
                android:layout_toRightOf="@+id/event_repetition_rule_label"
                android:clickable="false"
-                android:ellipsize="end"
                android:gravity="end"
-                android:lines="1"
                android:padding="@dimen/activity_margin"
                android:text="@string/every_day"
                android:textSize="@dimen/day_text_size"/>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -59,7 +59,7 @@
    <string name="the_last_day">Sidste dag</string>
    <string name="repeat_on_the_same_day_monthly">Gentag på samme dato hver måned</string>
    <string name="repeat_on_the_last_day_monthly">Gentag på månedens sidste dag</string>
-    <string name="repeat_on_the_same_day_yearly">Repeat on the same day every year</string>
+    <string name="repeat_on_the_same_day_yearly">Gentag på samme dag hvert år</string>
    <string name="repeat_every_m">Gentag hver</string>
    <string name="every_m">Hver</string>
    <string name="first_m">første</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -59,7 +59,7 @@
    <string name="the_last_day">De laatste dag</string>
    <string name="repeat_on_the_same_day_monthly">Op dezelfde dag van de maand herhalen</string>
    <string name="repeat_on_the_last_day_monthly">Op de laatste dag van de maand herhalen</string>
-    <string name="repeat_on_the_same_day_yearly">Repeat on the same day every year</string>
+    <string name="repeat_on_the_same_day_yearly">Op dezelfde dag van ieder jaar herhalen</string>
    <string name="repeat_every_m">Herhalen op elke</string>
    <string name="every_m">Elke</string>
    <string name="first_m">eerste</string>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@ -2,6 +2,13 @@
 <resources>

    <!-- Release notes -->
+    <string name="release_119">
+        Allow changing the app launcher icon color\n
+        Added support for more advanced yearly repetition rules\n
+        Allow setting reminder looping till dismissed\n
+        Added a button in Settings for changing widget colors without recreating them\n
+        Added optional dimming of past events
+    </string>
    <string name="release_117">Reworked custom notification sound picking, should be more reliable</string>
    <string name="release_98">
        Added a Location field\n
--- a/fastlane/metadata/android/en-US/images/icon.png
+++ b/fastlane/metadata/android/en-US/images/icon.png