diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index 2cbd13c683..f904a06eb4 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -111,5 +111,4 @@
 
     </LinearLayout>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_survey.xml b/app/src/main/res/layout/activity_survey.xml
index 835cf769af..ae711855bf 100644
--- a/app/src/main/res/layout/activity_survey.xml
+++ b/app/src/main/res/layout/activity_survey.xml
@@ -177,7 +177,6 @@
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-
     </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/careportal_stats_fragment.xml b/app/src/main/res/layout/careportal_stats_fragment.xml
index df85552e4f..cccb4541d7 100644
--- a/app/src/main/res/layout/careportal_stats_fragment.xml
+++ b/app/src/main/res/layout/careportal_stats_fragment.xml
@@ -112,7 +112,6 @@
             android:paddingEnd="2dp"
             android:textSize="14sp" />
 
-
         <TextView
             android:id="@+id/insulin_level_label"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 71b771bb15..2e44aa81c3 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -242,7 +242,6 @@
                 android:text="+20"
                 tools:ignore="HardcodedText" />
 
-
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 808f8d47f1..fdea04ea7a 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -115,11 +115,10 @@
 
         </LinearLayout>
 
-
         <include
             android:id="@+id/okcancel"
             layout="@layout/okcancel" />
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_loop.xml b/app/src/main/res/layout/dialog_loop.xml
index f0289139d3..5f0cad9ba3 100644
--- a/app/src/main/res/layout/dialog_loop.xml
+++ b/app/src/main/res/layout/dialog_loop.xml
@@ -46,7 +46,6 @@
             android:orientation="horizontal"
             android:padding="5dp" />
 
-
         <LinearLayout
             android:id="@+id/overview_loop"
             android:layout_width="fill_parent"
@@ -177,7 +176,6 @@
                 android:text="@string/suspendloop"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-
             <info.nightscout.androidaps.utils.ui.SingleClickButton
                 android:id="@+id/overview_resume"
                 style="@style/ButtonSmallFontStyle"
@@ -229,7 +227,6 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     android:textSize="11sp" />
 
-
                 <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_suspend_3h"
                     style="@style/ButtonSmallFontStyle"
@@ -244,7 +241,6 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     android:textSize="11sp" />
 
-
                 <info.nightscout.androidaps.utils.ui.SingleClickButton
                     android:id="@+id/overview_suspend_10h"
                     style="@style/ButtonSmallFontStyle"
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 8dfca79eae..8531857cbb 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -61,7 +61,6 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-
         <LinearLayout
             android:id="@+id/reuselayout"
             android:layout_width="match_parent"
@@ -234,4 +233,3 @@
     </LinearLayout>
 
 </ScrollView>
-
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 9064fe76d2..08fa04d594 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -476,7 +476,6 @@
                         android:checked="false"
                         android:text="@string/bg_trend_label" />
 
-
                     <TextView
                         android:id="@+id/bg_trend"
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/food_fragment.xml b/app/src/main/res/layout/food_fragment.xml
index bac511d180..a64274ad54 100644
--- a/app/src/main/res/layout/food_fragment.xml
+++ b/app/src/main/res/layout/food_fragment.xml
@@ -72,7 +72,6 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/food_item.xml b/app/src/main/res/layout/food_item.xml
index af7be5d91d..fd529084aa 100644
--- a/app/src/main/res/layout/food_item.xml
+++ b/app/src/main/res/layout/food_item.xml
@@ -137,7 +137,6 @@
         </LinearLayout>
 
 
-
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 785cb700c1..f1bd26f410 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -347,5 +347,3 @@
     </LinearLayout>
 
 </ScrollView>
-
-
diff --git a/app/src/main/res/layout/logsettings_item.xml b/app/src/main/res/layout/logsettings_item.xml
index 0c4634ac90..5a64ac9b08 100644
--- a/app/src/main/res/layout/logsettings_item.xml
+++ b/app/src/main/res/layout/logsettings_item.xml
@@ -13,11 +13,10 @@
         android:textSize="12sp"
         tools:text="TYPE" />
 
