diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 59d836a82..2e8d7bf08 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,42 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="weekly_view">Weekly view</string>
-    <string name="monthly_view">Monthly view</string>
-    <string name="create_new_event">Create a new event</string>
-    <string name="events">Events</string>
-    <plurals name="within_the_next_days">
-        <item quantity="other">Within the next %d day</item>
-    </plurals>
-    <plurals name="within_the_next_weeks">
-        <item quantity="other">Within the next %d week</item>
-    </plurals>
-    <plurals name="within_the_next_months">
-        <item quantity="other">Within the next %d month</item>
-    </plurals>
-    <string name="faq_1_title">How can I remove the holidays imported via the \"Add holidays\" button\?</string>
     <string name="app_name">Simple Calendar</string>
     <string name="app_launcher_name">Calendar</string>
     <string name="change_view">Change view</string>
     <string name="daily_view">Daily view</string>
+    <string name="weekly_view">Weekly view</string>
+    <string name="monthly_view">Monthly view</string>
     <string name="monthly_daily_view">Monthly and daily view</string>
     <string name="yearly_view">Yearly view</string>
     <string name="simple_event_list">Simple event list</string>
     <string name="no_upcoming_events">Seems like you don\'t have any upcoming events.</string>
     <string name="go_to_today">Go to today</string>
     <string name="go_to_date">Go to date</string>
+    <string name="upgraded_from_free">Hey,\n\nseems like you upgraded from the old free app. You have to migrate locally stored events manually via exporting in an .ics file, then importing. You can find both export/import buttons at the main screen menu.\n\nYou can then uninstall the old version, which has an \'Upgrade to Pro\' button at the top of the app settings. You will then only have to reset your app settings.\n\nThanks!</string>
+
+    <!-- Widget titles -->
     <string name="widget_monthly">Calendar monthly</string>
     <string name="widget_list">Calendar event list</string>
-    <string name="upgraded_from_free">Hey,
-\n
-\nseems like you upgraded from the old free app. You have to migrate locally stored events manually via exporting in an .ics file, then importing. You can find both export/import buttons at the main screen menu.
-\n
-\nYou can then uninstall the old version, which has an \'Upgrade to Pro\' button at the top of the app settings. You will then only have to reset your app settings.
-\n
-\nThanks!</string>
     <string name="widget_todays_date">Calendar today\'s date</string>
+
+    <!-- Event -->
     <string name="event">Event</string>
     <string name="edit_event">Edit Event</string>
     <string name="new_event">New Event</string>
+    <string name="create_new_event">Create a new event</string>
     <string name="duplicate_event">Duplicate event</string>
     <string name="title_empty">Title cannot be empty</string>
     <string name="end_before_start">The event cannot end earlier than it starts</string>
@@ -46,6 +33,8 @@
     <string name="please_fill_location">Please fill in a location to be shown on a map</string>
     <string name="public_event_notification_text">An event is upcoming</string>
     <string name="saving_filtered_out">Saving… But the selected event type is filtered out in the top Menu - Filter</string>
+
+    <!-- Tasks -->
     <string name="task">Task</string>
     <string name="tasks">Tasks</string>
     <string name="edit_task">Edit Task</string>
@@ -54,6 +43,8 @@
     <string name="duplicate_task">Duplicate task</string>
     <string name="mark_completed">Mark completed</string>
     <string name="mark_incomplete">Mark incomplete</string>
+
+    <!-- Event Repetition -->
     <string name="repetition">Repetition</string>
     <string name="no_repetition">No repetition</string>
     <string name="daily">Daily</string>
@@ -93,48 +84,55 @@
     <string name="fourth_m">fourth</string>
     <string name="fifth_m">fifth</string>
     <string name="last_m">last</string>
-    <string name="first_f">first</string>
+
+    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
+    <!-- used in repetition, like "Every first Sunday" -->
     <string name="repeat_every_f">Repeat every</string>
     <string name="every_f">Every</string>
+    <string name="first_f">first</string>
     <string name="second_f">second</string>
     <string name="third_f">third</string>
     <string name="fourth_f">fourth</string>
     <string name="fifth_f">fifth</string>
     <string name="last_f">last</string>
+
+    <!-- Birthdays -->
+    <string name="birthdays">Birthdays</string>
     <string name="add_birthdays">Add contact birthdays</string>
     <string name="no_birthdays">No birthdays have been found</string>
-    <string name="birthdays">Birthdays</string>
     <string name="no_new_birthdays">No new birthdays have been found</string>
     <string name="birthdays_added">Birthdays added successfully</string>
     <string name="add_birthdays_automatically">Add new birthdays automatically</string>
