Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev

2019-11-30 18:39:20 +01:00 · 2019-11-30 18:39:20 +01:00 · 4c23b5e323
parent 23eddb25e7 b8ba94fa30
commit 4c23b5e323
186 changed files with 7095 additions and 400 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,48 @@
+This document speciffy hints and good practices for source code contributions.
+
+AndroidAPS is community effort and all contributions are welcome! If you wish help us improving AndroidAPS - please read and try to adhere to 
+this guidelines, to make the development and process of change aproval as smooth as possible :) 
+
+General rules
+=============
+
+* There are plenty of ways you can help, some of them are listed on wiki: 
+  https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/How-can-I-help.html
+* If you wish to help with documentation or translating: 
+  https://androidaps.readthedocs.io/en/latest/EN/translations.html
+  
+Development guidelines
+======================
+
+Coding convetions
+-----------------
+1. Use Android Studio with default indents (4 chars, use spaces)
+2. Use autoformat feature CTRL-ALT-L in every changed file before commit
+
+Commiting Changes / Pull Requests
+---------------------------------
+
+1. Make fork of repository on github
+2. Create separate branch for each feature, branch from most recent dev
+3. Commit all changes to your fork
+4. When ready, rebase on top of dev and make pull request to main repo
+
+Naming Conventions for Pull Requests / Branches
+-----------------------------------------------
+
+TODO
+
+Translations
+------------
+
+* If possible, always use Android translation mechanism (with strings.xml and @strings/id) instead of hardcoded texts
+* Provide only English strings - all other languages will be crowd translated via Crowdn https://translations.androidaps.org/
+
+Hints
+-----
+
+* Start small, it is easier to review smaller changes that affect fewer parts of code 
+* Take a look into Issues list (https://github.com/MilosKozak/AndroidAPS/issues) - maybe there is somthing you can fix or implement
+* For new features, make sure there is Issue to track progress and have on-topic discussion
+* Reach out to community, discuss idea on Gitter (https://gitter.im/MilosKozak/AndroidAPS)
+* Speak with other developers to minimise merge conflicts. Find out who worked, working or plan to work on speciffic issue or part of app
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -1138,8 +1138,6 @@
    <string name="tidepool_upload_tbr">Laai tydelike basale op</string>
    <string name="tidepool_upload_profile">Laai profiel veranderings, tydelike teikens op</string>
    <string name="tidepool_upload_bg">Laai BG toetse op</string>
-    <string name="dst_in_24h_warning">Daglig spaar tyd verandering in 24 h of minder</string>
-    <string name="dst_loop_disabled_warning">Daglig spaar tyd het verander minder as 3 ure terug - Geslote lus afgeskakel</string>
    <string name="storage">interne berging beperking</string>
    <string name="diskfull">Bevry ten minste %1$d MB van intene stoorspasie! Lus gedeaktiveer!</string>
    <string name="wrongformat">Verkeerde formaat</string>
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@ -36,11 +36,12 @@
    <string name="objectives_useloop">Отворете съдържанието на Цикъл плъгина.</string>
    <string name="objectives_usescale">Използвайте функцията за удължаване на периода на графиката, като задържите върху нея.</string>
    <string name="objectives_button_enter">Въведи</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Въведете кода, получен от разработчиците да прескочите останалите цели</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ако сте били потребител на OpenAPS и НС има най-малко 3 месеца цикъл на данни, можете да изпращате по електронна поща objectives@androidaps.org с адрес на НС, за да поискате код за заобикаляне на останалите цели. Въведете кода, получен от разработчици</string>
    <string name="codeaccepted">Код приет!</string>
    <string name="codeinvalid">Неправилен код</string>
    <string name="objectives_exam_objective">Докажете знанията си</string>
    <string name="objectives_exam_gate">Отговорете правилно на въпросите</string>
+    <string name="answerdisabledto">Изключено до: %1$s</string>
    <string name="wronganswer">Грешен отговор!</string>
    <string name="unfinshed_button">Следващия неотговорен</string>
    <string name="requestcode">Код (request code): %1$s</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -98,6 +98,7 @@
    <string name="openapsma_profile_label">Профил</string>
    <string name="openapsma_mealdata_label">Данни за хранене</string>
    <string name="result">Резултат</string>
+    <string name="result_insulin_carbs">Резултат: %1$s %2$s</string>
    <string name="openapsma_noglucosedata">Няма данни за КЗ</string>
    <string name="nochangerequested">Не се изисква промяна</string>
    <string name="openapsma_request_label">Искане</string>
@ -215,6 +216,7 @@
    <string name="overview_tempbasal_button">Временен базал</string>
    <string name="overview_extendedbolus_button">Удължен болус</string>
    <string name="configbuilder_nightscoutversion_label">Nightscout версия:</string>
+    <string name="missing_carbs">Нужни %1$dг</string>
    <string name="exported">Настройките са експортирани</string>
    <string name="export_to">Експортирай настройките в </string>
    <string name="import_from">Импорт на настройки от</string>
@ -258,11 +260,23 @@
    <string name="smscommunicator_allowednumbers">Разрешени телефонни номера</string>
    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">За да доставите болус от %1$.2fЕ отговорете с код %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">За да стартирате болус от %1$.2fЕ отговорете с код %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Зa zадаване на временна цел %1$s отговорете с код %2$s</string>
+    <string name="smscommunicator_temptargetcancel">За да спрете временната цел отговорете с код %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">За да изключите услугата за отдалечен SMS контрол отговорете с код %1$s.\n\nИмайте предвид, че можете да го активирате само от AAPS смартфона.</string>
+    <string name="smscommunicator_stoppedsms">Отдалечен SMS контрол е изключен. Можете да го включите от AndroidAPS телефона.</string>
    <string name="smscommunicator_calibrationreplywithcode">За да изпратите калибрация %1$.2f отговорете с код %2$s</string>
    <string name="smscommunicator_bolusfailed">Болус отказан</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Минимален брой минути, в които трябва да мине между един отдалечен болус и следващия</string>
+    <string name="smscommunicator_remotebolusmindistance">Колко най-малко минути трябва да минат два болуса</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">За вашата сигурност, променете тази настройка, трябва да добавите най-малко 2 телефонни номера.</string>
    <string name="bolusdelivered">Болус от %1$.2fЕ доставен успешно</string>
    <string name="bolusrequested">Ще стартира %1$.2fЕ болус</string>
    <string name="smscommunicator_bolusdelivered">Болус от %1$.2fЕ доставен успешно</string>
+    <string name="smscommunicator_mealbolusdelivered">Болус от %1$.2fЕ доставен успешно</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Временна цел от %1$s за %2$d минути</string>
+    <string name="smscommunicator_tt_set">Временна цел от %1$s за %2$d минути стартирана успешно</string>
+    <string name="smscommunicator_tt_canceled">Временна цел успешно спряна</string>
    <string name="bolusdelivering">Стартирам %1$.2fЕ</string>
    <string name="smscommunicator_remotecommandsallowed">Позволи отдалечени команди чрез SMS</string>
    <string name="glucosetype_finger">Пръст</string>
@ -322,10 +336,13 @@
    <string name="smscommunicator_basalreplywithcode">За да стартирате базал от %1$.2fЕ/ч за %2$d мин отговорете с код %3$s</string>
    <string name="smscommunicator_profilereplywithcode">За да превключите профила към %1$s %2$d%% отговорете с код %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">За да започнете удължен болус %1$.2fЕ за %2$d мин отговорете с код %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">За да въведете %1$dг в %2$s отговорете с код %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">За да стартирате базал от %1$d%Е/ч за %2$d мин отговорете с код %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">За да спрете APS за %1$d минути отговорете с код %2$s</string>
    <string name="smscommunicator_tempbasalset">Временен базал от %1$.2fЕ/ч за %2$d мин стартиран успешно</string>
    <string name="smscommunicator_extendedset">Удължен болус %1$.2fU за %2$d мин стартиран успешно</string>
+    <string name="smscommunicator_carbsset">Въглехидрати %1$dг въведени</string>
+    <string name="smscommunicator_carbsfailed">Въвеждане на%1$dг въглехидрати - НЕУСПЕШНО</string>
    <string name="smscommunicator_tempbasalset_percent">Временен базал от %1$d%Е/ч за %2$d мин стартиран успешно</string>
    <string name="smscommunicator_tempbasalfailed">Неуспешно стартиране на временен базал</string>
    <string name="smscommunicator_extendedfailed">Неуспешно стартиране на удължен болус</string>
@ -546,6 +563,8 @@
    <string name="show_statuslights_extended_summary">Показвай подробни статус светлини за канула, инсулин, сензор, резервоар и батерията на началния екран.</string>
    <string name="statuslights_res_warning">Ниво за аларма за останал инсулин в резервоара [Е]</string>
    <string name="statuslights_res_critical">Критично ниво на останал инсулин в резервоар [Е]</string>
+    <string name="statuslights_bat_warning">Аларма при заряд на батерия под [%]</string>
+    <string name="statuslights_bat_critical">Критично ниво на батерията под [%]</string>
    <string name="iob">IOB</string>
    <string name="cob">СОВ</string>
    <string name="virtualpump_firmware_label">Фърмуер</string>
@ -676,6 +695,7 @@
    <string name="shortgramm">гр.</string>
    <string name="shortminute">мин.</string>
    <string name="shorthour">ч.</string>
+    <string name="shortday">д</string>
    <string name="none"><![CDATA[<празно>]]></string>
    <string name="shortkilojoul">килодж.</string>
    <string name="shortenergy">Ен</string>
@ -704,6 +724,7 @@
    <string name="bgsource_upload">Настройки при качване на КЗ към Nightscout</string>
    <string name="wear_detailed_delta_title">Показвай подробна делта</string>
    <string name="wear_detailed_delta_summary">Показвай делта с още един десетичен знак</string>
+    <string name="smbmaxminutes">Максимум минути СМБ</string>
    <string name="smbmaxminutes_summary">Максимални минути за ограничаване на базала от SMB</string>
    <string name="unsupportedfirmware">Неподдържан фърмуер на помпата</string>
    <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
@ -1232,6 +1253,8 @@
    <string name="medtronic_pump_battery_no">Не е избрано (общ)</string>
    <string name="medtronic_pump_battery_alkaline">Алкални</string>
    <string name="medtronic_pump_battery_lithium">Литиева</string>
+    <string name="medtronic_pump_battery_nizn">NiZn батерия</string>
+    <string name="medtronic_bolus_debugging">Болус/Корекция подробно</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">СКАНИРАЙ</string>
    <string name="rileylink_scanner_scan_stop">СТОП</string>
@ -1343,6 +1366,7 @@
    <string name="profilename">Смени профила на</string>
    <string name="changengetoprofilename">Смени профила на %1$s</string>
    <string name="automation_trigger_pump_last_connection_label">Последно свързване към помпа</string>
+    <string name="automation_trigger_pump_last_connection_description">Последнa връзкa с помпата [минути]</string>
    <string name="automation_trigger_pump_last_connection_compared">Последна връзка с помпата е %1$s %2$s минути преди</string>
    <string name="sendsmsactionlabel">Изпращане на SMS с текст %1$s</string>
    <string name="sendsmsactiondescription">Изпрати SMS до всички телефони от настройките</string>
@ -1367,4 +1391,7 @@
    <string name="format_percent">%1$d %%</string>
    <string name="boluswizard">Болус калкулатор</string>
    <string name="unit_minute_short">мин</string>
+    <string name="format_carbs">%1$dг</string>
+    <string name="common_on">Вкл</string>
+    <string name="common_off">Изкл</string>
 </resources>
--- a/app/src/main/res/values-cs-rCZ/objectives.xml
+++ b/app/src/main/res/values-cs-rCZ/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Zobrazte obsah modulu Smyčka</string>
    <string name="objectives_usescale">Přepněte režim zobrazení dlouhým stisknutím grafu glykémie</string>
    <string name="objectives_button_enter">Zadat</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Zadejte kód, který jste získali od vývojářů, abyste obešli zbývající cíle</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokud jste byli dříve uživateli OpenAPS a váš NS má alespoň 3 měsíce dat z používání smyčky, můžete poslat e-mail na adresu objectives@androidaps.org s adresou svého NS a požádat o kód, pomocí něhož budete moci obejít zbývající cíle. Zadejte kód získaný od vývojářů.</string>
    <string name="codeaccepted">Kód přijat</string>
    <string name="codeinvalid">Neplatný kód</string>
    <string name="objectives_exam_objective">Prokažte své znalosti</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -260,11 +260,23 @@
    <string name="smscommunicator_allowednumbers">Povolená tel. čísla</string>
    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">K potvrzení bolusu %1$.2fU odpověz SMS s kódem %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Pro potvrzení bolusu na jídlo %1$.2fU odpovězte pomocí SMS s kódem %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Pro nastavení dočasného cíle %1$s odpovězte pomocí SMS s kódem %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Pro zrušení dočasného cíle odpovězte pomocí SMS s kódem %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Chcete-li deaktivovat Vzdálené řízení přes SMS, odpovězte pomocí SMS s kódem %1$s.\n\nUpozornění: tuto funkci budete moci znovu aktivovat pouze z telefonu s hlavní verzí AAPS.</string>
+    <string name="smscommunicator_stoppedsms">Služba Vzdáleného řízení přes SMS zastavena. Chcete-li ji znovu aktivovat, použijte telefon s hlavní verzí AAPS.</string>
    <string name="smscommunicator_calibrationreplywithcode">Odeslání kalibrace %1$.2f potvrďte kódem %2$s</string>
    <string name="smscommunicator_bolusfailed">Chyba při aplikování bolusu</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimální počet minut, které musí uplynout mezi dvěma bolusy podanými přes vzdálené řízení</string>
+    <string name="smscommunicator_remotebolusmindistance">Kolik minut (minimálně) musí uplynout mezi dvěma bolusy</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Úprava tohoto nastavení v zájmu vaší bezpečnosti vyžaduje, abyste zadali alespoň 2 telefonní čísla.</string>
    <string name="bolusdelivered">Bolus %1$.2fU aplikován úspěšně</string>
    <string name="bolusrequested">Podávání %1$.2fU inzulínu</string>
    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU aplikován úspěšně</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolus na jídlo %1$.2fU byl úspěšně aplikován</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Cíl %1$s na %2$d minut</string>
+    <string name="smscommunicator_tt_set">Cíl %1$s na %2$d minut byl úspěšně nastaven</string>
+    <string name="smscommunicator_tt_canceled">Dočasný cíl byl úspěšně zrušen</string>
    <string name="bolusdelivering">Aplikováno %1$.2fU</string>
    <string name="smscommunicator_remotecommandsallowed">Povolit posílání příkazů přes SMS</string>
    <string name="glucosetype_finger">Glukoměr</string>
@ -324,10 +336,13 @@
    <string name="smscommunicator_basalreplywithcode">Pro spuštění bazálu %1$.2fU/h na %2$d min odpovězte SMS s kódem %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Pro přepnutí profilu na %1$s %2$d%% odpovězte SMS s kódem %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">Pro spuštění prodlouženého bolusu %1$.2fU na %2$d min odpovězte SMS s kódem %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Pro zadání %1$dg na %2$s odpovězte pomocí SMS s kódem %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Pro spuštění bazálu %1$d%% na %2$d min odpovězte SMS s kódem %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">K pozastavení smyčky na %1$d minut odpověz SMS s kódem %2$s</string>
    <string name="smscommunicator_tempbasalset">Dočasný bazál %1$.2fU/h na %2$d minut spuštěn</string>
    <string name="smscommunicator_extendedset">Prodloužený bolus %1$.2fU na %2$d min úspěšně spuštěn</string>
+    <string name="smscommunicator_carbsset">Sacharidy %1$dg byly úspěšně zadány</string>
+    <string name="smscommunicator_carbsfailed">Zadání %1$dg sacharidů se nezdařilo</string>
    <string name="smscommunicator_tempbasalset_percent">Dočasný bazál %1$d%% na %2$d minut úspěšně spuštěn</string>
    <string name="smscommunicator_tempbasalfailed">Spuštění dočasného bazálu selhalo</string>
    <string name="smscommunicator_extendedfailed">Spuštění prodlouženého bolusu selhalo</string>
@ -680,6 +695,7 @@
    <string name="shortgramm">g</string>
    <string name="shortminute">m</string>
    <string name="shorthour">h</string>
+    <string name="shortday">d</string>
    <string name="none"><![CDATA[<prázdný>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">En</string>
@ -708,6 +724,7 @@
    <string name="bgsource_upload">Nastavení nahrávání glykémií</string>
    <string name="wear_detailed_delta_title">Zobrazovat detailní změny</string>
    <string name="wear_detailed_delta_summary">Zobrazovat rozdíl s jedním desetinným místem navíc</string>
+    <string name="smbmaxminutes">Max. minut SMB</string>
    <string name="smbmaxminutes_summary">Maximální počet minut bazálu, ke kterým se limituje SMB</string>
    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpě</string>
    <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
@ -1148,7 +1165,7 @@
    <string name="tidepool_upload_profile">Nahrávat přepnutí profilu, dočasné cíle</string>
    <string name="tidepool_upload_bg">Nahrávat měření z prstu</string>
    <string name="dst_in_24h_warning">Změna letního času za méně než 24 hodin</string>
-    <string name="dst_loop_disabled_warning">Změna letního času za méně než 3 hodiny - Uzavřená smyčka zastavena</string>
+    <string name="dst_loop_disabled_warning">Změna letního času za méně než 3 hodiny – Uzavřená smyčka zastavena</string>
    <string name="storage">omezení vnitřního úložiště</string>
    <string name="diskfull">Uvolněte alespoň %1$d MB z vnitřního úložiště! Smyčka zakázána!</string>
    <string name="wrongformat">Chybný formát</string>
--- a/app/src/main/res/values-de-rDE/objectives.xml
+++ b/app/src/main/res/values-de-rDE/objectives.xml
@ -37,7 +37,7 @@ die Formel maxIOB = durchschnittlicher Essensbolus + 3 x höchste Basalrate</str
    <string name="objectives_useloop">Zeige den Inhalt des Loop-Plugins an</string>
    <string name="objectives_usescale">Nutze die Skalierfunktion. Drücke dazu lange auf das BZ-Diagramm</string>
    <string name="objectives_button_enter">OK</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Gib den Code ein, den Du von den Entwicklern erhalten hast, um die restlichen Objectives zu überspringen.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wenn Du früher bereits OpenAPS genutzt hast und auf Deiner Nightscout-Seite mindestens drei Monate Closed-Loop-Daten ersichtlich sind, kannst Du eine E-Mail an objectives@androidaps.org mit Deiner NS-URL und Deinem Anforderungscode senden, um die restlichen Ziele zu überspringen. Code eingeben, der von den Entwicklern übermittelt wurde:</string>
    <string name="codeaccepted">Code akzeptiert</string>
    <string name="codeinvalid">Code ungültig</string>
    <string name="objectives_exam_objective">Prüfe Dein Wissen</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -260,11 +260,23 @@
    <string name="smscommunicator_allowednumbers">Erlaubte Telefonnummern</string>
    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">Um einen Bolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Um einen Mahlzeitenbolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</string>
+    <string name="smscommunicator_temptargetwithcode">Um ein Temp Target von %1$s zu setzen, antworte mit dem Code %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Um das temporäre Ziel zu stoppen, antworte mit dem Code %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Um den SMS Remote Service zu deaktivieren, antworte mit dem Code %1$s.\n\nBeachte, dass Du diesen nur am AAPS Master Smartphone wieder aktivieren kannst.</string>
+    <string name="smscommunicator_stoppedsms">SMS Remote Service gestoppt. Verwende das AAPS Master, um ihn wieder zu aktivieren.</string>
    <string name="smscommunicator_calibrationreplywithcode">Um die Kalibrierung %1$.2f zu senden, antworte mit dem Code %2$s.</string>
    <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimale Dauer in Minuten, die nach einem Remote Bolus verstrichen sein muss, bevor ein neuer abgegeben werden kann.</string>
+    <string name="smscommunicator_remotebolusmindistance">Anzahl Minuten, die mindestens zwischen zwei Bolusgaben liegen müssen.</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Aus Sicherheitsgründen musst Du mindestens zwei Telefonnummern eintragen, um diese Voreinstellung zu ändern.</string>
    <string name="bolusdelivered">Bolus %1$.2fIE erfolgreich abgegeben</string>
    <string name="bolusrequested">Werde %1$.2fIE abgeben</string>
    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fIE erfolgreich abgegeben</string>
+    <string name="smscommunicator_mealbolusdelivered">Mahlzeiten-Bolus %1$.2f IE erfolgreich abgegeben.</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Ziel %1$s für %2$d Minuten</string>
+    <string name="smscommunicator_tt_set">Ziel %1$s für %2$d Minuten erfolgreich gesetzt.</string>
+    <string name="smscommunicator_tt_canceled">Temporäres Ziel wurde erfolgreich abgebrochen</string>
    <string name="bolusdelivering">Gebe %1$.2fIE ab</string>
    <string name="smscommunicator_remotecommandsallowed">Erlaube externe Befehle per SMS</string>
    <string name="glucosetype_finger">Finger</string>
@ -314,7 +326,7 @@
    <string name="youareonallowedlimit">Limit erreicht</string>
    <string name="noprofileselected">Kein Profil ausgewählt</string>
    <string name="smscommunicator_loophasbeendisabled">Loop wurde deaktiviert.</string>
-    <string name="smscommunicator_loophasbeenenabled">Lopp wurde aktiviert</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop wurde aktiviert</string>
    <string name="smscommunicator_loopisdisabled">Loop ist deaktiviert.</string>
    <string name="smscommunicator_loopisenabled">Loop ist aktiviert.</string>
    <string name="valuelimitedto">%1$.2f limitiert auf %2$.2f</string>
@ -324,10 +336,13 @@
    <string name="smscommunicator_basalreplywithcode">Um eine Basalrate von %1$.2fIE/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Um das Profil auf %1$s %2$d%% zu setzen, antworte mit dem Code %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">Um den erweiterten Bolus %1$.2fIE für %2$d Minuten abzugeben, antworte mit dem Code %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Um %1$dg Kohlenhydrate um %2$s einzugeben, antworte mit dem Code %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Um die Basalrate von %1$d%% für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Um das Loopen für %1$d Minuten zu pausieren, antworte mit dem Code %2$s.</string>
    <string name="smscommunicator_tempbasalset">TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.</string>
    <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2f IE/h für %2$d Minuten wurde erfolgreich gestartet</string>
+    <string name="smscommunicator_carbsset">%1$dg Kohlenhydrate erfolgreich erfasst</string>
+    <string name="smscommunicator_carbsfailed">Eingabe von %1$dg Kohlenhydraten ist fehlgeschlagen.</string>
    <string name="smscommunicator_tempbasalset_percent">Die temporäre Basalrate wurde erfolgreich für %2$d Minuten auf %1$d%% gesetzt</string>
    <string name="smscommunicator_tempbasalfailed">Das Starten der TBR ist fehlgeschlagen.</string>
    <string name="smscommunicator_extendedfailed">Die Abgabe des erweiterten Bolus ist fehlgeschlagen</string>
@ -680,6 +695,7 @@
    <string name="shortgramm">g</string>
    <string name="shortminute">min</string>
    <string name="shorthour">h</string>
+    <string name="shortday">T</string>
    <string name="none"><![CDATA[<nichts>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">En</string>
@ -708,6 +724,7 @@
    <string name="bgsource_upload">BZ Upload Einstellungen</string>
    <string name="wear_detailed_delta_title">Zeige detailliertes Delta</string>
    <string name="wear_detailed_delta_summary">Delta wird mit Dezimalstelle angezeigt.</string>
+    <string name="smbmaxminutes">SMB max. Minuten</string>
    <string name="smbmaxminutes_summary">SMB Basal-Limit in Minuten</string>
    <string name="unsupportedfirmware">Nicht unterstützte Pumpen-Firmware</string>
    <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
--- a/app/src/main/res/values-el-rGR/objectives.xml
+++ b/app/src/main/res/values-el-rGR/objectives.xml
@ -36,7 +36,6 @@
    <string name="objectives_useloop">Εμφάνιση περιεχομένου της προσθήκης Κύκλωμα</string>
    <string name="objectives_usescale">Χρησιμοποιήστε τη λειτουργία κλίμακας πατώντας παρατεταμένα το διάγραμμα BG</string>
    <string name="objectives_button_enter">Εισαγωγή</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Εισαγάγετε τον κωδικό που λαμβάνετε από τους προγραμματιστές για να παρακάμψετε τους υπόλοιπους στόχους</string>
    <string name="codeaccepted">Κωδικός αποδεκτός</string>
    <string name="codeinvalid">Μη έγκυρος κωδικός</string>
    <string name="objectives_exam_objective">Αποδείξτε τις γνώσεις σας</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -1147,8 +1147,6 @@
    <string name="tidepool_upload_tbr">Αποστολή προσωρινών ρυθμών</string>
    <string name="tidepool_upload_profile">Αποστολή αλλαγών προφίλ, προσωρινών στόχων</string>
    <string name="tidepool_upload_bg">Αποστολή BG βαθμονομήσεων</string>
-    <string name="dst_in_24h_warning">Αλλαγή σε Θερινή ώρα σε 24h ή λιγότερο</string>
-    <string name="dst_loop_disabled_warning">Η Θερινή ώρα αλλάζει σε λιγότερο από 3 ώρες - Απενεργοποιήθηκε το κλειστό κύκλωμα</string>
    <string name="storage">περιορισμός εσωτερικής μνήμης</string>
    <string name="diskfull">Ελευθερώστε τουλάχιστον %1$d MB από εσωτερική μνήμη! Κύκλωμα απενεργοποιήθηκε!</string>
    <string name="wrongformat">Λάθος μορφή αρχείου</string>
--- a/app/src/main/res/values-es-rES/exam.xml
+++ b/app/src/main/res/values-es-rES/exam.xml
@ -8,9 +8,9 @@
    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
    <string name="dia_meaningisequaltodiapump">El significado es igual al parámetro DIA utilizado en su bomba.</string>
    <string name="dia_valuemustbedetermined">Debes determinar tu valor individual (pero no menos de 5 horas).</string>
-    <string name="hypott_label">Tema: Hypo Temp-Objetivo</string>
-    <string name="hypott_whenhypott">¿Cuál es la razón principal para establecer un hipo TT?</string>
-    <string name="hypott_goinglow">Para evitar que BG caiga si ya hay basal temporal a cero corriendo.</string>
+    <string name="hypott_label">Tema: Objetivo Temporal por Hipoglucemia</string>
+    <string name="hypott_whenhypott">¿Cuál es la razón principal para establecer un objetivo temporal por hipoglucemia?</string>
+    <string name="hypott_goinglow">Para evitar que la glucemia caiga si ya hay una basal temporal a cero activada.</string>
    <string name="hypott_preventoversmb">Para evitar que AAPS inyecte demasiada insulina después de una subida causada por los carbohidratos de acción rápida utilizados para tratar una bajada en las lecturas de glucosa.</string>
    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
    <string name="offlineprofile_whatprofile">¿Qué perfil puede ser usado y configurado estando desconectado?</string>
@ -163,4 +163,7 @@
    <string name="basalhelp_diabetesteam">Tu equipo de diabetes</string>
    <string name="basalhelp_google">Google</string>
    <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Otra medicación</string>
+    <string name="other_medication_text">La AAPS reduce el BR para aumentar la glucosa en la sangre. Los inhibidores del grupo de las SGLT2 (gliflozinas) pueden prevenir el aumento esperado de BG y, por lo tanto, pueden producir una deficiencia de insulina peligrosa (DKA).
+\nLos nombres comunes de marca son: Invokana ®, Forxiga ®, Steglatro ®, Suglat ®, Apleway ®, Synjardy ®, Vokanamet ®, Xigduo ®.\n\nI prometo que no tomaré este tipo de medicamentos cuando use AAPS o desactivará el lazo cerrado antes de usar estas drogas.</string>
 </resources>
--- a/app/src/main/res/values-es-rES/insight_alert_titles.xml
+++ b/app/src/main/res/values-es-rES/insight_alert_titles.xml
@ -10,7 +10,7 @@
    <string name="alert_w32_title">Pila baja</string>
    <string name="alert_w33_title">Fecha/hora no válida</string>
    <string name="alert_w34_title">Fin de la garantía</string>
-    <string name="alert_w36_title">TBR cancelada</string>
+    <string name="alert_w36_title">Basal Temporal cancelada</string>
    <string name="alert_w38_title">Bolo cancelado</string>
    <string name="alert_w39_title">Aviso de préstamo de infusora</string>
    <string name="alert_m20_title">Reservorio no insertado</string>
--- a/app/src/main/res/values-es-rES/objectives.xml
+++ b/app/src/main/res/values-es-rES/objectives.xml
@ -36,7 +36,6 @@
    <string name="objectives_useloop">Mostrar contenido del plugin Loop</string>
    <string name="objectives_usescale">Usar función de escala mediante un gráfico BG pulsado largo</string>
    <string name="objectives_button_enter">Intro</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Introduzca el código obtenido de los desarrolladores para eludir el resto de objetivos</string>
    <string name="codeaccepted">Código aceptado</string>
    <string name="codeinvalid">Código no válido</string>
    <string name="objectives_exam_objective">Compruebe su conocimiento</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -1147,8 +1147,8 @@
    <string name="tidepool_upload_tbr">Subir basales temporales</string>
    <string name="tidepool_upload_profile">Subir conmutaciones de perfil, objetivos temps</string>
    <string name="tidepool_upload_bg">Subir pruebas BG</string>
-    <string name="dst_in_24h_warning">Cambio al horario de verano/invierno en menos de 24 horas</string>
-    <string name="dst_loop_disabled_warning">Cambio al horario de verano/invierno hace menos de 3 horas - Lazo cerrado deshabilitado</string>
+    <string name="dst_in_24h_warning">Cambio al horario de verano en menos de 24 horas</string>
+    <string name="dst_loop_disabled_warning">Cambio al horario de verano hace menos de 3 horas - Lazo cerrado deshabilitado</string>
    <string name="storage">restricción de almacenamiento interno</string>
    <string name="diskfull">Libera al menos %1$d MB de almacenamiento interno. ¡Loop desactivado!</string>
    <string name="wrongformat">Formato incorrecto</string>
@ -1236,6 +1236,8 @@
    <string name="medtronic_pump_battery_no">No seleccionado (Vista simple)</string>
    <string name="medtronic_pump_battery_alkaline">Alcalina (vista extendida)</string>
    <string name="medtronic_pump_battery_lithium">Litio (vista extendida)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (vista ampliada)</string>
+    <string name="medtronic_bolus_debugging">Bolos/Depuración de Tratamientos</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">ESCANEAR</string>
    <string name="rileylink_scanner_scan_stop">DETENER</string>
@ -1373,4 +1375,6 @@
    <string name="boluswizard">Asistente Bolus</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">Activado</string>
+    <string name="common_off">Desactivado</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Affichage du contenu du plugin Boucle</string>
    <string name="objectives_usescale">Modification de l\'échelle du graphique par un appui long sur la courbe de glycémie</string>
    <string name="objectives_button_enter">Entrer</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Entrez le code obtenu auprès des développeurs pour contourner le reste des objectifs</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous étiez avant un utilisateur d\'OpenAPS et que votre NS a au moins 3 mois de données de bouclage, vous pouvez envoyer un e-mail à objectives@androidaps.org avec votre adresse NS et demander un code pour contourner le reste des objectifs. Entrez le code obtenu auprès des développeurs</string>
    <string name="codeaccepted">Code accepté</string>
    <string name="codeinvalid">Code invalide</string>
    <string name="objectives_exam_objective">Prouver ses connaissances</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -155,9 +155,9 @@
    <string name="confirmation">Confirmation</string>
    <string name="entertreatmentquestion">Entrez le nouveau traitement :</string>
    <string name="bolus">Bolus</string>
-    <string name="sms_bolus">Bolus :</string>
+    <string name="sms_bolus">Bolus:</string>
    <string name="basal">Basal</string>
-    <string name="sms_basal">Basal :</string>
+    <string name="sms_basal">Basal:</string>
    <string name="carbs">Glucides</string>
    <string name="changeyourinput">Changez vos entrées !</string>
    <string name="setextendedbolusquestion">Définir un nouveau bolus étendu</string>
@ -314,7 +314,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="overview_bolusprogress_goingtodeliver">%1$.2fU vont être injectées</string>
    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
    <string name="noprofileselected">Aucun profil séléctionné</string>
-    <string name="smscommunicator_loophasbeendisabled">La Boucle été désactivée</string>
+    <string name="smscommunicator_loophasbeendisabled">La Boucle a été désactivée</string>
    <string name="smscommunicator_loophasbeenenabled">La Boucle a été activée</string>
    <string name="smscommunicator_loopisdisabled">La Boucle est désactivée</string>
    <string name="smscommunicator_loopisenabled">La Boucle est activée</string>
@ -322,17 +322,17 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="valueoutofrange">La valeur %1$s est en dehors des limites</string>
    <string name="smscommunicator_remotecommandnotallowed">La commande à distance n\'est pas autorisée</string>
    <string name="smscommunicator_remotebolusnotallowed">Bolus à distance non disponible. Réessayez plus tard.</string>
-    <string name="smscommunicator_basalreplywithcode">Pour démarrer Basal %1$.2fU/h pendant %2$d min, renvoyer le code %3$s</string>
+    <string name="smscommunicator_basalreplywithcode">Pour démarrer la Basal %1$.2fU/h pendant %2$d min, renvoyer le code %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Pour changer le profil vers %1$s %2$d%%, renvoyer le code %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">Pour démarrer le Bolus étendu %1$.2fU pendant %2$d min, renvoyer le code %3$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Pour démarrer le Basal %1$d%% pendant %2$d min, renvoyer le code %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Pour démarrer la Basal %1$d%% pendant %2$d min, renvoyer le code %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Envoyer le code %2$s pour suspendre la Boucle pour %1$d minutes</string>
    <string name="smscommunicator_tempbasalset">Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min</string>
    <string name="smscommunicator_extendedset">Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès</string>
    <string name="smscommunicator_tempbasalset_percent">Démarrage réussi pour %1$d%% de Basal temporaire pour %2$d min</string>
    <string name="smscommunicator_tempbasalfailed">Le démarrage du basal temporaire a échoué</string>
    <string name="smscommunicator_extendedfailed">Le départ du Bolus étendu a échoué</string>
-    <string name="smscommunicator_basalstopreplywithcode">Envoyer le code %1$s pour arrêter le Basal temporaire</string>
+    <string name="smscommunicator_basalstopreplywithcode">Envoyer le code %1$s pour arrêter la Basal temporaire</string>
    <string name="smscommunicator_extendedstopreplywithcode">Pour arrêter le Bolus étendu, renvoyer le code %1$s</string>
    <string name="smscommunicator_tempbasalcanceled">Basal temporaire annulé</string>
    <string name="smscommunicator_extendedcanceled">Bolus étendu annulé</string>
@ -393,7 +393,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="ongoingnotificaction">Notification en cours</string>
    <string name="old_data">DONNÉES ANCIENNES</string>
    <string name="minago">%1$d min passées</string>
-    <string name="sms_minago">%1$dmin passées</string>
+    <string name="sms_minago">il y a %1$d min</string>
    <string name="localprofile">Profil Local</string>
    <string name="openapsama">OpenAPS AMA</string>
    <string name="short_avgdelta">Delta basé sur une courte moyenne</string>
@ -533,7 +533,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="treatments_wizard_bgtrend_label">Delta 15 min</string>
    <string name="treatments_wizard_cob_label">GA</string>
    <string name="superbolus">Superbolus</string>
-    <string name="ns_logappstartedevent">Démarrage de l\'app journaux vers NS</string>
+    <string name="ns_logappstartedevent">Démarrage AAPS entré dans NS</string>
    <string name="restartingapp">Sortie de l’application pour appliquer de nouveaux paramètres.</string>
    <string name="danarv2pump">DanaRv2</string>
    <string name="configbuilder_insulin">Insuline</string>
@ -544,9 +544,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="insulin_shortname">INS</string>
    <string name="enablesuperbolus">Activer les Superbolus dans l’Assistant</string>
    <string name="enablesuperbolus_summary">Activer la fonctionnalité SuperBolus dans l’Assistant. Ne pas l’activer avant de bien comprendre comment cela fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT !</string>
-    <string name="show_statuslights">Afficher les lumières d\'état sur l\'écran d\'accueil</string>
-    <string name="show_statuslights_extended">Afficher les lumières d\'état prolongées sur l\'écran d\'accueil</string>
-    <string name="show_statuslights_extended_summary">Activer les lumières d\'état prolongées pour AgeC, AgeI, AgeS, niveaux du réservoir et de batterie sur l\'écran d\'accueil.</string>
+    <string name="show_statuslights">Afficher les voyants d\'état sur l\'écran d\'accueil</string>
+    <string name="show_statuslights_extended">Afficher les voyants d\'état prolongés sur l\'écran d\'accueil</string>
+    <string name="show_statuslights_extended_summary">Activer les voyants d\'état prolongés pour AgeC, AgeI, AgeS, niveaux du réservoir et de batterie sur l\'écran d\'accueil.</string>
    <string name="statuslights_res_warning">Seuil d\'avertissement de niveau du réservoir [U]</string>
    <string name="statuslights_res_critical">Seuil critique de niveau du réservoir [U]</string>
    <string name="statuslights_bat_warning">Seuil d’avertissement du niveau de batterie [%]</string>
@ -681,6 +681,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="shortgramm">g</string>
    <string name="shortminute">m</string>
    <string name="shorthour">h</string>
+    <string name="shortday">j</string>
    <string name="none"><![CDATA[<aucune>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">En</string>
@ -705,13 +706,14 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="btwatchdog_title">BT Watchdog</string>
    <string name="btwatchdog_summary">Ceci va arrêter le Bluetooth du téléphone pour une seconde si la connexion pompe n’est pas possible. Cela peut assister certains téléphones dont la connexion Bluetooth se bloque.</string>
    <string name="eversense">App Eversense (patché)</string>
-    <string name="dexcomg5_nsupload_title">Remonter les données glycémiques vers NS</string>
+    <string name="dexcomg5_nsupload_title">Remonter les Gly vers NS</string>
    <string name="bgsource_upload">Paramètres de téléchargement des glycémies</string>
    <string name="wear_detailed_delta_title">Afficher le delta détaillé</string>
    <string name="wear_detailed_delta_summary">Afficher delta avec une décimale supplémentaire</string>
+    <string name="smbmaxminutes">SMB minutes max</string>
    <string name="smbmaxminutes_summary">Max. minutes de basal pour limiter le SMB</string>
    <string name="unsupportedfirmware">Firmware pompe incompatible </string>
-    <string name="dexcomg5_xdripupload_title">Transmettre les données G vers xDrip+</string>
+    <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
    <string name="nsclientbg">Glycémie NSClient</string>
    <string name="minimalbasalvaluereplaced">Valeur de basal remplacée par la valeur minimale autorisée : %1$s</string>
@ -869,7 +871,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="unsafeusage">utilisation dangereuse</string>
    <string name="readstatusfailed">La lecture du statut a échoué</string>
    <string name="record_pump_site_change">Enregistrer changement de site de cathéter</string>
-    <string name="record_insulin_cartridge_change">Enregistrer changement de réservoir</string>
+    <string name="record_insulin_cartridge_change">Enreg. changement de réservoir</string>
    <string name="smbalwaysdisabled">SMB toujours et post-ingestion de glucides désactivé car la source de glycémies actuelle ne supporte pas de filtrage avancé</string>
    <string name="smbnotallowedinopenloopmode">SMB non autorisé en mode Boucle Ouverte</string>
    <string name="food_short">Aliments</string>
@ -1148,8 +1150,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="tidepool_upload_tbr">Transférer les Basal temporaires</string>
    <string name="tidepool_upload_profile">Transférer les changements de profils, les objectifs temporaires</string>
    <string name="tidepool_upload_bg">Transférer les tests de glycémies</string>
-    <string name="dst_in_24h_warning">Changement d\'heure d\'été dans moins de 24 heures</string>
-    <string name="dst_loop_disabled_warning">Changement d\'heure d\'été dans moins de 3 heures - Boucle fermée désactivée</string>
+    <string name="dst_in_24h_warning">Changement d\'heure dans moins de 24 heures</string>
+    <string name="dst_loop_disabled_warning">Changement d\'heure dans moins de 3 heures - Boucle fermée désactivée</string>
    <string name="storage">stockage interne limité</string>
    <string name="diskfull">Boucle désactivée ! Libérez au moins %1$d Mo du stockage interne !</string>
    <string name="wrongformat">Format incorrect</string>
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@ -28,8 +28,8 @@
    <string name="objectives_exportsettings">Esportarle localmente dal menu Manutenzione.</string>
    <string name="objectives_storeelsewhere">Salvare il file esportato in un altro posto come l\'email, Dropbox, Google drive…</string>
    <string name="objectives_doexportonstart">Esportarle subito dopo l\'installazione di AAPS.</string>
-    <string name="objectives_doexportafterchange">Esportarli dopo aver fatto modifiche d\'impostazione.</string>
-    <string name="objectives_doexportafterobjective">Esportarli dopo il completamento di un obiettivo.</string>
+    <string name="objectives_doexportafterchange">Esportarle dopo aver fatto modifiche d\'impostazione.</string>
+    <string name="objectives_doexportafterobjective">Esportarle dopo il completamento di un obiettivo.</string>
    <string name="objectives_doexportafterfirtssettings">Esportarle quando termini le configurazioni iniziali.</string>
    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@ -32,18 +32,18 @@
    <string name="objectives_usedisconnectpump">Simula la doccia. Disconnetti il micro per 1h (premi a lungo su Loop aperto)</string>
    <string name="objectives_usereconnectpump">... e riconnetti allo stesso modo</string>
    <string name="objectives_usetemptarget">Crea un target temporaneo personalizzato con una durata di 10 min (premi a lungo sul tuo target corrente)</string>
-    <string name="objectives_useactions">Nel Configuratore attiva il plugin Azioni, rendilo visibile e visualizzane i contenuti tramite il menu in alto</string>
+    <string name="objectives_useactions">Nel Configuratore strutturale attiva il plugin Azioni, rendilo visibile e visualizzane i contenuti tramite il menu in alto</string>
    <string name="objectives_useloop">Visualizza il contenuto del plugin Loop</string>
    <string name="objectives_usescale">Usa la funzione di ridimensionamento premendo a lungo sul grafico delle glicemie</string>
    <string name="objectives_button_enter">Entra</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Inserisci il codice ottenuto dagli sviluppatori per aggirare il resto degli obiettivi</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se prima eri un utente OpenAPS e il tuo NS ha almeno 3 mesi di dati in loop, puoi inviare un\'e-mail a objectives@androidaps.org con il tuo indirizzo NS e richiedere il codice per ignorare il resto degli obiettivi. Inserisci il codice ottenuto dagli sviluppatori</string>
    <string name="codeaccepted">Codice accettato</string>
    <string name="codeinvalid">Codice non valido</string>
    <string name="objectives_exam_objective">Dai prova della tua conoscenza</string>
    <string name="objectives_exam_gate">Studia e rispondi correttamente alle domande</string>
    <string name="answerdisabledto">Risposta disabilitata per: %1$s</string>
    <string name="wronganswer">Risposta sbagliata!</string>
-    <string name="unfinshed_button">Prossimo non completato</string>
+    <string name="unfinshed_button">Prossimo N.C.</string>
    <string name="requestcode">Codice richiesta: %1$s</string>
    <string name="objectives_hint">(segna tutte le risposte corrette)</string>
    <string name="disconnectpump_hint">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -7,7 +7,7 @@
    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
    <string name="treatmentssafety_title">Sicurezza trattamenti</string>
    <string name="treatmentssafety_maxbolus_title">Max bolo consentito [U]</string>
-    <string name="treatmentssafety_maxcarbs_title">Max carboidrati consentiti [g]</string>
+    <string name="treatmentssafety_maxcarbs_title">Max CHO consentiti [g]</string>
    <string name="nav_preferences">Preferenze</string>
    <string name="nav_refreshtreatments">Ricarica trattamenti da NS</string>
    <string name="nav_resetdb">Resetta database</string>
@ -18,7 +18,7 @@
    <string name="ns_sync_use_absolute_title">Utilizza sempre valori basali assoluti</string>
    <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
    <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
-    <string name="description_actions">Alcuni pulsanti per accedere rapidamente alle funzioni comuni</string>
+    <string name="description_actions">Alcuni tasti per accedere rapidamente alle funzioni comuni</string>
    <string name="description_careportal">Inserisci voci di registro avanzate.</string>
    <string name="description_config_builder">Utilizzato per configurare i plugin attivi</string>
    <string name="description_objectives">Programma di apprendimento</string>
@ -31,7 +31,7 @@
    <string name="description_ma">Stato dell\'algoritmo nel 2016</string>
    <string name="description_ama">Stato dell\'algoritmo nel 2017</string>
    <string name="description_smb">Algoritmo più recente per gli utenti avanzati</string>
-    <string name="description_overview">Visualizza lo stato corrente del tuo loop e i pulsanti per le azioni più comuni</string>
+    <string name="description_overview">Visualizza lo stato corrente del tuo loop e i tasti per le azioni più comuni</string>
    <string name="description_persistent_notification">Mostra una notifica con una breve panoramica di ciò che sta facendo il tuo loop</string>
    <string name="description_profile_local">Definisci un profilo disponibile offline.</string>
    <string name="description_profile_nightscout">Fornisce il profilo definito in Nightscout</string>
@ -43,15 +43,15 @@
    <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
    <string name="description_pump_mdi">Per le persone in terapia multi-iniettiva</string>
    <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop Aperto)</string>
-    <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma puoi specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento carboidrati\' nelle preferenze.</string>
+    <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma puoi specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze.</string>
    <string name="description_sensitivity_oref0">La sensibilità è calcolata dai dati delle ultime 24h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze.</string>
    <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il Plugin calcola anche UAM.</string>
-    <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata dalle deviazioni. Le deviazioni più recenti hanno peso maggiore. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento carboidrati\' nelle preferenze. Questo algoritmo è il più veloce nel seguire i cambiamenti di sensibilità.</string>
-    <string name="description_source_eversense">Ricevi valori Glicemia dall\'app Eversense modificata.</string>
-    <string name="description_source_glimp">Ricevi valori Glicemia da Glimp.</string>
-    <string name="description_source_mm640g">Ricevi valori Glicemia da 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Scarica dati Glicemia da Nightscout</string>
-    <string name="description_source_xdrip">Ricevi dati Glicemia da xDrip.</string>
+    <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata dalle deviazioni. Le deviazioni più recenti hanno peso maggiore. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze. Questo algoritmo è il più veloce nel seguire i cambiamenti di sensibilità.</string>
+    <string name="description_source_eversense">Ricevi valori glicemia dall\'app Eversense modificata.</string>
+    <string name="description_source_glimp">Ricevi valori glicemia da Glimp.</string>
+    <string name="description_source_mm640g">Ricevi valori glicemia da 600SeriesAndroidUploader.</string>
+    <string name="description_source_ns_client">Scarica dati glicemia da Nightscout</string>
+    <string name="description_source_xdrip">Ricevi dati glicemia da xDrip.</string>
    <string name="description_treatments">Salva tutti i trattamenti che sono stati fatti</string>
    <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
    <string name="description_xdrip_status_line">Mostra le informazioni del loop sulla watchface di xDrip+.</string>
@ -64,7 +64,7 @@
    <string name="nsprofileview_target_label">Target</string>
    <string name="noprofileset">NESSUN PROFILO IMPOSTATO</string>
    <string name="treatments_insulin_label_string">Insulina:</string>
-    <string name="treatments_carbs_label_string">Carboidrati:</string>
+    <string name="treatments_carbs_label_string">CHO:</string>
    <string name="treatments_iob_label_string">IOB:</string>
    <string name="sms_iob">IOB:</string>
    <string name="treatments_iobtotal_label_string">IOB totale:</string>
@ -75,15 +75,15 @@
    <string name="tempbasals_iob_label_string">IOB:</string>
    <string name="tempbasals_iobtotal_label_string">IOB totale:</string>
    <string name="treatments_newtreatment_insulinamount_label">Insulina</string>
-    <string name="treatments_newtreatment_carbsamount_label">Carbs</string>
+    <string name="treatments_newtreatment_carbsamount_label">CHO</string>
    <string name="treatments_wizard_bg_label">BG</string>
    <string name="treatments_wizard_tt_label">TT</string>
-    <string name="treatments_wizard_carbs_label">Carbs</string>
-    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="treatments_wizard_carbs_label">CHO</string>
+    <string name="treatments_wizard_correction_label">Correzione</string>
    <string name="insulin_unit_shortname">U</string>
    <string name="treatments_wizard_bolusiob_label">IOB da bolo</string>
    <string name="openapsma_run">Esegui ora</string>
-    <string name="vitualpump_label">MICROINFUSORE VIRTUALE</string>
+    <string name="vitualpump_label">MICRO VIRTUALE</string>
    <string name="pump_basebasalrate_label">Velocità basale originale</string>
    <string name="pump_tempbasal_label">Basale temporanea</string>
    <string name="virtualpump_extendedbolus_label">Bolo esteso</string>
@ -108,7 +108,7 @@
    <string name="glucose">Glicemia</string>
    <string name="delta">Delta</string>
    <string name="sms_delta">Delta:</string>
-    <string name="configbuilder">Configurazione strutturale</string>
+    <string name="configbuilder">Configuratore strutturale</string>
    <string name="objectives">Obiettivi</string>
    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Panoramica</string>
@ -116,7 +116,7 @@
    <string name="simpleprofile">Profilo semplice</string>
    <string name="tempbasal">Basale temporanea</string>
    <string name="treatments">Trattamenti</string>
-    <string name="virtualpump">Microinfusore Virtuale</string>
+    <string name="virtualpump">Micro Virtuale</string>
    <string name="careportal">Portale</string>
    <string name="configbuilder_pump">Micro</string>
    <string name="configbuilder_pump_description">Quale microinfusore desideri utilizzare con AndroidAPS?</string>
@ -158,10 +158,10 @@
    <string name="sms_bolus">Bolo:</string>
    <string name="basal">Basale</string>
    <string name="sms_basal">Basale</string>
-    <string name="carbs">Carbs</string>
+    <string name="carbs">CHO</string>
    <string name="changeyourinput">Cambia il tuo input!</string>
    <string name="setextendedbolusquestion">Imposta nuovo bolo esteso:</string>
-    <string name="configbuilder_bgsource">Origine Glicemia</string>
+    <string name="configbuilder_bgsource">Origine glicemia</string>
    <string name="configbuilder_bgsource_description">Da dove AndroidAPS dovrebbe ottenere i suoi dati?</string>
    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Modalità APS</string>
@ -177,8 +177,8 @@
    <string name="loopdisabled">LOOP DISABILITATO DAI VINCOLI</string>
    <string name="treatments_wizard_basaliob_label">IOB da basale</string>
    <string name="bolusconstraintapplied">Vincolo bolo applicato</string>
-    <string name="carbsconstraintapplied">Vincolo carboidrati applicato</string>
-    <string name="careportal_bgcheck">Controllo BG</string>
+    <string name="carbsconstraintapplied">Vincolo CHO applicato</string>
+    <string name="careportal_bgcheck">Controllo glicemia</string>
    <string name="careportal_announcement">Annuncio</string>
    <string name="careportal_note">Nota</string>
    <string name="careportal_question">Domanda</string>
@ -194,16 +194,16 @@
    <string name="careportal_combobolus">Bolo combo</string>
    <string name="careportal_tempbasalstart">Inizio basale temporanea</string>
    <string name="careportal_tempbasalend">Fine basale temporanea</string>
-    <string name="careportal_carbscorrection">Correzione con carboidrati</string>
+    <string name="careportal_carbscorrection">Correzione con CHO</string>
    <string name="careportal_openapsoffline">OpenAPS Offline</string>
    <string name="careportal_newnstreatment_eventtype">Tipo di evento</string>
    <string name="careportal_newnstreatment_other">Altro</string>
    <string name="careportal_newnstreatment_meter">Glucometro</string>
    <string name="careportal_newnstreatment_sensor">Sensore</string>
-    <string name="careportal_newnstreatment_carbs_label">Carbs</string>
+    <string name="careportal_newnstreatment_carbs_label">CHO</string>
    <string name="careportal_newnstreatment_insulin_label">Insulina</string>
-    <string name="careportal_newnstreatment_carbtime_label">Tempo carboidrati</string>
-    <string name="careportal_newnstreatment_split_label">Fraziona</string>
+    <string name="careportal_newnstreatment_carbtime_label">Tempo CHO</string>
+    <string name="careportal_newnstreatment_split_label">Frazione</string>
    <string name="careportal_newnstreatment_duration_label">Durata</string>
    <string name="careportal_newnstreatment_percent_label">Percentuale</string>
    <string name="careportal_newnstreatment_absolute_label">Assoluto</string>
@ -224,11 +224,11 @@
    <string name="filenotfound">File non trovato</string>
    <string name="nav_export">Esporta impostazioni</string>
    <string name="nav_import">Importa impostazioni</string>
-    <string name="openapsma_maxbasal_title">Max U/h che una basale temporanea può impostare</string>
+    <string name="openapsma_maxbasal_title">Max U/h a cui limitare una basale temporanea</string>
    <string name="openapsma_maxbasal_summary">Questo valore è chiamato max basale nel contesto OpenAPS</string>
-    <string name="openapsma_maxiob_title">Max IOB da basale che OpenAPS può erogare [U]</string>
-    <string name="openapsma_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nIndica l\'insulina massima in [U] che APS può erogare contemporaneamente.</string>
-    <string name="dismiss">RESPINGI</string>
+    <string name="openapsma_maxiob_title">Max IOB da basale a cui limitare OpenAPS [U]</string>
+    <string name="openapsma_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nIndica l\'insulina massima in [U] che APS può erogare in contemporanea.</string>
+    <string name="dismiss">RIMUOVI</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Connessione</string>
    <string name="connected">Connesso</string>
@ -260,11 +260,23 @@
    <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">Per erogare il bolo di %1$.2fU rispondi col codice %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Per erogare il bolo pasto di %1$.2fU rispondi col codice %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Per impostare il Temp-Target %1$s rispondi con il codice %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Per cancellare il Temp-Target rispondi col codice %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Per disabilitare il Servizio di Controllo Remoto tramite SMS rispondi col codice %1$s.\n\nRicorda che potrai riattivarlo solo in maniera diretta dallo smartphone master in cui è installato AAPS.</string>
+    <string name="smscommunicator_stoppedsms">Servizio di Controllo Remoto tramite SMS stoppato. Per riattivarlo, usa lo smartphone master in cui è installato AAPS.</string>
    <string name="smscommunicator_calibrationreplywithcode">Per inviare la calibrazione %1$.2f rispondi col codice %2$s</string>
    <string name="smscommunicator_bolusfailed">Bolo fallito</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Numero minimo di minuti che devono trascorrere tra un bolo remoto e il successivo</string>
+    <string name="smscommunicator_remotebolusmindistance">Quanti minuti devono trascorrere, almeno, tra un bolo e il successivo</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Per la tua sicurezza, per modificare questa preferenza hai bisogno di aggiungere almeno 2 numeri di telefono.</string>
    <string name="bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
    <string name="bolusrequested">Sto per erogare %1$.2fU</string>
    <string name="smscommunicator_bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolo pasto di %1$.2fU erogato con successo</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Target %1$s per %2$d minuti</string>
+    <string name="smscommunicator_tt_set">Target %1$s per %2$d minuti impostato con successo</string>
+    <string name="smscommunicator_tt_canceled">Temp-Target cancellato con successo</string>
    <string name="bolusdelivering">Erogazione di %1$.2fU</string>
    <string name="smscommunicator_remotecommandsallowed">Consenti comandi remoti tramite SMS</string>
    <string name="glucosetype_finger">Dito</string>
@ -324,10 +336,13 @@
    <string name="smscommunicator_basalreplywithcode">Per avviare la basale %1$.2fU/h per %2$d min rispondi col codice %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Per passare al profilo %1$s %2$d%% rispondi col codice %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">Per avviare il bolo esteso %1$.2fU/h per %2$d min rispondi col codice %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Per inserire %1$dg a %2$s rispondi col codice %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Per avviare la basale %1$d%% per %2$d min rispondi col codice %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Per sospendere il loop per %1$d minuti rispondi col codice %2$s</string>
    <string name="smscommunicator_tempbasalset">Basale temporanea %1$.2fU/h per %2$d min avviata con successo</string>
    <string name="smscommunicator_extendedset">Bolo esteso %1$.2fU/h per %2$d min avviato con successo</string>
+    <string name="smscommunicator_carbsset">CHO %1$dg inseriti con successo</string>
+    <string name="smscommunicator_carbsfailed">Inserimento di %1$dg di CHO fallito</string>
    <string name="smscommunicator_tempbasalset_percent">Basale temporanea %1$d%% per %2$d min avviata con successo</string>
    <string name="smscommunicator_tempbasalfailed">Avvio basale temporanea fallito</string>
    <string name="smscommunicator_extendedfailed">Avvio bolo esteso fallito</string>
@ -338,26 +353,26 @@
    <string name="smscommunicator_tempbasalcancelfailed">Cancellazione basale temporanea fallita</string>
    <string name="smscommunicator_extendedcancelfailed">Cancellazione bolo esteso fallita</string>
    <string name="smscommunicator_unknowncommand">Comando sconosciuto o risposta errata</string>
-    <string name="quickwizard">QuickWizard</string>
-    <string name="quickwizardsettings">Impostazioni QuickWizard</string>
-    <string name="overview_editquickwizard_buttontext">Testo pulsante:</string>
-    <string name="overview_editquickwizard_carbs">Carboidrati:</string>
+    <string name="quickwizard">Calcolatore Rapido</string>
+    <string name="quickwizardsettings">Impostazioni Calcolatore Rapido</string>
+    <string name="overview_editquickwizard_buttontext">Testo:</string>
+    <string name="overview_editquickwizard_carbs">CHO:</string>
    <string name="overview_editquickwizard_valid">Valido:</string>
    <string name="overview_editquickwizardlistactivity_add">Aggiungi</string>
    <string name="overview_quickwizard_item_edit_button">Modifica</string>
    <string name="overview_quickwizard_item_remove_button">Rimuovi</string>
    <string name="mealbolus">Pasto</string>
-    <string name="correctionbous">Corr</string>
+    <string name="correctionbous">Correzione</string>
    <string name="actions">Azioni</string>
    <string name="androidaps_start">AndroidAPS avviato</string>
-    <string name="ns_upload_only">NS: solo upload (sincronizzazione disabilitata)</string>
+    <string name="ns_upload_only">NS: solo upload (sincron. disabilitata)</string>
    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui Profili durante l\'utilizzo dei profili NS.</string>
    <string name="pumpNotInitialized">Micro non inizializzato!</string>
    <string name="pumpNotInitializedProfileNotSet">Micro non inizializzato, profilo non impostato!</string>
    <string name="primefill">Carica/Riempi</string>
    <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
    <string name="othersettings_title">Altro</string>
-    <string name="fillbolus_title">Quantità standard di insulina per la funzione Carica/Riempi.</string>
+    <string name="fillbolus_title">Quantità standard di insulina per Carica/Riempi.</string>
    <string name="button1">Tasto 1</string>
    <string name="button2">Tasto 2</string>
    <string name="button3">Tasto 3</string>
@ -370,7 +385,7 @@
    <string name="prefs_range_summary">Limite alto e basso per i grafici nella sezione Panoramica e sullo Smartwatch</string>
    <string name="low_mark">Limite BASSO</string>
    <string name="high_mark">Limite ALTO</string>
-    <string name="wear">Wear</string>
+    <string name="wear">Smartwatch</string>
    <string name="resend_all_data">Invia di nuovo tutti i dati</string>
    <string name="open_settings_on_wear">Apri impostazioni sullo smartwatch</string>
    <string name="pumperror">Errore micro</string>
@ -385,8 +400,8 @@
    <string name="danar_enableextendedbolus">Abilita bolo esteso sul micro</string>
    <string name="danar_switchtouhmode">Cambia la modalità da U/d a U/h nel micro</string>
    <string name="basalvaluebelowminimum">Valore basale inferiore al minimo. Profilo non impostato!</string>
-    <string name="sms_actualbg">BG:</string>
-    <string name="sms_lastbg">Ultimo BG:</string>
+    <string name="sms_actualbg">Glicemia:</string>
+    <string name="sms_lastbg">Ultima glicemia:</string>
    <string name="mdi">MDI</string>
    <string name="MM640g">MM640g</string>
    <string name="ongoingnotificaction">Notifica in corso</string>
@ -404,7 +419,7 @@
    <string name="refresheventsfromnightscout">Ricarica eventi da NS</string>
    <string name="deletefuturetreatments">Elimina trattamenti nel futuro</string>
    <string name="eatingsoon">Pasto a breve</string>
-    <string name="hypo">Ipo</string>
+    <string name="hypo">Ipoglicemia</string>
    <string name="activity">Attività</string>
    <string name="removerecord">Rimuovi record:</string>
    <string name="danar_stats">Statistiche DanaR</string>
@ -435,10 +450,10 @@
    <string name="treatments_shortname">TRATT</string>
    <string name="careportal_shortname">PT</string>
    <string name="objectives_shortname">OBT</string>
-    <string name="wear_shortname">WEAR</string>
+    <string name="wear_shortname">SMWA</string>
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Abbrevia i titoli delle schede</string>
-    <string name="always_use_shortavg">Utilizza sempre il delta medio ridotto anziché il delta semplice</string>
+    <string name="always_use_shortavg">Utilizza sempre il delta medio ridotto</string>
    <string name="always_use_shortavg_summary">Utile quando i dati provenienti da sorgenti non filtrate come xDrip diventano \"rumorosi\" (instabili).</string>
    <string name="advancedsettings_title">Impostazioni avanzate</string>
    <string name="danar_model">Modello:%1$02X Protocollo:%2$02X Codice:%3$02X</string>
@ -451,7 +466,7 @@
    <string name="openapsama_autosens_adjusttargets_summary">[Valore predefinito: vero]\nViene utilizzato per consentire ad autosens di regolare i target glicemici, in aggiunta a ISF e basali.</string>
    <string name="openapsama_bolussnooze_dia_divisor_summary">[Valore predefinito: 2]\nBolus snooze è attivato dopo un bolo pasto per fare in modo che il loop non imposti basali temporanee basse quando hai appena mangiato. AndroidAPS non imposterà velocità basali troppo basse nel periodo corrispondente a DIA diviso il parametro bolus snooze - divisore DIA. Con DIA di 3 ore \"bolus snooze\" durerà 1.5 ore (3/2).</string>
    <string name="openapsama_min_5m_carbimpact_summary">[Valore predefinito: 3.0 (AMA) o 8.0 (SMB)]. Questa è un\'impostazione per l\'impatto di assorbimento predefinito dei carboidrati in 5 minuti. L\'impostazione predefinita è una previsione di 3mg/dl/5min. Ha effetto sulla velocità di decadimento dei COB (carboidrati attivi) e su quanto il loro assorbimento incide nella previsione dell’andamento glicemico, quando la glicemia sta scendendo più del previsto o non sta salendo quanto previsto.</string>
-    <string name="openapsama_link_to_preferncejson_doc_txt">Attenzione!\nNormalmente non dovresti modificare questi valori. FAI CLICK QUI e leggi il testo e assicuratevi di AVERLO CAPITO prima di cambiare uno di questi valori.</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">Attenzione!\nNormalmente non dovresti modificare questi valori. FAI CLICK QUI e leggi il testo e assicurati di AVERLO CAPITO prima di cambiare uno di questi valori.</string>
    <string name="error_only_numeric_digits_allowed">Sono consentite solo cifre numeriche.</string>
    <string name="error_only_numeric_digits_range_allowed">Sono consentite solo cifre numeriche nel range %1$s - %2$s.</string>
    <string name="error_field_must_not_be_empty">Il campo non deve essere vuoto</string>
@ -489,17 +504,17 @@
    <string name="nsclientinternal_secret_title">API secret di NS</string>
    <string name="nsclientinternal_secret_dialogtitle">API secret di NS</string>
    <string name="nsclientinternal_secret_dialogmessage">Inserisci l\'API secret di NS (minimo 12 caratteri)</string>
-    <string name="deliver_now">Invia adesso</string>
+    <string name="deliver_now">Invia ora</string>
    <string name="clear_queue">Cancella coda</string>
    <string name="show_queue">Mostra coda</string>
    <string name="queue">Coda:</string>
    <string name="status">Stato:</string>
    <string name="paused">In pausa</string>
-    <string name="clearlog">Cancella il log</string>
+    <string name="clearlog">Cancella log</string>
    <string name="nowritepermission">NSCLIENT non ha il permesso di scrittura. API secret errato?</string>
    <string name="wear_settings">Impostazioni smartwatch</string>
    <string name="wear_detailedIOB_title">Mostra IOB dettagliato</string>
-    <string name="wear_detailedIOB_summary">Dividi IOB tra boli e IOB da basale sulla watchface</string>
+    <string name="wear_detailedIOB_summary">Dividi IOB in bolo e basale sulla watchface</string>
    <string name="nosuccess">non riuscito - controlla il telefono</string>
    <string name="notavailable">Non disponibile</string>
    <string name="patientage">Età del paziente</string>
@ -541,21 +556,21 @@
    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
    <string name="ultrafastactinginsulincomment">Fiasp</string>
    <string name="insulin_shortname">INS</string>
-    <string name="enablesuperbolus">Abilita superbolo nel wizard</string>
-    <string name="enablesuperbolus_summary">Abilita la funzionalità superbolo nel wizard. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRADOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
-    <string name="show_statuslights">Mostra \"indicatori di stato\" sulla schermata iniziale</string>
-    <string name="show_statuslights_extended">Mostra \"indicatori di stato\" estesi sulla schermata iniziale</string>
+    <string name="enablesuperbolus">Abilita superbolo nel calcolatore</string>
+    <string name="enablesuperbolus_summary">Abilita la funzionalità superbolo nel calcolatore. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRADOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
+    <string name="show_statuslights">Mostra indicatori di stato sulla home</string>
+    <string name="show_statuslights_extended">Mostra indicatori estesi sulla home</string>
    <string name="show_statuslights_extended_summary">Abilita indicatori di stato estesi per \"età\" cannula, insulina, sensore, serbatoio e livello batteria sulla schermata iniziale.</string>
    <string name="statuslights_res_warning">Soglia di avviso livello serbatoio [U]</string>
-    <string name="statuslights_res_critical">Soglia critica livello serbatoio [U]</string>
-    <string name="statuslights_bat_warning">Soglia livello batteria a cui prestare attenzione [%]</string>
+    <string name="statuslights_res_critical">Soglia livello serbatoio critico [U]</string>
+    <string name="statuslights_bat_warning">Soglia di avviso livello batteria [%]</string>
    <string name="statuslights_bat_critical">Soglia livello batteria critico [%]</string>
    <string name="iob">IOB</string>
    <string name="cob">COB</string>
    <string name="virtualpump_firmware_label">Firmware</string>
    <string name="pump_lastconnection_label">Ultima connessione</string>
    <string name="danar_bluetooth_status">Stato bluetooth</string>
-    <string name="nav_about">Riguardo a</string>
+    <string name="nav_about">Informazioni su</string>
    <string name="smscommunicator_missingsmspermission">Autorizzazione SMS mancante</string>
    <string name="smscommunicator_missingphonestatepermission">Autorizzazione stato telefono mancante</string>
    <string name="xdripstatus_settings">Stato xDrip (smartwatch)</string>
@ -606,7 +621,7 @@
    <string name="careportal_sensorage_label_short">SAGE</string>
    <string name="careportal_insulinage_label_short">IAGE</string>
    <string name="careportal_canulaage_label_short">CAGE</string>
-    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="careportal_pbage_label_short">MBAGE</string>
    <string name="openaps_short">OAPS</string>
    <string name="uploader_short">UPLD</string>
    <string name="basal_short">BAS</string>
@ -622,7 +637,7 @@
    <string name="ns_localbroadcasts">Abilita le trasmissioni ad altre app (come xDrip). Non abilitare se hai installato più di un\'istanza di AAPS o NSClient!</string>
    <string name="ns_localbroadcasts_title">Abilita le trasmissioni locali.</string>
    <string name="careportal_activity_label">ATTIVITÀ &amp; FEEDBACK</string>
-    <string name="careportal_carbsandbolus_label">CARBOIDRATI &amp; BOLO</string>
+    <string name="careportal_carbsandbolus_label">CHO &amp; BOLO</string>
    <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
    <string name="careportal_pump_label">MICRO</string>
    <string name="overview_newtempbasal_basalabsolute">Valore basale [U/h]</string>
@ -680,6 +695,7 @@
    <string name="shortgramm">g</string>
    <string name="shortminute">m</string>
    <string name="shorthour">h</string>
+    <string name="shortday">g</string>
    <string name="none"><![CDATA[<none>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">Enr</string>
@ -693,9 +709,9 @@
    <string name="pumpdrivercorrected">Driver del micro corretto</string>
    <string name="pump_unreachable">Micro irraggiungibile</string>
    <string name="missed_bg_readings">Letture glicemia mancanti</string>
-    <string name="raise_notifications_as_android_notifications">Utilizza le notifiche di sistema per avvisi e notifiche</string>
+    <string name="raise_notifications_as_android_notifications">Usa le notifiche di sistema per gli avvisi</string>
    <string name="localalertsettings_title">Allarmi locali</string>
-    <string name="enable_missed_bg_readings_alert">Allarme se non si ricevono dati Glicemia</string>
+    <string name="enable_missed_bg_readings_alert">Allarme se non si ricevono dati glicemia</string>
    <string name="enable_pump_unreachable_alert">Allarme se il micro non è raggiungibile</string>
    <string name="pump_unreachable_threshold">Soglia micro irraggiungibile [min]</string>
    <string name="urgent_alarm">Allarme urgente</string>
@ -708,6 +724,7 @@
    <string name="bgsource_upload">Impostazioni caricamento glicemia</string>
    <string name="wear_detailed_delta_title">Mostra delta dettagliato</string>
    <string name="wear_detailed_delta_summary">Mostra delta con una cifra decimale in più</string>
+    <string name="smbmaxminutes">Max minuti SMB</string>
    <string name="smbmaxminutes_summary">Max minuti di basale a cui limitare SMB</string>
    <string name="unsupportedfirmware">Firmware del micro non supportato</string>
    <string name="dexcomg5_xdripupload_title">Invia dati glicemia a xDrip+</string>
@ -741,7 +758,7 @@
    <string name="combo_no_pump_connection">Nessuna connessione per %1$d min</string>
    <string name="combo_tbr_remaining">%1$d%% (%2$d min restanti)</string>
    <string name="combo_pump_state_initializing">Inizializzazione</string>
-    <string name="combo_pump_state_suspended_due_to_error">Sospeso a causa di errore</string>
+    <string name="combo_pump_state_suspended_due_to_error">Sospeso a causa di un errore</string>
    <string name="combo_pump_state_suspended_by_user">Sospeso dall\'utente</string>
    <string name="combo_pump_state_running">In esecuzione</string>
    <string name="combo_pump_action_cancelling_tbr">Cancellazione TBR</string>
@ -775,9 +792,9 @@
    <string name="ago">fa</string>
    <string name="format_hours">%1$.2f h</string>
    <string name="enablesmbalways">Abilita SMB sempre</string>
-    <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemie con un buon filtraggio dei dati, come G5</string>
-    <string name="enablesmbaftercarbs">Abilita SMB dopo i carboidrati</string>
-    <string name="enablesmbaftercarbs_summary">Abilita SMB per 6h dopo i carboidrati, anche con 0 COB. Possibile solo con sorgente glicemie con un buon filtraggio dei dati, come G5</string>
+    <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
+    <string name="enablesmbaftercarbs">Abilita SMB dopo i CHO</string>
+    <string name="enablesmbaftercarbs_summary">Abilita SMB per 6h dopo i carboidrati, anche con 0 COB. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
    <string name="enablesmbwithcob">Abilita SMB con COB</string>
    <string name="enablesmbwithcob_summary">Abilita SMB quando COB è attivo (ci sono carboidrati non assorbiti).</string>
    <string name="enablesmbwithtemptarget">Abilita SMB con target temporanei</string>
@ -787,7 +804,7 @@
    <string name="let_temp_basal_run">Lascia eseguire la basale temporanea</string>
    <string name="mute">Muto</string>
    <string name="overview_insulin_label">Insulina</string>
-    <string name="overview_carbs_label">Carbs</string>
+    <string name="overview_carbs_label">CHO</string>
    <string name="overview_buttons_selection">Tasti</string>
    <string name="show_calibration_button_summary">Invia una calibrazione a xDrip+ o apre la finestra di calibrazione del G5</string>
    <string name="show_cgm_button_summary">Apre xDrip+, il tasto indietro torna ad AAPS</string>
@ -819,8 +836,8 @@
    <string name="overview_show_activity">Attività</string>
    <string name="overview_show_sensitivity">Sensibilità</string>
    <string name="overview_show_deviations">Deviazioni</string>
-    <string name="overview_show_cob">Carboidrato attivi (COB)</string>
-    <string name="overview_show_iob">Insulina attiva (IOB)</string>
+    <string name="overview_show_cob">CHO attivi</string>
+    <string name="overview_show_iob">Insulina attiva</string>
    <string name="overview_show_basals">Basali</string>
    <string name="no_action_selected">Nessuna azione selezionata, non succederà nulla</string>
    <string name="start_hypo_tt">Avvia TT Ipoglicemia</string>
@ -853,8 +870,8 @@
    <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s</string>
    <string name="pumplimit">limite micro</string>
    <string name="itmustbepositivevalue">deve essere un valore positivo</string>
-    <string name="maxbasalmultiplier">moltiplicatore - max basale</string>
-    <string name="maxdailybasalmultiplier">moltiplicatore - max basale giornaliera</string>
+    <string name="maxbasalmultiplier">moltiplicatore max basale</string>
+    <string name="maxdailybasalmultiplier">moltiplicatore max basale giornaliera</string>
    <string name="smb_frequency_exceeded">Un bolo è stato erogato negli ultimi 3 minuti, SMB ignorato</string>
    <string name="basal_set_correctly">Basale impostata correttamente</string>
    <string name="limitingpercentrate">Limitazione max tasso percentuale a %1$d%% a causa di: %2$s</string>
@ -869,13 +886,13 @@
    <string name="readstatusfailed">Lettura stato fallita</string>
    <string name="record_pump_site_change">Registra cambio posizione cannula</string>
    <string name="record_insulin_cartridge_change">Registra cambio serbatoio insulina</string>
-    <string name="smbalwaysdisabled">Le funzioni \"SMB sempre\" e \"SMB dopo i carboidrati\" sono disabilitate perché la sorgente delle glicemie non supporta il filtraggio avanzato</string>
+    <string name="smbalwaysdisabled">Le funzioni \"SMB sempre\" e \"SMB dopo i CHO\" sono disabilitate perché l\'attuale sorgente delle glicemie non supporta il filtraggio avanzato</string>
    <string name="smbnotallowedinopenloopmode">SMB non consentito in modalità loop aperto</string>
    <string name="food_short">Cibo</string>
    <string name="reset">reset</string>
    <string name="waitingfortimesynchronization">In attesa della sincronizzazione dell\'ora (%1$d sec)</string>
    <string name="loopdisconnectedfor">Disconnesso (%1$d m)</string>
-    <string name="openapssmb_maxiob_title">Max IOB totale oltre la quale OpenAPS non può andare [U]</string>
+    <string name="openapssmb_maxiob_title">Max IOB totale a cui limitare OpenAPS [U]</string>
    <string name="openapssmb_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nOpenAPS non aggiungerà ulteriore insulina se IOB corrente è maggiore di questo valore</string>
    <string name="pump_stopped">Micro stoppato</string>
    <string name="pump_started">Micro avviato</string>
@ -883,7 +900,7 @@
    <string name="absorption_cutoff_title">Max tempo assorbimento pasto [h]</string>
    <string name="absorption_cutoff_summary">Tempo entro il quale ogni pasto si considera assorbito. Eventuali carboidrati rimanenti verranno tagliati fuori.</string>
    <string name="time">Tempo</string>
-    <string name="overview_show_notes_field_in_dialogs_title">Mostra campo note nelle finestre trattamento</string>
+    <string name="overview_show_notes_field_in_dialogs_title">Finestre tratt.nto: mostra campo note</string>
    <string name="next_button">Avanti</string>
    <string name="previous_button">Indietro</string>
    <string name="nav_setupwizard">Configurazione guidata</string>
@ -893,9 +910,9 @@
    <string name="firstinsulinincrement">Primo incremento di insulina</string>
    <string name="secondinsulinincrement">Secondo incremento di insulina</string>
    <string name="thirdinsulinincrement">Terzo incremento di insulina</string>
-    <string name="firstcarbsincrement">Primo incremento di carboidrati</string>
-    <string name="secondcarbsincrement">Secondo incremento di carboidrati</string>
-    <string name="thirdcarbsincrement">Terzo incremento di carboidrati</string>
+    <string name="firstcarbsincrement">Primo incremento di CHO</string>
+    <string name="secondcarbsincrement">Secondo incremento di CHO</string>
+    <string name="thirdcarbsincrement">Terzo incremento di CHO</string>
    <string name="cgm">CGM</string>
    <string name="ns_wifionly">Usa solo connessione WiFi</string>
    <string name="ns_wifi_ssids">WiFi SSID</string>
@ -913,9 +930,9 @@
    <string name="virtualpump_definition">Definizione micro</string>
    <string name="virtualpump_pump_def">Bolo: Step=%1$s\nBolo Esteso: [Step=%2$s, Durata=%3$smin-%4$sh]\nBasale: Step=%5$s\nTBR: %6$s (di %7$s), Durata=%8$smin-%9$sh\n%10$s</string>
    <string name="virtualpump_pump_def_extended_note">* Sono supportati solo valori discreti, non intervalli di valori, come incrementi per basale/bolo nel micro virtuale.</string>
-    <string name="ns_autobackfill_title">Riempimento automatico BG</string>
-    <string name="wear_wizard_settings">Impostazioni Wizard</string>
-    <string name="wear_wizard_settings_summary">Calcoli inclusi nel risultato di Wizard:</string>
+    <string name="ns_autobackfill_title">Riempimento automatico glicemie</string>
+    <string name="wear_wizard_settings">Impostazioni Calcolatore</string>
+    <string name="wear_wizard_settings_summary">Calcoli inclusi nel risultato del Calcolatore:</string>
    <string name="wear_display_settings">Impostazioni di visualizzazione</string>
    <string name="wear_general_settings">Impostazioni generali</string>
    <string name="enable_nsclient">Abilita NSClient</string>
@ -924,14 +941,14 @@
    <string name="readstatus">Lettura stato</string>
    <string name="adjustprofileinns">Le modifiche devono essere fatte in NS</string>
    <string name="exitwizard">Salta configurazione guidata</string>
-    <string name="setupwizard_loop_description">Premi il pulsante in basso per permettere ad AndroidAPS di suggerire/fare modifiche alla basale</string>
+    <string name="setupwizard_loop_description">Premi il tasto in basso per permettere ad AndroidAPS di suggerire/fare modifiche alla basale</string>
    <string name="apssetup">Configura il plugin APS</string>
    <string name="sensitivitysetup">Configura il plugin di Sensibilità</string>
    <string name="setupwizard_sensitivity_description">Il plugin di Sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
    <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
    <string name="nsclientinfotext">NSClient gestisce la connessione a Nightscout. Puoi saltare questa parte ora, ma non sarai in grado di superare gli obiettivi fino a quando non ne porterai a termine la configurazione.</string>
    <string name="diawarning">Ricorda: i nuovi profili di insulina richiedono una DIA di almeno 5h. DIA di 5 - 6h sui nuovi profili sono uguali a DIA di 3h sui vecchi profili di insulina.</string>
-    <string name="bgsourcesetup">Configura sorgente glicemie</string>
+    <string name="bgsourcesetup">Configura sorgente glicemia</string>
    <string name="setupwizard_profile_description">Seleziona il tipo di profilo. Se il paziente è un bambino dovresti utilizzare il profilo di NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per utilizzarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio profilo\"</string>
    <string name="setupwizard_aps_description">Seleziona uno degli algoritmi disponibili. Sono ordinati dal più vecchio al più recente. L\'algoritmo più recente è solitamente più potente e più aggressivo. Pertanto, se sei un nuovo utente, probabilmente dovresti iniziare con AMA e non con l\'ultimo. Non dimenticare di leggere la documentazione di OpenAPS e di configurarlo prima dell\'uso.</string>
    <string name="startobjective">Avvia il tuo primo obiettivo</string>
@ -981,12 +998,12 @@
    <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
    <string name="maintenance_settings">Impostazioni manutenzione</string>
    <string name="maintenance_email">Email</string>
-    <string name="maintenance_amount">Nessun log da inviare</string>
+    <string name="maintenance_amount">Numero di log da inviare</string>
    <string name="maintenance">Manutenzione</string>
    <string name="maintenance_shortname">MANUT</string>
    <string name="description_maintenance">Fornisce numerose funzioni per la manutenzione (ad es. invio log, eliminazione log).</string>
-    <string name="send_all_logs">Invia i log via Email</string>
-    <string name="delete_logs">Elimina i log</string>
+    <string name="send_all_logs">Invia log via Email</string>
+    <string name="delete_logs">Elimina log</string>
    <string name="error_adding_treatment_message">Un trattamento (insulina: %1$.2f, carboidrati: %2$d, a: %3$s) non può essere aggiunto ai trattamenti. Controlla e aggiungi il record necessario.</string>
    <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), ritardo: %3$d m</string>
    <string name="openaps_noasdata">Nessun dato autosens disponibile</string>
@ -995,7 +1012,7 @@
    <string name="nsmalfunction">Malfunzionamento NSClient. Considera il riavvio di NS e NSClient.</string>
    <string name="as">AS</string>
    <string name="versionavailable">Versione %1$s disponibile</string>
-    <string name="time_offset">Offset temporale</string>
+    <string name="time_offset">Offset</string>
    <string name="setupwizard_preferred_aps_mode">Modalità APS preferita</string>
    <string name="treatments_wizard_total_label">Totale</string>
    <string name="calculation_short">Calc</string>
@ -1061,7 +1078,7 @@
    <string name="enable_tbr_over_notification">Abilita notifica di fine TBR\n(impostazione micro)</string>
    <string name="disable_tbr_over_notification">Disabilita notifica di fine TBR\n(impostazione micro)</string>
    <string name="refresh">Ricarica</string>
-    <string name="description_pump_insight_local">Integrazione micro Accu-Chek Insight</string>
+    <string name="description_pump_insight_local">Integrazione microinfusore Accu-Chek Insight</string>
    <string name="not_inserted">Non inserito</string>
    <string name="short_status_last_connected">Ultima conn: %1$d min fa</string>
    <string name="short_status_tbr">TBR: %1$d%% per %2$d / %3$d min</string>
@ -1358,10 +1375,10 @@
    <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Vincolo Bolo applicato: %2$.2fU a %3$.2fU</font>]]></string>
    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Rilevato assorbimento lento dei carboidrati: %2$d%% del tempo. Ricontrolla il tuo calcolo. COB potrebbero essere sovrastimati e potrebbe essere somministrata più insulina !!!!!</font>]]></string>
    <string name="reservoirvalue">%1$.0f / %2$d U</string>
-    <string name="partialboluswizard">Eroga questa parte del risultato del bolus wizard [%]</string>
-    <string name="deliverpartofboluswizard">Bolus wizard esegue il calcolo, ma solo questa parte dell\'insulina calcolata è erogata. Utile con algoritmo SMB.</string>
+    <string name="partialboluswizard">Eroga parte del risultato del calcolatore [%]</string>
+    <string name="deliverpartofboluswizard">Il calcolatore esegue il calcolo, ma solo questa parte dell\'insulina calcolata è erogata. Utile con algoritmo SMB.</string>
    <string name="loading">Caricamento ...</string>
-    <string name="snooze">Snooze</string>
+    <string name="snooze">Posticipa</string>
    <string name="time_range">Intervallo di tempo</string>
    <string name="timerange_value">Il tempo è compreso tra %1$s e %2$s</string>
    <string name="between">Tra </string>
@ -1372,7 +1389,7 @@
    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
    <string name="format_percent">%1$d%%</string>
-    <string name="boluswizard">Bolus wizard</string>
+    <string name="boluswizard">Calcolatore</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
    <string name="common_on">On</string>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -1140,8 +1140,6 @@
    <string name="tidepool_upload_tbr">임시 Basal 업로드</string>
    <string name="tidepool_upload_profile">프로파일변경, 임시목표 업로드</string>
    <string name="tidepool_upload_bg">혈당 테스트 업로드</string>
-    <string name="dst_in_24h_warning">24시간 이내 썸머타임 변경</string>
-    <string name="dst_loop_disabled_warning">썸머타임 변경이 3시간 미만입니다 - Closed Loop 비활성됨</string>
    <string name="storage">내부 저장 용량 제한</string>
    <string name="diskfull">내부 저장 공간을 최소 %1$d MB 이상 비우세요! Loop가 비활성화되었습니다!</string>
    <string name="wrongformat">잘못된 형식</string>
--- a/app/src/main/res/values-lt-rLT/objectives.xml
+++ b/app/src/main/res/values-lt-rLT/objectives.xml
@ -36,7 +36,6 @@
    <string name="objectives_useloop">Parodyti Ciklo įskiepio turinį</string>
    <string name="objectives_usescale">Panaudokite vaizdo dydžio keitimo funkciją ilgai spaudžiant ant glikemijos kreivės</string>
    <string name="objectives_button_enter">Įeiti</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Įveskite kūrėjo kodą, kad apeitumėte likusius tikslus</string>
    <string name="codeaccepted">Kodas priimtas</string>
    <string name="codeinvalid">Neteisingas kodas</string>
    <string name="objectives_exam_objective">Patvirtinkite savo žinias</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -202,7 +202,7 @@
    <string name="careportal_newnstreatment_sensor">Sensorius</string>
    <string name="careportal_newnstreatment_carbs_label">Angliavandeniai</string>
    <string name="careportal_newnstreatment_insulin_label">Insulinas</string>
-    <string name="careportal_newnstreatment_carbtime_label">Angliavandenių laikas</string>
+    <string name="careportal_newnstreatment_carbtime_label">AV laikas</string>
    <string name="careportal_newnstreatment_split_label">Išskaidyti</string>
    <string name="careportal_newnstreatment_duration_label">Trukmė</string>
    <string name="careportal_newnstreatment_percent_label">Procentai</string>
@ -988,7 +988,7 @@
    <string name="send_all_logs">Siųsti įrašus el. paštu</string>
    <string name="delete_logs">Ištrinti įrašus</string>
    <string name="error_adding_treatment_message">Įrašas (insulinas: %1$.2f, angl.: %2$d, ties: %3$s) negali būti pridėtas. Prašome patikrinti ir rankiniu būdu atitinkamai įtraukti įrašą.</string>
-    <string name="generated_ecarbs_note">eAngl.: %1$d g (%2$d h), atidėjimas: %3$d m</string>
+    <string name="generated_ecarbs_note">iAV.: %1$d g (%2$d h), atidėjimas: %3$d m</string>
    <string name="openaps_noasdata">Nėra autosens duomenų</string>
    <string name="nav_logsettings">Įrašų nustatymai</string>
    <string name="resettodefaults">Atkurti numatytuosius</string>
@ -1147,8 +1147,6 @@
    <string name="tidepool_upload_tbr">Perkelti laikiną bazę</string>
    <string name="tidepool_upload_profile">Perduoti profilio pokyčius, laikinas bazes</string>
    <string name="tidepool_upload_bg">Perduoti KG testus</string>
-    <string name="dst_in_24h_warning">Laiko persukimas įvyks po 24 val ar mažiau</string>
-    <string name="dst_loop_disabled_warning">Laikas persuktas prieš mažiau nei 3 val - Uždaras ciklas deaktyvuotas</string>
    <string name="storage">vidinės saugyklos apribojimas</string>
    <string name="diskfull">Atlaisvinkite ne mažiau kaip %1$d MB iš vidinės atminties! Ciklas išjungtas!</string>
    <string name="wrongformat">Neteisingas formatas</string>
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@ -143,7 +143,7 @@
    <string name="profileswitch_basalhigher">Basalen zullen 10% hoger zijn.</string>
    <string name="profileswitch_basallower">Basalen zullen 10% lager zijn.</string>
    <string name="profileswitch_ichigher">De KH ratio wordt 10% hoger.</string>
-    <string name="profileswitch_iclower">De KH ratio wordt 10% hoger.</string>
+    <string name="profileswitch_iclower">De KH ratio wordt 10% lager.</string>
    <string name="profileswitch_isfhigher">ISF-waarde wordt 10% hoger.</string>
    <string name="profileswitch_isflower">ISF-waarde wordt 10% lager.</string>
    <string name="profileswitch_overall">In totaal zul je ongeveer 10% minder insuline krijgen.</string>
--- a/app/src/main/res/values-nl-rNL/objectives.xml
+++ b/app/src/main/res/values-nl-rNL/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Inhoud van loop plugin weergeven</string>
    <string name="objectives_usescale">Gebruik de schaalfunctie: houd de BG grafiek lang ingedrukt</string>
    <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Voer de code in die u van de ontwikkelaars hebt gekregen om de rest van de doelen te omzeilen</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Als u eerder OpenAPS gebruikte en u NS ten minste 3 maanden aan Loop gegevens heeft kunt u een code aanvragen waarmee u de rest van de doelstellingen kunt omzeilen. U kunt de aanvraag indienen via objectives@androidaps.org, samen met de url van uw NS. Voer de code die u van de ontwikkelaars hebt ontvangen in</string>
    <string name="codeaccepted">Code geaccepteerd</string>
    <string name="codeinvalid">Code ongeldig</string>
    <string name="objectives_exam_objective">Bewijs je kennis</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -1147,8 +1147,6 @@
    <string name="tidepool_upload_tbr">Tijdelijke basalen uploaden</string>
    <string name="tidepool_upload_profile">Upload profiel wisselingen, tijdelijke doelen</string>
    <string name="tidepool_upload_bg">Upload BG-tests</string>
-    <string name="dst_in_24h_warning">Zomer/wintertijd omschakeling binnen 24 uur</string>
-    <string name="dst_loop_disabled_warning">Omschakeling zomer/wintertijd minder dan 3 uur geleden - Closed Loop modus gedeactiveerd</string>
    <string name="storage">interne opslag bijna vol</string>
    <string name="diskfull">Maak minstens %1$d MB vrij in interne opslag! Loop is uitgeschakeld!</string>
    <string name="wrongformat">Verkeerde invoer</string>
@ -1236,6 +1234,8 @@
    <string name="medtronic_pump_battery_no">Niet geselecteerd (Eenvoudige weergave)</string>
    <string name="medtronic_pump_battery_alkaline">Alkaline (uitgebreide weergave)</string>
    <string name="medtronic_pump_battery_lithium">Lithium (uitgebreide weergave)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (uitgebreide weergave)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Behandelingen Debuggen</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SCAN</string>
    <string name="rileylink_scanner_scan_stop">STOP</string>
@ -1373,4 +1373,6 @@
    <string name="boluswizard">Bolus wizard</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">Aan</string>
+    <string name="common_off">Uit</string>
 </resources>
--- a/app/src/main/res/values-pl-rPL/objectives.xml
+++ b/app/src/main/res/values-pl-rPL/objectives.xml
@ -36,7 +36,6 @@
    <string name="objectives_useloop">Wyświetl zawartość wtyczki Pętla (Loop)</string>
    <string name="objectives_usescale">Użyj funkcji skalowania przez dłuższe przytrzymanie wykresu glikemii</string>
    <string name="objectives_button_enter">Wprowadź</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wprowadź kod otrzymany od programistów by pominąć resztę zadań</string>
    <string name="codeaccepted">Kod został zaakceptowany</string>
    <string name="codeinvalid">Niepoprawny kod</string>
    <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -1148,7 +1148,7 @@
    <string name="tidepool_upload_tbr">Prześlij bazy tymczasowe</string>
    <string name="tidepool_upload_profile">Prześlij zmiany profilu, cele tymczasowe</string>
    <string name="tidepool_upload_bg">Prześlij testowe BG</string>
-    <string name="dst_in_24h_warning">Zmiana na czas letni w ciągu 24 godzin lub krócej</string>
+    <string name="dst_in_24h_warning">Zmiana czasu w 24h lub mniej</string>
    <string name="dst_loop_disabled_warning">Zmiana czasu nastąpiła mniej niż 3 godziny temu - Zamknięta pętla wyłączona</string>
    <string name="storage">limit wielkości pamięci wewnętrznej</string>
    <string name="diskfull">Zwolnij co najmniej %1$d MB z pamięci wewnętrznej! Pętla zatrzymana!</string>
@ -1237,6 +1237,8 @@
    <string name="medtronic_pump_battery_no">Nie wybrany (widok prosty)</string>
    <string name="medtronic_pump_battery_alkaline">Alkaliczne (widok rozszerzony)</string>
    <string name="medtronic_pump_battery_lithium">Litowe (widok rozszerzony)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (widok rozszerzony)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Leczenie - debugowanie</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SKANUJ</string>
    <string name="rileylink_scanner_scan_stop">ZATRZYMAJ</string>
@ -1374,4 +1376,6 @@
    <string name="boluswizard">Kalkulator bolusa</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">Włącz</string>
+    <string name="common_off">Wyłącz</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
    <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
    <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Insira o código obtido dos programadores para ignorar o resto dos objectivos</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se era utilizador do OpenAPS antes e o seu NS tem pelo menos 3 meses de dados do loop, pode enviar um e-mail para oobjectives@androidaps.org com seu endereço de NS e pedir código para ignorar o resto dos objectivos. Digite o código obtido dos programadores</string>
    <string name="codeaccepted">Código aceite</string>
    <string name="codeinvalid">Código inválido</string>
    <string name="objectives_exam_objective">Prove seu conhecimento</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -680,6 +680,7 @@
    <string name="shortgramm">g</string>
    <string name="shortminute">m</string>
    <string name="shorthour">h</string>
+    <string name="shortday">d</string>
    <string name="none"><![CDATA[<nenhum>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">En</string>
@ -708,6 +709,7 @@
    <string name="bgsource_upload">Configurações de upload de BG</string>
    <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
    <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
+    <string name="smbmaxminutes">SMB máx. minutos</string>
    <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
    <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
@ -1236,6 +1238,8 @@
    <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
    <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
    <string name="medtronic_pump_battery_lithium">Lithium (visão estendida)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
+    <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">PROCURAR</string>
    <string name="rileylink_scanner_scan_stop">PARAR</string>
@ -1373,4 +1377,6 @@
    <string name="boluswizard">Assistente de Bólus</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">Ligado</string>
+    <string name="common_off">Desligado</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
    <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
    <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Insira o código obtido dos programadores para ignorar o resto dos objectivos</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se era utilizador do OpenAPS antes e o seu NS tem pelo menos 3 meses de dados do loop, pode enviar um e-mail para oobjectives@androidaps.org com seu endereço de NS e pedir código para ignorar o resto dos objectivos. Digite o código obtido dos programadores</string>
    <string name="codeaccepted">Código aceite</string>
    <string name="codeinvalid">Código inválido</string>
    <string name="objectives_exam_objective">Prove seu conhecimento</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -680,6 +680,7 @@
    <string name="shortgramm">g</string>
    <string name="shortminute">m</string>
    <string name="shorthour">h</string>
+    <string name="shortday">d</string>
    <string name="none"><![CDATA[<nenhum>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">En</string>
@ -708,6 +709,7 @@
    <string name="bgsource_upload">Configurações de upload de BG</string>
    <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
    <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
+    <string name="smbmaxminutes">SMB máx. minutos</string>
    <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
    <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
--- a/app/src/main/res/values-ro-rRO/objectives.xml
+++ b/app/src/main/res/values-ro-rRO/objectives.xml
@ -36,7 +36,6 @@
    <string name="objectives_useloop">Afișați conținutul facilității Buclă</string>
    <string name="objectives_usescale">Folosiți funcția scală prin apăsarea prelungă a graficului glicemiei</string>
    <string name="objectives_button_enter">Introduceţi</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Introduceți codul obținut de la dezvoltatori pentru a sări peste restul obiectivelor</string>
    <string name="codeaccepted">Cod acceptat</string>
    <string name="codeinvalid">Cod invalid</string>
    <string name="objectives_exam_objective">Dovediți-vă cunoștințele</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -1144,8 +1144,6 @@
    <string name="tidepool_upload_tbr">Înregistrează bazalele temporare</string>
    <string name="tidepool_upload_profile">Înregistrează schimbările de profil, țintele temporare</string>
    <string name="tidepool_upload_bg">Înregistrează testările de glicemie</string>
-    <string name="dst_in_24h_warning">Schimbare oră vară/iarnă în mai puțin de 24h</string>
-    <string name="dst_loop_disabled_warning">Schimbare oră vară/iarnă în mai puțin de 3 ore - buclă dezactivată</string>
    <string name="storage">restricție de stocare internă</string>
    <string name="diskfull">Eliberați cel puțin %1$d MB din spațiunl de stocare al telefonlui! Buclă dezactivată!</string>
    <string name="wrongformat">Format greșit</string>
--- a/app/src/main/res/values-ru-rRU/objectives.xml
+++ b/app/src/main/res/values-ru-rRU/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Просмотр содержимого модуля Цикл Loop</string>
    <string name="objectives_usescale">Применить функцию масштабирования по долгому нажатию на диаграмму ГК</string>
    <string name="objectives_button_enter">Ввод</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Введите код, полученный от разработчиков, чтобы обойти остальные цели</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Если прежде вы были пользователем OpenAPS и имеете в NS не менее 3 месяцев данных, отправьте электронное письмо на objectives@androidaps.org с вашим адресом NS и запросом кода для обхода остальных целей. Введите код, полученный от разработчиков</string>
    <string name="codeaccepted">Код принят</string>
    <string name="codeinvalid">Неверный код</string>
    <string name="objectives_exam_objective">Подтвердите ваши знания</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -202,7 +202,7 @@
    <string name="careportal_newnstreatment_sensor">сенсор</string>
    <string name="careportal_newnstreatment_carbs_label">углеводы</string>
    <string name="careportal_newnstreatment_insulin_label">инсулин</string>
-    <string name="careportal_newnstreatment_carbtime_label">Время действия углеводов</string>
+    <string name="careportal_newnstreatment_carbtime_label">Подождать до еды</string>
    <string name="careportal_newnstreatment_split_label">разбивка</string>
    <string name="careportal_newnstreatment_duration_label">Длительность действия</string>
    <string name="careportal_newnstreatment_percent_label">процент</string>
@ -260,11 +260,23 @@
    <string name="smscommunicator_allowednumbers">разрешенные телефонные номера</string>
    <string name="smscommunicator_allowednumbers_summary">+ XXXXXXXXXX; + YYYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">Чтобы подать болюс %1$.2fU ответьте кодом %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Чтобы подать болюс %1$.2fU ответьте кодом %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Чтобы установить временную цель %1$s ответьте кодом %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Чтобы отменить временную цель ответьте кодом %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Чтобы отключить службу удаленных SMS-сообщений ответьте кодом %1$s.\n\n Имейте в виду, что вы сможете вновь активировать ее только с основного телефона AAPS.</string>
+    <string name="smscommunicator_stoppedsms">Удаленная служба SMS остановлена. Для ее реактивации используйте AAPS на главном смартфоне.</string>
    <string name="smscommunicator_calibrationreplywithcode">чтобы отправить калибровку %1$.2f ответьте кодом %2$s</string>
    <string name="smscommunicator_bolusfailed">Подача болюса не состоялась</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Минимальное количество минут между одним удаленным болюсом и следующим</string>
+    <string name="smscommunicator_remotebolusmindistance">Минимум минут, должных пройти между одним болюсом и следующим</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">В целях безопасности, для изменения этого параметра необходимо добавить не менее 2 телефонных номеров.</string>
    <string name="bolusdelivered">Болюс %1$.2fед. подан успешно</string>
    <string name="bolusrequested">Начинается подача болюса %1$.2fед.</string>
    <string name="smscommunicator_bolusdelivered">Болюс %1$.2fед. подан успешно</string>
+    <string name="smscommunicator_mealbolusdelivered">Болюс на еду %1$.2f ед. подан успешно</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Цель %1$s на %2$d минут</string>
+    <string name="smscommunicator_tt_set">Цель %1$s на %2$d минут установлена успешно</string>
+    <string name="smscommunicator_tt_canceled">Временная цель успешно отменена</string>
    <string name="bolusdelivering">Подается болюс %1$.2fед.</string>
    <string name="smscommunicator_remotecommandsallowed">разрешить команды через смс</string>
    <string name="glucosetype_finger">палец</string>
@ -298,7 +310,7 @@
    <string name="danar_history_glucose">гликемия</string>
    <string name="danar_history_refill">Перезаправка</string>
    <string name="danar_history_syspend">Останов</string>
-    <string name="danar_history_connectingfor">Связь установлена за %1$d сек</string>
+    <string name="danar_history_connectingfor">Попытка установить связь: %1$d сек</string>
    <string name="danar_password_title">пароль помпы</string>
    <string name="wrongpumppassword">неверный пароль помпы</string>
    <string name="pumpbusy">помпа занята</string>
@ -324,10 +336,13 @@
    <string name="smscommunicator_basalreplywithcode">Чтобы подать базал %1$.2fед./ч в течение %2$d мин. ответьте кодом %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Для переключения профиля на %1$s %2$d%% ответьте кодом %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">Для начала подачи пролонгированного болюса %1$.2fед. за %2$d мин. ответьте кодом %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Чтобы ввести %1$d г в %2$s ответьте кодом %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Для начала подачи базала %1$d%% на %2$d мин. ответьте кодом %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">для приостановки цикла на %1$d мин ответьте кодом %2$s</string>
    <string name="smscommunicator_tempbasalset">врем базал %1$.2fU/h на %2$d мин начат успешно</string>
    <string name="smscommunicator_extendedset">Пролонгированный болюс %1$.2fед. на %2$d мин. начат успешно</string>
+    <string name="smscommunicator_carbsset">Углеводы %1$d г введены успешно</string>
+    <string name="smscommunicator_carbsfailed">Не удалось ввести %1$d г углеводов</string>
    <string name="smscommunicator_tempbasalset_percent">Врем. базал %1$d%% на %2$d мин. начат успешно</string>
    <string name="smscommunicator_tempbasalfailed">неуспех старта врем базала</string>
    <string name="smscommunicator_extendedfailed">Не удалось начать подачу пролонгированного болюса</string>
@ -680,6 +695,7 @@
    <string name="shortgramm">грамм</string>
    <string name="shortminute">минут</string>
    <string name="shorthour">ч</string>
+    <string name="shortday">дн</string>
    <string name="none"><![CDATA[<отсутствует>]]></string>
    <string name="shortkilojoul">кДж</string>
    <string name="shortenergy">Энергия</string>
@ -708,6 +724,7 @@
    <string name="bgsource_upload">Параметры загрузки СК</string>
    <string name="wear_detailed_delta_title">Показать подробно дельту</string>
    <string name="wear_detailed_delta_summary">Показать дельту еще с одним десятичным знаком</string>
+    <string name="smbmaxminutes">Максимум минут микроболюса SMB</string>
    <string name="smbmaxminutes_summary">Верхний лимит минут базала на SMB</string>
    <string name="unsupportedfirmware">Неподдерживаемая версия прошивки помпы</string>
    <string name="dexcomg5_xdripupload_title">Отправить данные СК на xDrip+</string>
@ -1150,7 +1167,7 @@ Context | Edit Context</string>
    <string name="tidepool_upload_profile">Загрузить переключения профиля, временные цели</string>
    <string name="tidepool_upload_bg">Загрузить тесты ГК</string>
    <string name="dst_in_24h_warning">Переход на летнее/зимнее время через 24 часа или менее</string>
-    <string name="dst_loop_disabled_warning">Переход на летнее время меньше 3 часов назад - Замкнутый цикл отключен</string>
+    <string name="dst_loop_disabled_warning">Изменение сезонного времени произошло меньше 3 часов назад-Закрытый цикл выключен</string>
    <string name="storage">ограничение по объему карты памяти</string>
    <string name="diskfull">Освободите по крайней мере %1$d MB из внутренней памяти! Цикл остановлен!</string>
    <string name="wrongformat">Неверный формат</string>
@ -1238,6 +1255,8 @@ Context | Edit Context</string>
    <string name="medtronic_pump_battery_no">Не выбрано (Простой вид)</string>
    <string name="medtronic_pump_battery_alkaline">Щелочная (Подробный вид)</string>
    <string name="medtronic_pump_battery_lithium">Литиевая (Подробный вид)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Подробный вид)</string>
+    <string name="medtronic_bolus_debugging">Отладка Болюс/Назначения</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">СКАН</string>
    <string name="rileylink_scanner_scan_stop">СТОП</string>
@ -1375,4 +1394,6 @@ Context | Edit Context</string>
    <string name="boluswizard">Мастер Болюса</string>
    <string name="unit_minute_short">мин</string>
    <string name="format_carbs">%1$d гр</string>
+    <string name="common_on">Вкл.</string>
+    <string name="common_off">Выкл.</string>
 </resources>
--- a/app/src/main/res/values-sk-rSK/objectives.xml
+++ b/app/src/main/res/values-sk-rSK/objectives.xml
@ -36,7 +36,7 @@
    <string name="objectives_useloop">Zobrazte obsah modulu uzavretý okruh</string>
    <string name="objectives_usescale">Prepnite režim zobrazenia dlhým stlačením grafu glykémie</string>
    <string name="objectives_button_enter">Zadať</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Zadajte kód, ktorý ste získali od vývojárov, aby ste obišli zostávajúce ciele</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ak ste boli používateľom OpenAPS už predtým a Váš NS má dáta uzavretého okruhu za minimálne 3 mesiace, môžete nám zaslať E-mail na adresu objectives@androidaps.org z Vašou adresou NS a požiadať o kód na obídenie zvyšných cieľov. Zadajte kód získaný od vývojárov</string>
    <string name="codeaccepted">Kód akceptovaný</string>
    <string name="codeinvalid">Neplatný kód</string>
    <string name="objectives_exam_objective">Preukážte svoje znalosti</string>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -260,11 +260,23 @@
    <string name="smscommunicator_allowednumbers">Povolené telefónne čísla</string>
    <string name="smscommunicator_allowednumbers_summary">+421XXXXXXXXX;+421YYYYYYYYY</string>
    <string name="smscommunicator_bolusreplywithcode">Pre podanie bolusu %1$.2fJI odpovedz SMS kódom %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Pre podanie bolusu k jedlu %1$.2fJI odpovedz SMS kódom %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Pre nastavenie dočasného cieľa %1$s odpovedz SMS kódom %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Pre zrušenie dočasného bazálu odpovedzte SMS s kódom %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Pre vypnutie služby SMS komunikátora odpovedz SMS kódom %1$s.\n\n\Majte na pamäti, že opätovná reaktivácia je možná len priamo na AAPS master telefóne.</string>
+    <string name="smscommunicator_stoppedsms">SMS komunikátor zastavený. Na jeho reaktiváciu, použite AAPS na master telefóne.</string>
    <string name="smscommunicator_calibrationreplywithcode">Pre odoslanie kalibrácie %1$.2f odpovedz SMS kódom %2$s</string>
    <string name="smscommunicator_bolusfailed">Chyba pri aplikovaní bolusu</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimálny počet minút, ktorý musí uplynúť medzi jedným vzdialeným bolusom a tým nasledujúcim</string>
+    <string name="smscommunicator_remotebolusmindistance">Aspoň koľko minút musí uplynúť, medzi jedným vzdialeným bolusom a tým nasledujúcim</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Pre vašu bezpečnosť,  musíte pridať aspoň 2 telefónne čísla, aby ste zmenili toto prednastavenie.</string>
    <string name="bolusdelivered">Bolus %1$.2fJI podaný úspešne</string>
    <string name="bolusrequested">Podávanie %1$.2fJ inzulínu</string>
    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fJI podaný úspešne</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolus %1$.2fJI podaný úspešne</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Cieľ %1$s na %2$d minút</string>
+    <string name="smscommunicator_tt_set">Cieľ %1$s na %2$d minút bol úspešne nastavený</string>
+    <string name="smscommunicator_tt_canceled">Dočasný cieľ úspešne zrušený</string>
    <string name="bolusdelivering">Podávanie %1$.2fJI</string>
    <string name="smscommunicator_remotecommandsallowed">Povoliť príkazy na diaľku cez SMS</string>
    <string name="glucosetype_finger">Prst</string>
@ -324,10 +336,13 @@
    <string name="smscommunicator_basalreplywithcode">Pre spustenie bazálu %1$.2fJI/h na %2$d min odpovedzte SMS s kódom %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Pre prepnutie profilu na %1$s %2$d%% odpovedzte SMS s kódom %3$s</string>
    <string name="smscommunicator_extendedreplywithcode">Pre spustenie predĺženého bolusu %1$.2fJI na %2$d min odpovedzte SMS s kódom %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Pre zadanie %1$dg na %2$s odpovedz SMS kódom %3$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Pre spustenie bazálu %1$d%% na %2$d min odpovedzte SMS s kódom %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Pre pozastavenie uzavretého okruhu na %1$d minút odpovedaj SMS s kódom %2$s</string>
    <string name="smscommunicator_tempbasalset">Dočasný bazál %1$.2fJI/h spustený na %2$d minút</string>
    <string name="smscommunicator_extendedset">Predĺžený bolus %1$.2fJI na %2$d min úspešne spustený</string>
+    <string name="smscommunicator_carbsset">Sacharidy %1$dg zadané úspešne</string>
+    <string name="smscommunicator_carbsfailed">Zadanie %1$dg sacharidov sa nepodarilo</string>
    <string name="smscommunicator_tempbasalset_percent">Dočasný bazál %1$d%% na %2$d minút úspešne spustený</string>
    <string name="smscommunicator_tempbasalfailed">Spustenie dočasného bazálu zlyhalo</string>
    <string name="smscommunicator_extendedfailed">Spustenie predĺženého bolusu zlyhalo</string>
@ -680,6 +695,7 @@
    <string name="shortgramm">g</string>
    <string name="shortminute">m</string>
    <string name="shorthour">h</string>
+    <string name="shortday">d</string>
    <string name="none"><![CDATA[<prázdne>]]></string>
    <string name="shortkilojoul">kJ</string>
    <string name="shortenergy">En</string>
@ -708,6 +724,7 @@
    <string name="bgsource_upload">Nastavenie nahrávania glykémie</string>
    <string name="wear_detailed_delta_title">Zobrazovať detailné zmeny</string>
    <string name="wear_detailed_delta_summary">Zobrazovať rozdiel s jedným desatinným miestom naviac</string>
+    <string name="smbmaxminutes">SMB max. minút</string>
    <string name="smbmaxminutes_summary">Maximálny počet minút bazálu, ku ktorým se limituje SMB</string>
    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpe</string>
    <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
@ -1237,6 +1254,7 @@
    <string name="medtronic_pump_battery_alkaline">Alkalické (rozšírené zobrazenie)</string>
    <string name="medtronic_pump_battery_lithium">Líthiové (rozšírené zobrazenie)</string>
    <string name="medtronic_pump_battery_nizn">NiZn (Rozšírené)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Ošetrenia ladenie</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">VYHĽADAŤ</string>
    <string name="rileylink_scanner_scan_stop">ZASTAVIŤ</string>
@ -1374,4 +1392,6 @@
    <string name="boluswizard">Bolusová kalkulačka</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">ZAP</string>
+    <string name="common_off">VYP</string>
 </resources>
--- a/app/src/main/res/values-sv-rSE/exam.xml
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@ -164,4 +164,7 @@
    <string name="basalhelp_google">Google</string>
    <string name="basalhelp_facebook">Facebook</string>
    <string name="other_medication_label">Annan medicinering</string>
+    <string name="other_medication_text">AAPS sänker basalen för att höja glukosmängden i blodet. Mediciner av typen SGLT2-hämmare (glifloziner) kan motverka eller förhindra den väntade glukoshöjningen vilket kan leda till akut insulinbrist och ketoacidos (DKA). 
+\nVanliga märken som finns på marknaden: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n
+Jag lovar härmed att inte ta sådana läkemedel medan jag använder AAPS eller kommer att pausa loopen innan jag tar dessa läkemedel.</string>
 </resources>
--- a/app/src/main/res/values-sv-rSE/objectives.xml
+++ b/app/src/main/res/values-sv-rSE/objectives.xml
@ -36,7 +36,6 @@
    <string name="objectives_useloop">Visa innehållet i insticksprogrammet \"Loop\"</string>
    <string name="objectives_usescale">Testa skala om BG-grafen genom att trycka och hålla in fingret på den</string>
    <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ange kod som erhållits från utvecklare för att kringgå resten av målen</string>
    <string name="codeaccepted">Koden godkänd</string>
    <string name="codeinvalid">Koden är felaktig</string>
    <string name="objectives_exam_objective">Bevisa dina kunskaper</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -6,7 +6,7 @@
    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
    <string name="treatmentssafety_title">Säkerhetsbegränsningar för behandlingar</string>
-    <string name="treatmentssafety_maxbolus_title">Max tillåten bolus [E]</string>
+    <string name="treatmentssafety_maxbolus_title">Max tillåten bolus [U]</string>
    <string name="treatmentssafety_maxcarbs_title">Max tillåtna KH [g]</string>
    <string name="nav_preferences">Inställningar</string>
    <string name="nav_refreshtreatments">Uppdatera behandlingar från Nightscout</string>
@ -23,8 +23,8 @@
    <string name="description_config_builder">Används för att konfigurera de aktiva insticksprogrammen</string>
    <string name="description_objectives">Inlärningsprogram</string>
    <string name="description_food">Visar förutbestämda inställningar för mat i Nightscout</string>
-    <string name="description_insulin_rapid">Insulininställning för Humalog, Apidra och Novorapid/Novolog</string>
-    <string name="description_insulin_ultra_rapid">Insulininställning för Fiasp</string>
+    <string name="description_insulin_rapid">Insulininställning för vanliga direktverkande insuliner som Humalog, Lispro, Apidra och Novorapid/Novolog</string>
+    <string name="description_insulin_ultra_rapid">Insulininställning för ultrasnabba insuliner, t ex Fiasp</string>
    <string name="description_insulin_free_peak">Låter dig ställa in tidpunkten för toppen på insulinets aktivitet. Bör bara användas av avancerade användare</string>
    <string name="description_loop">Aktivera eller avaktivera implementationen som kör loopen.</string>
    <string name="description_ns_client">Synkroniserar dina data med Nightscout</string>
@ -54,7 +54,7 @@ Eversense-appen.</string>
    <string name="description_source_ns_client">Ladda ner BG-data från Nightscout</string>
    <string name="description_source_xdrip">Ta emot BG-data från xDrip</string>
    <string name="description_treatments">Spara alla behandlingar som gjorts</string>
-    <string name="description_wear">Följ och kontrollera din AndroidAPS med din WearOS-klocka</string>
+    <string name="description_wear">Följ och kontrollera AndroidAPS med din Wear OS-klocka</string>
    <string name="description_xdrip_status_line">Visa AAPS-information på din xDrip-urtavla</string>
    <string name="description_sms_communicator">Fjärrstyr AndroidAPS med SMS-kommandon.</string>
    <string name="nsprofileview_units_label">Enheter</string>
@ -80,8 +80,8 @@ Eversense-appen.</string>
    <string name="treatments_wizard_bg_label">BG</string>
    <string name="treatments_wizard_tt_label">TT</string>
    <string name="treatments_wizard_carbs_label">KH</string>
-    <string name="treatments_wizard_correction_label">Korr</string>
-    <string name="insulin_unit_shortname">E</string>
+    <string name="treatments_wizard_correction_label">Korrektion</string>
+    <string name="insulin_unit_shortname">U</string>
    <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
    <string name="openapsma_run">Utför nu</string>
    <string name="vitualpump_label">Virtuell pump</string>
@ -192,7 +192,7 @@ Eversense-appen.</string>
    <string name="careportal_snackbolus">Mellanmålsbolus</string>
    <string name="careportal_mealbolus">Måltidsbolus</string>
    <string name="careportal_correctionbolus">Korrektionsbolus</string>
-    <string name="careportal_combobolus">Kombinationsbolus</string>
+    <string name="careportal_combobolus">Kombi-bolus</string>
    <string name="careportal_tempbasalstart">Temp basal start</string>
    <string name="careportal_tempbasalend">Temp basal slut</string>
    <string name="careportal_carbscorrection">KH-korrektion</string>
@ -544,8 +544,8 @@ Eversense-appen.</string>
    <string name="insulin_shortname">INS</string>
    <string name="enablesuperbolus">Aktivera superbolus i kalkylatorn</string>
    <string name="enablesuperbolus_summary">Aktiverar superbolusfunktionen i kalkylatorn. Aktivera inte innan du förstått hur den fungerar. DEN KAN ORSAKA ÖVERDOSERING AV INSULIN OM INSIKT SAKNAS OM FUNKTIONEN!</string>
-    <string name="show_statuslights">Visa statusindikationer på hemskärmen</string>
-    <string name="show_statuslights_extended">Visa statusindikatorer på hemskärmen</string>
+    <string name="show_statuslights">Visa \"statuslampor\" på hemskärmen</string>
+    <string name="show_statuslights_extended">Visa utökade statusindikatorer</string>
    <string name="show_statuslights_extended_summary">Aktivera statusindikatorerna för cage, iage, sage, reservoar och batterinivå på hemskärmen.</string>
    <string name="statuslights_res_warning">Varningsnivå för reservoar [U]</string>
    <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
@ -709,6 +709,7 @@ Eversense-appen.</string>
    <string name="bgsource_upload">Uppladdningsinställningar för BG</string>
    <string name="wear_detailed_delta_title">Visa detaljerad delta</string>
    <string name="wear_detailed_delta_summary">Visa delta med en extra decimal</string>
+    <string name="smbmaxminutes">SMB max minuter</string>
    <string name="smbmaxminutes_summary">Max antal minuter som kan bli SMB</string>
    <string name="unsupportedfirmware">Pumpens firmware stöds inte</string>
    <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
@ -1057,7 +1058,7 @@ Eversense-appen.</string>
    <string name="stopped">Stoppade</string>
    <string name="tbr_formatter">%1$d%% i %2$d / %3$d min</string>
    <string name="extended_bolus">Förlängd bolus</string>
-    <string name="multiwave_bolus">Kombinationsbolus</string>
+    <string name="multiwave_bolus">Kombi-bolus</string>
    <string name="eb_formatter">%1$.2f / %2$.2f U i %3$d min</string>
    <string name="enable_tbr_over_notification">Aktivera meddelanden om avslutade tempbasaler\n(pumpinställning)</string>
    <string name="disable_tbr_over_notification">Inaktivera meddelanden om avslutade tempbasaler\n(pumpinställning)</string>
@ -1193,8 +1194,8 @@ Eversense-appen.</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
    <string name="deltacompared">%3$s %1$s %2$s</string>
-    <string name="deltalabel">Skillnad</string>
-    <string name="deltalabel_u">BG-skillnad [%1$s]</string>
+    <string name="deltalabel">BG-förändring</string>
+    <string name="deltalabel_u">BG-förändring [%1$s]</string>
    <string name="currentlocation">Nuvarande plats</string>
    <string name="location">Plats</string>
    <string name="latitude_short">Lat:</string>
@ -1237,6 +1238,8 @@ Eversense-appen.</string>
    <string name="medtronic_pump_battery_no">Ej vald</string>
    <string name="medtronic_pump_battery_alkaline">Alkaliskt</string>
    <string name="medtronic_pump_battery_lithium">Litium</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (utökad vy)</string>
+    <string name="medtronic_bolus_debugging">Avlusning av Bolus/Behandlingar</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SÖK</string>
    <string name="rileylink_scanner_scan_stop">AVBRYT</string>
@ -1374,4 +1377,6 @@ Eversense-appen.</string>
    <string name="boluswizard">Kalkylator</string>
    <string name="unit_minute_short">min</string>
    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">På</string>
+    <string name="common_off">Av</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -1091,8 +1091,6 @@
    <string name="tidepool_upload_tbr">上传临时基础率</string>
    <string name="tidepool_upload_profile">上传配置文件切换，临时目标</string>
    <string name="tidepool_upload_bg">上传血糖值</string>
-    <string name="dst_in_24h_warning">在24小时内或更少时间内更夏令时时间</string>
-    <string name="dst_loop_disabled_warning">不到3小时前夏令时时间变化了-已禁用闭环</string>
    <string name="storage">内部储存空间不足</string>
    <string name="diskfull">至少 剩余%1$d MB 内部存储！闭环已禁用！</string>
    <string name="wrongformat">格式错误</string>
--- a/build.gradle
+++ b/build.gradle
@ -9,8 +9,8 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath 'com.google.gms:google-services:4.3.2'
-        classpath 'io.fabric.tools:gradle:1.31.0'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'io.fabric.tools:gradle:1.31.2'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/icons/battery-burnin/battery-charging-wireless-10-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-10-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v14h-2v-1.5h-2v1.5h-2v-1.5h-2zm13.24 1.7598-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-20-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-20-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v11h-2v1h2v2h-2v-2h-2v2h-2v-2h-2zm2 12h2v-1h-2zm11.24-10.24-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-30-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-30-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v10h-2v2h2v2h-2v-2h-2v2h-2v-2h-2zm2 12h2v-2h-2zm11.24-10.24-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-40-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-40-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v10h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-1.5h-2zm2 10v2h2v-2zm2 0h2v-1.5h-2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-50-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-50-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v7h-2v1h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2zm2 8h2v-1h-2zm2 0v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-60-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-60-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v6h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-.40039h-2zm2 6v2h2v-2zm2 0h2v-.40039h-2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-70-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-70-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v6h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2zm2 6v2h2v-2zm2 0h2v-2h-2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-80-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-80-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v3h-2v1h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2zm2 4h2v-1h-2zm2 0v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-90-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-90-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2c-.55228 0-1 .44772-1 1v16c0 .55228.44772 1 1 1h10c.55228 0 1-.44772 1-1v-16c0-.55228-.44772-1-1-1h-2v-2zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-16.07 1.0703h8v2h-2v2h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-.5h-2zm2 2v2h2v-2zm2 0h2v-.5h-2zm0 2v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-charging-wireless-burnin.svg
+++ b/icons/battery-burnin/battery-charging-wireless-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 2v2h-2a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1v-16a1 1 0 0 0-1-1h-2v-2h-6zm15.07 2.9297-1.4102 1.4102c3.13 3.12 3.13 8.1903 0 11.32l1.4102 1.4102c3.9-3.9 3.9-10.231 0-14.141zm-14.07 1.0703h2v2h2v-2h2v2h-2v2h2v2h-2v2h2v2h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v-2h2v-2h-2v-2h2v-2h-2v-2h2v-2zm0 2v2h2v-2h-2zm2 2v2h2v-2h-2zm0 2h-2v2h2v-2zm0 2v2h2v-2h-2zm0 2h-2v2h2v-2zm9.2402-8.2402-1.4102 1.4102c1.56 1.56 1.56 4.0902 0 5.6602l1.4102 1.4102c2.34-2.34 2.34-6.1405 0-8.4805z"/>
+</svg>
--- a/icons/battery-burnin/battery-unknown-burnin.svg
+++ b/icons/battery-burnin/battery-unknown-burnin.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9 2v2h-1.6699a1.33 1.33 0 0 0-1.3301 1.3301v15.34c0 .73.60008 1.3301 1.3301 1.3301h9.3398a1.33 1.33 0 0 0 1.3301-1.3301v-15.34c0-.73-.60008-1.3301-1.3301-1.3301h-1.6699v-2h-6zm-1 4h8v14h-8v-14zm3.9922 1.6348c-.20776.0001459-.41627.012296-.53906.035156-.40487.075377-.87711.27315-1.1992.50391-.6162.44145-1.052 1.0995-1.2012 1.8145-.036974.17724-.068135.43288-.068359.54883v.076172h.75.75v-.09375c.0014-.40911.27856-.88798.66211-1.1445.27527-.18413.51594-.25465.85547-.25195.42432.00337.77536.15218 1.0664.45312.18687.19323.29535.3781.37695.64648.041091.13522.045052.18127.044922.39648-.00018.27125-.03153.43084-.12695.63476-.09497.20296-.18126.30868-.59375.72852-.74662.75992-.86069.88539-.99219 1.082-.13974.20897-.2684.46308-.34766.68945-.05321.15199-.14258.52203-.14258.58984v.037109h.75977.75781l.009765-.048828c.03414-.15494.12253-.39847.19141-.5332.15368-.3006.29355-.46626 1.0293-1.2148.18393-.18714.36832-.38472.41211-.4375.25761-.31052.44302-.7197.51172-1.1309.04095-.24512.02889-.73384-.02539-.98828-.12115-.568-.37976-1.0577-.77734-1.4727-.45238-.47215-.98198-.76014-1.6328-.88672-.11668-.022692-.32349-.03335-.53125-.033203zm-.75781 8.2637v.75.75h.75.75195v-.75-.75h-.75195-.75z"/>
+</svg>
--- a/icons/battery-source/mask-burnin-battery-raw.svg
+++ b/icons/battery-source/mask-burnin-battery-raw.svg
@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="mask-burnin-battery-raw.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="33.379557"
+     inkscape:cx="5.9350871"
+     inkscape:cy="13.348904"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     style="opacity:1;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+     d="M 6 6 L 6 8 L 8 8 L 8 6 L 6 6 z M 8 8 L 8 10 L 10 10 L 10 8 L 8 8 z M 10 8 L 12 8 L 12 6 L 10 6 L 10 8 z M 10 10 L 10 12 L 12 12 L 12 10 L 10 10 z M 10 12 L 8 12 L 8 14 L 10 14 L 10 12 z M 10 14 L 10 16 L 12 16 L 12 14 L 10 14 z M 10 16 L 8 16 L 8 18 L 10 18 L 10 16 z M 10 18 L 10 20 L 12 20 L 12 18 L 10 18 z M 8 18 L 6 18 L 6 20 L 8 20 L 8 18 z M 6 18 L 6 16 L 4 16 L 4 18 L 6 18 z M 6 16 L 8 16 L 8 14 L 6 14 L 6 16 z M 6 14 L 6 12 L 4 12 L 4 14 L 6 14 z M 6 12 L 8 12 L 8 10 L 6 10 L 6 12 z M 6 10 L 6 8 L 4 8 L 4 10 L 6 10 z "
+     id="rect824-9" />
+</svg>
--- a/icons/battery-source/mask-burnin-battery.svg
+++ b/icons/battery-source/mask-burnin-battery.svg
@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="mask-burnin-battery.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="33.379557"
+     inkscape:cx="5.9350871"
+     inkscape:cy="13.348904"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <g
+     id="g1106"
+     transform="translate(-9.526788,-0.134268)">
+    <g
+       transform="translate(9.526789,4.1342669)"
+       id="g933">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1" />
+    </g>
+    <g
+       transform="rotate(180,16.253008,7.0403444)"
+       id="g927">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-8"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 12.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 14.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-2-0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 16.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-1-8" />
+    </g>
+    <g
+       transform="translate(9.526789,8.1342669)"
+       id="g933-9">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824-6"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9-18" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1-0" />
+    </g>
+    <g
+       transform="rotate(180,16.253008,9.0403445)"
+       id="g927-9">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-8-0"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 12.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-8-6" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 14.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-2-0-8" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 16.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-1-8-4" />
+    </g>
+    <g
+       transform="translate(9.526789,12.134267)"
+       id="g933-1">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824-3"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9-16" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2-83" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1-1" />
+    </g>
+    <g
+       transform="rotate(180,16.253008,11.040345)"
+       id="g927-4">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-8-4"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 12.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-8-1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 14.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-2-0-0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 16.979228,3.946422 h 2 v 2 h -2 z"
+         id="rect824-9-1-8-8" />
+    </g>
+    <g
+       transform="translate(9.526788,16.134268)"
+       id="g933-0">
+      <path
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 4,2 H 6 V 4 H 4 Z"
+         id="rect824-63"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 6,2 H 8 V 4 H 6 Z"
+         id="rect824-9-85" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="M 8,2 H 9.9999996 V 4 H 8 Z"
+         id="rect824-2-87" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#008080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99737531;paint-order:markers stroke fill"
+         d="m 10,2 h 2 v 2 h -2 z"
+         id="rect824-9-1-7" />
+    </g>
+  </g>
+</svg>
--- a/icons/battery/battery-charging-wireless-10.svg
+++ b/icons/battery/battery-charging-wireless-10.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,18.5H4V6H12V18.5Z" /></svg>
--- a/icons/battery/battery-charging-wireless-20.svg
+++ b/icons/battery/battery-charging-wireless-20.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,17H4V6H12V17Z" /></svg>
--- a/icons/battery/battery-charging-wireless-30.svg
+++ b/icons/battery/battery-charging-wireless-30.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,16H4V6H12V16Z" /></svg>
--- a/icons/battery/battery-charging-wireless-40.svg
+++ b/icons/battery/battery-charging-wireless-40.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,14.5H4V6H12V14.5Z" /></svg>
--- a/icons/battery/battery-charging-wireless-50.svg
+++ b/icons/battery/battery-charging-wireless-50.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,13H4V6H12V13Z" /></svg>
--- a/icons/battery/battery-charging-wireless-60.svg
+++ b/icons/battery/battery-charging-wireless-60.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,11.6H4V6H12V11.6Z" /></svg>
--- a/icons/battery/battery-charging-wireless-70.svg
+++ b/icons/battery/battery-charging-wireless-70.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,10H4V6H12V10Z" /></svg>
--- a/icons/battery/battery-charging-wireless-80.svg
+++ b/icons/battery/battery-charging-wireless-80.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,9H4V6H12V9Z" /></svg>
--- a/icons/battery/battery-charging-wireless-90.svg
+++ b/icons/battery/battery-charging-wireless-90.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,7.5H4V6H12V7.5Z" /></svg>
--- a/icons/battery/battery-charging-wireless.svg
+++ b/icons/battery/battery-charging-wireless.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76Z" /></svg>
--- a/icons/battery/battery-outline.svg
+++ b/icons/battery/battery-outline.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,20H8V6H16M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z" /></svg>
--- a/icons/battery/battery-unknown.svg
+++ b/icons/battery/battery-unknown.svg
@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15.07,12.25L14.17,13.17C13.63,13.71 13.25,14.18 13.09,15H11.05C11.16,14.1 11.56,13.28 12.17,12.67L13.41,11.41C13.78,11.05 14,10.55 14,10C14,8.89 13.1,8 12,8A2,2 0 0,0 10,10H8A4,4 0 0,1 12,6A4,4 0 0,1 16,10C16,10.88 15.64,11.68 15.07,12.25M13,19H11V17H13M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.66C6,21.4 6.6,22 7.33,22H16.67C17.4,22 18,21.4 18,20.66V5.33C18,4.59 17.4,4 16.67,4Z" /></svg>
--- a/icons/complications-source/ic_br_cob_iob_orig.svg
+++ b/icons/complications-source/ic_br_cob_iob_orig.svg
@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_br_cob_iob_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.48"
+     inkscape:cx="21.368628"
+     inkscape:cy="7.6899364"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="7.0150757,3.6431885"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="6.110738,1.9637045"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999988"
+       d="m 0.03622667,296.52928 c -0.05573246,-0.0616 -0.05418386,-0.0663 0.0545402,-0.1676 0.0615457,-0.0574 0.11915314,-0.12579 0.12801621,-0.15212 0.008863,-0.0264 -0.0358645,-0.14128 -0.0993956,-0.25541 -0.11006156,-0.19773 -0.11551067,-0.22183 -0.11551067,-0.51082 0,-0.27606 0.0084459,-0.31854 0.09406667,-0.47311 0.11396967,-0.20573 0.29667962,-0.37806 0.34723811,-0.32749 0.0650151,0.065 0.10430015,0.034 0.18887001,-0.14919 0.13241088,-0.28679 0.24662218,-0.40499 0.3924149,-0.40611 0.1141555,-8.6e-4 0.1239478,-0.009 0.1669233,-0.13767 0.025367,-0.0759 0.1153545,-0.21076 0.2025129,-0.3033 l 0.1568592,-0.16657 0.1259147,0.14214 c 0.069253,0.0782 0.1514296,0.18951 0.1826144,0.24742 0.031184,0.0579 0.074962,0.10528 0.097285,0.10528 0.022322,0 0.1232137,-0.0641 0.2242032,-0.1424 0.2551499,-0.19787 0.4707024,-0.26368 0.8024812,-0.24499 0.073924,0.003 0.075677,0.0105 0.060668,0.2203 -0.018902,0.2642 -0.1054117,0.46835 -0.2776124,0.65516 -0.071801,0.0779 -0.1305487,0.15755 -0.1305487,0.177 0,0.0194 0.075424,0.0848 0.1676113,0.14531 0.092186,0.0605 0.2081383,0.1437 0.2576717,0.18495 l 0.090061,0.075 -0.1219865,0.1237 c -0.067093,0.0681 -0.2010031,0.16002 -0.2975793,0.2044 -0.199175,0.0915 -0.2308085,0.12454 -0.1908675,0.19916 0.036351,0.068 -0.1489458,0.25209 -0.3518735,0.34972 -0.2420168,0.11644 -0.2399953,0.11454 -0.2300318,0.21521 0.00753,0.076 -0.014618,0.1162 -0.1102841,0.2002 -0.065833,0.0578 -0.1972437,0.14059 -0.2920236,0.18399 -0.1511967,0.0692 -0.2052261,0.0771 -0.4406271,0.0648 -0.23174967,-0.0122 -0.29885754,-0.0301 -0.49261315,-0.13125 l -0.22431318,-0.11718 -0.13823523,0.12743 c -0.0760293,0.0701 -0.14517698,0.12742 -0.15366134,0.12742 -0.008483,0 -0.0412387,-0.0284 -0.0727873,-0.0634 z m 1.47652803,-0.19404 c 0.074834,-0.0322 0.1454948,-0.0831 0.157023,-0.1132 0.05126,-0.13358 -0.38361,-0.32453 -0.6545159,-0.2874 -0.18637946,0.0257 -0.42075507,0.16129 -0.42075507,0.24369 0,0.12311 0.41715077,0.267 0.67044497,0.23125 0.061457,-0.009 0.1729686,-0.0421 0.247803,-0.0743 z m -0.95860832,-0.48265 c 0.0758147,-0.11469 0.0881196,-0.16528 0.0873291,-0.35916 -0.001169,-0.28626 -0.11548526,-0.54494 -0.24081925,-0.54494 -0.17348331,0 -0.28704584,0.48479 -0.18397596,0.7854 0.0980628,0.28599 0.20256607,0.32275 0.33746611,0.1187 z m 1.38140422,-0.0292 c 0.1856471,-0.0398 0.339672,-0.15275 0.3108314,-0.22791 -0.036872,-0.0961 -0.3571185,-0.22243 -0.5638097,-0.22243 -0.2049092,0 -0.4262288,0.0935 -0.4945342,0.2089 -0.041951,0.071 0.034352,0.1341 0.2645597,0.21918 0.1753201,0.0648 0.2652676,0.0689 0.4829528,0.0223 z m -0.8639771,-0.44935 c 0.1737466,-0.1865 0.2053776,-0.55083 0.070735,-0.81476 -0.1284641,-0.25181 -0.21204859,-0.2578 -0.32554745,-0.0234 -0.12087975,0.2497 -0.0886573,0.57245 0.0834178,0.83551 0.0586103,0.0896 0.0898824,0.0901 0.17139505,0.003 z m 1.5901381,-0.16903 c 0.176478,-0.0822 0.2038657,-0.13507 0.1117407,-0.21585 -0.2457795,-0.21549 -0.6736019,-0.23825 -0.9418152,-0.0501 -0.1378586,0.0967 -0.1129176,0.16431 0.095778,0.25956 0.2460525,0.11232 0.5019589,0.11452 0.7342967,0.006 z m -0.9395138,-0.52788 c 0.074142,-0.14449 0.087995,-0.20668 0.078224,-0.35117 -0.012903,-0.19079 -0.13139,-0.46543 -0.2216396,-0.51373 -0.078974,-0.0422 -0.1770734,0.0737 -0.237132,0.28028 -0.056866,0.19561 -0.026219,0.43452 0.083271,0.64914 0.094132,0.18452 0.1789426,0.16611 0.2972777,-0.0645 z m 0.6441989,-0.15798 c 0.1891937,-0.0821 0.3202273,-0.20649 0.4125549,-0.39177 0.1512249,-0.30347 0.097564,-0.40563 -0.1711463,-0.32584 -0.2829441,0.0841 -0.5846126,0.43186 -0.5846126,0.67407 0,0.14794 0.079282,0.158 0.343204,0.0435 z"
+       id="path7219"
+       inkscape:connector-curvature="0" />
+    <g
+       id="layer1-1"
+       transform="matrix(0.58700842,0,0,0.58700842,1.7392457,119.14951)"
+       style="fill:#000000;stroke-width:1.70355296">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.90146357;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="M 0.62430507,292.16017 V 295.604 H -1.4578422 v 0.65081 h 2.7329683 v -3.44383 h 1.0710931 v 1.66668 h 1.6138442 v 1.77715 H 6.3496096 V 295.604 h -1.738725 v -1.77475 H 2.9970403 v -1.66908 z"
+         id="path6563"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:#000000;stroke-width:1"
+       d="m 2.7360592,296.16852 c 0.035985,-0.0266 0.079014,-0.0464 0.095561,-0.0439 0.028453,0.004 0.1012562,0.0628 0.1998654,0.16077 0.042618,0.0422 0.050276,0.0379 0.2271026,-0.13015 0.1006543,-0.0957 0.1837529,-0.17894 0.1846679,-0.18509 7.368e-4,-0.005 -0.080243,-0.0992 -0.1803661,-0.20667 -0.1001149,-0.10752 -0.1858963,-0.21293 -0.1906298,-0.23422 -0.01591,-0.0715 0.00672,-0.14361 0.055248,-0.17596 0.052777,-0.0351 0.1863359,-0.0256 0.2035889,0.0146 0.00599,0.0138 0.028459,0.0383 0.049986,0.0543 0.034199,0.0255 0.1469599,-0.0773 0.8921084,-0.81307 0.4959648,-0.48972 0.8786622,-0.84956 0.9143988,-0.85984 0.057272,-0.0164 0.1193571,-0.006 0.4656563,0.0774 l 0.1179261,0.0284 0.2688188,-0.25067 c 0.4071733,-0.37969 0.4103449,-0.37495 0.026669,0.0399 l -0.2462072,0.26615 0.042598,0.25476 c 0.023426,0.14012 0.037869,0.28652 0.032094,0.3253 -0.00841,0.0565 -0.1829859,0.24089 -0.871827,0.92127 l -0.8613178,0.85072 0.056621,0.0699 c 0.080472,0.0992 0.086441,0.16909 0.02003,0.23528 -0.099061,0.0988 -0.169502,0.0709 -0.3691134,-0.14606 -0.097862,-0.10638 -0.1875382,-0.19485 -0.1992942,-0.1966 -0.01811,-0.003 -0.2766334,0.23868 -0.346337,0.3234 -0.014924,0.0182 0.00872,0.0666 0.069195,0.14254 0.1016878,0.12757 0.1059961,0.18332 0.020346,0.26412 -0.09641,0.0909 -0.1470079,0.0616 -0.4406566,-0.25571 -0.1491273,-0.16113 -0.2817818,-0.31113 -0.2947946,-0.33331 -0.037247,-0.0635 -0.013228,-0.14534 0.058107,-0.19819 z m 1.2661739,-0.0595 c 0.00508,7.5e-4 0.024809,0.009 0.042796,0.0201 0.02401,0.0137 0.2623398,-0.20766 0.8700641,-0.80776 0.4603218,-0.45456 0.839611,-0.84429 0.8428512,-0.86604 0.00323,-0.0217 -0.00965,-0.1319 -0.028692,-0.24474 -0.040702,-0.24158 -0.049455,-0.24932 -0.328551,-0.29089 -0.1607045,-0.0239 -0.2000044,-0.0227 -0.2397059,0.0103 -0.026037,0.0213 -0.043089,0.049 -0.037808,0.0615 0.00526,0.0126 0.079361,0.0959 0.1645424,0.18593 0.1467729,0.15491 0.1751347,0.20713 0.124336,0.22895 -0.012216,0.005 -0.096829,-0.0721 -0.1880173,-0.17197 -0.1747009,-0.19129 -0.1974008,-0.19898 -0.2757157,-0.0937 -0.024291,0.0327 -0.00304,0.0658 0.1358708,0.21208 0.090572,0.0953 0.1627979,0.18582 0.1605287,0.20105 -0.00998,0.067 -0.060365,0.0359 -0.2143205,-0.1314 -0.090441,-0.0983 -0.1694681,-0.1795 -0.175613,-0.18042 -0.00636,-9.4e-4 -0.037769,0.0259 -0.070354,0.0598 l -0.059172,0.0615 0.1595191,0.17024 c 0.087744,0.0935 0.1607166,0.18409 0.1621791,0.201 0.00675,0.0776 -0.058967,0.0374 -0.2140684,-0.13126 l -0.1681788,-0.18284 -0.051111,0.0492 c -0.028143,0.0272 -0.052465,0.057 -0.054123,0.0659 -0.00176,0.01 0.095906,0.12352 0.2167832,0.25426 0.1208911,0.13069 0.2213029,0.24481 0.2231458,0.25359 0.002,0.008 -0.2203961,0.23363 -0.4938623,0.49971 -0.4231911,0.41178 -0.5536869,0.55846 -0.5034353,0.56594 z"
+       id="path825"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/icons/complications-source/ic_cob_detailed_orig.svg
+++ b/icons/complications-source/ic_cob_detailed_orig.svg
@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_cob_detailed_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.24"
+     inkscape:cx="15.646632"
+     inkscape:cy="-12.499983"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="5.3485108,-2.2479248"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="7.4930827,-2.2479248"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999994"
+       d="m 0.05089598,294.93416 c -0.07830027,-0.0866 -0.07612459,-0.0931 0.07662521,-0.23546 0.0864674,-0.0807 0.16740192,-0.17673 0.17985392,-0.21372 0.0124519,-0.0371 -0.0503872,-0.19849 -0.13964395,-0.35883 -0.15462889,-0.27779 -0.1622845,-0.31166 -0.1622845,-0.71767 0,-0.38785 0.01186591,-0.44752 0.13215717,-0.66469 0.16011951,-0.28904 0.41681436,-0.53114 0.48784554,-0.4601 0.0913417,0.0914 0.1465345,0.0477 0.26534931,-0.2096 0.18602812,-0.40291 0.34648712,-0.56898 0.55131572,-0.57056 0.1603807,-0.001 0.1741382,-0.0125 0.2345157,-0.1934 0.035639,-0.10668 0.1620652,-0.29611 0.2845168,-0.42613 l 0.2203763,-0.23402 0.1769015,0.1997 c 0.097295,0.10979 0.212748,0.26624 0.2565605,0.34761 0.043811,0.0814 0.1053167,0.14791 0.1366786,0.14791 0.031361,0 0.1731067,-0.09 0.3149901,-0.20006 0.358468,-0.278 0.6613044,-0.37046 1.1274306,-0.34419 0.1038581,0.004 0.1063214,0.0148 0.085235,0.3095 -0.026556,0.37118 -0.1480962,0.65799 -0.3900263,0.92046 -0.1008754,0.10945 -0.1834119,0.22134 -0.1834119,0.24866 0,0.0273 0.1059661,0.11915 0.2354823,0.20416 0.1295149,0.085 0.2924199,0.20189 0.362011,0.25984 l 0.1265294,0.10535 -0.1713826,0.17378 c -0.094261,0.0957 -0.2823955,0.22482 -0.4180783,0.28717 -0.2798272,0.12855 -0.3242699,0.17497 -0.2681556,0.27981 0.051071,0.0956 -0.2092585,0.35418 -0.4943581,0.49132 -0.3400167,0.16361 -0.3371767,0.16094 -0.3231787,0.30237 0.010579,0.10678 -0.020536,0.16325 -0.1549416,0.28125 -0.092491,0.0813 -0.2771137,0.19753 -0.4102729,0.25852 -0.2124209,0.0972 -0.2883285,0.10823 -0.6190505,0.091 -0.3255924,-0.0172 -0.4198742,-0.0423 -0.69208754,-0.18441 l -0.31514452,-0.16462 -0.19421093,0.17903 c -0.1068159,0.0985 -0.20396363,0.17902 -0.21588358,0.17902 -0.011918,0 -0.05793753,-0.0399 -0.10226112,-0.0891 z m 2.07441972,-0.27261 c 0.1051369,-0.0453 0.2044102,-0.11674 0.2206066,-0.15904 0.072017,-0.18766 -0.5389456,-0.45594 -0.9195496,-0.40378 -0.2618503,0.0361 -0.59113182,0.2266 -0.59113182,0.34238 0,0.17295 0.58606802,0.37512 0.94192882,0.3249 0.086342,-0.0127 0.2430089,-0.0592 0.348146,-0.10435 z m -1.34677832,-0.6781 c 0.1065144,-0.16113 0.12380194,-0.2322 0.12269135,-0.50459 -0.001642,-0.40217 -0.16224881,-0.76561 -0.3383344,-0.76561 -0.24373207,0 -0.40327958,0.68111 -0.25847353,1.10345 0.13777147,0.4018 0.28459134,0.45344 0.47411658,0.16675 z m 1.94077752,-0.0411 c 0.2608212,-0.0559 0.4772157,-0.2146 0.4366965,-0.3202 -0.051801,-0.13501 -0.5017268,-0.3125 -0.7921136,-0.3125 -0.2878833,0 -0.598822,0.13137 -0.6947864,0.29349 -0.058938,0.0998 0.048262,0.18841 0.3716881,0.30794 0.2463126,0.091 0.3726826,0.0968 0.6785154,0.0313 z m -1.2138282,-0.6313 c 0.244102,-0.26202 0.2885414,-0.77388 0.099378,-1.14469 -0.1804831,-0.35378 -0.2979135,-0.36219 -0.4573717,-0.033 -0.16982766,0.35082 -0.1245573,0.80425 0.1171964,1.17383 0.082343,0.12588 0.1262785,0.12658 0.2407982,0.004 z m 2.2340342,-0.23749 c 0.2479394,-0.11543 0.2864171,-0.18975 0.1569879,-0.30324 -0.3453032,-0.30275 -0.9463641,-0.33474 -1.3231853,-0.0704 -0.1936818,0.13585 -0.1586414,0.23084 0.1345615,0.36465 0.3456868,0.15781 0.7052176,0.1609 1.0316361,0.008 z m -1.319952,-0.74162 c 0.1041645,-0.203 0.1236269,-0.29037 0.1098991,-0.49337 -0.018127,-0.26805 -0.1845938,-0.6539 -0.3113883,-0.72176 -0.1109526,-0.0593 -0.248776,0.10357 -0.3331541,0.39378 -0.079893,0.27482 -0.036837,0.61047 0.1169895,0.912 0.1322489,0.25923 0.251402,0.23337 0.4176547,-0.0907 z m 0.9050549,-0.22195 c 0.2658041,-0.11532 0.4498971,-0.29011 0.5796111,-0.55042 0.2124605,-0.42634 0.1370707,-0.56987 -0.2404487,-0.45778 -0.397517,0.11816 -0.8213403,0.60673 -0.8213403,0.94702 0,0.20785 0.1113854,0.22198 0.4821779,0.0612 z"
+       id="path7219"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.42386249;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 2.9588068,295.12302 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 1.861385 a 0.21195244,0.21195244 0 1 0 0,-0.42374 h -1.861385 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 2.4784015,0 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 5.4583956 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m -2.4784015,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 0.8030516 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 1.4273029,0 a 0.21218709,0.21218709 0 0 0 0.021704,0.42374 h 1.7244425 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 4.4078138 a 0.21195244,0.21195244 0 0 0 -0.021704,0 z m -1.4273029,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z"
+       id="path819-9"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/icons/complications-source/ic_cob_iob_orig.svg
+++ b/icons/complications-source/ic_cob_iob_orig.svg
@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_cob_iob_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.48"
+     inkscape:cx="11.749487"
+     inkscape:cy="7.6899364"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="5.3485108,-2.2479248"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="7.4930827,-2.2479248"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999988"
+       d="m 0.04584936,294.50936 c -0.07053636,-0.078 -0.06857641,-0.0839 0.06902739,-0.21211 0.0778937,-0.0727 0.15080309,-0.15921 0.1620204,-0.19253 0.0112172,-0.0334 -0.045391,-0.17881 -0.12579747,-0.32325 -0.13929657,-0.25025 -0.14619309,-0.28076 -0.14619309,-0.64651 0,-0.34939 0.01068934,-0.40315 0.11905305,-0.59878 0.14424277,-0.26038 0.37548489,-0.47848 0.43947293,-0.41448 0.0822847,0.0823 0.13200479,0.043 0.23903845,-0.18882 0.16758237,-0.36296 0.31213098,-0.51256 0.49664968,-0.51398 0.1444781,-0.001 0.1568714,-0.0113 0.2112622,-0.17423 0.032105,-0.0961 0.1459955,-0.26675 0.2563053,-0.38387 l 0.1985248,-0.21082 0.1593607,0.1799 c 0.087648,0.0989 0.1916529,0.23984 0.2311211,0.31314 0.039467,0.0733 0.094874,0.13325 0.1231262,0.13325 0.028251,0 0.1559422,-0.0811 0.283757,-0.18023 0.3229239,-0.25043 0.5957324,-0.33372 1.0156396,-0.31006 0.09356,0.004 0.095779,0.0133 0.076783,0.27881 -0.023923,0.33438 -0.1334116,0.59275 -0.351353,0.82919 -0.090873,0.0986 -0.1652256,0.1994 -0.1652256,0.22401 0,0.0246 0.095459,0.10733 0.2121329,0.18391 0.1166728,0.0766 0.2634249,0.18188 0.3261156,0.23408 l 0.1139833,0.0949 -0.154389,0.15655 c -0.084915,0.0862 -0.2543944,0.20253 -0.3766235,0.2587 -0.2520808,0.1158 -0.2921168,0.15762 -0.2415665,0.25206 0.046007,0.0861 -0.1885094,0.31906 -0.4453397,0.44261 -0.3063022,0.14738 -0.3037438,0.14498 -0.2911338,0.27238 0.00953,0.0962 -0.0185,0.14707 -0.1395782,0.25337 -0.08332,0.0732 -0.2496364,0.17794 -0.3695921,0.23288 -0.1913582,0.0876 -0.2597391,0.0975 -0.5576682,0.082 -0.2933081,-0.0155 -0.3782413,-0.0381 -0.62346317,-0.16613 l -0.28389618,-0.14829 -0.17495384,0.16127 c -0.0962245,0.0887 -0.18373949,0.16127 -0.19447751,0.16127 -0.0107363,0 -0.0521927,-0.0359 -0.09212136,-0.0803 z m 1.86872944,-0.24558 c 0.094712,-0.0408 0.1841418,-0.10516 0.1987322,-0.14327 0.064876,-0.16905 -0.4855061,-0.41073 -0.8283711,-0.36374 -0.2358864,0.0325 -0.53251782,0.20413 -0.53251782,0.30843 0,0.1558 0.52795612,0.33792 0.84853132,0.29268 0.077781,-0.0114 0.2189132,-0.0533 0.3136254,-0.094 z m -1.21323775,-0.61086 c 0.0959529,-0.14515 0.11152629,-0.20918 0.11052582,-0.45456 -0.001479,-0.36229 -0.14616094,-0.68969 -0.30478666,-0.68969 -0.21956467,0 -0.36329215,0.61357 -0.23284443,0.99403 0.12411066,0.36196 0.25637252,0.40848 0.42710527,0.15022 z m 1.74833855,-0.037 c 0.2349594,-0.0504 0.4298971,-0.19332 0.3933956,-0.28845 -0.046665,-0.12162 -0.4519777,-0.28151 -0.7135711,-0.28151 -0.259338,0 -0.5394454,0.11834 -0.6258944,0.26439 -0.053094,0.0899 0.043477,0.16972 0.3348331,0.2774 0.2218894,0.082 0.3357291,0.0872 0.6112368,0.0282 z m -1.0934703,-0.5687 c 0.2198979,-0.23604 0.2599309,-0.69715 0.089524,-1.03119 -0.1625872,-0.3187 -0.2683737,-0.32628 -0.4120207,-0.0297 -0.15298833,0.31603 -0.11220682,0.7245 0.1055757,1.05744 0.074178,0.1134 0.1137573,0.11403 0.2169217,0.004 z m 2.0125172,-0.21394 c 0.2233548,-0.10399 0.2580173,-0.17094 0.1414217,-0.27318 -0.3110645,-0.27273 -0.8525268,-0.30154 -1.1919841,-0.0634 -0.1744772,0.12238 -0.1429112,0.20795 0.121219,0.3285 0.31141,0.14216 0.6352913,0.14494 0.9293436,0.007 z m -1.1890714,-0.66809 c 0.093836,-0.18287 0.1113686,-0.26158 0.099002,-0.44445 -0.01633,-0.24147 -0.1662903,-0.58906 -0.2805124,-0.65019 -0.099951,-0.0534 -0.2241085,0.0933 -0.30012,0.35473 -0.071971,0.24757 -0.033184,0.54994 0.1053893,0.82157 0.1191357,0.23353 0.2264741,0.21023 0.3762419,-0.0817 z m 0.8153137,-0.19994 c 0.2394481,-0.10389 0.4052873,-0.26134 0.5221394,-0.49584 0.1913939,-0.38407 0.1234794,-0.51337 -0.2166069,-0.41239 -0.3581009,0.10644 -0.7398998,0.54657 -0.7398998,0.85312 0,0.18724 0.1003409,0.19997 0.4343673,0.0551 z"
+       id="path7219"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;stroke-width:1"
+       d="m 1.7447878,295.94036 c 0.045855,-0.0339 0.1006869,-0.0591 0.1217726,-0.0559 0.036257,0.005 0.1290298,0.08 0.2546866,0.20487 0.054308,0.0538 0.064066,0.0483 0.2893948,-0.16585 0.1282628,-0.12195 0.2341546,-0.22802 0.2353206,-0.23586 9.389e-4,-0.006 -0.1022529,-0.12641 -0.2298389,-0.26336 -0.1275755,-0.13701 -0.2368859,-0.27133 -0.2429178,-0.29846 -0.020274,-0.0911 0.00856,-0.183 0.070402,-0.22423 0.067253,-0.0447 0.2374462,-0.0326 0.2594315,0.0186 0.00763,0.0176 0.036265,0.0488 0.063697,0.0692 0.043579,0.0325 0.1872697,-0.0985 1.1368056,-1.03609 0.6320035,-0.62404 1.1196713,-1.08258 1.1652101,-1.09568 0.072981,-0.0209 0.1520957,-0.008 0.5933816,0.0986 l 0.1502722,0.0362 0.3425533,-0.31943 c 0.5188572,-0.48383 0.5228988,-0.47779 0.033984,0.0509 l -0.3137396,0.33915 0.054282,0.32464 c 0.029852,0.17855 0.048256,0.36511 0.040897,0.41452 -0.010717,0.072 -0.2331773,0.30697 -1.1109612,1.17397 l -1.0975694,1.08406 0.072152,0.0891 c 0.1025447,0.12641 0.110151,0.21547 0.025524,0.29981 -0.1262325,0.1259 -0.2159948,0.0904 -0.4703578,-0.18612 -0.1247047,-0.13556 -0.2389782,-0.2483 -0.2539588,-0.25053 -0.023077,-0.004 -0.3525114,0.30415 -0.4413341,0.41211 -0.019017,0.0232 0.011112,0.0849 0.088175,0.18164 0.1295798,0.16256 0.1350698,0.2336 0.025927,0.33656 -0.1228544,0.11584 -0.1873308,0.0785 -0.5615247,-0.32585 -0.1900316,-0.20532 -0.359072,-0.39647 -0.3756541,-0.42473 -0.047464,-0.0809 -0.016856,-0.18521 0.074045,-0.25255 z m 1.6134739,-0.0758 c 0.00647,9.6e-4 0.031614,0.0115 0.054535,0.0256 0.030596,0.0175 0.3342972,-0.26462 1.1087147,-1.02932 0.5865839,-0.57924 1.0699087,-1.07587 1.0740377,-1.10358 0.00412,-0.0277 -0.012297,-0.16808 -0.036562,-0.31187 -0.051866,-0.30785 -0.06302,-0.31771 -0.4186696,-0.37068 -0.2047842,-0.0305 -0.2548637,-0.0289 -0.305455,0.0131 -0.033179,0.0271 -0.054908,0.0624 -0.048178,0.0784 0.0067,0.0161 0.101129,0.12221 0.2096749,0.23693 0.1870314,0.1974 0.2231725,0.26394 0.1584402,0.29175 -0.015567,0.006 -0.1233883,-0.0919 -0.2395887,-0.21914 -0.2226198,-0.24376 -0.2515461,-0.25356 -0.351342,-0.1194 -0.030954,0.0417 -0.00387,0.0838 0.1731389,0.27025 0.1154151,0.12144 0.2074519,0.23679 0.2045603,0.2562 -0.012717,0.0854 -0.076923,0.0457 -0.2731067,-0.16745 -0.1152481,-0.12526 -0.2159517,-0.22873 -0.223782,-0.2299 -0.0081,-0.001 -0.048129,0.033 -0.089651,0.0762 l -0.075402,0.0784 0.2032737,0.21693 c 0.1118114,0.11915 0.2047997,0.23459 0.2066633,0.25614 0.0086,0.0989 -0.075141,0.0476 -0.2727854,-0.16727 l -0.2143087,-0.23299 -0.06513,0.0627 c -0.035862,0.0347 -0.066856,0.0726 -0.068968,0.084 -0.00224,0.0127 0.1222121,0.1574 0.2762448,0.324 0.1540505,0.16654 0.2820043,0.31196 0.2843527,0.32315 0.00255,0.0102 -0.2808487,0.29771 -0.6293242,0.63678 -0.5392686,0.52472 -0.7055582,0.71164 -0.641523,0.72117 z"
+       id="path825"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/icons/complications-source/ic_ins_burnin_orig.svg
+++ b/icons/complications-source/ic_ins_burnin_orig.svg
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24"
+   sodipodi:docname="ic_ins_burnin_orig.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="9.8333334"
+     inkscape:cx="-16.577819"
+     inkscape:cy="-13.406881"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6582" />
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#000000;stroke-width:1"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 2.0068089,1.5336611 z"
+     id="path825"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccscccccsccccccssscccsscccccccccsscsccscccsscsccsccccc" />
+</svg>
--- a/icons/complications-source/ic_ins_orig.svg
+++ b/icons/complications-source/ic_ins_orig.svg
@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24"
+   sodipodi:docname="ic_ins_orig.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="764"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-24.10281"
+     inkscape:cy="-2.764539"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6582" />
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#000000;stroke-width:1"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 0.08764,0.06738 c 0.0482,0.03706 0.09946,0.06775 0.11391,0.06819 0.01445,4.42e-4 0.168222,-0.175983 0.341718,-0.392066 0.173497,-0.216083 0.326136,-0.396847 0.339198,-0.401698 0.01306,-0.0049 0.410233,0.285716 0.882601,0.645702 0.73098,0.557073 0.986764,0.72433 0.986764,0.645245 z"
+     id="path825"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/icons/complications-source/ic_iob_detailed_orig.svg
+++ b/icons/complications-source/ic_iob_detailed_orig.svg
@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="ic_iob_detailed_orig.svg">
+  <defs
+     id="defs6576" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.24"
+     inkscape:cx="34.884913"
+     inkscape:cy="-12.499983"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       position="5.3485108,-2.2479248"
+       orientation="0,1"
+       id="guide7239"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="7.4930827,-2.2479248"
+       orientation="0,1"
+       id="guide4515"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="8.2940674,-11.575521"
+       orientation="0,1"
+       id="guide950"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <path
+       style="fill:#000000;stroke-width:0.99999994"
+       d="m 0.10358636,294.55177 c 0.0493981,-0.0365 0.10846679,-0.0637 0.13118174,-0.0602 0.0390585,0.005 0.13899969,0.0862 0.27436575,0.2207 0.0585043,0.058 0.0690163,0.052 0.31175579,-0.17867 0.13817342,-0.13137 0.25224726,-0.24563 0.25350336,-0.25408 0.00101,-0.006 -0.11015378,-0.13618 -0.2475981,-0.28371 -0.13743302,-0.1476 -0.25518963,-0.29229 -0.2616876,-0.32152 -0.0218405,-0.0981 0.009221,-0.19714 0.0758418,-0.24156 0.0724495,-0.0481 0.25579322,-0.0351 0.27947728,0.02 0.00822,0.019 0.0390671,0.0526 0.0686187,0.0746 0.0469462,0.035 0.20173962,-0.10611 1.22464432,-1.11615 0.6808372,-0.67226 1.2061862,-1.16623 1.2552437,-1.18034 0.07862,-0.0225 0.1638478,-0.009 0.6392311,0.10622 l 0.1618834,0.039 0.3690218,-0.34412 c 0.5589482,-0.52121 0.563302,-0.5147 0.03661,0.0548 l -0.3379816,0.36535 0.058476,0.34973 c 0.032159,0.19234 0.051985,0.39332 0.044057,0.44655 -0.011545,0.0776 -0.2511945,0.33069 -1.1968031,1.26468 l -1.1823765,1.16782 0.077727,0.096 c 0.1104681,0.13618 0.1186621,0.23212 0.027496,0.32298 -0.1359863,0.13563 -0.2326844,0.0974 -0.5067015,-0.2005 -0.1343404,-0.14604 -0.2574436,-0.26749 -0.2735817,-0.26989 -0.02486,-0.004 -0.3797493,0.32765 -0.47543506,0.44395 -0.0204864,0.025 0.0119706,0.0915 0.0949881,0.19568 0.1395922,0.17512 0.1455064,0.25165 0.02793,0.36256 -0.13234709,0.12479 -0.20180545,0.0846 -0.60491261,-0.35102 -0.20471498,-0.22119 -0.38681681,-0.42711 -0.40468017,-0.45755 -0.05113146,-0.0871 -0.01815844,-0.19952 0.07976631,-0.27207 z m 1.73814394,-0.0817 c 0.00697,10e-4 0.034057,0.0124 0.058749,0.0276 0.03296,0.0189 0.3601277,-0.28507 1.194383,-1.10885 0.6319081,-0.624 1.1525785,-1.159 1.1570265,-1.18885 0.00444,-0.0299 -0.013247,-0.18107 -0.039387,-0.33597 -0.055874,-0.33164 -0.06789,-0.34226 -0.4510194,-0.39932 -0.2206075,-0.0329 -0.2745566,-0.0311 -0.329057,0.0141 -0.035743,0.0292 -0.059151,0.0672 -0.051901,0.0845 0.00722,0.0173 0.1089431,0.13165 0.2258761,0.25523 0.201483,0.21266 0.2404166,0.28434 0.1706826,0.3143 -0.01677,0.006 -0.1329223,-0.099 -0.2581013,-0.23608 -0.2398212,-0.26259 -0.2709826,-0.27315 -0.3784895,-0.12862 -0.033346,0.0449 -0.00417,0.0903 0.186517,0.29113 0.124333,0.13082 0.2234813,0.25509 0.2203663,0.276 -0.0137,0.092 -0.082867,0.0492 -0.2942092,-0.18039 -0.1241531,-0.13494 -0.2326378,-0.24641 -0.2410732,-0.24767 -0.00873,-10e-4 -0.051848,0.0356 -0.096578,0.0821 l -0.081228,0.0845 0.2189803,0.23369 c 0.1204508,0.12836 0.2206241,0.25272 0.2226317,0.27593 0.00926,0.10654 -0.080947,0.0513 -0.293863,-0.18019 l -0.2308679,-0.251 -0.070162,0.0675 c -0.038633,0.0374 -0.072022,0.0782 -0.074297,0.0905 -0.00241,0.0137 0.1316552,0.16956 0.2975897,0.34903 0.1659537,0.17941 0.3037943,0.33607 0.3063241,0.34812 0.00275,0.011 -0.3025493,0.32072 -0.6779509,0.68599 -0.5809368,0.56526 -0.7600753,0.76662 -0.6910922,0.77689 z"
+       id="path825"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.42386249;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 2.9588068,295.12302 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 1.861385 a 0.21195244,0.21195244 0 1 0 0,-0.42374 h -1.861385 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 2.4784015,0 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 5.4583956 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m -2.4784015,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 h 0.8030516 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z m 1.4273029,0 a 0.21218709,0.21218709 0 0 0 0.021704,0.42374 h 1.7244425 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 4.4078138 a 0.21195244,0.21195244 0 0 0 -0.021704,0 z m -1.4273029,0.72657 a 0.21218709,0.21218709 0 0 0 0.021187,0.42374 H 6.132256 a 0.21195244,0.21195244 0 1 0 0,-0.42374 H 2.9799941 a 0.21195244,0.21195244 0 0 0 -0.021187,0 z"
+       id="path819-9"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/icons/complications/ic_aaps_full.svg
+++ b/icons/complications/ic_aaps_full.svg
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4879"
+   version="1.1"
+   viewBox="-0.1 0 38.4175 38.4175"
+   height="38.4175mm"
+   width="38.4175mm">
+  <defs
+     id="defs4873" />
+  <metadata
+     id="metadata4876">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(267.81708,63.899226)"
+     id="layer1">
+    <path
+       id="path197"
+       transform="matrix(0.26458333,0,0,0.26458333,-267.91708,-63.899226)"
+       d="M 72.599609 0 C 62.799597 0 53.499969 1.9003894 45 5.4003906 C 27.099969 12.800392 12.800365 27.099999 5.4003906 45 C 1.9003591 53.499999 0 62.799608 0 72.599609 C 0 82.399611 1.9003591 91.69922 5.4003906 100.19922 C 12.800365 118.09922 27.099969 132.40078 45 139.80078 C 53.499969 143.30078 62.799597 145.19922 72.599609 145.19922 C 82.399584 145.19922 91.699212 143.30078 100.19922 139.80078 C 118.09921 132.40078 132.40077 118.09922 139.80078 100.19922 C 143.30077 91.69922 145.19922 82.399611 145.19922 72.599609 C 145.19922 62.799608 143.30077 53.499999 139.80078 45 C 132.40077 27.099999 118.09921 12.800392 100.19922 5.4003906 C 91.699212 1.9003894 82.399584 0 72.599609 0 z M 72.5 11.300781 C 106.29997 11.300781 133.69922 38.799997 133.69922 72.5 C 133.69922 84.099997 130.5004 94.899219 124.90039 104.19922 L 124.90039 72.699219 C 125.00055 62.899221 122.6996 53.900781 118.09961 45.800781 C 113.49958 37.700781 107.19963 31.39922 99.099609 26.699219 C 95.599616 24.699217 91.899584 23.100001 88.099609 22 C 83.899609 20.700001 79.599609 24.099999 79.599609 28.5 C 79.599609 31.5 81.600403 34.000391 84.400391 34.900391 C 87.000403 35.700392 89.400781 36.799221 91.800781 38.199219 C 97.600769 41.69922 102.19998 46.400391 105.5 52.400391 C 108.79998 58.400391 110.5 65.099609 110.5 72.599609 C 110.5 80.099609 108.79998 86.800781 105.5 92.800781 C 102.09997 98.800781 97.600769 103.50039 91.800781 106.90039 C 90.200756 107.80039 88.600384 108.60078 86.900391 109.30078 L 86.900391 106.09961 L 86.900391 98.900391 L 86.900391 92.900391 L 86.900391 82.400391 C 86.900391 80.300391 86.200794 78.499611 84.800781 77.099609 C 83.400806 75.699608 81.699987 75 79.5 75 C 77.499987 75 75.800762 75.699608 74.300781 77.099609 C 72.900769 78.499611 72.099609 80.200388 72.099609 82.400391 L 72.099609 92.900391 L 72.099609 98.900391 L 72.099609 106.5 L 72.099609 112.40039 L 72.099609 117.19922 C 72.099609 119.19922 72.800762 120.90039 74.300781 122.40039 C 75.700756 123.80039 77.499987 124.59961 79.5 124.59961 C 80.599994 124.59961 81.69959 124.39999 82.599609 124 C 86.299616 123.1 89.899238 121.89961 93.199219 120.09961 C 99.999231 116.59961 105.59963 111.90078 110.09961 105.80078 L 110.09961 117.19922 C 110.09961 118.39922 110.29916 119.40078 110.69922 120.30078 C 100.19924 128.70078 86.9 133.69922 72.5 133.69922 C 38.699987 133.69922 11.300781 106.2 11.300781 72.5 C 11.300781 38.799997 38.799994 11.300781 72.5 11.300781 z M 64.900391 20.300781 C 64.00041 20.300781 63.200365 20.499233 62.400391 20.699219 C 56.400391 21.699217 50.700384 23.699219 45.400391 26.699219 C 37.400378 31.299217 31.100384 37.700781 26.400391 45.800781 C 21.800365 53.900781 19.5 62.899221 19.5 72.699219 C 19.5 82.49922 21.6992 91.499999 26.199219 99.5 C 30.6992 107.5 36.799609 113.8 44.599609 118.5 C 48.199609 120.7 51.999616 122.30039 56.099609 123.40039 C 60.499622 124.60039 64.900391 121.40078 64.900391 116.80078 C 64.900391 113.70078 62.800384 111.19922 59.900391 110.19922 C 57.400384 109.39922 54.899603 108.30039 52.599609 106.90039 C 46.699616 103.50039 42.100762 98.800781 38.800781 92.800781 C 35.400794 86.800781 33.800781 80.099609 33.800781 72.599609 C 33.800781 65.099609 35.500762 58.400391 38.800781 52.400391 C 42.100762 46.400391 46.799622 41.69922 52.599609 38.199219 C 54.199597 37.299219 55.899578 36.500784 57.599609 35.800781 L 57.599609 38 L 57.599609 44 L 57.599609 51.599609 L 57.599609 57.5 L 57.599609 62.300781 C 57.599609 64.300779 58.300762 66 59.800781 67.5 C 61.200794 68.900001 63.000025 69.699219 65 69.699219 C 67.100019 69.699219 68.900806 69 70.300781 67.5 C 71.700794 66.099999 72.400391 64.300779 72.400391 62.300781 L 72.400391 57.5 L 72.400391 51.199219 L 72.400391 44 L 72.400391 38 L 72.400391 27.5 C 72.400391 25.4 71.700794 23.59922 70.300781 22.199219 C 68.8008 20.999219 67.100416 20.300781 64.900391 20.300781 z "
+       style="stroke-width:0.99999994;fill:#ffffff" />
+  </g>
+</svg>
--- a/icons/complications/ic_basal.svg
+++ b/icons/complications/ic_basal.svg
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path6563"
+       d="m 1.6933594,292.16016 v 2.80078 H 0 v 0.52929 h 2.2226562 v -2.80078 H 3.09375 v 1.35547 h 1.3125 v 1.44531 h 1.9433594 v -0.52929 H 4.9355469 v -1.44336 h -1.3125 v -1.35742 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
--- a/icons/complications/ic_br_cob_iob.svg
+++ b/icons/complications/ic_br_cob_iob.svg
--- a/icons/complications/ic_carbs.svg
+++ b/icons/complications/ic_carbs.svg
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7219"
+       d="m 0.07295798,296.83173 c -0.1122387,-0.12403 -0.10912,-0.13361 0.1098377,-0.33755 0.123946,-0.11545 0.2399605,-0.2533 0.2578097,-0.30635 0.017849,-0.053 -0.072227,-0.28451 -0.2001711,-0.51436 -0.2216511,-0.3982 -0.232625,-0.44673 -0.232625,-1.02872 0,-0.55596 0.01701,-0.64151 0.1894393,-0.95278 0.2295216,-0.41433 0.5974781,-0.76138 0.699297,-0.65956 0.13093292,0.13093 0.21004832,0.0684 0.38036222,-0.30044 0.26666,-0.57755 0.4966683,-0.81559 0.7902781,-0.81787 0.2298957,-0.002 0.2496163,-0.0181 0.3361639,-0.27725 0.051087,-0.15301 0.2323105,-0.42442 0.4078375,-0.61081 l 0.3158958,-0.33544 0.2535776,0.28625 c 0.1394675,0.15744 0.3049613,0.38166 0.367764,0.49829 0.062802,0.11662 0.150967,0.21203 0.1959215,0.21203 0.044954,0 0.2481379,-0.12905 0.4515189,-0.28678 0.5138423,-0.3985 0.9479397,-0.53103 1.6161036,-0.49339 0.1488754,0.008 0.1524038,0.0212 0.1221769,0.44366 -0.038067,0.53204 -0.2122871,0.9432 -0.5590789,1.31942 -0.1446004,0.15688 -0.2629099,0.31727 -0.2629099,0.35643 0,0.0392 0.1518971,0.17085 0.3375495,0.29265 0.185652,0.1218 0.4191662,0.2894 0.5189208,0.37247 l 0.1813712,0.15102 -0.2456665,0.24913 c -0.1351167,0.13703 -0.4047968,0.32226 -0.5992897,0.41164 -0.4011153,0.18432 -0.4648215,0.2508 -0.3843851,0.40109 0.073206,0.13678 -0.2999593,0.50766 -0.708632,0.70428 -0.4873936,0.23449 -0.4833225,0.23068 -0.4632573,0.43341 0.015149,0.15308 -0.029439,0.23403 -0.222099,0.40318 -0.1325804,0.11641 -0.3972262,0.28315 -0.5881017,0.37054 -0.3044925,0.13941 -0.4133015,0.1554 -0.8873715,0.13052 -0.466717,-0.0245 -0.6018643,-0.0605 -0.9920655,-0.26433 l -0.45174132,-0.23597 -0.2783896,0.25662 c -0.1531142,0.14114 -0.2923695,0.25661 -0.309456,0.25661 -0.017086,0 -0.08305,-0.0574 -0.1465851,-0.12764 z M 3.046513,296.44094 c 0.1507077,-0.0649 0.2930096,-0.16746 0.3162261,-0.22796 0.1032308,-0.26902 -0.7725458,-0.65358 -1.3181185,-0.5788 -0.3753467,0.0515 -0.8473517,0.32482 -0.8473517,0.49076 0,0.24793 0.8400929,0.5377 1.3501978,0.46571 0.1237678,-0.0175 0.3483389,-0.0848 0.4990463,-0.14971 z m -1.9305252,-0.972 c 0.1526821,-0.23095 0.1774628,-0.33287 0.1758706,-0.72332 -0.00236,-0.57649 -0.2325739,-1.09745 -0.48498192,-1.09745 -0.3493751,0 -0.5780768,0.97634 -0.3705061,1.58171 0.1974871,0.57597 0.4079444,0.64999 0.67961742,0.23906 z m 2.7819869,-0.0587 c 0.3738715,-0.0802 0.6840596,-0.30762 0.625978,-0.45898 -0.074257,-0.19351 -0.719195,-0.44794 -1.1354468,-0.44794 -0.4126632,0 -0.858375,0.18827 -0.9959339,0.42069 -0.084486,0.14275 0.069181,0.27006 0.5327922,0.4414 0.3530742,0.1305 0.534218,0.13884 0.9726105,0.0448 z M 2.1580258,294.5053 c 0.3499054,-0.37558 0.4136063,-1.10931 0.1424518,-1.64082 -0.2587115,-0.50712 -0.4270412,-0.51919 -0.6556148,-0.047 -0.2434377,0.50288 -0.1785456,1.15285 0.1679929,1.68264 0.1180344,0.18046 0.1810123,0.18141 0.3451701,0.005 z m 3.2023524,-0.34041 c 0.355406,-0.16547 0.4105616,-0.27201 0.2250328,-0.43468 -0.4949714,-0.43399 -1.3565556,-0.47981 -1.896706,-0.10086 -0.277631,0.19477 -0.2274028,0.33089 0.1928854,0.52273 0.495521,0.22618 1.0108864,0.23064 1.4787878,0.0128 z m -1.8920711,-1.06321 c 0.1493138,-0.29099 0.1772115,-0.41624 0.157532,-0.70724 -0.025984,-0.38422 -0.264604,-0.93731 -0.4463561,-1.03458 -0.1590461,-0.0851 -0.3566052,0.14839 -0.4775562,0.56444 -0.114522,0.39395 -0.052801,0.87509 0.1676979,1.3073 0.1895712,0.3716 0.3603694,0.33453 0.5986824,-0.12992 z m 1.2973412,-0.31818 c 0.3810141,-0.16525 0.6449005,-0.41584 0.8308376,-0.78896 0.3045492,-0.61116 0.1964826,-0.81689 -0.3446688,-0.65619 -0.5698163,0.16922 -1.1773414,0.8697 -1.1773414,1.35748 0,0.29794 0.1596627,0.31819 0.6911726,0.0877 z"
+       style="fill:#ffffff;stroke-width:1" />
+  </g>
+</svg>
--- a/icons/complications/ic_cob_detailed.svg
+++ b/icons/complications/ic_cob_detailed.svg
--- a/icons/complications/ic_cob_iob.svg
+++ b/icons/complications/ic_cob_iob.svg
--- a/icons/complications/ic_ins.svg
+++ b/icons/complications/ic_ins.svg
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path825"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 0.08764,0.06738 c 0.0482,0.03706 0.09946,0.06775 0.11391,0.06819 0.01445,4.42e-4 0.168222,-0.175983 0.341718,-0.392066 0.173497,-0.216083 0.326136,-0.396847 0.339198,-0.401698 0.01306,-0.0049 0.410233,0.285716 0.882601,0.645702 0.73098,0.557073 0.986764,0.72433 0.986764,0.645245 z"
+     style="fill:#ffffff;stroke-width:1" />
+</svg>
--- a/icons/complications/ic_ins_burnin.svg
+++ b/icons/complications/ic_ins_burnin.svg
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg6582">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path825"
+     d="m 5.2032286,5.5871636 c -0.04934,-0.04934 -0.08964,-0.111011 -0.08957,-0.137051 1.52e-4,-0.04479 0.07357,-0.17029 0.201637,-0.344565 0.05534,-0.07532 0.04685,-0.08608 -0.252444,-0.319785 -0.170344,-0.133015 -0.317626,-0.241845 -0.327294,-0.241845 -0.0097,0 -0.134233,0.146285 -0.276812,0.325077 -0.14258,0.178792 -0.285173,0.33503 -0.316874,0.347195 -0.106583,0.0409 -0.222631,0.0226 -0.28355,-0.04472 -0.06622,-0.07318 -0.08206,-0.280988 -0.02413,-0.316785 0.01999,-0.01236 0.05248,-0.05261 0.0722,-0.08944 0.03132,-0.05851 -0.152744,-0.208523 -1.45636,-1.186943 -0.867679,-0.65123 -1.50947501,-1.157865 -1.53346701,-1.210523 -0.03847,-0.08443 -0.03669,-0.182385 0.01334,-0.734653 l 0.01703,-0.188057 -0.447569,-0.356365 c -0.677916,-0.53977105 -0.671352,-0.54573805 0.05517,-0.05015 l 0.46618901,0.318004 0.382456,-0.124018 c 0.210351,-0.06821 0.432408,-0.124018 0.49346,-0.124018 0.08878,0 0.412826,0.226458 1.618266,1.1309 l 1.507261,1.1309 0.09444,-0.1032 c 0.13419,-0.146644 0.240524,-0.171859 0.357656,-0.08481 0.174744,0.129864 0.147971,0.244692 -0.140308,0.601765 -0.141329,0.175055 -0.256962,0.333412 -0.256962,0.351903 0,0.02852 0.430933,0.371143 0.577336,0.459025 0.03126,0.01877 0.100589,-0.02865 0.203562,-0.139225 0.173028,-0.185803 0.257926,-0.205222 0.401944,-0.09194 0.162187,0.127576 0.128598,0.212191 -0.292577,0.737056 -0.21388,0.266535 -0.414377,0.505167 -0.445547,0.530293 -0.08919,0.07189 -0.220737,0.05371 -0.318466,-0.04402 z m -0.38208,-1.935654 c 0,-0.0084 0.0095,-0.04015 0.0212,-0.07054 0.0154,-0.04012 -0.379863,-0.35625 -1.443129,-1.154214 -0.805383,-0.604426 -1.492346,-1.098957 -1.526584,-1.098957 -0.03424,0 -0.200846,0.04514 -0.37024,0.100301 -0.362556,0.118072 -0.37248,0.133324 -0.37248,0.57253 0,0.252909 0.01163,0.313126 0.07079,0.36667 0.03893,0.03524 0.08535,0.05506 0.103151,0.04406 0.0178,-0.011 0.12963,-0.144179 0.248515,-0.295954 0.204828,-0.261494 0.278719,-0.31713 0.323961,-0.243927 0.01089,0.01762 -0.08884,0.165617 -0.221625,0.328891 -0.254408,0.312833 -0.261065,0.349543 -0.08088,0.445977 0.05584,0.02989 0.101998,-0.01041 0.295319,-0.257823 0.126023,-0.161285 0.248747,-0.293246 0.27272,-0.293246 0.1052,0 0.06917,0.08472 -0.153163,0.360085 -0.130623,0.161786 -0.237497,0.30207 -0.237497,0.311742 0,0.0097 0.04864,0.05222 0.108097,0.09456 l 0.108096,0.07697 0.225527,-0.284627 c 0.12404,-0.156545 0.246547,-0.28965 0.272238,-0.295788 0.118009,-0.0282 0.07105,0.08224 -0.152949,0.359672 l -0.242907,0.300856 2.0068089,1.5336611 z"
+     style="fill:#ffffff;stroke-width:1" />
+</svg>
--- a/icons/complications/ic_iob_detailed.svg
+++ b/icons/complications/ic_iob_detailed.svg
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path825"
+       transform="matrix(0.26458333,0,0,0.26458333,0,290.64998)"
+       d="M 19.140625 0.001953125 C 19.121272 -0.027012229 18.589483 0.4583956 17.533203 1.4433594 L 16.138672 2.7441406 L 15.527344 2.5976562 C 13.730619 2.1621791 13.408475 2.1102731 13.111328 2.1953125 C 12.925914 2.2486416 10.94043 4.1154248 8.3671875 6.65625 C 4.501091 10.473724 3.9157157 11.007283 3.7382812 10.875 C 3.6265902 10.79185 3.5095833 10.665561 3.4785156 10.59375 C 3.3890011 10.385498 2.6956999 10.335783 2.421875 10.517578 C 2.1700799 10.685465 2.054172 11.058916 2.1367188 11.429688 C 2.161278 11.540163 2.6055681 12.088626 3.125 12.646484 C 3.6444746 13.204078 4.0643642 13.696073 4.0605469 13.71875 C 4.0557994 13.750687 3.6257459 14.181218 3.1035156 14.677734 C 2.186075 15.549558 2.1449467 15.572728 1.9238281 15.353516 C 1.4122084 14.845169 1.0343414 14.538429 0.88671875 14.519531 C 0.80121122 14.506356 0.57686699 14.608976 0.390625 14.746094 C 0.022338157 15.020354 -0.10299958 15.442985 0.08984375 15.771484 C 0.15735881 15.886533 0.84541472 16.665959 1.6191406 17.501953 C 3.1426952 19.148391 3.4060405 19.299772 3.90625 18.828125 C 4.3506332 18.408938 4.3283738 18.120855 3.8007812 17.458984 C 3.4870143 17.065233 3.3639773 16.813238 3.4414062 16.71875 C 3.8030532 16.279191 5.1443222 15.025898 5.2382812 15.041016 C 5.2992756 15.050086 5.7637411 15.508585 6.2714844 16.060547 C 7.3071396 17.186468 7.673536 17.330977 8.1875 16.818359 C 8.5320648 16.474952 8.5015016 16.112352 8.0839844 15.597656 L 7.7890625 15.234375 L 12.257812 10.820312 C 15.831766 7.2902716 16.737615 6.334307 16.78125 6.0410156 C 16.811214 5.8398314 16.73678 5.08047 16.615234 4.3535156 L 16.394531 3.03125 L 17.671875 1.6503906 C 18.667198 0.57417015 19.159978 0.030918479 19.140625 0.001953125 z M 13.359375 2.9960938 C 13.540323 2.9885819 13.799901 3.0179049 14.216797 3.0800781 C 15.664845 3.295738 15.710698 3.3344481 15.921875 4.5878906 C 16.020672 5.1733394 16.087094 5.744414 16.070312 5.8574219 C 16.053501 5.9702408 14.08558 7.9931373 11.697266 10.351562 C 8.5441747 13.465062 7.308167 14.614402 7.1835938 14.542969 C 7.0902697 14.48552 6.9872808 14.44128 6.9609375 14.4375 L 6.9609375 14.439453 C 6.700214 14.400637 7.376599 13.638369 9.5722656 11.501953 C 10.991106 10.121405 12.145159 8.9517311 12.134766 8.9101562 C 12.125204 8.8646129 11.603789 8.271835 10.976562 7.59375 C 10.349408 6.9154382 9.8424538 6.3271702 9.8515625 6.2753906 C 9.8601609 6.2289024 9.986798 6.0749481 10.132812 5.9335938 L 10.398438 5.6777344 L 11.271484 6.6269531 C 12.076206 7.501876 12.415858 7.7093115 12.380859 7.3066406 C 12.373272 7.2189178 11.99431 6.748812 11.539062 6.2636719 L 10.712891 5.3808594 L 11.019531 5.0625 C 11.18859 4.886752 11.35177 4.7481736 11.384766 4.7519531 C 11.416647 4.7567153 11.825682 5.1774906 12.294922 5.6875 C 13.093696 6.5552417 13.356424 6.7168572 13.408203 6.3691406 C 13.419976 6.2901107 13.044139 5.8206097 12.574219 5.3261719 C 11.853512 4.5671294 11.743108 4.3962633 11.869141 4.2265625 C 12.275466 3.6803074 12.39437 3.7204245 13.300781 4.7128906 C 13.773899 5.2309883 14.212008 5.6261928 14.275391 5.6035156 C 14.538952 5.490281 14.39237 5.21977 13.630859 4.4160156 C 13.188908 3.9489416 12.804632 3.5165577 12.777344 3.4511719 C 12.749942 3.385786 12.837565 3.2431747 12.972656 3.1328125 C 13.075649 3.0473952 13.178427 3.0036056 13.359375 2.9960938 z M 11.183594 16.90625 A 0.80196695 0.80196695 0 0 0 11.263672 18.507812 L 18.298828 18.507812 A 0.80108009 0.80108009 0 1 0 18.298828 16.90625 L 11.263672 16.90625 A 0.80108009 0.80108009 0 0 0 11.183594 16.90625 z M 20.550781 16.90625 A 0.80196695 0.80196695 0 0 0 20.630859 18.507812 L 23.177734 18.507812 A 0.80108009 0.80108009 0 1 0 23.177734 16.90625 L 20.630859 16.90625 A 0.80108009 0.80108009 0 0 0 20.550781 16.90625 z M 11.183594 19.652344 A 0.80196695 0.80196695 0 0 0 11.263672 21.253906 L 14.298828 21.253906 A 0.80108009 0.80108009 0 1 0 14.298828 19.652344 L 11.263672 19.652344 A 0.80108009 0.80108009 0 0 0 11.183594 19.652344 z M 16.578125 19.652344 A 0.80196695 0.80196695 0 0 0 16.660156 21.253906 L 23.177734 21.253906 A 0.80108009 0.80108009 0 1 0 23.177734 19.652344 L 16.660156 19.652344 A 0.80108009 0.80108009 0 0 0 16.578125 19.652344 z M 11.183594 22.398438 A 0.80196695 0.80196695 0 0 0 11.263672 24 L 23.177734 24 A 0.80108009 0.80108009 0 1 0 23.177734 22.398438 L 11.263672 22.398438 A 0.80108009 0.80108009 0 0 0 11.183594 22.398438 z "
+       style="fill:#ffffff;stroke-width:3.77952743" />
+  </g>
+</svg>
--- a/icons/complications/ic_sgv.svg
+++ b/icons/complications/ic_sgv.svg
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg6582"
+   version="1.1"
+   viewBox="0 0 6.3499999 6.3500002"
+   height="24"
+   width="24">
+  <defs
+     id="defs6576" />
+  <metadata
+     id="metadata6579">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-290.64998)"
+     id="layer1">
+    <path
+       id="path7206"
+       d="m 2.6709439,296.94599 c -0.564202,-0.13292 -1.10932,-0.57834 -1.395458,-1.14023 -0.209976,-0.41234 -0.255,-1.03331 -0.115079,-1.58719 0.192881,-0.76352 1.199054,-2.58796 1.865321,-3.38228 l 0.156223,-0.18625 0.127394,0.15521 c 0.255954,0.31183 1.051728,1.53363 1.300101,1.99612 0.140327,0.2613 0.343099,0.70829 0.450605,0.99333 0.251656,0.66721 0.280223,1.46003 0.06928,1.9227 -0.424912,0.93195 -1.479804,1.45914 -2.458384,1.22859 z m 0.0041,-1.00028 c 0.121194,-0.12119 0.08718,-0.27576 -0.138214,-0.62811 -0.319446,-0.49937 -0.421499,-0.87437 -0.397534,-1.46074 0.01125,-0.27533 0.003,-0.48091 -0.01834,-0.45684 -0.120721,0.13615 -0.385751,0.96774 -0.411897,1.29242 -0.03899,0.4842 0.107815,0.95289 0.366713,1.17073 0.198622,0.16713 0.476417,0.2054 0.599268,0.0825 z"
+       style="fill:#ffffff;stroke-width:0.99999994" />
+  </g>
+</svg>
--- a/wear/build.gradle
+++ b/wear/build.gradle
@ -1,4 +1,18 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+    }
+}
 apply plugin: 'com.android.application'
+apply plugin: 'jacoco-android'
+
+jacoco {
+    toolVersion = "0.8.3"
+}

 ext {
    wearableVersion = "2.4.0"
@ -93,6 +107,10 @@ dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    //implementation files("libs/hellocharts-library-1.5.5.jar")
    //compile "com.ustwo.android:clockwise-wearable:1.0.2"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+
    compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
    implementation "com.google.android.support:wearable:${wearableVersion}"
    implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
@ -105,7 +123,16 @@ dependencies {
    
    testImplementation "junit:junit:4.12"
    testImplementation "org.json:json:20140107"
-    testImplementation "org.mockito:mockito-core:2.8.47"
+    testImplementation ("org.mockito:mockito-core:2.8.47") {
+        exclude group: 'net.bytebuddy', module: 'byte-buddy'
+        exclude group: 'net.bytebuddy', module: 'byte-buddy-android'
+        exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'
+    }
+    // to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+
+    testImplementation 'net.bytebuddy:byte-buddy:1.8.22'
+    testImplementation 'net.bytebuddy:byte-buddy-android:1.8.22'
+    testImplementation 'net.bytebuddy:byte-buddy-agent:1.8.22'
+
    testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
    testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
    testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@ -10,6 +10,7 @@


    <application
+        android:name=".aaps"
        android:allowBackup="true"
        android:icon="@drawable/ic_icon"
        android:label="@string/app_name"
@ -231,6 +232,229 @@
            </intent-filter>
        </service>

+        <service
+            android:name=".complications.LongStatusComplication"
+            android:icon="@drawable/ic_aaps_full"
+            android:label="Full Status"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+        <intent-filter>
+            <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+        </intent-filter>
+
+        <meta-data
+            android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+            android:value="LONG_TEXT" />
+        <meta-data
+            android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+            android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.LongStatusFlippedComplication"
+            android:icon="@drawable/ic_aaps_full"
+            android:label="Full Status (flipped)"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LONG_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.SgvComplication"
+            android:icon="@drawable/ic_sgv"
+            android:label="Blood Glucose"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.BrCobIobComplication"
+            android:icon="@drawable/ic_br_cob_iob"
+            android:label="BR, CoB &amp; IoB"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.CobIobComplication"
+            android:icon="@drawable/ic_cob_iob"
+            android:label="CoB &amp; IoB"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.CobIconComplication"
+            android:icon="@drawable/ic_carbs"
+            android:label="CoB Icon"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.CobDetailedComplication"
+            android:icon="@drawable/ic_cob_detailed"
+            android:label="CoB Detailed"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.IobIconComplication"
+            android:icon="@drawable/ic_ins"
+            android:label="IoB Icon"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.IobDetailedComplication"
+            android:icon="@drawable/ic_iob_detailed"
+            android:label="IoB Detailed"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="SHORT_TEXT" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.UploaderBattery"
+            android:icon="@drawable/ic_battery_charging_wireless_50"
+            android:label="Uploader/Phone Battery"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="RANGED_VALUE,SHORT_TEXT,ICON" />
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="300" />
+        </service>
+
+        <service
+            android:name=".complications.WallpaperLightComplication"
+            android:icon="@drawable/ic_aaps_light"
+            android:label="Light Walpaper"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LARGE_IMAGE"/>
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0"/>
+        </service>
+
+        <service
+            android:name=".complications.WallpaperDarkComplication"
+            android:icon="@drawable/ic_aaps_dark"
+            android:label="Dark Walpaper"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LARGE_IMAGE"/>
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0"/>
+        </service>
+
+        <service
+            android:name=".complications.WallpaperGrayComplication"
+            android:icon="@drawable/ic_aaps_gray"
+            android:label="Gray Walpaper"
+            android:permission="com.google.android.wearable.permission.BIND_COMPLICATION_PROVIDER">
+            <intent-filter>
+                <action android:name="android.support.wearable.complications.ACTION_COMPLICATION_UPDATE_REQUEST" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.support.wearable.complications.SUPPORTED_TYPES"
+                android:value="LARGE_IMAGE"/>
+            <meta-data
+                android:name="android.support.wearable.complications.UPDATE_PERIOD_SECONDS"
+                android:value="0"/>
+        </service>
+
+        <receiver android:name=".complications.ComplicationTapBroadcastReceiver"/>
+
        <activity
            android:name=".interaction.menus.MainMenuActivity"
            android:label="@string/label_actions_activity">
--- a/wear/src/main/assets/watch_dark.jpg
+++ b/wear/src/main/assets/watch_dark.jpg
--- a/wear/src/main/assets/watch_gray.jpg
+++ b/wear/src/main/assets/watch_gray.jpg
--- a/wear/src/main/assets/watch_light.jpg
+++ b/wear/src/main/assets/watch_light.jpg
--- a/wear/src/main/java/info/nightscout/androidaps/aaps.java
+++ b/wear/src/main/java/info/nightscout/androidaps/aaps.java
@ -0,0 +1,75 @@
+package info.nightscout.androidaps;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.StringRes;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+
+/**
+ * Created for xDrip+ by Emma Black on 3/21/15.
+ * Adapted for AAPS by dlvoy 2019-11-06.
+ */
+
+public class aaps extends Application implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+    @SuppressLint("StaticFieldLeak")
+    private static Context context;
+    private static Boolean unicodeComplications = true;
+    private static String complicationTapAction = "default";
+
+    @Override
+    public void onCreate() {
+        aaps.context = getApplicationContext();
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+        updatePrefs(sharedPrefs);
+        super.onCreate();
+    }
+
+    private void updatePrefs(SharedPreferences sharedPrefs) {
+        unicodeComplications = sharedPrefs.getBoolean("complication_unicode", true);
+        complicationTapAction = sharedPrefs.getString("complication_tap_action", "default");
+    }
+
+    public static Context getAppContext() {
+        return aaps.context;
+    }
+
+    private static boolean isWear2OrAbove() {
+        return Build.VERSION.SDK_INT > 23;
+    }
+
+    public static String gs(@StringRes final int id) {
+        return getAppContext().getString(id);
+    }
+
+    public static String gs(@StringRes final int id, String... args) {
+        return getAppContext().getString(id, (Object[]) args);
+    }
+
+    public static Boolean areComplicationsUnicode() {
+        return unicodeComplications;
+    }
+
+    public static String getComplicationTapAction() {
+        return complicationTapAction;
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        updatePrefs(sharedPrefs);
+
+        // we trigger update on Complications
+        Intent messageIntent = new Intent();
+        messageIntent.setAction(Intent.ACTION_SEND);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(messageIntent);
+    }
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/BaseComplicationProviderService.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/BaseComplicationProviderService.java
@ -0,0 +1,411 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationManager;
+import android.support.wearable.complications.ComplicationProviderService;
+import android.support.wearable.complications.ComplicationText;
+import android.support.wearable.complications.ProviderUpdateRequester;
+import android.util.Log;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.data.ListenerService;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.Inevitable;
+import info.nightscout.androidaps.interaction.utils.Persistence;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
+/**
+ * Base class for all complications
+ *
+ * Created by dlvoy on 2019-11-12
+ */
+public abstract class BaseComplicationProviderService extends ComplicationProviderService {
+
+    private static final String TAG = BaseComplicationProviderService.class.getSimpleName();
+
+    private static final String KEY_COMPLICATIONS = "complications";
+    private static final String KEY_LAST_SHOWN_SINCE_VALUE = "lastSince";
+    private static final String KEY_STALE_REPORTED = "staleReported";
+    private static final String TASK_ID_REFRESH_COMPLICATION = "refresh-complication";
+
+
+    private LocalBroadcastManager localBroadcastManager;
+    private MessageReceiver messageReceiver;
+
+    public static void turnOff() {
+        Log.d(TAG, "TURNING OFF all active complications");
+        final Persistence persistence = new Persistence();
+        persistence.putString(KEY_COMPLICATIONS, "");
+    }
+
+    //==============================================================================================
+    // ABSTRACT COMPLICATION INTERFACE
+    //==============================================================================================
+
+    public abstract ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent);
+    public abstract String getProviderCanonicalName();
+
+    public ComplicationAction getComplicationAction() { return ComplicationAction.MENU; };
+
+    //----------------------------------------------------------------------------------------------
+    // DEFAULT BEHAVIOURS
+    //----------------------------------------------------------------------------------------------
+
+    public ComplicationData buildNoSyncComplicationData(int dataType,
+                                                        RawDisplayData raw,
+                                                        PendingIntent complicationPendingIntent,
+                                                        PendingIntent exceptionalPendingIntent,
+                                                        long since) {
+
+
+        final ComplicationData.Builder builder = new ComplicationData.Builder(dataType);
+        if (dataType != ComplicationData.TYPE_LARGE_IMAGE) {
+            builder.setIcon(Icon.createWithResource(this, R.drawable.ic_sync_alert));
+        }
+
+        if (dataType ==  ComplicationData.TYPE_RANGED_VALUE) {
+            builder.setMinValue(0);
+            builder.setMaxValue(100);
+            builder.setValue(0);
+        }
+
+        switch (dataType) {
+            case ComplicationData.TYPE_ICON:
+            case ComplicationData.TYPE_SHORT_TEXT:
+            case ComplicationData.TYPE_RANGED_VALUE:
+                if (since > 0) {
+                    builder.setShortText(ComplicationText.plainText(DisplayFormat.shortTimeSince(since) + " old"));
+                } else {
+                    builder.setShortText(ComplicationText.plainText("!err!"));
+                }
+                break;
+            case ComplicationData.TYPE_LONG_TEXT:
+                builder.setLongTitle(ComplicationText.plainText(aaps.gs(R.string.label_warning_sync)));
+                if (since > 0) {
+                    builder.setLongText(ComplicationText.plainText(String.format(aaps.gs(R.string.label_warning_since), DisplayFormat.shortTimeSince(since))));
+                } else {
+                    builder.setLongText(ComplicationText.plainText(aaps.gs(R.string.label_warning_sync_aaps)));
+                }
+                break;
+            case ComplicationData.TYPE_LARGE_IMAGE:
+                return buildComplicationData(dataType, raw, complicationPendingIntent);
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+                break;
+        }
+
+        builder.setTapAction(exceptionalPendingIntent);
+        return builder.build();
+    }
+
+    public ComplicationData buildOutdatedComplicationData(int dataType,
+                                                          RawDisplayData raw,
+                                                          PendingIntent complicationPendingIntent,
+                                                          PendingIntent exceptionalPendingIntent,
+                                                          long since) {
+
+        final ComplicationData.Builder builder = new ComplicationData.Builder(dataType);
+        if (dataType != ComplicationData.TYPE_LARGE_IMAGE) {
+            builder.setIcon(Icon.createWithResource(this, R.drawable.ic_alert));
+            builder.setBurnInProtectionIcon(Icon.createWithResource(this, R.drawable.ic_alert_burnin));
+        }
+
+        if (dataType ==  ComplicationData.TYPE_RANGED_VALUE) {
+            builder.setMinValue(0);
+            builder.setMaxValue(100);
+            builder.setValue(0);
+        }
+
+        switch (dataType) {
+            case ComplicationData.TYPE_ICON:
+            case ComplicationData.TYPE_SHORT_TEXT:
+            case ComplicationData.TYPE_RANGED_VALUE:
+                if (since > 0) {
+                    builder.setShortText(ComplicationText.plainText(DisplayFormat.shortTimeSince(since) + " old"));
+                } else {
+                    builder.setShortText(ComplicationText.plainText("!old!"));
+                }
+                break;
+            case ComplicationData.TYPE_LONG_TEXT:
+                builder.setLongTitle(ComplicationText.plainText(aaps.gs(R.string.label_warning_old)));
+                if (since > 0) {
+                    builder.setLongText(ComplicationText.plainText(String.format(aaps.gs(R.string.label_warning_since), DisplayFormat.shortTimeSince(since))));
+                } else {
+                    builder.setLongText(ComplicationText.plainText(aaps.gs(R.string.label_warning_sync_aaps)));
+                }
+                break;
+            case ComplicationData.TYPE_LARGE_IMAGE:
+                return buildComplicationData(dataType, raw, complicationPendingIntent);
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+                break;
+        }
+
+        builder.setTapAction(exceptionalPendingIntent);
+        return builder.build();
+    }
+
+    /**
+     * If Complication depend on "since" field and need to be updated every minute or not
+     * and need only update when new DisplayRawData arrive
+     */
+    protected boolean usesSinceField() {
+        return false;
+    }
+
+    //==============================================================================================
+    // COMPLICATION LIFECYCLE
+    //==============================================================================================
+
+    /*
+     * Called when a complication has been activated. The method is for any one-time
+     * (per complication) set-up.
+     *
+     * You can continue sending data for the active complicationId until onComplicationDeactivated()
+     * is called.
+     */
+    @Override
+    public void onComplicationActivated(
+            int complicationId, int dataType, ComplicationManager complicationManager) {
+        Log.d(TAG, "onComplicationActivated(): " + complicationId + " of kind: "+getProviderCanonicalName());
+
+        Persistence persistence = new Persistence();
+        persistence.putString("complication_"+complicationId, getProviderCanonicalName());
+        persistence.putBoolean("complication_"+complicationId+"_since", usesSinceField());
+        persistence.addToSet(KEY_COMPLICATIONS, "complication_"+complicationId);
+
+        IntentFilter messageFilter = new IntentFilter(Intent.ACTION_SEND);
+
+        messageReceiver = new BaseComplicationProviderService.MessageReceiver();
+        localBroadcastManager = LocalBroadcastManager.getInstance(this);
+        localBroadcastManager.registerReceiver(messageReceiver, messageFilter);
+
+        ListenerService.requestData(this);
+        checkIfUpdateNeeded();
+    }
+
+    /*
+     * Called when the complication needs updated data from your provider. There are four scenarios
+     * when this will happen:
+     *
+     *   1. An active watch face complication is changed to use this provider
+     *   2. A complication using this provider becomes active
+     *   3. The period of time you specified in the manifest has elapsed (UPDATE_PERIOD_SECONDS)
+     *   4. You triggered an update from your own class via the
+     *       ProviderUpdateRequester.requestUpdate() method.
+     */
+    @Override
+    public void onComplicationUpdate(
+            int complicationId, int dataType, ComplicationManager complicationManager) {
+        Log.d(TAG, "onComplicationUpdate() id: " + complicationId + " of class: "+getProviderCanonicalName());
+
+        // Create Tap Action so that the user can checkIfUpdateNeeded an update by tapping the complication.
+        final ComponentName thisProvider = new ComponentName(this, getProviderCanonicalName());
+
+        // We pass the complication id, so we can only update the specific complication tapped.
+        final PendingIntent complicationPendingIntent =
+                ComplicationTapBroadcastReceiver.getTapActionIntent(
+                        aaps.getAppContext(), thisProvider, complicationId, getComplicationAction());
+
+        final Persistence persistence = new Persistence();
+
+        final RawDisplayData raw = new RawDisplayData();
+        raw.updateForComplicationsFromPersistence(persistence);
+        Log.d(TAG, "Complication data: " + raw.toDebugString());
+
+        // store what is currently rendered in 'SGV since' field, to detect if it was changed and need update
+        persistence.putString(KEY_LAST_SHOWN_SINCE_VALUE, DisplayFormat.shortTimeSince(raw.datetime));
+
+        // by each render we clear stale flag to ensure it is re-rendered at next refresh detection round
+        persistence.putBoolean(KEY_STALE_REPORTED, false);
+
+        ComplicationData complicationData;
+
+        if (WearUtil.msSince(persistence.whenDataUpdated()) > Constants.STALE_MS) {
+            // no new data arrived - probably configuration or connection error
+            final PendingIntent infoToast = ComplicationTapBroadcastReceiver.getTapWarningSinceIntent(
+                    aaps.getAppContext(), thisProvider, complicationId, ComplicationAction.WARNING_SYNC, persistence.whenDataUpdated());
+            complicationData = buildNoSyncComplicationData(dataType, raw, complicationPendingIntent, infoToast, persistence.whenDataUpdated());
+        } else if (WearUtil.msSince(raw.datetime) > Constants.STALE_MS) {
+            // data arriving from phone AAPS, but it is outdated (uploader/NS/xDrip/Sensor error)
+            final PendingIntent infoToast = ComplicationTapBroadcastReceiver.getTapWarningSinceIntent(
+                    aaps.getAppContext(), thisProvider, complicationId, ComplicationAction.WARNING_OLD, raw.datetime);
+            complicationData = buildOutdatedComplicationData(dataType, raw, complicationPendingIntent, infoToast, raw.datetime);
+        } else {
+            // data is up-to-date, we can render standard complication
+            complicationData = buildComplicationData(dataType, raw, complicationPendingIntent);
+        }
+
+        if (complicationData != null) {
+            complicationManager.updateComplicationData(complicationId, complicationData);
+        } else {
+            // If no data is sent, we still need to inform the ComplicationManager, so the update
+            // job can finish and the wake lock isn't held any longer than necessary.
+            complicationManager.noUpdateRequired(complicationId);
+        }
+    }
+
+    /*
+     * Called when the complication has been deactivated.
+     */
+    @Override
+    public void onComplicationDeactivated(int complicationId) {
+        Log.d(TAG, "onComplicationDeactivated(): " + complicationId);
+
+        Persistence persistence = new Persistence();
+        persistence.removeFromSet(KEY_COMPLICATIONS, "complication_"+complicationId);
+
+        if (localBroadcastManager != null && messageReceiver != null) {
+            localBroadcastManager.unregisterReceiver(messageReceiver);
+        }
+        Inevitable.kill(TASK_ID_REFRESH_COMPLICATION);
+    }
+
+    //==============================================================================================
+    // UPDATE AND REFRESH LOGIC
+    //==============================================================================================
+
+    /*
+     * Schedule check for field update
+     */
+    public static void checkIfUpdateNeeded() {
+
+        Persistence p = new Persistence();
+
+        Log.d(TAG, "Pending check if update needed - "+p.getString(KEY_COMPLICATIONS, ""));
+
+        Inevitable.task(TASK_ID_REFRESH_COMPLICATION, 15 * Constants.SECOND_IN_MS, () -> {
+            if (WearUtil.isBelowRateLimit("complication-checkIfUpdateNeeded", 5)) {
+                Log.d(TAG, "Checking if update needed");
+                requestUpdateIfSinceChanged();
+                // We reschedule need for check - to make sure next check will Inevitable go in next 15s
+                checkIfUpdateNeeded();
+            }
+        });
+
+    }
+
+    /*
+     * Check if displayed since field (field that shows how old, in minutes, is reading)
+     * is up-to-date or need to be changed (a minute or more elapsed)
+     */
+    private static void requestUpdateIfSinceChanged() {
+        final Persistence persistence = new Persistence();
+
+        final RawDisplayData raw = new RawDisplayData();
+        raw.updateForComplicationsFromPersistence(persistence);
+
+        final String lastSince = persistence.getString(KEY_LAST_SHOWN_SINCE_VALUE, "-");
+        final String calcSince = DisplayFormat.shortTimeSince(raw.datetime);
+        final boolean isStale = (WearUtil.msSince(persistence.whenDataUpdated()) > Constants.STALE_MS)
+                ||(WearUtil.msSince(raw.datetime) > Constants.STALE_MS);
+
+        final boolean staleWasRefreshed = persistence.getBoolean(KEY_STALE_REPORTED, false);
+        final boolean sinceWasChanged = !lastSince.equals(calcSince);
+
+        if (sinceWasChanged|| (isStale && !staleWasRefreshed)) {
+            persistence.putString(KEY_LAST_SHOWN_SINCE_VALUE, calcSince);
+            persistence.putBoolean(KEY_STALE_REPORTED, isStale);
+
+            Log.d(TAG, "Detected refresh of time needed! Reason: "
+                    + (isStale ? "- stale detected": "")
+                    + (sinceWasChanged ? "- since changed from: "+lastSince+" to: "+calcSince : ""));
+
+            if (isStale) {
+                // all complications should update to show offline/old warning
+                requestUpdate(getActiveProviderClasses());
+            } else {
+                // ... but only some require update due to 'since' field change
+                requestUpdate(getSinceDependingProviderClasses());
+            }
+        }
+    }
+
+    /*
+     * Request update for specified list of providers
+     */
+    private static void requestUpdate(Set<String> providers) {
+        for (String provider: providers) {
+            Log.d(TAG, "Pending update of "+provider);
+            // We wait with updating allowing all request, from various sources, to arrive
+            Inevitable.task("update-req-"+provider, 700, () -> {
+                if (WearUtil.isBelowRateLimit("update-req-"+provider, 2)) {
+                    Log.d(TAG, "Requesting update of "+provider);
+                    final ComponentName componentName = new ComponentName(aaps.getAppContext(), provider);
+                    final ProviderUpdateRequester providerUpdateRequester = new ProviderUpdateRequester(aaps.getAppContext(), componentName);
+                    providerUpdateRequester.requestUpdateAll();
+                }
+            });
+        }
+    }
+
+    /*
+     * List all Complication providing classes that have active (registered) providers
+     */
+    private static Set<String> getActiveProviderClasses() {
+        Persistence persistence = new Persistence();
+        Set<String> providers = new HashSet<>();
+        Set<String> complications = persistence.getSetOf(KEY_COMPLICATIONS);
+        for (String complication: complications) {
+            final String providerClass = persistence.getString(complication, "");
+            if (providerClass.length() > 0) {
+                providers.add(providerClass);
+            }
+        }
+        return providers;
+    }
+
+    /*
+     * List all Complication providing classes that have active (registered) providers
+     * and additionally they depend on "since" field
+     *    == they need to be updated not only on data broadcasts, but every minute or so
+     */
+    private static Set<String> getSinceDependingProviderClasses() {
+        Persistence persistence = new Persistence();
+        Set<String> providers = new HashSet<>();
+        Set<String> complications = persistence.getSetOf(KEY_COMPLICATIONS);
+        for (String complication: complications) {
+            final String providerClass = persistence.getString(complication, "");
+            final boolean dependOnSince = persistence.getBoolean(complication+"_since", false);
+            if ((providerClass.length() > 0)&&(dependOnSince)) {
+                providers.add(providerClass);
+            }
+        }
+        return providers;
+    }
+
+    /*
+     * Listen to broadcast --> new data was stored by ListenerService to Persistence
+     */
+    public class MessageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Set<String> complications = Persistence.setOf(KEY_COMPLICATIONS);
+            if (complications.size() > 0) {
+                checkIfUpdateNeeded();
+                // We request all active providers
+                requestUpdate(getActiveProviderClasses());
+            }
+        }
+    }
+
+
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/BrCobIobComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/BrCobIobComplication.java
@ -0,0 +1,49 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
+
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MIN_FIELD_LEN_COB;
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MIN_FIELD_LEN_IOB;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class BrCobIobComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = BrCobIobComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final String cob = new SmallestDoubleString(raw.sCOB2, SmallestDoubleString.Units.USE).minimise(MIN_FIELD_LEN_COB);
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(Math.max(MIN_FIELD_LEN_IOB, (MAX_FIELD_LEN_SHORT -1) - cob.length()));
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(DisplayFormat.basalRateSymbol()+raw.sBasalRate))
+                    .setShortTitle(ComplicationText.plainText(cob + " " + iob))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return BrCobIobComplication.class.getCanonicalName();
+    }
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/CobDetailedComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/CobDetailedComplication.java
@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.Pair;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class CobDetailedComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = CobDetailedComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+
+            Pair<String, String> cob = DisplayFormat.detailedCob(raw);
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(cob.first))
+                    .setTapAction(complicationPendingIntent);
+
+            if (cob.second.length() > 0) {
+                builder.setShortTitle(ComplicationText.plainText(cob.second));
+            }
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return CobDetailedComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.WIZARD;
+    };
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/CobIconComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/CobIconComplication.java
@ -0,0 +1,51 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.RawDisplayData;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class CobIconComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = CobIconComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(raw.sCOB2))
+                    .setIcon(
+                            Icon.createWithResource(
+                                    this, R.drawable.ic_carbs))
+                    .setBurnInProtectionIcon(
+                            Icon.createWithResource(
+                                    this, R.drawable.ic_carbs))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return CobIconComplication.class.getCanonicalName();
+    }
+
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.WIZARD;
+    };
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/CobIobComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/CobIobComplication.java
@ -0,0 +1,46 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
+
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class CobIobComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = CobIobComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final String cob = raw.sCOB2;
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(cob))
+                    .setShortTitle(ComplicationText.plainText(iob))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return CobIobComplication.class.getCanonicalName();
+    }
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationAction.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationAction.java
@ -0,0 +1,12 @@
+package info.nightscout.androidaps.complications;
+
+public enum ComplicationAction {
+    NONE,
+    MENU,
+    WIZARD,
+    BOLUS,
+    ECARB,
+    STATUS,
+    WARNING_SYNC,
+    WARNING_OLD
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
@ -0,0 +1,167 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.wearable.complications.ProviderUpdateRequester;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.StringRes;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
+import info.nightscout.androidaps.interaction.actions.BolusActivity;
+import info.nightscout.androidaps.interaction.actions.ECarbActivity;
+import info.nightscout.androidaps.interaction.actions.WizardActivity;
+import info.nightscout.androidaps.interaction.menus.MainMenuActivity;
+import info.nightscout.androidaps.interaction.menus.StatusMenuActivity;
+import info.nightscout.androidaps.interaction.utils.Constants;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.WearUtil;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class ComplicationTapBroadcastReceiver extends BroadcastReceiver {
+
+    private static final String TAG = ComplicationTapBroadcastReceiver.class.getSimpleName();
+
+    private static final String EXTRA_PROVIDER_COMPONENT =
+            "info.nightscout.androidaps.complications.action.PROVIDER_COMPONENT";
+    private static final String EXTRA_COMPLICATION_ID =
+            "info.nightscout.androidaps.complications.action.COMPLICATION_ID";
+    private static final String EXTRA_COMPLICATION_ACTION =
+            "info.nightscout.androidaps.complications.action.COMPLICATION_ACTION";
+    private static final String EXTRA_COMPLICATION_SINCE =
+            "info.nightscout.androidaps.complications.action.COMPLICATION_SINCE";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Bundle extras = intent.getExtras();
+        ComponentName provider = extras.getParcelable(EXTRA_PROVIDER_COMPONENT);
+        int complicationId = extras.getInt(EXTRA_COMPLICATION_ID);
+        String complicationAction = extras.getString(EXTRA_COMPLICATION_ACTION, ComplicationAction.MENU.toString());
+
+        ComplicationAction action = ComplicationAction.MENU;
+        try {
+            action = ComplicationAction.valueOf(ComplicationAction.class, complicationAction);
+        } catch (IllegalArgumentException | NullPointerException ex) {
+            // but how?
+            Log.e(TAG, "Cannot interpret complication action: "+complicationAction);
+        }
+
+        action = remapActionWithUserPreferences(action);
+
+        // Request an update for the complication that has just been tapped.
+        ProviderUpdateRequester requester = new ProviderUpdateRequester(context, provider);
+        requester.requestUpdate(complicationId);
+
+        Intent intentOpen = null;
+
+        switch (action) {
+            case NONE:
+                // do nothing
+                return;
+            case WIZARD:
+                intentOpen = new Intent(aaps.getAppContext(), WizardActivity.class);
+                break;
+            case BOLUS:
+                intentOpen = new Intent(aaps.getAppContext(), BolusActivity.class);
+                break;
+            case ECARB:
+                intentOpen = new Intent(aaps.getAppContext(), ECarbActivity.class);
+                break;
+            case STATUS:
+                intentOpen = new Intent(aaps.getAppContext(), StatusMenuActivity.class);
+                break;
+            case WARNING_OLD:
+            case WARNING_SYNC:
+                long oneAndHalfMinuteAgo = WearUtil.timestamp() - (Constants.MINUTE_IN_MS+Constants.SECOND_IN_MS * 30);
+                long since = extras.getLong(EXTRA_COMPLICATION_SINCE, oneAndHalfMinuteAgo);
+                @StringRes int labelId = (action == ComplicationAction.WARNING_SYNC) ?
+                        R.string.msg_warning_sync : R.string.msg_warning_old;
+                String msg = String.format(aaps.gs(labelId), DisplayFormat.shortTimeSince(since));
+                Toast.makeText(aaps.getAppContext(), msg, Toast.LENGTH_LONG).show();
+                break;
+            case MENU:
+            default:
+                intentOpen = new Intent(aaps.getAppContext(), MainMenuActivity.class);
+        }
+
+        if (intentOpen != null) {
+            // Perform intent - open dialog
+            intentOpen.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            aaps.getAppContext().startActivity(intentOpen);
+        }
+    }
+
+    private ComplicationAction remapActionWithUserPreferences(ComplicationAction originalAction) {
+        final String userPrefAction = aaps.getComplicationTapAction();
+        switch (originalAction) {
+            case WARNING_OLD:
+            case WARNING_SYNC:
+                // warnings cannot be reconfigured by user
+                return originalAction;
+            default:
+                switch (userPrefAction) {
+                    case "menu":
+                        return ComplicationAction.MENU;
+                    case "wizard":
+                        return ComplicationAction.WIZARD;
+                    case "bolus":
+                        return ComplicationAction.BOLUS;
+                    case "ecarb":
+                        return ComplicationAction.ECARB;
+                    case "status":
+                        return ComplicationAction.STATUS;
+                    case "none":
+                        return ComplicationAction.NONE;
+                    case "default":
+                    default:
+                        return originalAction;
+                }
+        }
+    }
+
+    /**
+     * Returns a pending intent, suitable for use as a tap intent, that causes a complication to be
+     * toggled and updated.
+     */
+    static PendingIntent getTapActionIntent(
+            Context context, ComponentName provider, int complicationId, ComplicationAction action) {
+        Intent intent = new Intent(context, ComplicationTapBroadcastReceiver.class);
+        intent.putExtra(EXTRA_PROVIDER_COMPONENT, provider);
+        intent.putExtra(EXTRA_COMPLICATION_ID, complicationId);
+        intent.putExtra(EXTRA_COMPLICATION_ACTION, action.toString());
+
+
+        // Pass complicationId as the requestCode to ensure that different complications get
+        // different intents.
+        return PendingIntent.getBroadcast(
+                context, complicationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+    /**
+     * Returns a pending intent, suitable for use as a tap intent, that causes a complication to be
+     * toggled and updated.
+     */
+    static PendingIntent getTapWarningSinceIntent(
+            Context context, ComponentName provider, int complicationId, ComplicationAction action, long since) {
+        Intent intent = new Intent(context, ComplicationTapBroadcastReceiver.class);
+        intent.putExtra(EXTRA_PROVIDER_COMPONENT, provider);
+        intent.putExtra(EXTRA_COMPLICATION_ID, complicationId);
+        intent.putExtra(EXTRA_COMPLICATION_ACTION, action.toString());
+        intent.putExtra(EXTRA_COMPLICATION_SINCE, since);
+
+
+        // Pass complicationId as the requestCode to ensure that different complications get
+        // different intents.
+        return PendingIntent.getBroadcast(
+                context, complicationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/IobDetailedComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/IobDetailedComplication.java
@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+import info.nightscout.androidaps.interaction.utils.Pair;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class IobDetailedComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = IobDetailedComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+
+            Pair<String, String> iob = DisplayFormat.detailedIob(raw);
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(iob.first))
+                    .setTapAction(complicationPendingIntent);
+
+            if (iob.second.length() > 0) {
+                builder.setShortTitle(ComplicationText.plainText(iob.second));
+            }
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return IobDetailedComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.BOLUS;
+    };
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/IobIconComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/IobIconComplication.java
@ -0,0 +1,56 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Icon;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.SmallestDoubleString;
+
+import static info.nightscout.androidaps.interaction.utils.DisplayFormat.MAX_FIELD_LEN_SHORT;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class IobIconComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = IobIconComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        if (dataType == ComplicationData.TYPE_SHORT_TEXT) {
+            final String iob = new SmallestDoubleString(raw.sIOB1, SmallestDoubleString.Units.USE).minimise(MAX_FIELD_LEN_SHORT);
+
+            final ComplicationData.Builder builder = new ComplicationData.Builder(ComplicationData.TYPE_SHORT_TEXT)
+                    .setShortText(ComplicationText.plainText(iob))
+                    .setIcon(Icon.createWithResource(
+                            this, R.drawable.ic_ins))
+                    .setBurnInProtectionIcon(
+                            Icon.createWithResource(
+                                    this, R.drawable.ic_ins_burnin))
+                    .setTapAction(complicationPendingIntent);
+
+            complicationData = builder.build();
+        } else {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Unexpected complication type " + dataType);
+            }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return IobIconComplication.class.getCanonicalName();
+    }
+
+    @Override
+    public ComplicationAction getComplicationAction() {
+        return ComplicationAction.BOLUS;
+    };
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusComplication.java
@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class LongStatusComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = LongStatusComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        switch (dataType) {
+            case ComplicationData.TYPE_LONG_TEXT:
+
+                final String glucoseLine = DisplayFormat.longGlucoseLine(raw);
+                final String detailsLine = DisplayFormat.longDetailsLine(raw);
+
+                final ComplicationData.Builder builderLong = new ComplicationData.Builder(ComplicationData.TYPE_LONG_TEXT)
+                        .setLongTitle(ComplicationText.plainText(glucoseLine))
+                        .setLongText(ComplicationText.plainText(detailsLine))
+                        .setTapAction(complicationPendingIntent);
+                complicationData = builderLong.build();
+
+                break;
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return LongStatusComplication.class.getCanonicalName();
+    }
+
+    @Override
+    protected boolean usesSinceField() {
+        return true;
+    }
+}
--- a/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusFlippedComplication.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/LongStatusFlippedComplication.java
@ -0,0 +1,52 @@
+package info.nightscout.androidaps.complications;
+
+import android.app.PendingIntent;
+import android.support.wearable.complications.ComplicationData;
+import android.support.wearable.complications.ComplicationText;
+import android.util.Log;
+
+import info.nightscout.androidaps.data.RawDisplayData;
+import info.nightscout.androidaps.interaction.utils.DisplayFormat;
+
+/*
+ * Created by dlvoy on 2019-11-12
+ */
+public class LongStatusFlippedComplication extends BaseComplicationProviderService {
+
+    private static final String TAG = LongStatusFlippedComplication.class.getSimpleName();
+
+    public ComplicationData buildComplicationData(int dataType, RawDisplayData raw, PendingIntent complicationPendingIntent) {
+
+        ComplicationData complicationData = null;
+
+        switch (dataType) {
+            case ComplicationData.TYPE_LONG_TEXT:
+
+                final String glucoseLine = DisplayFormat.longGlucoseLine(raw);
+                final String detailsLine = DisplayFormat.longDetailsLine(raw);
+
+                final ComplicationData.Builder builderLong = new ComplicationData.Builder(ComplicationData.TYPE_LONG_TEXT)
+                        .setLongTitle(ComplicationText.plainText(detailsLine))
+                        .setLongText(ComplicationText.plainText(glucoseLine))
+                        .setTapAction(complicationPendingIntent);
+                complicationData = builderLong.build();
+
+                break;
+            default:
+                if (Log.isLoggable(TAG, Log.WARN)) {
+                    Log.w(TAG, "Unexpected complication type " + dataType);
+                }
+        }
+        return complicationData;
+    }
+
+    @Override
+    public String getProviderCanonicalName() {
+        return LongStatusFlippedComplication.class.getCanonicalName();
+    }
+
+    @Override
+    protected boolean usesSinceField() {
+        return true;
+    }
+}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M20.07,4.93L18.66,6.34C21.79,9.46 21.79,14.53 18.66,17.66L20.07,19.07C23.97,15.17 23.97,8.84 20.07,4.93M17.24,7.76L15.83,9.17C17.39,10.73 17.39,13.26 15.83,14.83L17.24,16.24C19.58,13.9 19.58,10.1 17.24,7.76M13,4H11V2H5V4H3A1,1 0 0,0 2,5V21A1,1 0 0,0 3,22H13A1,1 0 0,0 14,21V5A1,1 0 0,0 13,4M12,18.5H4V6H12V18.5Z" /></svg>
				`@ -0,0 +1 @@`
				`<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,20H8V6H16M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z" /></svg>`