-
     <CheckBox
         android:id="@+id/logsettings_visibility"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:saveEnabled="false" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/maintenance_fragment.xml b/app/src/main/res/layout/maintenance_fragment.xml
index b715bf3133..e059bf928c 100644
--- a/app/src/main/res/layout/maintenance_fragment.xml
+++ b/app/src/main/res/layout/maintenance_fragment.xml
@@ -84,7 +84,6 @@
             android:text="@string/nav_import"
             android:textColor="?attr/treatmentButton" />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/export_csv"
             style="@style/GrayButton"
diff --git a/app/src/main/res/layout/overview_editquickwizard_dialog.xml b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
index b9cc1f8ca4..19e9140002 100644
--- a/app/src/main/res/layout/overview_editquickwizard_dialog.xml
+++ b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
@@ -246,7 +246,6 @@
 
         </RadioGroup>
 
-
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index c8e73887b7..b787e50049 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -42,7 +42,6 @@
         app:layout_constraintTop_toTopOf="@+id/bg"
         tools:ignore="HardcodedText" />
 
-
     <LinearLayout
         android:id="@+id/arrows_layout"
         android:layout_width="wrap_content"
@@ -420,4 +419,4 @@
             tools:ignore="HardcodedText" />
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 594721d43e..25301a3bb6 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -147,7 +147,6 @@
 
                 </LinearLayout>
 
-
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c64cb175a7..b4c15f6ed8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <resources>
 
-
     <!--
 Refer to App Widget Documentation for margin information
 http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 74f76fe8cf..00fc05980d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,12 +13,10 @@
     <style name="AppTheme.Launcher.AppWidgetContainer" parent="AppTheme.Launcher.AppWidgetContainerParent">
         <!-- Apply padding to avoid the content of the widget colliding with the rounded corners -->
         <item name="appWidgetPadding">16dp</item>
-
-
         <item name="icBolusColor">@color/colorInsulinButton</item>
         <item name="icBolusCarbsColor">@color/colorCarbsButton</item>
         <item name="defaultTextColor">@color/white</item>
 
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 945161d9af..ebe3e0ec92 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -113,14 +113,12 @@
             validate:minNumber="15"
             validate:testType="numericRange" />
 
-
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_uam"
             android:summary="@string/enableuam_summary"
             android:title="@string/enableuam" />
 
-
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_sensitivity_raises_target"
diff --git a/app/src/main/res/xml/pref_openapssmbdynamicisf.xml b/app/src/main/res/xml/pref_openapssmbdynamicisf.xml
index 8c7aeba6d1..135771f768 100644
--- a/app/src/main/res/xml/pref_openapssmbdynamicisf.xml
+++ b/app/src/main/res/xml/pref_openapssmbdynamicisf.xml
@@ -124,14 +124,12 @@
             validate:minNumber="15"
             validate:testType="numericRange" />
 
-
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_uam"
             android:summary="@string/enableuam_summary"
             android:title="@string/enableuam" />
 
-
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_sensitivity_raises_target"
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index 18c27d2d44..bfeee6b32e 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -164,7 +164,6 @@
                 validate:floatminNumber="4.0"
                 validate:testType="floatNumericRange" />
 
-
             <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="0"
                 android:inputType="number"
@@ -174,7 +173,6 @@
                 validate:minNumber="15"
                 validate:testType="numericRange" />
 
-
             <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="0"
                 android:inputType="numberDecimal"
@@ -202,7 +200,6 @@
                 validate:floatminNumber="6.0"
                 validate:testType="floatNumericRange" />
 
-
         </androidx.preference.PreferenceScreen>
 
         <androidx.preference.PreferenceScreen
@@ -236,7 +233,6 @@
                 validate:floatminNumber="0.05"
                 validate:testType="floatNumericRange" />
 
-
         </androidx.preference.PreferenceScreen>
 
         <androidx.preference.PreferenceScreen