-    <string name="anniversaries_added">Anniversaries added successfully</string>
-    <string name="add_anniversaries_automatically">Add new anniversaries automatically</string>
+
+    <!-- Anniversaries -->
     <string name="anniversaries">Anniversaries</string>
     <string name="add_anniversaries">Add contact anniversaries</string>
     <string name="no_anniversaries">No anniversaries have been found</string>
     <string name="no_new_anniversaries">No new anniversaries have been found</string>
+    <string name="anniversaries_added">Anniversaries added successfully</string>
+    <string name="add_anniversaries_automatically">Add new anniversaries automatically</string>
+
+    <!-- Event Reminders -->
     <string name="reminder">Reminder</string>
     <string name="before">before</string>
     <string name="add_another_reminder">Add another reminder</string>
     <string name="event_reminders">Event reminders</string>
     <string name="reminders">Reminders</string>
+
+    <!-- Event attendees -->
     <string name="add_another_attendee">Add another attendee</string>
     <string name="my_status">My status:</string>
     <string name="going">Going</string>
     <string name="not_going">Not going</string>
     <string name="maybe_going">Maybe going</string>
     <string name="invited">Invited</string>
+
+    <!-- Time zones -->
     <string name="enter_a_country">Enter a country or time zone</string>
+
+    <!-- Export / Import -->
     <string name="import_events">Import events</string>
     <string name="export_events">Export events</string>
-    <string name="description">Description</string>
-    <string name="all_day">All-day</string>
-    <string name="week">Week</string>
-    <string name="start_week_with_current_day">Start week with the current day</string>
-    <string name="event_types">Event types</string>
-    <string name="add_new_type">Add a new type</string>
-    <string name="edit_type">Edit type</string>
-    <string name="type_already_exists">Type with this title already exists</string>
     <string name="import_events_from_ics">Import events from an .ics file</string>
     <string name="import_events_from_ics_pro">Import events from an .ics file (Pro)</string>
     <string name="export_events_to_ics">Export events to an .ics file</string>
@@ -143,7 +141,21 @@
     <string name="include_event_types">Include event types</string>
     <string name="filename_without_ics">Filename (without .ics)</string>
     <string name="ignore_event_types">Ignore event types in the file, always use the default one</string>
+
+    <!-- Event details -->
     <string name="location">Location</string>
+    <string name="description">Description</string>
+    <string name="all_day">All-day</string>
+
+    <!-- Weekly view -->
+    <string name="week">Week</string>
+    <string name="start_week_with_current_day">Start week with the current day</string>
+
+    <!-- Event types -->
+    <string name="event_types">Event types</string>
+    <string name="add_new_type">Add a new type</string>
+    <string name="edit_type">Edit type</string>
+    <string name="type_already_exists">Type with this title already exists</string>
     <string name="color">Color</string>
     <string name="regular_event">Regular event</string>
     <string name="cannot_delete_default_type">Default event type cannot be deleted</string>
@@ -151,23 +163,27 @@
     <string name="move_events_into_default">Move affected events into the default event type</string>
     <string name="remove_affected_events">Permanently remove affected events</string>
     <string name="unsync_caldav_calendar">To remove a CalDAV calendar you have to unsynchronize it</string>
+
+    <!-- Holidays -->
     <string name="holidays">Holidays</string>
     <string name="add_holidays">Add holidays</string>
     <string name="national_holidays">National holidays</string>
     <string name="religious_holidays">Religious holidays</string>
     <string name="holidays_imported_successfully">Holidays have been successfully imported into the \"Holidays\" event type</string>
     <string name="importing_some_holidays_failed">Importing some events failed</string>
-    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
-    <string name="allow_customizing_day_count">Allow customizing day count</string>
     <string name="importing_holidays_failed">Importing holidays failed</string>
-    <string name="reminder_sound">Reminder sound</string>
-    <string name="no_ringtone_picker">No app capable of setting ringtone found</string>
-    <string name="no_ringtone_selected">None</string>
+
+    <!-- Settings -->
     <string name="manage_event_types">Manage event types</string>
     <string name="start_day_at">Start day at</string>
     <string name="end_day_at">End day at</string>
+    <string name="midnight_spanning">Show events spanning across midnight at the top bar</string>
+    <string name="allow_customizing_day_count">Allow customizing day count</string>
     <string name="week_numbers">Show week numbers</string>
     <string name="vibrate">Vibrate on reminder notification</string>
