diff --git a/app/src/main/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml
index 8d3cbd992..8ed5bae82 100644
--- a/app/src/main/res/values-v16/styles.xml
+++ b/app/src/main/res/values-v16/styles.xml
@@ -4,7 +4,7 @@
     <style name="BodyTextV16" parent="BodyTextBase">
         <item name="android:lineSpacingMultiplier">1.25</item>
     </style>
-    <style name="BodyText" parent="BodyTextV16" />
+    <style name="BodyText" parent="BodyTextV16"/>
 
     <style name="AppListItemStatusText" parent="AppListItemStatusTextBase">
         <item name="android:fontFamily">sans-serif-light</item>
diff --git a/app/src/main/res/values-v17/styles.xml b/app/src/main/res/values-v17/styles.xml
index 26165dfa1..79d23f125 100644
--- a/app/src/main/res/values-v17/styles.xml
+++ b/app/src/main/res/values-v17/styles.xml
@@ -5,13 +5,13 @@
         <item name="android:textDirection">locale</item>
     </style>
 
-    <style name="CaptionText" parent="CaptionTextV17" />
+    <style name="CaptionText" parent="CaptionTextV17"/>
 
     <style name="BodyTextV17" parent="BodyTextV16">
         <item name="android:textDirection">locale</item>
     </style>
 
-    <style name="BodyText" parent="BodyTextV17" />
+    <style name="BodyText" parent="BodyTextV17"/>
 
     <style name="SwapTheme.AppList.SwapSuccess" parent="SwapTheme.AppList.SwapSuccessBase">
         <item name="android:textAlignment">center</item>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 0307b95b6..4e2777222 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -8,6 +8,6 @@
     </style>
 
     <!-- see http://stackoverflow.com/questions/32169303/activity-did-not-call-finish-api-23 -->
-    <style name="AppThemeTransparent" parent="@android:style/Theme.Translucent.NoTitleBar" />
+    <style name="AppThemeTransparent" parent="@android:style/Theme.Translucent.NoTitleBar"/>
 
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7a31395eb..3aa2b9f5d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <declare-styleable name="Theme">
-        <attr name="appDetailsBackground" format="color" />
-        <attr name="appDetailsCardBackground" format="color" />
-        <attr name="categoryPreviewAppCardBackground" format="reference" />
-        <attr name="mainTabSwapBackground" format="color" />
-        <attr name="mainTabSwapSplashTint" format="color" />
-        <attr name="categoryName" format="color" />
-        <attr name="installedApps" format="color" />
-        <attr name="detailPanel" format="reference" />
-        <attr name="appListItem" format="color" />
-        <attr name="lightGrayTextColor" format="color" />
-        <attr name="antiFeaturesWarning" format="reference" />
-        <attr name="backButtonDrawable" format="reference" />
-        <attr name="clearButtonDrawable" format="reference" />
+        <attr name="appDetailsBackground" format="color"/>
+        <attr name="appDetailsCardBackground" format="color"/>
+        <attr name="categoryPreviewAppCardBackground" format="reference"/>
+        <attr name="mainTabSwapBackground" format="color"/>
+        <attr name="mainTabSwapSplashTint" format="color"/>
+        <attr name="categoryName" format="color"/>
+        <attr name="installedApps" format="color"/>
+        <attr name="detailPanel" format="reference"/>
+        <attr name="appListItem" format="color"/>
+        <attr name="lightGrayTextColor" format="color"/>
+        <attr name="antiFeaturesWarning" format="reference"/>
+        <attr name="backButtonDrawable" format="reference"/>
+        <attr name="clearButtonDrawable" format="reference"/>
     </declare-styleable>
 
     <integer name="unhidePin">1337</integer>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 09fe45d56..c49c85d9b 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_description">F-Droid is an installable catalogue of FOSS (Free and Open Source Software) applications for the Android platform. The client makes it easy to browse, install, and keep track of updates on your device.</string>
+    <string name="app_description">F-Droid is an installable catalogue of FOSS (Free and Open Source Software)
+        applications for the Android platform. The client makes it easy to browse, install, and keep track of updates
+        on your device.
+    </string>
 
     <string name="site_link">https://f-droid.org</string>
     <string name="source_link">https://gitlab.com/fdroid/fdroidclient</string>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 865c8c622..07fa4d94a 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="preference_fragment_parent" />
+    <item type="id" name="preference_fragment_parent"/>
 
-  <item type="id" name="whats_new_feature" />
-  <item type="id" name="whats_new_large_tile" />
-  <item type="id" name="whats_new_small_tile" />
-  <item type="id" name="whats_new_regular_list" />
+    <item type="id" name="whats_new_feature"/>
+    <item type="id" name="whats_new_large_tile"/>
+    <item type="id" name="whats_new_small_tile"/>
+    <item type="id" name="whats_new_regular_list"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8789fe218..d34733560 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,18 +79,18 @@
         <!-- customizations that are not API-level specific go here. -->
     </style>
 
-    <style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert" />
+    <style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert"/>
     <style name="AlertDialogThemeDark" parent="AlertDialogBaseThemeDark">
         <item name="colorAccent">@color/fdroid_green</item>
         <item name="android:windowBackground">@color/cardview_dark_background</item>
     </style>
 