@@ -512,4 +508,4 @@
 
     </PreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_safety.xml b/app/src/main/res/xml/pref_safety.xml
index 6113be6c13..641ddf6aee 100644
--- a/app/src/main/res/xml/pref_safety.xml
+++ b/app/src/main/res/xml/pref_safety.xml
@@ -25,7 +25,6 @@
             validate:floatminNumber="0.1"
             validate:testType="floatNumericRange" />
 
-
         <EditTextPreference
             android:defaultValue="48"
             android:inputType="numberDecimal"
@@ -37,4 +36,4 @@
 
     </PreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/combo/src/main/res/layout/combopump_fragment.xml b/combo/src/main/res/layout/combopump_fragment.xml
index 3236dbc7d7..3225c78e76 100644
--- a/combo/src/main/res/layout/combopump_fragment.xml
+++ b/combo/src/main/res/layout/combopump_fragment.xml
@@ -109,7 +109,6 @@
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/core/src/main/res/layout/activity_tdd_stats.xml b/core/src/main/res/layout/activity_tdd_stats.xml
index ee232f769f..e73f296e22 100644
--- a/core/src/main/res/layout/activity_tdd_stats.xml
+++ b/core/src/main/res/layout/activity_tdd_stats.xml
@@ -146,7 +146,6 @@
         </LinearLayout>
     </ScrollView>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -189,4 +188,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index ff02e8002f..68c425d34d 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -70,7 +70,6 @@
     <color name="list_delimiter">#505050</color>
     <color name="basal">#00ffff</color>
 
-
     <!--    Loop     -->
     <color name="loopDisconnected">#939393</color>
     <color name="loopClosed">#00C03E</color>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 400d3af6df..c0dd2233f5 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -45,7 +45,6 @@
     <color name="ic_local_reset">#E93057</color>
     <color name="ic_local_save">#67E86A</color>
 
-
     <!--    Fragments-->
     <color name="pumpStatusBackground">#CCCCCC</color>
 
@@ -71,7 +70,6 @@
     <color name="list_delimiter">#505050</color>
     <color name="basal">#00ffff</color>
 
-
     <!--    Loop     -->
     <color name="loopDisconnected">#939393</color>
     <color name="loopClosed">#00C03E</color>
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index 034d176906..e26919aebd 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -54,7 +54,6 @@
                     android:textSize="14sp"
                     tools:ignore="RtlSymmetry" />
 
-
             </LinearLayout>
 
             <View
@@ -105,7 +104,6 @@
                     android:textSize="14sp"
                     tools:ignore="HardcodedText,RtlSymmetry" />
 
-
             </LinearLayout>
 
             <View
@@ -154,7 +152,6 @@
                     android:textSize="14sp"
                     tools:ignore="RtlSymmetry" />
 
-
             </LinearLayout>
 
             <View
@@ -672,7 +669,6 @@
             android:paddingEnd="0dp"
             android:text="@string/viewprofile" />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/history"
             style="@style/ButtonSmallFontStyle"
diff --git a/dana/src/main/res/layout/danar_history_activity.xml b/dana/src/main/res/layout/danar_history_activity.xml
index 8ee98515b3..726ba70805 100644
--- a/dana/src/main/res/layout/danar_history_activity.xml
+++ b/dana/src/main/res/layout/danar_history_activity.xml
@@ -8,7 +8,6 @@
     android:layout_height="fill_parent"
     tools:context="info.nightscout.androidaps.dana.activities.DanaHistoryActivity">
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/header"
         android:layout_width="0dp"
diff --git a/danars/src/main/res/layout/danars_enter_pin_activity.xml b/danars/src/main/res/layout/danars_enter_pin_activity.xml
index 0c48780c5d..4d3bb1648f 100644
--- a/danars/src/main/res/layout/danars_enter_pin_activity.xml
+++ b/danars/src/main/res/layout/danars_enter_pin_activity.xml
@@ -65,7 +65,6 @@
         android:text="@string/num2pin"
         android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-
     <EditText
         android:id="@+id/rs_v3_pin2"
         android:layout_width="match_parent"