+    <string name="reminder_sound">Reminder sound</string>
+    <string name="no_ringtone_picker">No app capable of setting ringtone found</string>
+    <string name="no_ringtone_selected">None</string>
     <string name="day_end_before_start">The day cannot end earlier than it starts</string>
     <string name="caldav_sync">CalDAV sync</string>
     <string name="event_lists">Event lists</string>
@@ -175,16 +191,12 @@
     <string name="replace_description_with_location">Replace event description with location</string>
     <string name="display_description_or_location">Display description or location</string>
     <string name="delete_all_events">Delete all events</string>
-    <string name="delete_all_events_confirmation">Are you sure you want to delete all events\? This will leave your event types and other settings intact.</string>
+    <string name="delete_all_events_confirmation">Are you sure you want to delete all events? This will leave your event types and other settings intact.</string>
     <string name="show_a_grid">Show a grid</string>
-    <string name="last_view">Last view</string>
-    <string name="default_reminder_3">Default reminder 3</string>
-    <string name="view_to_open_from_widget">View to open from the event list widget</string>
-    <string name="new_events">New events</string>
-    <string name="default_start_time">Default start time</string>
     <string name="loop_reminders">Loop reminders until dismissed</string>
     <string name="dim_past_events">Dim past events</string>
     <string name="dim_completed_tasks">Dim completed tasks</string>
+    <string name="events">Events</string>
     <string name="reminder_stream">Audio stream used by reminders</string>
     <string name="system_stream">System</string>
     <string name="alarm_stream">Alarm</string>
@@ -193,6 +205,11 @@
     <string name="use_last_event_reminders">Use the last events\' reminders as the default for new events</string>
     <string name="default_reminder_1">Default reminder 1</string>
     <string name="default_reminder_2">Default reminder 2</string>
+    <string name="default_reminder_3">Default reminder 3</string>
+    <string name="view_to_open_from_widget">View to open from the event list widget</string>
+    <string name="last_view">Last view</string>
+    <string name="new_events">New events</string>
+    <string name="default_start_time">Default start time</string>
     <string name="next_full_hour">Next full hour</string>
     <string name="current_time">Current time</string>
     <string name="default_duration">Default duration</string>
@@ -202,30 +219,37 @@
     <string name="highlight_weekends_color">Color of highlighted weekends</string>
     <string name="allow_changing_time_zones">Allow changing event time zones</string>
     <string name="manage_quick_filter_event_types">Manage quick filter event types</string>
+    <string name="allow_creating_tasks">Allow creating tasks</string>
+
+    <!-- CalDAV sync -->
+    <string name="caldav">CalDAV</string>
     <string name="select_caldav_calendars">Select calendars to sync</string>
     <string name="manage_synced_calendars">Manage synced calendars</string>
-    <string name="allow_creating_tasks">Allow creating tasks</string>
-    <string name="caldav">CalDAV</string>
     <string name="store_locally_only">Store locally only</string>
     <string name="refresh_caldav_calendars">Refresh CalDAV calendars</string>
-    <string name="syncing">Syncing…</string>
     <string name="refreshing">Refreshing…</string>
     <string name="refreshing_complete">Refreshing complete</string>
     <string name="editing_calendar_failed">Editing calendar failed</string>
+    <string name="syncing">Syncing…</string>
     <string name="synchronization_completed">Sync completed</string>
     <string name="select_a_different_caldav_color">Select a different color (might be applied locally only)</string>
     <string name="insufficient_permissions">You are not allowed to write in the selected calendar</string>
-    <string name="wednesday_alt">Wednesday</string>
     <string name="caldav_event_not_found">Event not found. Please enable CalDAV sync for the appropriate calendar in the app settings.</string>
     <string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
     <string name="status_free">Free</string>
     <string name="status_busy">Busy</string>
+
+    <!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
+    <!-- used in repetition, like "Every last Sunday" -->
     <string name="monday_alt">Monday</string>
     <string name="tuesday_alt">Tuesday</string>
+    <string name="wednesday_alt">Wednesday</string>
     <string name="thursday_alt">Thursday</string>
     <string name="friday_alt">Friday</string>
     <string name="saturday_alt">Saturday</string>
     <string name="sunday_alt">Sunday</string>
+
+    <!-- List widget config example events -->
     <string name="sample_title_1">Workout</string>
     <string name="sample_description_1">Leg day</string>
     <string name="sample_title_2">Meeting with John</string>
@@ -234,22 +258,95 @@
     <string name="sample_title_4">Lunch with Mary</string>
     <string name="sample_description_4">In the Plaza</string>
     <string name="sample_title_5">Coffee time</string>