-    <style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert" />
+    <style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert"/>
     <style name="AlertDialogThemeLight" parent="AlertDialogBaseThemeLight">
         <item name="colorAccent">@color/fdroid_green</item>
     </style>
 
-    <style name="AlertDialogBaseThemeNight" parent="AlertDialogThemeDark" />
+    <style name="AlertDialogBaseThemeNight" parent="AlertDialogThemeDark"/>
     <style name="AlertDialogThemeNight" parent="AlertDialogBaseThemeNight">
         <item name="android:windowBackground">@color/fdroid_night</item>
     </style>
@@ -122,7 +122,7 @@
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Caption</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
-    <style name="CaptionText" parent="CaptionTextBase" />
+    <style name="CaptionText" parent="CaptionTextBase"/>
 
     <!-- use this style for a text views that is a paragraph of text -->
     <style name="BodyTextBase">
@@ -130,7 +130,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Body1</item>
     </style>
-    <style name="BodyText" parent="BodyTextBase" />
+    <style name="BodyText" parent="BodyTextBase"/>
 
     <style name="AppListEmptyText">
         <item name="android:id">@android:id/empty</item>
@@ -149,7 +149,7 @@
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
     </style>
-    <style name="AppListItemStatusText" parent="AppListItemStatusTextBase" />
+    <style name="AppListItemStatusText" parent="AppListItemStatusTextBase"/>
 
     <style name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorButtonNormal">@color/swap_bright_blue</item>
@@ -180,7 +180,7 @@
         <item name="android:paddingBottom">20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
     </style>
 
-    <style name="SwapTheme.AppList.SwapSuccess" parent="SwapTheme.AppList.SwapSuccessBase" />
+    <style name="SwapTheme.AppList.SwapSuccess" parent="SwapTheme.AppList.SwapSuccessBase"/>
 
     <style name="SwapTheme.AppList.SwapSuccessDetailsBase">
         <item name="android:gravity">center</item>
@@ -190,7 +190,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="SwapTheme.AppList.SwapSuccessDetails" parent="SwapTheme.AppList.SwapSuccessDetailsBase" />
+    <style name="SwapTheme.AppList.SwapSuccessDetails" parent="SwapTheme.AppList.SwapSuccessDetailsBase"/>
 
     <style name="SwapTheme.StartSwap.MainTextBase">
         <item name="android:gravity">center</item>
@@ -211,7 +211,7 @@
         <item name="android:textColorSecondary">#fff</item>
     </style>
 
-    <style name="SwapTheme.Wizard.Text" parent="SwapTheme.Wizard.TextBase" />
+    <style name="SwapTheme.Wizard.Text" parent="SwapTheme.Wizard.TextBase"/>
 
     <style name="SwapTheme.Wizard.Text.Toolbar" parent="SwapTheme.Wizard.Text">
         <item name="android:textSize">22sp</item>
@@ -232,9 +232,9 @@
         <item name="android:paddingBottom">10dp</item>
     </style>
 
-    <style name="SwapTheme.Wizard.MainText" parent="SwapTheme.Wizard.MainTextBase" />
+    <style name="SwapTheme.Wizard.MainText" parent="SwapTheme.Wizard.MainTextBase"/>
 
-    <style name="SwapTheme.Wizard.QRScanWarningText" parent="@style/SwapTheme.Wizard.MainTextBase" >
+    <style name="SwapTheme.Wizard.QRScanWarningText" parent="@style/SwapTheme.Wizard.MainTextBase">
         <item name="android:paddingLeft">40dp</item>
         <item name="android:paddingRight">40dp</item>
         <item name="android:paddingTop">0dp</item>
@@ -288,7 +288,7 @@
         <item name="android:gravity">center_vertical</item>
     </style>
 
-    <style name="AppDetailsLink" parent="AppDetailsLinkBase" />
+    <style name="AppDetailsLink" parent="AppDetailsLinkBase"/>
 
     <style name="AppDetailsSubheaderTextBase">
         <item name="android:layout_width">match_parent</item>
@@ -300,9 +300,9 @@
         <item name="android:drawablePadding">12dp</item>
     </style>
 
-    <style name="AppDetailsSubheaderText" parent="AppDetailsSubheaderTextBase" />
+    <style name="AppDetailsSubheaderText" parent="AppDetailsSubheaderTextBase"/>
 
-    <style name="AppThemeTransparent" parent="@android:style/Theme.NoDisplay" />
+    <style name="AppThemeTransparent" parent="@android:style/Theme.NoDisplay"/>
 
     <style name="AppThemeLight.NoActionBar">
         <item name="windowActionBar">false</item>
@@ -314,7 +314,7 @@
         <item name="android:src">@drawable/ic_more</item>
     </style>
 
-    <style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 </resources>
diff --git a/app/src/main/res/values/styles_detail.xml b/app/src/main/res/values/styles_detail.xml
index e6d2825da..e53871d17 100644
--- a/app/src/main/res/values/styles_detail.xml
+++ b/app/src/main/res/values/styles_detail.xml
@@ -6,9 +6,9 @@
         <item name="android:minHeight">32dp</item>
         <item name="android:minWidth">0dp</item>
         <item name="android:padding">12dp</item>
-    </style>qgi
+    </style>
 
-    <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase" />
+    <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase"/>
 
     <style name="DetailsPrimaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">#ffffff</item>