@@ -90,4 +89,4 @@
         android:id="@+id/okcancel"
         layout="@layout/okcancel" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
index ea0bae3d66..b61e233549 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
@@ -5,7 +5,6 @@
     android:paddingTop="5dp"
     tools:context="info.nightscout.androidaps.diaconn.DiaconnG8Fragment">
 
-
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -73,7 +72,6 @@
                         android:paddingStart="5dp"
                         android:textSize="14sp" />
 
-
                 </LinearLayout>
 
                 <View
@@ -122,7 +120,6 @@
                         android:textSize="20dp"
                         tools:ignore="HardcodedText" />
 
-
                 </LinearLayout>
 
                 <TextView
@@ -177,7 +174,6 @@
                         android:paddingStart="5dp"
                         android:textSize="20sp" />
 
-
                 </LinearLayout>
 
                 <View
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
index 548d868952..98f725b89f 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
@@ -6,7 +6,6 @@
     android:layout_height="fill_parent"
     tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity">
 
-
     <RelativeLayout
         android:id="@+id/header"
         android:layout_width="match_parent"
diff --git a/diaconn/src/main/res/values/arrays.xml b/diaconn/src/main/res/values/arrays.xml
index ab98405145..f813bedce0 100644
--- a/diaconn/src/main/res/values/arrays.xml
+++ b/diaconn/src/main/res/values/arrays.xml
@@ -44,5 +44,4 @@
         <item>3</item>
     </string-array>
 
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/diaconn/src/main/res/values/strings.xml b/diaconn/src/main/res/values/strings.xml
index 686e5ededc..ac1ad0868e 100644
--- a/diaconn/src/main/res/values/strings.xml
+++ b/diaconn/src/main/res/values/strings.xml
@@ -167,5 +167,4 @@
     <string name="diaconn_g8_errorcode_35">Tempbasal start is rejected  when tempbasal is running</string>
     <string name="diaconn_g8_errorcode_36">Tempbasal stop is rejected  when tempbasal is not running</string>
 
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/insight/src/main/res/layout/activity_insight_pairing.xml b/insight/src/main/res/layout/activity_insight_pairing.xml
index 0f408a088e..514eae9252 100644
--- a/insight/src/main/res/layout/activity_insight_pairing.xml
+++ b/insight/src/main/res/layout/activity_insight_pairing.xml
@@ -104,5 +104,4 @@
             android:text="@string/exit" />
     </LinearLayout>
 
-
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/medtronic/src/main/res/values/strings.xml b/medtronic/src/main/res/values/strings.xml
index 0e247f48b1..eaa378f712 100644
--- a/medtronic/src/main/res/values/strings.xml
+++ b/medtronic/src/main/res/values/strings.xml
@@ -79,7 +79,6 @@
     <!--    <string name="medtronic_history_group_all">All</string>-->
     <string name="medtronic_pump_history">Medtronic Pump History</string>
 
-
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">You cancelled Bolus, after it was already set on Pump. Since Medtronic Pump doesn\'t support cancel, you will need to manually cancel it. Put the Pump into Suspend mode and then do Resume (if you still want to cancel). Application will pick up changes, on next update (in less than 5 minutes).</string>
     <string name="medtronic_cmd_cant_read_tbr">Could not read current TBR.</string>
@@ -126,4 +125,4 @@
     <string name="riley_statistics">RL Stats</string>
     <string name="medtronic_history_type">Type:</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/medtronic/src/main/res/xml/pref_medtronic.xml b/medtronic/src/main/res/xml/pref_medtronic.xml
index 40a70aa22b..77300cc8df 100644
--- a/medtronic/src/main/res/xml/pref_medtronic.xml
+++ b/medtronic/src/main/res/xml/pref_medtronic.xml
@@ -18,7 +18,6 @@
             validate:testErrorString="@string/error_mustbe6digitnumber"
             validate:testType="regexp" />
 