+
+    <!-- List widget config -->
     <string name="show_events_happening">Show events happening:</string>
     <string name="within_the_next_one_year">Within the next 1 year</string>
     <string name="today_only">Today only</string>
     <string name="within_the_next">Within the next…</string>
-    <string name="faq_1_text">Holidays created that way are inserted in a new event type called \"Holidays\". You can go in Settings -&gt; Manage Event Types, long press the given event type and delete it by selecting the trashbin.</string>
-    <string name="faq_2_title">Can I sync my events via Google Calendar, or other service supporting CalDAV\?</string>
-    <string name="faq_2_text">Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers. In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVx5.</string>
-    <string name="faq_3_title">I see the visual reminders, but hear no audio. What can I do\?</string>
-    <string name="faq_3_text">Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings, pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted.</string>
-    <string name="faq_4_title">Does the app support time zones\?</string>
-    <string name="faq_4_text">Yes, it does. By default all events are created in your current time zone. If you want to change an events\' time zone, you will first have to enable the time zone picker at the app settings, then change it at the Event Details screen. It is disabled by default as most people won\'t need it.</string>
-    <string name="faq_5_title">The app shows no notifications, why is that\?</string>
+    <plurals name="within_the_next_days">
+        <item quantity="one">Within the next %d day</item>
+        <item quantity="other">Within the next %d days</item>
+    </plurals>
+    <plurals name="within_the_next_weeks">
+        <item quantity="one">Within the next %d week</item>
+        <item quantity="other">Within the next %d weeks</item>
+    </plurals>
+    <plurals name="within_the_next_months">
+        <item quantity="one">Within the next %d month</item>
+        <item quantity="other">Within the next %d months</item>
+    </plurals>
+
+    <!-- FAQ -->
+    <string name="faq_1_title">How can I remove the holidays imported via the \"Add holidays\" button?</string>
+    <string name="faq_1_text">Holidays created that way are inserted in a new event type called \"Holidays\". You can go in Settings -> Manage Event Types,
+        long press the given event type and delete it by selecting the trashbin.</string>
+    <string name="faq_2_title">Can I sync my events via Google Calendar, or other service supporting CalDAV?</string>
+    <string name="faq_2_text">Yes, just toggle \"CalDAV sync\" in the app settings and select the calendars you want to sync. However, you will need some third party app handling the synchronization between the device and servers.
+        In case you want to synchronize a Google calendar, their official Calendar app will do the job. For other calendars you will need a third party sync adapter, for example DAVx5.</string>
+    <string name="faq_3_title">I see the visual reminders, but hear no audio. What can I do?</string>
+    <string name="faq_3_text">Not just displaying the actual reminder, but playing the audio is hugely affected by the system too. If you can\'t hear any sound, try going in the app settings,
+        pressing the \"Audio stream used by reminders\" option and changing it to a different value. If it still won\'t work, check your sound settings, if the particular stream isn\'t muted.</string>
+    <string name="faq_4_title">Does the app support time zones?</string>
+    <string name="faq_4_text">Yes, it does. By default all events are created in your current time zone. If you want to change an events\' time zone,
+        you will first have to enable the time zone picker at the app settings, then change it at the Event Details screen. It is disabled by default as most people won\'t need it.</string>
+    <string name="faq_5_title">The app shows no notifications, why is that?</string>
     <string name="faq_5_text">Check your device battery and notification settings, if there is nothing blocking the reminders, or killing the app in the background. You might also want to take a look at &lt;a href=https://dontkillmyapp.com&gt;https://dontkillmyapp.com&lt;/a&gt;, it has some useful tips.</string>
-    <string name="faq_6_title">How can I modify or delete an existing event type\?</string>
+    <string name="faq_6_title">How can I modify or delete an existing event type?</string>
     <string name="faq_6_text">You can do both of those in the app Settings - Manage event types. Just click on the wanted one for changing the label and color, or select the wanted one by long pressing it and use the trashbin at the top menu for deleting.</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Calendar Pro - Events &amp; Reminders</string>
+    <!-- Short description has to have less than 80 chars -->
     <string name="app_short_description">Simple mobile 2020 calendar. Schedule planner &amp; appointment reminder for any day</string>