-
         <ListPreference
             android:defaultValue="1"
             android:entries="@array/medtronicPumpTypeArray"
@@ -26,7 +25,6 @@
             android:key="@string/key_medtronic_pump_type"
             android:title="@string/medtronic_pump_type" />
 
-
         <ListPreference
             android:defaultValue="@string/key_medtronic_pump_frequency_us_ca"
             android:entries="@array/medtronicPumpFreqArray"
@@ -117,4 +115,4 @@
 
     </PreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
index 42cf74988f..bfab0bee96 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
@@ -28,7 +28,6 @@
             android:textSize="14sp"
             tools:ignore="HardcodedText" />
 
-
         <TextView
             android:id="@+id/omnipod_dash_bluetooth_address"
             android:layout_width="match_parent"
@@ -160,6 +159,7 @@
             android:textSize="14sp"
             tools:ignore="HardcodedText" />
     </LinearLayout>
+
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
@@ -168,4 +168,5 @@
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
-</merge>
\ No newline at end of file
+
+</merge>
diff --git a/pump-common/src/main/res/values/strings.xml b/pump-common/src/main/res/values/strings.xml
index cdbe2ba8bf..cfd76262bc 100644
--- a/pump-common/src/main/res/values/strings.xml
+++ b/pump-common/src/main/res/values/strings.xml
@@ -28,5 +28,4 @@
     <string name="history_group_alarm">Alarms</string>
     <string name="history_group_glucose">Glucose</string>
 
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml
index ed1f4e8159..dd3293ba48 100644
--- a/rileylink/src/main/res/layout/rileylink_status_general.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_general.xml
@@ -114,7 +114,6 @@
                     android:textAlignment="center" />
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -143,7 +142,6 @@
                     android:textAlignment="center" />
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -335,7 +333,6 @@
                     android:textAlignment="center" />
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -392,7 +389,6 @@
                     android:textAlignment="center" />
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -425,4 +421,4 @@
 
     </ScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wear/src/main/res/drawable/settings_background.xml b/wear/src/main/res/drawable/settings_background.xml
index 97632802ac..ae00ffc64b 100644
--- a/wear/src/main/res/drawable/settings_background.xml
+++ b/wear/src/main/res/drawable/settings_background.xml
@@ -8,5 +8,4 @@
 
     <item android:drawable="@drawable/nslogo_background" />
 
-
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/wear/src/main/res/layout/action_editplusminus_item.xml b/wear/src/main/res/layout/action_editplusminus_item.xml
index 8ea1826e77..be5b622dbe 100644
--- a/wear/src/main/res/layout/action_editplusminus_item.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item.xml
@@ -3,7 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -61,5 +60,7 @@
             android:backgroundTint="#ffffff"
             android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
-</LinearLayout>
+
+    </LinearLayout>
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
index defa4d274d..980677522c 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
@@ -3,7 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -64,5 +63,7 @@
                 android:tint="#ffffff" />
 
         </LinearLayout>
-</LinearLayout>
+
+    </LinearLayout>
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
index 31c6251f4b..a1b2107768 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
@@ -3,7 +3,6 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -54,6 +53,7 @@
                 android:tint="#ffffff" />
 
         </LinearLayout>
+
         <ImageView
             android:id="@+id/plusbutton"
             android:layout_width="wrap_content"
@@ -63,5 +63,7 @@
             android:backgroundTint="#ffffff"
             android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
-</LinearLayout>
+
+    </LinearLayout>
+
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/action_send_item.xml b/wear/src/main/res/layout/action_send_item.xml
index 9a31d53271..fd0d4c89b9 100644
--- a/wear/src/main/res/layout/action_send_item.xml
+++ b/wear/src/main/res/layout/action_send_item.xml
@@ -3,13 +3,13 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:gravity="center">
+
         <ImageView
             android:id="@+id/confirmbutton"
             android:layout_width="wrap_content"
@@ -22,7 +22,5 @@
             android:padding="25sp"
             android:layout_margin="10sp"/>
 
-
-
-</LinearLayout>
+    </LinearLayout>
 </RelativeLayout>
diff --git a/wear/src/main/res/layout/modern_layout.xml b/wear/src/main/res/layout/modern_layout.xml
index c1d429b229..9837a8a2aa 100644
--- a/wear/src/main/res/layout/modern_layout.xml
+++ b/wear/src/main/res/layout/modern_layout.xml
@@ -9,7 +9,6 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true">
 
-
         <TextView android:id="@+id/agoString"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -49,5 +48,6 @@
             android:layout_gravity="center"
             android:layout_marginTop="-5dp" />
 
-</LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/wear/src/main/res/layout/rect_activity_home.xml b/wear/src/main/res/layout/rect_activity_home.xml
index a9dfa846bd..c619efbb37 100644
--- a/wear/src/main/res/layout/rect_activity_home.xml
+++ b/wear/src/main/res/layout/rect_activity_home.xml
@@ -73,7 +73,6 @@
                     android:gravity="center_horizontal|bottom"
                     android:textStyle="bold" />
 
-
             </LinearLayout>
 
         </LinearLayout>
diff --git a/wear/src/main/res/layout/rect_activity_home_2.xml b/wear/src/main/res/layout/rect_activity_home_2.xml
index 3ebfbaac8e..6f8e811f22 100644
--- a/wear/src/main/res/layout/rect_activity_home_2.xml
+++ b/wear/src/main/res/layout/rect_activity_home_2.xml
@@ -324,7 +324,6 @@
                     android:orientation="vertical"
                     android:textAlignment="center">
 
-
                     <TextView
                         android:id="@+id/iob_text"
                         android:layout_width="wrap_content"
diff --git a/wear/src/main/res/layout/rect_activity_home_large.xml b/wear/src/main/res/layout/rect_activity_home_large.xml
index cefee9116b..5853c487d1 100644
--- a/wear/src/main/res/layout/rect_activity_home_large.xml
+++ b/wear/src/main/res/layout/rect_activity_home_large.xml
@@ -117,7 +117,6 @@
                     android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
 
-
             </LinearLayout>
 
         </LinearLayout>
diff --git a/wear/src/main/res/layout/rect_cockpit.xml b/wear/src/main/res/layout/rect_cockpit.xml
index a1b65652e8..ca09d8be69 100644
--- a/wear/src/main/res/layout/rect_cockpit.xml
+++ b/wear/src/main/res/layout/rect_cockpit.xml
@@ -5,7 +5,6 @@
     android:id="@+id/main_layout"
     android:background="@drawable/airplane_cockpit_outside_clouds">
 
-
     <LinearLayout
         android:id="@+id/inside"
         android:layout_width="fill_parent"
@@ -488,4 +487,4 @@
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/wear/src/main/res/layout/rect_steampunk.xml b/wear/src/main/res/layout/rect_steampunk.xml
index e88ab41c5c..771a03b619 100644
--- a/wear/src/main/res/layout/rect_steampunk.xml
+++ b/wear/src/main/res/layout/rect_steampunk.xml
@@ -89,7 +89,6 @@
                     android:layout_weight="0.16"
                     android:orientation="horizontal">
 
-
                     <TextView
                         android:id="@+id/cobView"
                         android:layout_width="match_parent"
@@ -334,7 +333,6 @@
         android:orientation="vertical">
     </LinearLayout>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/wear/src/main/res/layout/round_activity_home_2.xml b/wear/src/main/res/layout/round_activity_home_2.xml
index 622076add7..0bb9af387a 100644
--- a/wear/src/main/res/layout/round_activity_home_2.xml
+++ b/wear/src/main/res/layout/round_activity_home_2.xml
@@ -331,7 +331,6 @@
                     android:orientation="vertical"
                     android:textAlignment="center">
 
-
                     <TextView
                         android:id="@+id/iob_text"
                         android:layout_width="wrap_content"