-    <string name="app_long_description"> Simple Calendar Pro is a fully customizable, offline calendar designed to do exactly what a calendar should do. <b>No complicated features, unnecessary permissions and no ads!</b> Whether you’re organizing single or recurring events, birthdays, anniversaries, business meetings, appointments or anything else, Simple Calendar Pro makes it <b>easy to stay organized</b>. With an incredible variety of <b>customization options</b> you can customize event reminders, notification sounds, calendar widgets and how the app looks. Daily, weekly and monthly views make checking your upcoming events &amp; appointments a breeze. You can even view everything as a simple list of events rather than in calendar view, so you <b>know exactly what’s coming up in your life and when. </b> ---------------------------------------------------------- <b>Simple Calendar Pro – Features &amp; Benefits</b> ---------------------------------------------------------- ✔️ No ads or annoying popups ✔️ No internet access needed, giving you more privacy &amp; security ✔️ Only the bare minimum permissions required ✔️ Emphasis on simplicity – does what a calendar needs to do! ✔️ Open source ✔️ Fully customizable themes &amp; calendar / event widgets ✔️ Translated into 29 languages ✔️ Export settings to .txt files to import to another device ✔️ CalDAV calendar sync supported to sync events across devices ✔️ Daily, weekly, monthly, yearly &amp; event views on the calendar ✔️ Supports exporting &amp; importing events via .ics files ✔️ Set multiple event reminders, customize event reminder sound and vibration ✔️ Snooze option for reminders ✔️ Easily add holidays, birthdays, anniversaries &amp; appointments ✔️ Customize events – start time, duration, reminders etc ✔️ Add event attendees to each event ✔️ Use as a personal calendar or a business calendar ✔️ Choose between reminders &amp; email notifications to alert you about an event DOWNLOAD SIMPLE CALENDAR PRO – THE SIMPLE OFFLINE CALENDAR WITH NO ADS! <b>Check out the full suite of Simple Tools here:</b> https://www.simplemobiletools.com <b>Standalone website of Simple Calendar Pro:</b> https://www.simplemobiletools.com/calendar <b>Facebook:</b> https://www.facebook.com/simplemobiletools <b>Reddit:</b> https://www.reddit.com/r/SimpleMobileTools </string>
-</resources>
\ No newline at end of file
+    <string name="app_long_description">
+        Simple Calendar Pro is a fully customizable, offline calendar designed to do exactly what a calendar should do. <b>No complicated features, unnecessary permissions and no ads!</b>
+
+        Whether you’re organizing single or recurring events, birthdays, anniversaries, business meetings, appointments or anything else, Simple Calendar Pro makes it <b>easy to stay organized</b>. With an incredible variety of <b>customization options</b> you can customize event reminders, notification sounds, calendar widgets and how the app looks.
+
+        Daily, weekly and monthly views make checking your upcoming events &amp; appointments a breeze. You can even view everything as a simple list of events rather than in calendar view, so you <b>know exactly what’s coming up in your life and when. </b>
+
+        ----------------------------------------------------------
+        <b>Simple Calendar Pro – Features &amp; Benefits</b>
+        ----------------------------------------------------------
+
+        ✔️ No ads or annoying popups
+        ✔️ No internet access needed, giving you more privacy &amp; security
+        ✔️ Only the bare minimum permissions required
+        ✔️ Emphasis on simplicity – does what a calendar needs to do!
+        ✔️ Open source
+        ✔️ Fully customizable themes &amp; calendar / event widgets
+        ✔️ Translated into 29 languages
+        ✔️ Export settings to .txt files to import to another device
+        ✔️ CalDAV calendar sync supported to sync events across devices
+        ✔️ Daily, weekly, monthly, yearly &amp; event views on the calendar
+        ✔️ Supports exporting &amp; importing events via .ics files
+        ✔️ Set multiple event reminders, customize event reminder sound and vibration
+        ✔️ Snooze option for reminders
+        ✔️ Easily add holidays, birthdays, anniversaries &amp; appointments
+        ✔️ Customize events – start time, duration, reminders etc
+        ✔️ Add event attendees to each event
+        ✔️ Use as a personal calendar or a business calendar
+        ✔️ Choose between reminders &amp; email notifications to alert you about an event
+
+        DOWNLOAD SIMPLE CALENDAR PRO – THE SIMPLE OFFLINE CALENDAR WITH NO ADS!
+
+        <b>Check out the full suite of Simple Tools here:</b>
+        https://www.simplemobiletools.com
+
+        <b>Standalone website of Simple Calendar Pro:</b>
+        https://www.simplemobiletools.com/calendar
+
+        <b>Facebook:</b>
+        https://www.facebook.com/simplemobiletools
+
+        <b>Reddit:</b>
+        https://www.reddit.com/r/SimpleMobileTools
+    </string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>