diff --git a/wear/src/main/res/layout/round_cockpit.xml b/wear/src/main/res/layout/round_cockpit.xml
index a6564c00c9..44a91fe29c 100644
--- a/wear/src/main/res/layout/round_cockpit.xml
+++ b/wear/src/main/res/layout/round_cockpit.xml
@@ -5,7 +5,6 @@
     android:id="@+id/main_layout"
     android:background="@drawable/airplane_cockpit_outside_clouds">
 
-
     <LinearLayout
         android:id="@+id/inside"
         android:layout_width="fill_parent"
diff --git a/wear/src/main/res/layout/round_steampunk.xml b/wear/src/main/res/layout/round_steampunk.xml
index 6e586a4251..12ff642119 100644
--- a/wear/src/main/res/layout/round_steampunk.xml
+++ b/wear/src/main/res/layout/round_steampunk.xml
@@ -89,7 +89,6 @@
                     android:layout_weight="0.165"
                     android:orientation="horizontal">
 
-
                     <TextView
                         android:id="@+id/cobView"
                         android:layout_width="match_parent"
@@ -334,7 +333,6 @@
         android:orientation="vertical">
     </LinearLayout>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/wear/src/main/res/values/colors.xml b/wear/src/main/res/values/colors.xml
index 708cec0302..aa737084cb 100644
--- a/wear/src/main/res/values/colors.xml
+++ b/wear/src/main/res/values/colors.xml
@@ -4,7 +4,6 @@
     <color name="cardObjectiveText">#779ECB</color>
     <color name="titleHeader">#D9000000</color>
 
-
     <!-- light colors -->
     <color name="light_bigchart_time">@color/black</color>
     <color name="light_bigchart_status">@color/black</color>
@@ -46,7 +45,6 @@
     <color name="colorTemptButton">#CF8BFE</color>
     <color name="colorPrimeButton">#FBC02D</color>
 
-
     <color name="inrange">#00FF00</color>
     <color name="exercise">#67DFE8</color>
     <color name="carbs">#FFFB8C00</color>
@@ -186,4 +184,5 @@
     <!-- Black / White-->
     <color name="black">#000000</color>
     <color name="white">#FFFFFF</color>
-</resources>
\ No newline at end of file
+
+</resources>
diff --git a/wear/src/main/res/values/digitalstyle_arrays.xml b/wear/src/main/res/values/digitalstyle_arrays.xml
index 25f16564fe..a0d852fd83 100644
--- a/wear/src/main/res/values/digitalstyle_arrays.xml
+++ b/wear/src/main/res/values/digitalstyle_arrays.xml
@@ -60,7 +60,6 @@
         <item>multicolor</item>
     </string-array>
 
-
     <string-array name="digitalstyle_color_saturation">
         <item>100</item>
         <item>500</item>
@@ -68,7 +67,6 @@
         <item>900</item>
     </string-array>
 
-
     <string-array name="digitalstyle_color_opacity_name">
         <item>10%</item>
         <item>20%</item>
@@ -94,5 +92,4 @@
         <item>1</item>
     </string-array>
 
-
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wear/src/main/res/xml/watch_face_configuration_bigchart.xml b/wear/src/main/res/xml/watch_face_configuration_bigchart.xml
index a5f5010bdc..93fca4db9e 100644
--- a/wear/src/main/res/xml/watch_face_configuration_bigchart.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_bigchart.xml
@@ -2,7 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="dark"
diff --git a/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml b/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml
index 6e33c5d610..7f0a7ff7e9 100644
--- a/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml
@@ -2,7 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <ListPreference
         android:defaultValue="full"
         android:entries="@array/digitalstyle_styles_name"
diff --git a/wear/src/main/res/xml/watch_face_configuration_nochart.xml b/wear/src/main/res/xml/watch_face_configuration_nochart.xml
index a8d78f9d7c..93fca4db9e 100644
--- a/wear/src/main/res/xml/watch_face_configuration_nochart.xml
+++ b/wear/src/main/res/xml/watch_face_configuration_nochart.xml
@@ -10,7 +10,6 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="vibrate_Hourly"