diff --git a/oeffi/graphics/ic_oeffi_directions_color_48dp-mdpi.svg b/oeffi/graphics/ic_oeffi_directions_color_48dp-mdpi.svg
index e92a421..f1808ea 100644
--- a/oeffi/graphics/ic_oeffi_directions_color_48dp-mdpi.svg
+++ b/oeffi/graphics/ic_oeffi_directions_color_48dp-mdpi.svg
@@ -10,11 +10,15 @@
             <stop offset="100%" style="stop-color:#40a33f" />
         </linearGradient>
         <filter id="background-shadow">
-            <feOffset result="offsetOut" in="SourceGraphic" dx="0" dy="32" />
-            <feColorMatrix result="matrixOut" in="offsetOut" type="matrix"
+            <feOffset
+                result="offsetOut" in="SourceGraphic" dx="0" dy="32" />
+            <feColorMatrix
+                result="matrixOut" in="offsetOut" type="matrix"
                 values="0.15 0 0 0 0 0 0.15 0 0 0 0 0 0.15 0 0 0 0 0 1 0" />
-            <feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="32" />
-            <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
+            <feGaussianBlur
+                result="blurOut" in="matrixOut" stdDeviation="32" />
+            <feBlend
+                in="SourceGraphic" in2="blurOut" mode="normal" />
         </filter>
     </defs>
 
diff --git a/oeffi/graphics/ic_oeffi_plans_color_48dp-mdpi.svg b/oeffi/graphics/ic_oeffi_plans_color_48dp-mdpi.svg
index d1817b5..1afd560 100644
--- a/oeffi/graphics/ic_oeffi_plans_color_48dp-mdpi.svg
+++ b/oeffi/graphics/ic_oeffi_plans_color_48dp-mdpi.svg
@@ -10,11 +10,15 @@
             <stop offset="100%" style="stop-color:#40a33f" />
         </linearGradient>
         <filter id="background-shadow">
-            <feOffset result="offsetOut" in="SourceGraphic" dx="0" dy="32" />
-            <feColorMatrix result="matrixOut" in="offsetOut" type="matrix"
+            <feOffset
+                result="offsetOut" in="SourceGraphic" dx="0" dy="32" />
+            <feColorMatrix
+                result="matrixOut" in="offsetOut" type="matrix"
                 values="0.15 0 0 0 0 0 0.15 0 0 0 0 0 0.15 0 0 0 0 0 1 0" />
-            <feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="32" />
-            <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
+            <feGaussianBlur
+                result="blurOut" in="matrixOut" stdDeviation="32" />
+            <feBlend
+                in="SourceGraphic" in2="blurOut" mode="normal" />
         </filter>
     </defs>
 
@@ -25,18 +29,23 @@
     <!-- plan -->
     <g transform="scale(0.93) translate(42,42)">
         <!-- upper horizontal line -->
-        <path style="fill:#40a33f"
+        <path
+            style="fill:#40a33f"
             d="M 149.625 420 C 143.11709 445.71106 139.24323 472.47699 138.375 500 L 885.625 500 C 884.75677 472.47699 880.88291 445.71106 874.375 420 L 149.625 420 z " />
         <!-- lower horizontal line -->
-        <path style="fill:#307a2f"
+        <path
+            style="fill:#307a2f"
             d="M 138.5625 524 C 139.43073 551.52288 143.30196 578.29012 149.8125 604 L 874.1875 604 C 880.69804 578.29012 884.56927 551.52288 885.4375 524 L 138.5625 524 z " />
         <!-- vertical line -->
-        <path style="fill:#40a33f"
+        <path
+            style="fill:#40a33f"
             d="M 512 138.21875 C 498.48498 138.21875 485.14397 138.94519 472 140.34375 L 472 724.84375 L 552 724.84375 L 552 140.34375 C 538.85603 138.94519 525.51502 138.21875 512 138.21875 z " />
-        <path style="fill:#40a33f"
+        <path
+            style="fill:#40a33f"
             d="M 495.28125 668.3125 L 327 836.59375 C 351.809 850.76368 378.39123 862.17957 406.34375 870.40625 L 551.84375 724.90625 L 495.28125 668.3125 z " />
         <!-- stop -->
-        <rect style="fill:#40a33f" width="140" height="80" x="550.36188" y="210" />
+        <rect
+            style="fill:#40a33f" width="140" height="80" x="550.36188" y="210" />
         <!-- station -->
         <rect
             style="fill:#ffffff;stroke:#2a6b29;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4"
diff --git a/oeffi/graphics/ic_oeffi_stations_color_48dp-mdpi.svg b/oeffi/graphics/ic_oeffi_stations_color_48dp-mdpi.svg
index 87f345b..ba9f83f 100644
--- a/oeffi/graphics/ic_oeffi_stations_color_48dp-mdpi.svg
+++ b/oeffi/graphics/ic_oeffi_stations_color_48dp-mdpi.svg
@@ -10,11 +10,15 @@
             <stop offset="100%" style="stop-color:#40a33f" />
         </linearGradient>
         <filter id="background-shadow">
-            <feOffset result="offsetOut" in="SourceGraphic" dx="0" dy="32" />
-            <feColorMatrix result="matrixOut" in="offsetOut" type="matrix"
+            <feOffset
+                result="offsetOut" in="SourceGraphic" dx="0" dy="32" />
+            <feColorMatrix
+                result="matrixOut" in="offsetOut" type="matrix"
                 values="0.15 0 0 0 0 0 0.15 0 0 0 0 0 0.15 0 0 0 0 0 1 0" />
-            <feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="32" />
-            <feBlend in="SourceGraphic" in2="blurOut" mode="normal" />
+            <feGaussianBlur
+                result="blurOut" in="matrixOut" stdDeviation="32" />
+            <feBlend
+                in="SourceGraphic" in2="blurOut" mode="normal" />
         </filter>
     </defs>
 
diff --git a/oeffi/res/anim/enter_from_left.xml b/oeffi/res/anim/enter_from_left.xml
index 4cac509..9ddd0be 100644
--- a/oeffi/res/anim/enter_from_left.xml
+++ b/oeffi/res/anim/enter_from_left.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
         android:duration="@android:integer/config_longAnimTime"
diff --git a/oeffi/res/anim/enter_from_right.xml b/oeffi/res/anim/enter_from_right.xml
index 968228a..e7e0c1b 100644
--- a/oeffi/res/anim/enter_from_right.xml
+++ b/oeffi/res/anim/enter_from_right.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
         android:duration="@android:integer/config_longAnimTime"
diff --git a/oeffi/res/anim/exit_to_left.xml b/oeffi/res/anim/exit_to_left.xml
index 9b5995f..c69d498 100644
--- a/oeffi/res/anim/exit_to_left.xml
+++ b/oeffi/res/anim/exit_to_left.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
         android:duration="@android:integer/config_longAnimTime"
diff --git a/oeffi/res/anim/exit_to_right.xml b/oeffi/res/anim/exit_to_right.xml
index ad49be2..0b7ad73 100644
--- a/oeffi/res/anim/exit_to_right.xml
+++ b/oeffi/res/anim/exit_to_right.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
         android:duration="@android:integer/config_longAnimTime"
diff --git a/oeffi/res/anim/pop_in.xml b/oeffi/res/anim/pop_in.xml
index f848e72..1209566 100644
--- a/oeffi/res/anim/pop_in.xml
+++ b/oeffi/res/anim/pop_in.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <scale
         android:duration="@android:integer/config_shortAnimTime"
diff --git a/oeffi/res/anim/pop_out.xml b/oeffi/res/anim/pop_out.xml
index 43f52b2..c8ae72a 100644
--- a/oeffi/res/anim/pop_out.xml
+++ b/oeffi/res/anim/pop_out.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <scale
         android:duration="@android:integer/config_shortAnimTime"
diff --git a/oeffi/res/anim/rotate.xml b/oeffi/res/anim/rotate.xml
index 1ce20e1..999d05b 100644
--- a/oeffi/res/anim/rotate.xml
+++ b/oeffi/res/anim/rotate.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/linear_interpolator" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/linear_interpolator">
 
     <rotate
         android:duration="1000"
diff --git a/oeffi/res/anim/zoom_controls.xml b/oeffi/res/anim/zoom_controls.xml
index 9118314..6a000ec 100644
--- a/oeffi/res/anim/zoom_controls.xml
+++ b/oeffi/res/anim/zoom_controls.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <alpha
         android:duration="1000"
diff --git a/oeffi/res/animator/heartbeat.xml b/oeffi/res/animator/heartbeat.xml
index e49eaf0..629d34c 100644
--- a/oeffi/res/animator/heartbeat.xml
+++ b/oeffi/res/animator/heartbeat.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/accelerate_quad" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/accelerate_quad">
 
     <!-- Beat -->
     <objectAnimator
diff --git a/oeffi/res/drawable-anydpi/ic_accessible_grey600_18dp.xml b/oeffi/res/drawable-anydpi/ic_accessible_grey600_18dp.xml
index ac9f0d2..89142a3 100644
--- a/oeffi/res/drawable-anydpi/ic_accessible_grey600_18dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_accessible_grey600_18dp.xml
@@ -1,12 +1,14 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="18dp"
-        android:height="18dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+        android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
         android:fillColor="#FF757575"
-        android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45 -0.01,0 -0.01,-0.01 -0.02,-0.01L13,7.28c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09L10,15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45c1.29,1.07 3.25,1.94 5,1.95zM12.83,18c-0.41,1.16 -1.52,2 -2.83,2 -1.66,0 -3,-1.34 -3,-3 0,-1.31 0.84,-2.41 2,-2.83L9,12.1c-2.28,0.46 -4,2.48 -4,4.9 0,2.76 2.24,5 5,5 2.42,0 4.44,-1.72 4.9,-4h-2.07z"/>
+        android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45 -0.01,0 -0.01,-0.01 -0.02,-0.01L13,7.28c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09L10,15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45c1.29,1.07 3.25,1.94 5,1.95zM12.83,18c-0.41,1.16 -1.52,2 -2.83,2 -1.66,0 -3,-1.34 -3,-3 0,-1.31 0.84,-2.41 2,-2.83L9,12.1c-2.28,0.46 -4,2.48 -4,4.9 0,2.76 2.24,5 5,5 2.42,0 4.44,-1.72 4.9,-4h-2.07z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_arrow_back_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_arrow_back_white_24dp.xml
index 38fbc26..63c8f0b 100644
--- a/oeffi/res/drawable-anydpi/ic_arrow_back_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_arrow_back_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_beenhere_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_beenhere_grey600_24dp.xml
index 13dd5aa..b5b3966 100644
--- a/oeffi/res/drawable-anydpi/ic_beenhere_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_beenhere_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M19,1L5,1c-1.1,0 -1.99,0.9 -1.99,2L3,15.93c0,0.69 0.35,1.3 0.88,1.66L12,23l8.11,-5.41c0.53,-0.36 0.88,-0.97 0.88,-1.66L21,3c0,-1.1 -0.9,-2 -2,-2zM10,16l-5,-5 1.41,-1.41L10,13.17l7.59,-7.59L19,7l-9,9z"/>
+        android:pathData="M19,1L5,1c-1.1,0 -1.99,0.9 -1.99,2L3,15.93c0,0.69 0.35,1.3 0.88,1.66L12,23l8.11,-5.41c0.53,-0.36 0.88,-0.97 0.88,-1.66L21,3c0,-1.1 -0.9,-2 -2,-2zM10,16l-5,-5 1.41,-1.41L10,13.17l7.59,-7.59L19,7l-9,9z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_block_black_24dp.xml b/oeffi/res/drawable-anydpi/ic_block_black_24dp.xml
index 4510bf5..bda235d 100644
--- a/oeffi/res/drawable-anydpi/ic_block_black_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_block_black_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml
index 3465ebe..4057d4e 100644
--- a/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml
@@ -1,7 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FF757575" android:pathData="M5,6H23V18H5V6M14,9A3,3 0 0,1 17,12A3,3 0 0,1 14,15A3,3 0 0,1 11,12A3,3 0 0,1 14,9M9,8A2,2 0 0,1 7,10V14A2,2 0 0,1 9,16H19A2,2 0 0,1 21,14V10A2,2 0 0,1 19,8H9M1,10H3V20H19V22H1V10Z" />
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M5,6H23V18H5V6M14,9A3,3 0 0,1 17,12A3,3 0 0,1 14,15A3,3 0 0,1 11,12A3,3 0 0,1 14,9M9,8A2,2 0 0,1 7,10V14A2,2 0 0,1 9,16H19A2,2 0 0,1 21,14V10A2,2 0 0,1 19,8H9M1,10H3V20H19V22H1V10Z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_clear_black_24dp.xml b/oeffi/res/drawable-anydpi/ic_clear_black_24dp.xml
index ede4b71..09f4ccf 100644
--- a/oeffi/res/drawable-anydpi/ic_clear_black_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_clear_black_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_clear_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_clear_grey600_24dp.xml
index 01752dd..eae3b01 100644
--- a/oeffi/res/drawable-anydpi/ic_clear_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_clear_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_contacts_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_contacts_grey600_24dp.xml
index b2c9348..7f0da33 100644
--- a/oeffi/res/drawable-anydpi/ic_contacts_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_contacts_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z"/>
+        android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_18dp.xml b/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_18dp.xml
index d1d6bc1..889fc7f 100644
--- a/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_18dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_18dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="18dp"
-        android:height="18dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z"/>
+        android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_24dp.xml
index bee35d4..3b7f333 100644
--- a/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_directions_bike_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z"/>
+        android:pathData="M15.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM5,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5zM10.8,10.5l2.4,-2.4 0.8,0.8c1.3,1.3 3,2.1 5.1,2.1L19.1,9c-1.5,0 -2.7,-0.6 -3.6,-1.5l-1.9,-1.9c-0.5,-0.4 -1,-0.6 -1.6,-0.6s-1.1,0.2 -1.4,0.6L7.8,8.4c-0.4,0.4 -0.6,0.9 -0.6,1.4 0,0.6 0.2,1.1 0.6,1.4L11,14v5h2v-6.2l-2.2,-2.3zM19,12c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM19,20.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_directions_walk_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_directions_walk_grey600_24dp.xml
index 028d086..e08ef0a 100644
--- a/oeffi/res/drawable-anydpi/ic_directions_walk_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_directions_walk_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7"/>
+        android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.8,8.9L7,23h2.1l1.8,-8 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3C14.8,12 16.8,13 19,13v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1L6,8.3V13h2V9.6l1.8,-0.7" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_expand_less_black_24dp.xml b/oeffi/res/drawable-anydpi/ic_expand_less_black_24dp.xml
index 3afdf96..cbf30dc 100644
--- a/oeffi/res/drawable-anydpi/ic_expand_less_black_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_expand_less_black_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_expand_less_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_expand_less_white_24dp.xml
index d58421a..f947803 100644
--- a/oeffi/res/drawable-anydpi/ic_expand_less_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_expand_less_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_expand_more_black_24dp.xml b/oeffi/res/drawable-anydpi/ic_expand_more_black_24dp.xml
index 8d57dbc..0123d10 100644
--- a/oeffi/res/drawable-anydpi/ic_expand_more_black_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_expand_more_black_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_expand_more_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_expand_more_white_24dp.xml
index fd3ce4a..53f05c4 100644
--- a/oeffi/res/drawable-anydpi/ic_expand_more_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_expand_more_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_favorite_border_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_favorite_border_grey600_24dp.xml
index 0efbf80..58078c2 100644
--- a/oeffi/res/drawable-anydpi/ic_favorite_border_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_favorite_border_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_filter_list_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_filter_list_white_24dp.xml
index 7d435fa..d1ea65b 100644
--- a/oeffi/res/drawable-anydpi/ic_filter_list_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_filter_list_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_filter_list_yellow_24dp.xml b/oeffi/res/drawable-anydpi/ic_filter_list_yellow_24dp.xml
index 1674c3c..ced8856 100644
--- a/oeffi/res/drawable-anydpi/ic_filter_list_yellow_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_filter_list_yellow_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFEDF53"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_flag_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_flag_grey600_24dp.xml
index 192d1da..72cb07c 100644
--- a/oeffi/res/drawable-anydpi/ic_flag_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_flag_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
+        android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_gps_fixed_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_gps_fixed_grey600_24dp.xml
index 6a0e3d6..3a186fa 100644
--- a/oeffi/res/drawable-anydpi/ic_gps_fixed_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_gps_fixed_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_info_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_info_grey600_24dp.xml
index aa33ba0..4d76a9e 100644
--- a/oeffi/res/drawable-anydpi/ic_info_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_info_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_info_outline_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_info_outline_grey600_24dp.xml
index f987f36..4a85abd 100644
--- a/oeffi/res/drawable-anydpi/ic_info_outline_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_info_outline_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_info_outline_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_info_outline_white_24dp.xml
index 9567ecd..e0c3355 100644
--- a/oeffi/res/drawable-anydpi/ic_info_outline_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_info_outline_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml
index 45b7470..27d394d 100644
--- a/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml
@@ -1,8 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:viewportHeight="24"
     android:viewportWidth="24"
-    android:width="24dp" >
+    android:width="24dp">
     <path
         android:fillColor="#FF757575"
         android:pathData="M12,5C12.74,5 13.47,5.1 14.15,5.29L15.78,2.46C16.06,2 16.67,1.82 17.15,2.1C17.63,2.37 17.79,3 17.5,3.46L16,6.07C17.22,6.78 18.23,7.79 18.93,9H5.07C5.77,7.79 6.78,6.78 8,6.07L6.5,3.46C6.21,3 6.37,2.37 6.85,2.1C7.33,1.82 7.94,2 8.22,2.46L9.85,5.29C10.53,5.1 11.26,5 12,5M20,13C20,17.17 16.82,20.59 12.75,20.97V10.5H19.6C19.86,11.29 20,12.13 20,13M4,13C4,12.13 4.14,11.29 4.4,10.5H11.25V20.97C7.18,20.59 4,17.17 4,13Z" />
diff --git a/oeffi/res/drawable-anydpi/ic_local_taxi_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_local_taxi_grey600_24dp.xml
index 7b56b7e..71f638f 100644
--- a/oeffi/res/drawable-anydpi/ic_local_taxi_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_local_taxi_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5L15,5L15,3L9,3v2L6.5,5c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z"/>
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5L15,5L15,3L9,3v2L6.5,5c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_location_disabled_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_location_disabled_white_24dp.xml
index 16f058f..078ff1e 100644
--- a/oeffi/res/drawable-anydpi/ic_location_disabled_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_location_disabled_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z"/>
+        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_location_searching_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_location_searching_grey600_24dp.xml
index 7da6b0c..48a7450 100644
--- a/oeffi/res/drawable-anydpi/ic_location_searching_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_location_searching_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_location_searching_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_location_searching_white_24dp.xml
index 9faeb1a..781aa87 100644
--- a/oeffi/res/drawable-anydpi/ic_location_searching_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_location_searching_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+        android:pathData="M20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_map_black_24dp.xml b/oeffi/res/drawable-anydpi/ic_map_black_24dp.xml
index b9bacc8..c156c05 100644
--- a/oeffi/res/drawable-anydpi/ic_map_black_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_map_black_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_menu_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_menu_white_24dp.xml
index cf37e2a..cdb2387 100644
--- a/oeffi/res/drawable-anydpi/ic_menu_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_menu_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_more_vert_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_more_vert_grey600_24dp.xml
index 7fd6212..aa390fb 100644
--- a/oeffi/res/drawable-anydpi/ic_more_vert_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_more_vert_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_more_vert_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_more_vert_white_24dp.xml
index 3dfd99e..71cf4f8 100644
--- a/oeffi/res/drawable-anydpi/ic_more_vert_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_more_vert_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_oeffi_directions_grey600_36dp.xml b/oeffi/res/drawable-anydpi/ic_oeffi_directions_grey600_36dp.xml
index 6116f8d..6f61d5e 100644
--- a/oeffi/res/drawable-anydpi/ic_oeffi_directions_grey600_36dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_oeffi_directions_grey600_36dp.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="36dp"
     android:viewportHeight="1088"
     android:viewportWidth="1088"
-    android:width="36dp" >
+    android:width="36dp">
 
     <group
         android:translateX="32"
-        android:translateY="32" >
+        android:translateY="32">
         <path
             android:fillColor="#757575"
             android:pathData="M 512,512 m l -464,0 a 464,464 0 1,0 928,0 a 464,464 0 1,0 -928,0 M 512,512 m -368,0 a 368,368 0 1,1 736,0 a 368,368 0 1,1 -736,0" />
diff --git a/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey300_72dp.xml b/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey300_72dp.xml
index 9ba0cae..f95b591 100644
--- a/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey300_72dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey300_72dp.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="72dp"
     android:viewportHeight="1088"
     android:viewportWidth="1088"
-    android:width="72dp" >
+    android:width="72dp">
 
     <group
         android:translateX="32"
-        android:translateY="32" >
+        android:translateY="32">
         <path
             android:fillColor="#e0e0e0"
             android:pathData="M 512,512 m l -464,0 a 464,464 0 1,0 928,0 a 464,464 0 1,0 -928,0 M 512,512 m -368,0 a 368,368 0 1,1 736,0 a 368,368 0 1,1 -736,0" />
@@ -16,7 +17,7 @@
             android:scaleX="0.85"
             android:scaleY="0.85"
             android:translateX="88"
-            android:translateY="88" >
+            android:translateY="88">
             <path
                 android:fillColor="#e0e0e0"
                 android:pathData="M 149.625 420 C 143.11709 445.71106 139.24323 472.47699 138.375 500 L 885.625 500 C 884.75677 472.47699 880.88291 445.71106 874.375 420 L 149.625 420 z" />
diff --git a/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey600_36dp.xml b/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey600_36dp.xml
index 1421743..796069a 100644
--- a/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey600_36dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_oeffi_plans_grey600_36dp.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="36dp"
     android:viewportHeight="1088"
     android:viewportWidth="1088"
-    android:width="36dp" >
+    android:width="36dp">
 
     <group
         android:translateX="32"
-        android:translateY="32" >
+        android:translateY="32">
         <path
             android:fillColor="#757575"
             android:pathData="M 512,512 m l -464,0 a 464,464 0 1,0 928,0 a 464,464 0 1,0 -928,0 M 512,512 m -368,0 a 368,368 0 1,1 736,0 a 368,368 0 1,1 -736,0" />
@@ -16,7 +17,7 @@
             android:scaleX="0.85"
             android:scaleY="0.85"
             android:translateX="88"
-            android:translateY="88" >
+            android:translateY="88">
             <path
                 android:fillColor="#757575"
                 android:pathData="M 149.625 420 C 143.11709 445.71106 139.24323 472.47699 138.375 500 L 885.625 500 C 884.75677 472.47699 880.88291 445.71106 874.375 420 L 149.625 420 z" />
diff --git a/oeffi/res/drawable-anydpi/ic_oeffi_stations_grey600_36dp.xml b/oeffi/res/drawable-anydpi/ic_oeffi_stations_grey600_36dp.xml
index 3c003bc..13ea52b 100644
--- a/oeffi/res/drawable-anydpi/ic_oeffi_stations_grey600_36dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_oeffi_stations_grey600_36dp.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="36dp"
     android:viewportHeight="1088"
     android:viewportWidth="1088"
-    android:width="36dp" >
+    android:width="36dp">
 
     <group
         android:translateX="32"
-        android:translateY="32" >
+        android:translateY="32">
         <path
             android:fillColor="#757575"
             android:pathData="M 512,512 m l -464,0 a 464,464 0 1,0 928,0 a 464,464 0 1,0 -928,0 M 512,512 m -368,0 a 368,368 0 1,1 736,0 a 368,368 0 1,1 -736,0" />
diff --git a/oeffi/res/drawable-anydpi/ic_offline_pin_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_offline_pin_grey600_24dp.xml
index bdcb493..ae8995d 100644
--- a/oeffi/res/drawable-anydpi/ic_offline_pin_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_offline_pin_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM17,18L7,18v-2h10v2zM10.3,14L7,10.7l1.4,-1.4 1.9,1.9 5.3,-5.3L17,7.3 10.3,14z"/>
+        android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM17,18L7,18v-2h10v2zM10.3,14L7,10.7l1.4,-1.4 1.9,1.9 5.3,-5.3L17,7.3 10.3,14z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_place_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_place_grey600_24dp.xml
index 64fef3d..e286d16 100644
--- a/oeffi/res/drawable-anydpi/ic_place_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_place_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_portable_wifi_off_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_portable_wifi_off_grey600_24dp.xml
index 486b8a0..b20670a 100644
--- a/oeffi/res/drawable-anydpi/ic_portable_wifi_off_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_portable_wifi_off_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M17.56,14.24c0.28,-0.69 0.44,-1.45 0.44,-2.24 0,-3.31 -2.69,-6 -6,-6 -0.79,0 -1.55,0.16 -2.24,0.44l1.62,1.62c0.2,-0.03 0.41,-0.06 0.62,-0.06 2.21,0 4,1.79 4,4 0,0.21 -0.02,0.42 -0.05,0.63l1.61,1.61zM12,4c4.42,0 8,3.58 8,8 0,1.35 -0.35,2.62 -0.95,3.74l1.47,1.47C21.46,15.69 22,13.91 22,12c0,-5.52 -4.48,-10 -10,-10 -1.91,0 -3.69,0.55 -5.21,1.47l1.46,1.46C9.37,4.34 10.65,4 12,4zM3.27,2.5L2,3.77l2.1,2.1C2.79,7.57 2,9.69 2,12c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,17.53 4,14.96 4,12c0,-1.76 0.57,-3.38 1.53,-4.69l1.43,1.44C6.36,9.68 6,10.8 6,12c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-0.65 0.17,-1.25 0.44,-1.79l1.58,1.58L10,12c0,1.1 0.9,2 2,2l0.21,-0.02 0.01,0.01 7.51,7.51L21,20.23 4.27,3.5l-1,-1z"/>
+        android:pathData="M17.56,14.24c0.28,-0.69 0.44,-1.45 0.44,-2.24 0,-3.31 -2.69,-6 -6,-6 -0.79,0 -1.55,0.16 -2.24,0.44l1.62,1.62c0.2,-0.03 0.41,-0.06 0.62,-0.06 2.21,0 4,1.79 4,4 0,0.21 -0.02,0.42 -0.05,0.63l1.61,1.61zM12,4c4.42,0 8,3.58 8,8 0,1.35 -0.35,2.62 -0.95,3.74l1.47,1.47C21.46,15.69 22,13.91 22,12c0,-5.52 -4.48,-10 -10,-10 -1.91,0 -3.69,0.55 -5.21,1.47l1.46,1.46C9.37,4.34 10.65,4 12,4zM3.27,2.5L2,3.77l2.1,2.1C2.79,7.57 2,9.69 2,12c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,17.53 4,14.96 4,12c0,-1.76 0.57,-3.38 1.53,-4.69l1.43,1.44C6.36,9.68 6,10.8 6,12c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-0.65 0.17,-1.25 0.44,-1.79l1.58,1.58L10,12c0,1.1 0.9,2 2,2l0.21,-0.02 0.01,0.01 7.51,7.51L21,20.23 4.27,3.5l-1,-1z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_refresh_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_refresh_white_24dp.xml
index a8175c3..a3ce394 100644
--- a/oeffi/res/drawable-anydpi/ic_refresh_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_refresh_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_search_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_search_grey600_24dp.xml
index a1dc489..dcb6cce 100644
--- a/oeffi/res/drawable-anydpi/ic_search_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_search_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_search_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_search_white_24dp.xml
index 47432c1..444e57f 100644
--- a/oeffi/res/drawable-anydpi/ic_search_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_search_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_settings_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_settings_grey600_24dp.xml
index e180778..c6f31c9 100644
--- a/oeffi/res/drawable-anydpi/ic_settings_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_settings_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_settings_input_antenna_grey600_18dp.xml b/oeffi/res/drawable-anydpi/ic_settings_input_antenna_grey600_18dp.xml
index a01ddfb..1065c73 100644
--- a/oeffi/res/drawable-anydpi/ic_settings_input_antenna_grey600_18dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_settings_input_antenna_grey600_18dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="18dp"
-        android:height="18dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z"/>
+        android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_share_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_share_white_24dp.xml
index 9040666..b4052b7 100644
--- a/oeffi/res/drawable-anydpi/ic_share_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_share_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_shuffle_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_shuffle_white_24dp.xml
index 512042a..1a29e43 100644
--- a/oeffi/res/drawable-anydpi/ic_shuffle_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_shuffle_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z"/>
+        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_star_border_black_24dp.xml b/oeffi/res/drawable-anydpi/ic_star_border_black_24dp.xml
index b36536b..9ec3056 100644
--- a/oeffi/res/drawable-anydpi/ic_star_border_black_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_star_border_black_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_star_border_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_star_border_white_24dp.xml
index be9cd28..15140f9 100644
--- a/oeffi/res/drawable-anydpi/ic_star_border_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_star_border_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_star_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_star_grey600_24dp.xml
index 56551b9..07fe63e 100644
--- a/oeffi/res/drawable-anydpi/ic_star_grey600_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_star_grey600_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF757575"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_star_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_star_white_24dp.xml
index fa1c999..d925a7d 100644
--- a/oeffi/res/drawable-anydpi/ic_star_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_star_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_stat_notify_sync_24dp.xml b/oeffi/res/drawable-anydpi/ic_stat_notify_sync_24dp.xml
index 6933057..9e6222a 100644
--- a/oeffi/res/drawable-anydpi/ic_stat_notify_sync_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_stat_notify_sync_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_today_white_24dp.xml b/oeffi/res/drawable-anydpi/ic_today_white_24dp.xml
index e758274..1070961 100644
--- a/oeffi/res/drawable-anydpi/ic_today_white_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_today_white_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,8h14v11zM7,10h5v5L7,15z"/>
+        android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,8h14v11zM7,10h5v5L7,15z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/ic_warning_amber_24dp.xml b/oeffi/res/drawable-anydpi/ic_warning_amber_24dp.xml
index c3b7fdf..9b3ff5a 100644
--- a/oeffi/res/drawable-anydpi/ic_warning_amber_24dp.xml
+++ b/oeffi/res/drawable-anydpi/ic_warning_amber_24dp.xml
@@ -1,9 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFC107"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
 </vector>
diff --git a/oeffi/res/drawable-anydpi/network_avv_aachen_logo.xml b/oeffi/res/drawable-anydpi/network_avv_aachen_logo.xml
index f8f0d3f..8b61f2b 100644
--- a/oeffi/res/drawable-anydpi/network_avv_aachen_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_avv_aachen_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="780"
     android:viewportWidth="780"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="0"
-        android:translateY="217" >
+        android:translateY="217">
         <path
             android:fillColor="#b5097f"
             android:pathData="M84.46,343.37 L70.59,307.95 67.1,307.95 53.22,343.37 57.39,343.37 61.65,332.13 75.78,332.13 80.21,343.37 84.46,343.37zM63.09,328.47 L67.27,317.49C67.95,315.7 68.46,314 68.8,312.46 69.31,314.42 69.91,316.13 70.42,317.49L74.5,328.47 63.09,328.47zM107.88,343.37 L107.88,325.32C107.88,322.26 107.11,319.96 105.58,318.59 104.13,317.15 101.75,316.47 98.6,316.47 97.07,316.47 95.53,316.72 93.92,317.06 92.38,317.49 90.94,318 89.66,318.77L90.94,321.83C93.66,320.47 96.13,319.79 98.34,319.79 100.3,319.79 101.75,320.3 102.68,321.23 103.54,322.26 103.96,323.79 103.96,325.83L103.96,327.53 99.53,327.62C90.94,327.88 86.68,330.69 86.68,336.05 86.68,338.52 87.44,340.48 88.98,341.75 90.42,343.12 92.47,343.8 95.11,343.8 97.07,343.8 98.68,343.54 99.96,342.95 101.32,342.35 102.6,341.24 103.96,339.54L104.13,339.54 104.9,343.37 107.88,343.37zM92.21,339.37C91.36,338.6 90.94,337.5 90.94,336.05 90.94,334.26 91.62,332.9 92.98,331.96 94.43,331.11 96.72,330.6 99.88,330.51L103.88,330.34 103.88,332.73C103.88,335.2 103.2,337.07 101.75,338.43 100.3,339.8 98.34,340.48 95.87,340.48 94.34,340.48 93.06,340.14 92.21,339.37zM133.34,342.43 L133.34,338.86C131.04,339.88 128.82,340.31 126.61,340.31 124.06,340.31 122.1,339.45 120.82,337.75 119.46,335.96 118.78,333.49 118.78,330.26 118.78,323.36 121.5,319.96 126.87,319.96 127.63,319.96 128.57,320.13 129.67,320.3 130.7,320.55 131.63,320.89 132.57,321.23L133.76,317.83C133,317.4 132.06,317.15 130.78,316.81 129.5,316.55 128.23,316.47 126.95,316.47 123.03,316.47 119.97,317.66 117.84,320.04 115.71,322.43 114.69,325.83 114.69,330.26 114.69,334.6 115.71,337.92 117.84,340.31 119.88,342.6 122.86,343.8 126.69,343.8 129.33,343.8 131.63,343.37 133.34,342.43L133.34,342.43zM161.69,343.37 L161.69,326.09C161.69,322.77 160.92,320.3 159.3,318.77 157.69,317.23 155.22,316.47 151.98,316.47 150.19,316.47 148.49,316.81 147.04,317.57 145.6,318.34 144.49,319.28 143.72,320.55L143.47,320.55C143.55,319.7 143.64,318.51 143.64,317.15L143.64,305.82 139.64,305.82 139.64,343.37 143.64,343.37 143.64,329.49C143.64,326.09 144.23,323.62 145.51,322.09 146.79,320.55 148.83,319.87 151.64,319.87 153.68,319.87 155.3,320.38 156.24,321.4 157.18,322.51 157.69,324.13 157.69,326.26L157.69,343.37 161.69,343.37zM185.7,343.46C186.89,343.12 188.25,342.69 189.7,342.09L189.7,338.52C186.89,339.71 184.08,340.31 181.27,340.31 178.55,340.31 176.42,339.54 174.97,337.92 173.44,336.3 172.67,333.92 172.59,330.86L190.81,330.86 190.81,328.3C190.81,324.73 189.87,321.92 187.91,319.7 185.95,317.49 183.4,316.47 180.08,316.47 176.5,316.47 173.69,317.66 171.56,320.21 169.52,322.68 168.5,326.09 168.5,330.34 168.5,334.6 169.61,337.84 171.82,340.22 174.12,342.6 177.18,343.8 181.1,343.8 182.89,343.8 184.42,343.71 185.7,343.46zM184.85,321.83C185.95,323.11 186.55,325.07 186.55,327.62L172.67,327.62C172.93,325.15 173.69,323.28 174.97,321.83 176.16,320.47 177.87,319.79 179.99,319.79 182.12,319.79 183.74,320.47 184.85,321.83zM219.67,343.37 L219.67,326.09C219.67,322.68 218.9,320.3 217.29,318.77 215.67,317.23 213.28,316.47 210.13,316.47 208.26,316.47 206.64,316.81 205.2,317.49 203.66,318.25 202.56,319.19 201.71,320.55L201.53,320.55 200.85,316.89 197.62,316.89 197.62,343.37 201.62,343.37 201.62,329.49C201.62,326 202.3,323.53 203.58,322.09 204.86,320.55 206.9,319.87 209.62,319.87 211.75,319.87 213.28,320.38 214.22,321.4 215.24,322.51 215.67,324.13 215.67,326.26L215.67,343.37 219.67,343.37zM243.68,343.46C244.87,343.12 246.23,342.69 247.68,342.09L247.68,338.52C244.87,339.71 242.06,340.31 239.25,340.31 236.53,340.31 234.4,339.54 232.95,337.92 231.5,336.3 230.65,333.92 230.57,330.86L248.79,330.86 248.79,328.3C248.79,324.73 247.85,321.92 245.89,319.7 244.02,317.49 241.38,316.47 238.06,316.47 234.48,316.47 231.67,317.66 229.63,320.21 227.5,322.68 226.48,326.09 226.48,330.34 226.48,334.6 227.59,337.84 229.8,340.22 232.1,342.6 235.17,343.8 239.08,343.8 240.87,343.8 242.4,343.71 243.68,343.46zM242.83,321.83C243.94,323.11 244.53,325.07 244.53,327.62L230.65,327.62C230.91,325.15 231.67,323.28 232.95,321.83 234.23,320.47 235.85,319.79 237.98,319.79 240.1,319.79 241.72,320.47 242.83,321.83zM263.09,317.83C261.73,318.77 260.54,320.13 259.6,321.83L259.43,321.83 258.92,316.89 255.6,316.89 255.6,343.37 259.6,343.37 259.6,329.15C259.6,326.6 260.37,324.38 261.9,322.68 263.43,320.98 265.22,320.04 267.35,320.04 268.2,320.04 269.22,320.21 270.24,320.47L270.84,316.72C269.9,316.55 268.88,316.47 267.69,316.47 265.99,316.47 264.54,316.89 263.09,317.83zM301.32,330.77C300.38,333.32 299.62,335.96 299.02,338.52 298.51,336.05 297.75,333.49 296.81,330.86L288.72,308.12 284.38,308.12 296.98,343.37 301.07,343.37 313.75,308.12 309.32,308.12 301.32,330.77zM333.68,343.46C334.95,343.12 336.31,342.69 337.76,342.09L337.76,338.52C334.95,339.71 332.14,340.31 329.33,340.31 326.61,340.31 324.48,339.54 323.03,337.92 321.5,336.3 320.73,333.92 320.65,330.86L338.87,330.86 338.87,328.3C338.87,324.73 337.93,321.92 335.97,319.7 334.02,317.49 331.38,316.47 328.14,316.47 324.56,316.47 321.76,317.66 319.63,320.21 317.58,322.68 316.48,326.09 316.48,330.34 316.48,334.6 317.67,337.84 319.88,340.22 322.18,342.6 325.25,343.8 329.16,343.8 330.95,343.8 332.48,343.71 333.68,343.46zM332.91,321.83C334.02,323.11 334.61,325.07 334.61,327.62L320.73,327.62C320.99,325.15 321.76,323.28 323.03,321.83 324.22,320.47 325.93,319.79 328.06,319.79 330.18,319.79 331.8,320.47 332.91,321.83zM353.17,317.83C351.81,318.77 350.62,320.13 349.6,321.83L349.43,321.83 349,316.89 345.68,316.89 345.68,343.37 349.68,343.37 349.68,329.15C349.68,326.6 350.45,324.38 351.98,322.68 353.51,320.98 355.3,320.04 357.43,320.04 358.28,320.04 359.22,320.21 360.32,320.47L360.92,316.72C359.98,316.55 358.88,316.47 357.77,316.47 356.07,316.47 354.53,316.89 353.17,317.83zM369.61,329.83C369.69,327.96 369.78,326.6 369.78,325.75L369.78,305.82 365.86,305.82 365.86,343.37 369.78,343.37 369.78,333.49 372.84,330.86 382.12,343.37 386.97,343.37 375.56,328.13 386.21,316.89 381.44,316.89 372.93,325.92C371.56,327.53 370.46,328.81 369.78,329.83L369.61,329.83zM407.49,343.46C408.77,343.12 410.05,342.69 411.49,342.09L411.49,338.52C408.69,339.71 405.88,340.31 403.07,340.31 400.34,340.31 398.3,339.54 396.77,337.92 395.32,336.3 394.47,333.92 394.38,330.86L412.6,330.86 412.6,328.3C412.6,324.73 411.67,321.92 409.71,319.7 407.83,317.49 405.19,316.47 401.87,316.47 398.3,316.47 395.49,317.66 393.44,320.21 391.32,322.68 390.29,326.09 390.29,330.34 390.29,334.6 391.4,337.84 393.7,340.22 395.91,342.6 398.98,343.8 402.9,343.8 404.68,343.8 406.22,343.71 407.49,343.46zM406.64,321.83C407.75,323.11 408.34,325.07 408.34,327.62L394.55,327.62C394.72,325.15 395.49,323.28 396.77,321.83 398.04,320.47 399.66,319.79 401.79,319.79 403.92,319.79 405.53,320.47 406.64,321.83zM441.55,343.37 L441.55,326.09C441.55,322.77 440.7,320.3 439.08,318.77 437.46,317.23 435.08,316.47 431.84,316.47 429.97,316.47 428.27,316.81 426.82,317.57 425.37,318.34 424.27,319.28 423.5,320.55L423.24,320.55C423.41,319.7 423.41,318.51 423.41,317.15L423.41,305.82 419.41,305.82 419.41,343.37 423.41,343.37 423.41,329.49C423.41,326.09 424.1,323.62 425.37,322.09 426.65,320.55 428.69,319.87 431.42,319.87 433.55,319.87 435.08,320.38 436.02,321.4 437.04,322.51 437.55,324.13 437.55,326.26L437.55,343.37 441.55,343.37zM457.22,317.83C455.85,318.77 454.66,320.13 453.73,321.83L453.47,321.83 453.04,316.89 449.72,316.89 449.72,343.37 453.73,343.37 453.73,329.15C453.73,326.6 454.49,324.38 456.02,322.68 457.56,320.98 459.34,320.04 461.47,320.04 462.32,320.04 463.35,320.21 464.37,320.47L464.96,316.72C464.03,316.55 463.01,316.47 461.81,316.47 460.11,316.47 458.66,316.89 457.22,317.83zM485.31,331.79C484.21,330.6 482.08,329.49 478.93,328.3 476.63,327.45 475.1,326.85 474.33,326.34 473.48,325.92 472.88,325.41 472.54,324.98 472.2,324.47 472.03,323.87 472.03,323.11 472.03,322.09 472.46,321.23 473.48,320.64 474.41,320.04 475.86,319.79 477.74,319.79 479.86,319.79 482.33,320.3 484.97,321.4L486.42,318.17C483.7,316.98 480.89,316.47 478.08,316.47 475.01,316.47 472.63,317.06 470.84,318.34 469.05,319.53 468.2,321.23 468.2,323.36 468.2,324.64 468.45,325.66 468.97,326.51 469.48,327.36 470.24,328.13 471.26,328.81 472.29,329.49 474.07,330.34 476.54,331.2 479.1,332.22 480.8,333.07 481.74,333.84 482.67,334.52 483.1,335.45 483.1,336.47 483.1,337.84 482.5,338.86 481.4,339.54 480.29,340.22 478.67,340.48 476.54,340.48 475.18,340.48 473.82,340.31 472.37,339.97 470.92,339.62 469.56,339.11 468.28,338.43L468.28,342.18C470.24,343.29 472.97,343.8 476.46,343.8 479.78,343.8 482.33,343.12 484.21,341.84 485.99,340.48 486.93,338.6 486.93,336.13 486.93,334.35 486.42,332.9 485.31,331.79zM503.87,343.37 L513.92,316.89 509.66,316.89C506.34,325.92 504.21,331.79 503.28,334.43 502.34,337.07 501.83,338.86 501.66,339.71L501.4,339.71C501.23,338.6 500.47,336.22 499.19,332.56L493.49,316.89 489.23,316.89 499.19,343.37 503.87,343.37zM533.93,343.46C535.12,343.12 536.48,342.69 537.93,342.09L537.93,338.52C535.12,339.71 532.31,340.31 529.5,340.31 526.78,340.31 524.65,339.54 523.2,337.92 521.75,336.3 520.9,333.92 520.82,330.86L539.04,330.86 539.04,328.3C539.04,324.73 538.1,321.92 536.14,319.7 534.18,317.49 531.63,316.47 528.31,316.47 524.73,316.47 521.92,317.66 519.88,320.21 517.75,322.68 516.73,326.09 516.73,330.34 516.73,334.6 517.84,337.84 520.05,340.22 522.35,342.6 525.41,343.8 529.33,343.8 531.12,343.8 532.65,343.71 533.93,343.46zM533.08,321.83C534.18,323.11 534.78,325.07 534.78,327.62L520.99,327.62C521.16,325.15 521.92,323.28 523.2,321.83 524.48,320.47 526.1,319.79 528.22,319.79 530.35,319.79 531.97,320.47 533.08,321.83zM553.34,317.83C551.98,318.77 550.79,320.13 549.85,321.83L549.6,321.83 549.17,316.89 545.85,316.89 545.85,343.37 549.85,343.37 549.85,329.15C549.85,326.6 550.62,324.38 552.15,322.68 553.68,320.98 555.47,320.04 557.6,320.04 558.45,320.04 559.47,320.21 560.49,320.47L561.09,316.72C560.15,316.55 559.13,316.47 557.94,316.47 556.24,316.47 554.79,316.89 553.34,317.83zM570.03,320.47 L569.86,320.47C569.94,318.85 570.03,316.98 570.03,314.93L570.03,305.82 566.03,305.82 566.03,343.37 568.92,343.37 569.77,339.97 570.03,339.97C570.97,341.24 572.16,342.26 573.61,342.86 575.05,343.54 576.59,343.8 578.29,343.8 581.78,343.8 584.42,342.6 586.38,340.22 588.33,337.84 589.27,334.43 589.27,330.09 589.27,325.75 588.33,322.43 586.38,320.04 584.5,317.66 581.78,316.47 578.29,316.47 574.63,316.47 571.9,317.83 570.03,320.47L570.03,320.47zM583.31,322.34C584.5,324.04 585.1,326.6 585.1,330.09 585.1,333.41 584.5,335.96 583.31,337.75 582.12,339.54 580.33,340.48 577.86,340.48 575.14,340.48 573.09,339.62 571.9,338.09 570.63,336.47 570.03,333.84 570.03,330.09 570.03,326.43 570.63,323.79 571.82,322.17 573.01,320.64 574.97,319.87 577.78,319.87 580.25,319.87 582.12,320.64 583.31,322.34zM596,316.89 L596,334.18C596,337.58 596.76,339.97 598.38,341.5 600,343.03 602.38,343.8 605.62,343.8 607.49,343.8 609.11,343.46 610.56,342.78 612,342.09 613.2,341.07 613.96,339.8L614.22,339.8 614.81,343.37 618.05,343.37 618.05,316.89 614.05,316.89 614.05,330.77C614.05,334.26 613.45,336.73 612.17,338.18 610.9,339.71 608.85,340.48 606.13,340.48 604,340.48 602.47,339.97 601.53,338.86 600.51,337.84 600,336.22 600,334.09L600,316.89 596,316.89zM648.62,343.37 L648.62,326.09C648.62,322.68 647.85,320.3 646.23,318.77 644.61,317.23 642.23,316.47 639.08,316.47 637.21,316.47 635.59,316.81 634.14,317.49 632.61,318.25 631.5,319.19 630.65,320.55L630.48,320.55 629.8,316.89 626.56,316.89 626.56,343.37 630.57,343.37 630.57,329.49C630.57,326 631.25,323.53 632.52,322.09 633.8,320.55 635.84,319.87 638.57,319.87 640.7,319.87 642.23,320.38 643.17,321.4 644.19,322.51 644.61,324.13 644.61,326.26L644.61,343.37 648.62,343.37zM675.35,343.37 L678.67,343.37 678.67,305.82 674.67,305.82 674.67,316.55 674.75,318.42 674.92,320.3 674.58,320.3C672.71,317.74 669.9,316.47 666.32,316.47 662.92,316.47 660.19,317.66 658.32,320.04 656.36,322.43 655.43,325.83 655.43,330.17 655.43,334.52 656.36,337.92 658.32,340.31 660.19,342.6 662.92,343.8 666.32,343.8 669.99,343.8 672.8,342.43 674.67,339.8L674.84,339.8 675.35,343.37zM661.39,337.92C660.19,336.13 659.51,333.58 659.51,330.26 659.51,326.94 660.19,324.38 661.39,322.51 662.66,320.72 664.45,319.79 666.84,319.79 669.56,319.79 671.52,320.55 672.8,322.17 673.99,323.79 674.67,326.43 674.67,330.17L674.67,331.03C674.67,334.35 673.99,336.73 672.8,338.26 671.6,339.71 669.56,340.48 666.84,340.48 664.45,340.48 662.66,339.62 661.39,337.92" />
diff --git a/oeffi/res/drawable-anydpi/network_bvg_logo.xml b/oeffi/res/drawable-anydpi/network_bvg_logo.xml
index e688e7e..6db2a3a 100644
--- a/oeffi/res/drawable-anydpi/network_bvg_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_bvg_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="724.0552"
     android:viewportWidth="724.0552"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="7.6969"
-        android:translateY="0" >
+        android:translateY="0">
         <path
             android:fillColor="#f0d723"
             android:pathData="M0 0.000098662109l708.66101 0 0 724.054991337891 -708.66101 0z" />
diff --git a/oeffi/res/drawable-anydpi/network_db_logo.xml b/oeffi/res/drawable-anydpi/network_db_logo.xml
index 3818ee5..cd7927f 100644
--- a/oeffi/res/drawable-anydpi/network_db_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_db_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="744.0945"
     android:viewportWidth="744.0945"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="0"
-        android:translateY="105" >
+        android:translateY="105">
         <path
             android:fillColor="#ec1b2d"
             android:pathData="M90.1,17.8L653.7,17.8C693.8,17.8 726.4,50.1 726.4,90.2L726.4,436.1C726.4,476.2 693.8,508.7 653.7,508.7L90.1,508.7C50.1,508.7 17.7,476.2 17.7,436.1L17.7,90.2C17.7,50.1 50.1,17.8 90.1,17.8z"
diff --git a/oeffi/res/drawable-anydpi/network_kvv_logo.xml b/oeffi/res/drawable-anydpi/network_kvv_logo.xml
index 23b29e0..47322d0 100644
--- a/oeffi/res/drawable-anydpi/network_kvv_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_kvv_logo.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="61.2"
     android:viewportWidth="61.2"
-    android:width="48dp" >
+    android:width="48dp">
 
-    <group android:translateY="15.55" >
+    <group android:translateY="15.55">
         <path
             android:fillColor="#000000"
             android:pathData="M2.68125 18.331869L0 30.054369l3.1475 0 1.245 -5.53375 2.7925 5.53375 3.6925 0 -3.415 -6.0325 5.6825 -5.69 -4.0375 0 -4.38875 4.76125 1.11 -4.76125 -3.1475 0zm10.79375 0l1.29625 11.7225 3.865 0 6.70125 -11.7225 -3.365 0 -4.71625 8.82125 -0.675 -8.82125 -3.10625 0zm12.46 0l1.27875 11.7225 3.925 0 6.67375 -11.7225 -3.36375 0 -4.71875 8.82125 -0.6825 -8.82125 -3.1125 0z" />
@@ -14,7 +15,7 @@
             android:scaleX="0.06151166"
             android:scaleY="0.06151166"
             android:translateX="-0.9254394"
-            android:translateY="-0.903525" >
+            android:translateY="-0.903525">
             <path
                 android:fillColor="#cf113f"
                 android:pathData="M549.71875 14.6875C446.52693 114.05891 294.87504 190.22076 83.1875 192.78125l-16.46875 72.25 924.1875 0 18.06255 -72.28125 -608.4063 0C524.13664 150.88803 594.69278 81.910534 672.21875 14.6875l-122.5 0zm432.75 278.375C745.44051 293.57053 632.87828 405.34752 564.375 504.3125l103.15625 0c107.62188 -136.49853 241.28311 -141.97318 298 -142.5625l16.9375 -68.6875z" />
diff --git a/oeffi/res/drawable-anydpi/network_oebb_logo.xml b/oeffi/res/drawable-anydpi/network_oebb_logo.xml
index abf7839..f97b144 100644
--- a/oeffi/res/drawable-anydpi/network_oebb_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_oebb_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="158.079"
     android:viewportWidth="158.079"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="-6"
-        android:translateY="50.693" >
+        android:translateY="50.693">
         <path
             android:fillColor="#cc082a"
             android:pathData="M57.525 3.187l-12.62 0 -16.342 17.483 0 0 12.998 0z" />
diff --git a/oeffi/res/drawable-anydpi/network_sh_logo.xml b/oeffi/res/drawable-anydpi/network_sh_logo.xml
index f3ecfcc..8189c38 100644
--- a/oeffi/res/drawable-anydpi/network_sh_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_sh_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="168.0354"
     android:viewportWidth="168.0354"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="-78.526"
-        android:translateY="-356.91795" >
+        android:translateY="-356.91795">
         <path
             android:fillColor="#003064"
             android:pathData="M84.734 364.71c-3.437 0 -6.2082 2.721 -6.2082 6.1683 0 3.4625 2.7712 6.1842 6.2082 6.1842 3.4217 0 6.2002 -2.7217 6.2002 -6.1842 0 -3.4472 -2.7785 -6.1683 -6.2002 -6.1683zm0 15.512c-3.437 0 -6.2082 2.798 -6.2082 6.2401 0 3.3961 2.7712 6.1763 6.2082 6.1763 3.4217 0 6.2002 -2.7801 6.2002 -6.1763 0 -3.4421 -2.7785 -6.2401 -6.2002 -6.2401zm15.576 0c-3.4523 0 -6.256 2.798 -6.256 6.2401 0.04086 3.3961 2.8037 6.1763 6.256 6.1763 3.3859 0 6.1922 -2.7801 6.1922 -6.1763 0 -3.4421 -2.8063 -6.2401 -6.1922 -6.2401zm15.528 0c-3.391 0 -6.1682 2.798 -6.1682 6.2401 0 3.3961 2.7772 6.1763 6.1682 6.1763 3.4421 0 6.2015 -2.7801 6.2321 -6.1763 0 -3.4421 -2.79 -6.2401 -6.2321 -6.2401zm15.56 0c-3.4115 0 -6.1782 2.798 -6.2241 6.2401 0.0462 3.3961 2.8127 6.1763 6.2241 6.1763 3.4472 0 6.1934 -2.7801 6.2241 -6.1763 0 -3.4421 -2.7769 -6.2401 -6.2241 -6.2401zm15.552 0c-3.3757 0 -6.1616 2.798 -6.1922 6.2401 0.0286 3.3961 2.8165 6.1763 6.1922 6.1763 3.4268 0 6.248 -2.7801 6.248 -6.1763 0 -3.4421 -2.8212 -6.2401 -6.248 -6.2401zm15.608 0c-3.4523 0 -6.256 2.798 -6.256 6.2401 0 3.3961 2.8037 6.1763 6.256 6.1763 3.391 0 6.1762 -2.7801 6.1762 -6.1763 0 -3.4421 -2.7852 -6.2401 -6.1762 -6.2401zm-77.826 15.544c-3.437 0 -6.2082 2.8002 -6.2082 6.2321 0 3.437 2.7712 6.2401 6.2082 6.2401 3.4217 0 6.2002 -2.8031 6.2002 -6.2401 0 -3.4319 -2.7785 -6.2321 -6.2002 -6.2321zm31.105 0c-3.391 0 -6.1682 2.8002 -6.1682 6.2321 0 3.437 2.7772 6.2401 6.1682 6.2401 3.4421 0 6.2321 -2.8031 6.2321 -6.2401 0 -3.4319 -2.79 -6.2321 -6.2321 -6.2321zm15.56 0c-3.4115 0 -6.2241 2.8002 -6.2241 6.2321 0.0462 3.437 2.8127 6.2401 6.2241 6.2401 3.4472 0 6.2241 -2.8031 6.2241 -6.2401 0 -3.4319 -2.7769 -6.2321 -6.2241 -6.2321zm15.552 0c-3.3757 0 -6.1922 2.8002 -6.1922 6.2321 0 3.437 2.8165 6.2401 6.1922 6.2401 3.4268 0 6.248 -2.8031 6.248 -6.2401 0 -3.4319 -2.8212 -6.2321 -6.248 -6.2321zm15.608 0c-3.4523 0 -6.256 2.8002 -6.256 6.2321 0 3.437 2.8037 6.2401 6.256 6.2401 3.391 0 6.1762 -2.8031 6.1762 -6.2401 0 -3.4319 -2.7852 -6.2321 -6.1762 -6.2321zm15.528 0c-3.4115 0 -6.1922 2.8002 -6.1922 6.2321 0 3.437 2.7807 6.2401 6.1922 6.2401 3.437 0 6.2161 -2.8031 6.2161 -6.2401 0 -3.4319 -2.7791 -6.2321 -6.2161 -6.2321zm-62.249 15.592c-3.391 0 -6.1682 2.7871 -6.1682 6.2241 0 3.4217 2.7772 6.1603 6.1682 6.1603 3.4421 0 6.2321 -2.7386 6.2321 -6.1603 0 -3.437 -2.79 -6.2241 -6.2321 -6.2241zm15.56 0c-3.4115 0 -6.2241 2.7871 -6.2241 6.2241 0 3.4217 2.8127 6.1603 6.2241 6.1603 3.4472 0 6.2241 -2.7386 6.2241 -6.1603 0 -3.437 -2.7769 -6.2241 -6.2241 -6.2241zm15.552 0c-3.3757 0 -6.1922 2.7871 -6.1922 6.2241 0 3.4217 2.8165 6.1603 6.1922 6.1603 3.4268 0 6.248 -2.7386 6.248 -6.1603 0 -3.437 -2.8212 -6.2241 -6.248 -6.2241zm15.608 0c-3.4523 0 -6.256 2.7871 -6.256 6.2241 0 3.4217 2.8037 6.1603 6.256 6.1603 3.391 0 6.1762 -2.7386 6.1762 -6.1603 0 -3.437 -2.7852 -6.2241 -6.1762 -6.2241zm77.778 0c-3.437 0 -6.1842 2.7871 -6.1842 6.2241 0 3.4217 2.7472 6.1603 6.1842 6.1603 3.4676 0 6.2241 -2.7386 6.2241 -6.1603 0 -3.437 -2.7565 -6.2241 -6.2241 -6.2241zm-140.03 15.544c-3.4523 0.0462 -6.256 2.8526 -6.256 6.264 0 3.4217 2.8037 6.2002 6.256 6.2002 3.4166 0 6.1922 -2.7785 6.1922 -6.2002 0 -3.4114 -2.7757 -6.218 -6.1922 -6.264zm15.528 0c-3.391 0.0462 -6.1682 2.8526 -6.1682 6.264 0 3.4217 2.7772 6.2002 6.1682 6.2002 3.4421 0 6.2002 -2.7785 6.2002 -6.2002 0 -3.4114 -2.7581 -6.218 -6.2002 -6.264zm15.56 0c-3.4115 0.0462 -6.1782 2.8526 -6.2241 6.264 0.0462 3.4217 2.8127 6.2002 6.2241 6.2002 3.4472 0 6.1934 -2.7785 6.2241 -6.2002 0 -3.4114 -2.7769 -6.218 -6.2241 -6.264zm15.552 0c-3.3757 0.0462 -6.1922 2.8526 -6.1922 6.264 0 3.4217 2.8165 6.2002 6.1922 6.2002 3.4268 0 6.248 -2.7785 6.248 -6.2002 0 -3.4114 -2.8212 -6.218 -6.248 -6.264zm15.608 0c-3.4523 0.0462 -6.256 2.8526 -6.256 6.264 0 3.4217 2.8037 6.2002 6.256 6.2002 3.391 0 6.1762 -2.7785 6.1762 -6.2002 0 -3.4114 -2.7852 -6.218 -6.1762 -6.264zm15.528 0c-3.4115 0.0462 -6.1769 2.8526 -6.1922 6.264 0.0163 3.4217 2.7807 6.2002 6.1922 6.2002 3.437 0 6.2161 -2.7785 6.2161 -6.2002 0 -3.4114 -2.7791 -6.218 -6.2161 -6.264zm15.56 0c-3.4064 0.0462 -6.1922 2.8526 -6.1922 6.264 0 3.4217 2.7858 6.2002 6.1922 6.2002 3.4523 0 6.1964 -2.7785 6.2321 -6.2002 -0.0368 -3.4114 -2.7798 -6.218 -6.2321 -6.264zm15.568 0c-3.4472 0.0462 -6.2241 2.8526 -6.2241 6.264 0 3.4217 2.7769 6.2002 6.2241 6.2002 3.4472 0 6.2015 -2.7785 6.2321 -6.2002 -0.0327 -3.4114 -2.7849 -6.218 -6.2321 -6.264zm15.568 0c-3.4523 0.0462 -6.1993 2.8526 -6.2401 6.264 0.0409 3.4217 2.7878 6.2002 6.2401 6.2002 3.4319 0 6.2241 -2.7785 6.2241 -6.2002 0 -3.4114 -2.7922 -6.218 -6.2241 -6.264zm-108.95 15.64c-3.391 0 -6.1682 2.7131 -6.1682 6.1603 0 3.4319 2.7772 6.2401 6.1682 6.2401 3.4421 0 6.2321 -2.798 6.2321 -6.2401 0 -3.4472 -2.79 -6.1603 -6.2321 -6.1603zm15.568 0c-3.4166 0 -6.1922 2.7131 -6.1922 6.1603 0 3.4319 2.7757 6.2401 6.1922 6.2401 3.4472 0 6.2161 -2.798 6.2161 -6.2401 -0.0245 -3.4472 -2.7689 -6.1603 -6.2161 -6.1603zm15.544 0c-3.3757 0 -6.1922 2.7131 -6.1922 6.1603 0 3.4319 2.8165 6.2401 6.1922 6.2401 3.4268 0 6.248 -2.8082 6.248 -6.2401 0 -3.4472 -2.8212 -6.1603 -6.248 -6.1603zm15.608 0c-3.4523 0 -6.256 2.7131 -6.256 6.1603 0 3.4319 2.8037 6.2401 6.256 6.2401 3.391 0 6.1762 -2.8082 6.1762 -6.2401 0 -3.4472 -2.7852 -6.1603 -6.1762 -6.1603zm15.528 0c-3.4115 0 -6.1922 2.7131 -6.1922 6.1603 0 3.4319 2.7807 6.2401 6.1922 6.2401 3.437 0 6.2241 -2.8082 6.2241 -6.2401 0 -3.4472 -2.7871 -6.1603 -6.2241 -6.1603zm15.56 0c-3.437 0 -6.1922 2.7131 -6.1922 6.1603 0 3.4421 2.7552 6.2401 6.1922 6.2401 3.4523 0 6.1964 -2.8082 6.2321 -6.2401 -0.0368 -3.4472 -2.7798 -6.1603 -6.2321 -6.1603zm15.568 0c-3.4472 0 -6.2241 2.7131 -6.2241 6.1603 0 3.4319 2.7769 6.2401 6.2241 6.2401 3.4472 0 6.2321 -2.8082 6.2321 -6.2401 0 -3.4472 -2.7849 -6.1603 -6.2321 -6.1603zm15.568 0c-3.4319 0 -6.2401 2.7131 -6.2401 6.1603 0 3.4319 2.8082 6.2401 6.2401 6.2401 3.4319 0 6.2241 -2.8082 6.2241 -6.2401 0 -3.4472 -2.7922 -6.1603 -6.2241 -6.1603zm-108.95 15.544c-3.391 0 -6.1682 2.7603 -6.1682 6.1922 0 3.437 2.7772 6.2401 6.1682 6.2401 3.4421 0 6.2321 -2.8031 6.2321 -6.2401 0 -3.4319 -2.79 -6.1922 -6.2321 -6.1922zm15.568 0c-3.4166 0 -6.1922 2.7603 -6.1922 6.1922 0 3.437 2.7757 6.2401 6.1922 6.2401 3.4472 0 6.2161 -2.8031 6.2161 -6.2401 0 -3.4319 -2.7689 -6.1922 -6.2161 -6.1922zm15.544 0c-3.3757 0 -6.1922 2.7603 -6.1922 6.1922 0 3.437 2.8165 6.2401 6.1922 6.2401 3.4268 0 6.248 -2.8031 6.248 -6.2401 0 -3.4319 -2.8212 -6.1922 -6.248 -6.1922zm15.608 0c-3.4523 0 -6.256 2.7603 -6.256 6.1922 0 3.437 2.8037 6.2401 6.256 6.2401 3.391 0 6.1762 -2.8031 6.1762 -6.2401 0 -3.4319 -2.7852 -6.1922 -6.1762 -6.1922zm15.528 0c-3.4115 0 -6.1922 2.7603 -6.1922 6.1922 0 3.437 2.7807 6.2401 6.1922 6.2401 3.437 0 6.2161 -2.8031 6.2161 -6.2401 0 -3.4319 -2.7791 -6.1922 -6.2161 -6.1922zm15.56 0c-3.4064 0 -6.1922 2.7603 -6.1922 6.1922 0 3.437 2.7858 6.2401 6.1922 6.2401 3.4523 0 6.1964 -2.8031 6.2321 -6.2401 -0.0368 -3.4319 -2.7798 -6.1922 -6.2321 -6.1922zm15.568 0c-3.4472 0 -6.2241 2.7603 -6.2241 6.1922 0 3.437 2.7769 6.2401 6.2241 6.2401 3.4472 0 6.2321 -2.8031 6.2321 -6.2401 0 -3.4319 -2.7849 -6.1922 -6.2321 -6.1922zm-62.27 15.56c-3.3757 0 -6.1922 2.8005 -6.1922 6.1762 0 3.4523 2.8165 6.2321 6.1922 6.2321 3.4268 0 6.248 -2.7798 6.248 -6.2321 0 -3.3757 -2.8212 -6.1762 -6.248 -6.1762zm15.608 0c-3.4523 0 -6.256 2.8005 -6.256 6.1762 0 3.4523 2.8037 6.2321 6.256 6.2321 3.391 0 6.1762 -2.7798 6.1762 -6.2321 0 -3.3757 -2.7852 -6.1762 -6.1762 -6.1762zm15.528 0c-3.4115 0 -6.1769 2.8005 -6.1922 6.1762 0 3.4523 2.7807 6.2321 6.1922 6.2321 3.437 0 6.2241 -2.7798 6.2241 -6.2321 -0.008 -3.3757 -2.7871 -6.1762 -6.2241 -6.1762zm15.56 0c-3.437 0 -6.1666 2.8005 -6.1922 6.1762 0 3.4523 2.7552 6.2321 6.1922 6.2321 3.4523 0 6.2321 -2.7798 6.2321 -6.2321 -0.0368 -3.3757 -2.7798 -6.1762 -6.2321 -6.1762zm15.568 0c-3.4472 0 -6.2241 2.8005 -6.2241 6.1762 0 3.4523 2.7769 6.2321 6.2241 6.2321 3.4472 0 6.2321 -2.7798 6.2321 -6.2321 0 -3.3757 -2.7849 -6.1762 -6.2321 -6.1762zm-46.657 15.584c-3.4523 0 -6.256 2.7143 -6.256 6.1922 0 3.4319 2.8037 6.1603 6.256 6.1603 3.391 0 6.1762 -2.7284 6.1762 -6.1603 0 -3.4778 -2.7852 -6.1922 -6.1762 -6.1922zm31.089 0c-3.437 0 -6.1922 2.7143 -6.1922 6.1922 0 3.4319 2.7552 6.1603 6.1922 6.1603 3.4523 0 6.2321 -2.7284 6.2321 -6.1603 0 -3.4778 -2.7798 -6.1922 -6.2321 -6.1922zm15.568 0c-3.4472 0 -6.2241 2.7143 -6.2241 6.1922 0 3.4319 2.7769 6.1603 6.2241 6.1603 3.4472 0 6.2321 -2.7284 6.2321 -6.1603 0 -3.4778 -2.7849 -6.1922 -6.2321 -6.1922zm15.568 0c-3.4523 0 -6.2002 2.7143 -6.2002 6.1922 0 3.4319 2.7479 6.1603 6.2002 6.1603 3.4319 0 6.2241 -2.7284 6.2241 -6.1603 0 -3.4778 -2.7922 -6.1922 -6.2241 -6.1922zm-31.137 15.504c-3.437 0 -6.1922 2.8027 -6.1922 6.2244 0 3.4062 2.7552 6.2162 6.1922 6.2162 3.4523 0 6.1964 -2.8101 6.2321 -6.2162 -0.0368 -3.4217 -2.7798 -6.2244 -6.2321 -6.2244zm15.568 0c-3.4472 0 -6.2241 2.8027 -6.2241 6.2244 0.0163 3.4062 2.7769 6.2162 6.2241 6.2162 3.4472 0 6.2321 -2.8101 6.2321 -6.2162 0 -3.4217 -2.7849 -6.2244 -6.2321 -6.2244z" />
diff --git a/oeffi/res/drawable-anydpi/network_vagfr_logo.xml b/oeffi/res/drawable-anydpi/network_vagfr_logo.xml
index 25b5d55..3ef6346 100644
--- a/oeffi/res/drawable-anydpi/network_vagfr_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_vagfr_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="157"
     android:viewportWidth="157"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="-372.5"
-        android:translateY="-453.922647" >
+        android:translateY="-453.922647">
         <path
             android:fillColor="#ed1c24"
             android:pathData="M477.07813 500.23964c-8.00125 0 -14.50001 6.71 -14.5 14.9375 0 8.0775 6.49377 14.78128 14.3125 14.78125 3.87 0 7.73749 -1.76627 10.28125 -4.8125 2.545 -3.04875 2.94752 -6.23751 2.875 -10.125l-11.4375 0 0 2.96875 8.125 0c0 5.33375 -5.07628 9 -9.90625 9 -2.91375 0 -5.87626 -1.56122 -7.90625 -3.65625 -2.0625 -2.17375 -3.21874 -5.07623 -3.21875 -8.125 0 -6.47625 5.00122 -11.99998 11.34375 -12 4.09125 0 7.23873 2.03 9.5625 4.96875l2.25 -2.1875c-2.94875 -3.5075 -6.91372 -5.74998 -11.78125 -5.75zm-65 1.3125l10.0625 27.8125 9.3125 0 9.90625 -27.8125 -7.96875 0 -6.40625 20.6875 -6.375 -20.6875 -8.53125 0zm35.03125 0l-10.46875 27.8125 6.3125 0 1.78125 -5.53125 11 0 1.8125 5.53125 6.4375 0 -9.65625 -27.8125 -7.21875 0zm3.34375 5.90625l4.03125 11.3125 -7.96875 0 3.9375 -11.3125zm-35.9375 11.6875c-16.9375 5.86998 -23.34375 9.3125 -23.34375 9.3125 -19.87248 9.70999 -18.5 19.18745 -18.5 19.18745 0.90498 9.485 16.9375 13.0938 16.9375 13.0938 19.86501 5.3325 41.78125 3.4062 41.78125 3.4062 37.03498 -0.9024 68.71875 -13.75 68.71875 -13.75 25.96875 -9.9362 29.5 -21.0312 29.5 -21.0312l-1.28125 0.0625c-6.63623 11.64 -28.875 18.9063 -28.875 18.9063 -14.37751 5.9749 -37.3125 9.625 -37.3125 9.625 -33.04876 5.0562 -52.78125 1.7812 -52.78125 1.7812 -29.16499 -3.4112 -28.125 -14.125 -28.125 -14.125 -0.70998 -13.17376 34.09375 -24.84375 34.09375 -24.84375l-0.8125 -1.625z" />
diff --git a/oeffi/res/drawable-anydpi/network_vbb_logo.xml b/oeffi/res/drawable-anydpi/network_vbb_logo.xml
index 19f6e9a..2c2a161 100644
--- a/oeffi/res/drawable-anydpi/network_vbb_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_vbb_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="341.3282"
     android:viewportWidth="341.3282"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="192.1762"
-        android:translateY="-161.6981" >
+        android:translateY="-161.6981">
         <path
             android:fillColor="#e20619"
             android:pathData="M-19.260181 162.70135c-1.41518 0.0122 -2.17188 0.0547 -2.17188 0.0547l0 38.97656c0 0 34.47157 -1.48985 68.47657 19.66016 31.90375 19.8425 46.33007 48.63476 46.33007 48.63476l42.875001 0c0 0 -14.0307 -44.90906 -63.283201 -78.57031 -40.18219 -27.46406 -82.3202997 -28.8409 -92.22656 -28.75586zm-36.57227 3.50781c0 0 -11.52593 2.02578 -25.335932 7.17578 -13.80876 5.15 -24.093757 11.33789 -24.093757 11.33789l19.630857 33.80469c0 0 9.017192 -5.30375 19.523442 -9 10.505 -3.6975 18.2461 -5.13867 18.2461 -5.13867l-7.97071 -38.17969zm-74.322269 35.87695c0 0 -9.61234 8.42672 -15.05859 14.26172 -5.445 5.83375 -11.78125 13.73047 -11.78125 13.73047l31.53516 23.5625c0 0 3.85672 -5.58523 8.51172 -10.45898 4.655 -4.875 11.68554 -11.1543 11.68554 -11.1543l-24.89258 -29.94141zm-8.26757 84.37305l8.4082 91.28906 27.40821 0 47.216789 -91.28906 -25.662112 0 -29.216787 65.39453 -0.26758 0 -1.15039 -65.39453 -26.73633 0zm92.705079 0l-19.40235 91.28906 36.00782 0c17.87 0 32.1109103 -7.58406 35.9472603 -25.63281 2.61309 -12.29375 -3.21905 -19.61883 -14.49219 -21.58008l0.0566 -0.26172c9.87767 -2.22375 19.2127797 -7.58687 22.3261797 -22.23437 2.89127 -13.6025 -5.0857097 -21.58008 -24.97071 -21.58008l-35.47265 0zm80.34765 0l-19.40429 91.28906 36.00781 0c17.87 0 32.11091 -7.58406 35.94726 -25.63281 2.61309 -12.29375 -3.21905 -19.61883 -14.49218 -21.58008l0.0547 -0.26172c9.87767 -2.22375 19.21473 -7.58687 22.32813 -22.23437 2.89127 -13.6025 -5.08766 -21.58008 -24.97266 -21.58008l-35.46875 0zm-59.66406 16.48047l6.44727 0c5.9125 0 9.5452403 3.1382 8.09961 9.93945 -1.64013 7.71625 -7.65008 10.07032 -13.83008 10.07032l-4.97071 0 4.25391 -20.00977zm80.34375 0l6.45117 0c5.91125 0 9.5433 3.1382 8.09766 9.93945 -1.64013 7.71625 -7.64883 10.07032 -13.83008 10.07032l-4.9707 0 4.25195 -20.00977zm-88.09961 36.48828l7.79102 0c6.58375 0 9.4847 4.05422 8.03906 10.85547 -1.47328 6.93125 -6.38828 10.46289 -13.64453 10.46289l-6.7168 0 4.53125 -21.31836zm80.34375 0l7.79297 0c6.58375 0 9.4847 4.05422 8.03906 10.85547 -1.47327 6.93125 -6.38953 10.46289 -13.64453 10.46289l-6.71875 0 4.53125 -21.31836zM-179.1762 394.69744c0 0 14.0307 44.90907 63.28321 78.57032 45.922499 31.3875 94.398429 28.70117 94.398429 28.70117l0 -38.97461c0 0 -34.47156 1.48789 -68.476562 -19.66211 -31.903747 -19.8425 -46.330077 -48.63477 -46.330077 -48.63477l-42.875 0zm261.708989 16.38672c0 0 -3.85672 5.58524 -8.51172 10.45899 -4.655 4.875 -11.68555 11.15429 -11.68555 11.15429l24.89258 29.94141c0 0 9.61234 -8.42672 15.058591 -14.26172 5.445 -5.83375 11.78125 -13.73047 11.78125 -13.73047l-31.535151 -23.5625zm-39.82813 35.11328c0 0 -9.01719 5.30375 -19.52344 9 -10.505 3.6975 -18.2460897 5.13867 -18.2460897 5.13867l7.9726597 38.17969c0 0 11.52398 -2.02578 25.33398 -7.17578 13.80875 -5.15125 24.09375 -11.33984 24.09375 -11.33984l-19.63086 -33.80274z" />
diff --git a/oeffi/res/drawable-anydpi/network_vgn_logo.xml b/oeffi/res/drawable-anydpi/network_vgn_logo.xml
index 2fc1618..c47f958 100644
--- a/oeffi/res/drawable-anydpi/network_vgn_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_vgn_logo.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="274"
     android:viewportWidth="274"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="-399.5"
-        android:translateY="238" >
+        android:translateY="238">
         <group
             android:scaleX="5.783103"
             android:scaleY="5.783103"
             android:translateX="-2029.067"
-            android:translateY="-4604.031" >
+            android:translateY="-4604.031">
             <path
                 android:fillColor="#221f1f"
                 android:pathData="M432.21 782.077l-0.21 -4.915 -2.44 0 0.8 8.166 2.6 0 4.06 -8.166 -2.45 0 -2.36 4.915z"
diff --git a/oeffi/res/drawable-anydpi/network_vms_logo.xml b/oeffi/res/drawable-anydpi/network_vms_logo.xml
index cbdad75..6f4e46d 100644
--- a/oeffi/res/drawable-anydpi/network_vms_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_vms_logo.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="127.8"
     android:viewportWidth="127.8"
-    android:width="48dp" >
+    android:width="48dp">
 
     <path
         android:fillColor="#DD0B2F"
diff --git a/oeffi/res/drawable-anydpi/network_vrr_logo.xml b/oeffi/res/drawable-anydpi/network_vrr_logo.xml
index 2479e2f..363043d 100644
--- a/oeffi/res/drawable-anydpi/network_vrr_logo.xml
+++ b/oeffi/res/drawable-anydpi/network_vrr_logo.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="48dp"
     android:viewportHeight="137"
     android:viewportWidth="137"
-    android:width="48dp" >
+    android:width="48dp">
 
     <group
         android:translateX="8"
-        android:translateY="0" >
+        android:translateY="0">
         <path
             android:fillColor="#007e32"
             android:pathData="M 63.88672,0 L 63.88672,21.59178 L 103.26172,44.00878 L 103.26172,91.90917 L 63.88672,115.13671 L 63.88672,136.6748 L 121.91895,103.61327 L 121.91895,32.51952 L 63.88672,0"
diff --git a/oeffi/res/drawable-anydpi/product_bus_color_22dp.xml b/oeffi/res/drawable-anydpi/product_bus_color_22dp.xml
index cba8621..45c4f87 100644
--- a/oeffi/res/drawable-anydpi/product_bus_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_bus_color_22dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="22dp" >
+    android:width="22dp">
 
     <path
         android:fillColor="#a3007c"
@@ -12,7 +13,7 @@
     <group
         android:scaleX="0.93"
         android:scaleY="0.93"
-        android:translateY="28" >
+        android:translateY="28">
         <path
             android:fillColor="#ffffff"
             android:pathData="M178.20792 263.87558C178.20776 271.38825 176.67741 278.10092 173.61686
diff --git a/oeffi/res/drawable-anydpi/product_bus_color_32dp.xml b/oeffi/res/drawable-anydpi/product_bus_color_32dp.xml
index c9119b6..9270b25 100644
--- a/oeffi/res/drawable-anydpi/product_bus_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_bus_color_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#a3007c"
@@ -12,7 +13,7 @@
     <group
         android:scaleX="0.93"
         android:scaleY="0.93"
-        android:translateY="28" >
+        android:translateY="28">
         <path
             android:fillColor="#ffffff"
             android:pathData="M178.20792 263.87558C178.20776 271.38825 176.67741 278.10092 173.61686
diff --git a/oeffi/res/drawable-anydpi/product_bus_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_bus_darkgrey_32dp.xml
index 096e99a..6d48396 100644
--- a/oeffi/res/drawable-anydpi/product_bus_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_bus_darkgrey_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#a9a9a9"
@@ -12,7 +13,7 @@
     <group
         android:scaleX="0.93"
         android:scaleY="0.93"
-        android:translateY="28" >
+        android:translateY="28">
         <path
             android:fillColor="#ffffff"
             android:pathData="M178.20792 263.87558C178.20776 271.38825 176.67741 278.10092 173.61686
diff --git a/oeffi/res/drawable-anydpi/product_cablecar_color_22dp.xml b/oeffi/res/drawable-anydpi/product_cablecar_color_22dp.xml
index ca82f7f..73837e8 100644
--- a/oeffi/res/drawable-anydpi/product_cablecar_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_cablecar_color_22dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="22dp" >
+    android:width="22dp">
 
     <group
         android:pivotX="250"
         android:pivotY="250"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#0080c0"
             android:pathData="M 0 0 H 500 V 500 H 0 V 0 Z" />
@@ -17,7 +18,7 @@
         <group
             android:scaleX="5"
             android:scaleY="5"
-            android:translateX="87" >
+            android:translateX="87">
             <path
                 android:fillColor="#ffffff"
                 android:pathData="M 51.904,49.946 h -12.84 c 4.25,-5.939,6.5,-12.684,7.182,-18.825 c 0.768,-6.908,-0.201,-13.224,-3.373,-17.628
diff --git a/oeffi/res/drawable-anydpi/product_cablecar_color_32dp.xml b/oeffi/res/drawable-anydpi/product_cablecar_color_32dp.xml
index ec3a260..28d1c85 100644
--- a/oeffi/res/drawable-anydpi/product_cablecar_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_cablecar_color_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="250"
         android:pivotY="250"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#0080c0"
             android:pathData="M 0 0 H 500 V 500 H 0 V 0 Z" />
@@ -17,7 +18,7 @@
         <group
             android:scaleX="5"
             android:scaleY="5"
-            android:translateX="87" >
+            android:translateX="87">
             <path
                 android:fillColor="#ffffff"
                 android:pathData="M 51.904,49.946 h -12.84 c 4.25,-5.939,6.5,-12.684,7.182,-18.825 c 0.768,-6.908,-0.201,-13.224,-3.373,-17.628
diff --git a/oeffi/res/drawable-anydpi/product_cablecar_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_cablecar_darkgrey_32dp.xml
index dc4f61e..4c27365 100644
--- a/oeffi/res/drawable-anydpi/product_cablecar_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_cablecar_darkgrey_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="250"
         android:pivotY="250"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#a9a9a9"
             android:pathData="M 0 0 H 500 V 500 H 0 V 0 Z" />
@@ -17,7 +18,7 @@
         <group
             android:scaleX="5"
             android:scaleY="5"
-            android:translateX="87" >
+            android:translateX="87">
             <path
                 android:fillColor="#ffffff"
                 android:pathData="M 51.904,49.946 h -12.84 c 4.25,-5.939,6.5,-12.684,7.182,-18.825 c 0.768,-6.908,-0.201,-13.224,-3.373,-17.628
diff --git a/oeffi/res/drawable-anydpi/product_call_color_22dp.xml b/oeffi/res/drawable-anydpi/product_call_color_22dp.xml
index a788298..18ae9bf 100644
--- a/oeffi/res/drawable-anydpi/product_call_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_call_color_22dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="22dp" >
+    android:width="22dp">
 
     <path
         android:fillColor="#a3007c"
@@ -13,7 +14,7 @@
         android:scaleX="17"
         android:scaleY="17"
         android:translateX="45"
-        android:translateY="45" >
+        android:translateY="45">
         <path
             android:fillColor="#ffffff"
             android:pathData="M 20 15.5 c -1.25 0 -2.45 -0.2 -3.57 -0.57 -0.35 -0.11 -0.74 -0.03 -1.02 0.24 l -2.2 2.2 c -2.83 -1.44 -5.15 -3.75 -6.59 -6.58 l 2.2 -2.21 c 0.28 -0.27 0.36 -0.66 0.25 -1.01 C 8.7 6.45 8.5 5.25 8.5 4 c 0 -0.55 -0.45 -1 -1 -1 H 4 c -0.55 0 -1 0.45 -1 1 0 9.39 7.61 17 17 17 0.55 0 1 -0.45 1 -1 v -3.5 c 0 -0.55 -0.45 -1 -1 -1 z" />
diff --git a/oeffi/res/drawable-anydpi/product_call_color_32dp.xml b/oeffi/res/drawable-anydpi/product_call_color_32dp.xml
index bafe410..bacb90f 100644
--- a/oeffi/res/drawable-anydpi/product_call_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_call_color_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#a3007c"
@@ -13,7 +14,7 @@
         android:scaleX="17"
         android:scaleY="17"
         android:translateX="45"
-        android:translateY="45" >
+        android:translateY="45">
         <path
             android:fillColor="#ffffff"
             android:pathData="M 20 15.5 c -1.25 0 -2.45 -0.2 -3.57 -0.57 -0.35 -0.11 -0.74 -0.03 -1.02 0.24 l -2.2 2.2 c -2.83 -1.44 -5.15 -3.75 -6.59 -6.58 l 2.2 -2.21 c 0.28 -0.27 0.36 -0.66 0.25 -1.01 C 8.7 6.45 8.5 5.25 8.5 4 c 0 -0.55 -0.45 -1 -1 -1 H 4 c -0.55 0 -1 0.45 -1 1 0 9.39 7.61 17 17 17 0.55 0 1 -0.45 1 -1 v -3.5 c 0 -0.55 -0.45 -1 -1 -1 z" />
diff --git a/oeffi/res/drawable-anydpi/product_call_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_call_darkgrey_32dp.xml
index e65058d..4c38148 100644
--- a/oeffi/res/drawable-anydpi/product_call_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_call_darkgrey_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#a9a9a9"
@@ -13,7 +14,7 @@
         android:scaleX="17"
         android:scaleY="17"
         android:translateX="45"
-        android:translateY="45" >
+        android:translateY="45">
         <path
             android:fillColor="#ffffff"
             android:pathData="M 20 15.5 c -1.25 0 -2.45 -0.2 -3.57 -0.57 -0.35 -0.11 -0.74 -0.03 -1.02 0.24 l -2.2 2.2 c -2.83 -1.44 -5.15 -3.75 -6.59 -6.58 l 2.2 -2.21 c 0.28 -0.27 0.36 -0.66 0.25 -1.01 C 8.7 6.45 8.5 5.25 8.5 4 c 0 -0.55 -0.45 -1 -1 -1 H 4 c -0.55 0 -1 0.45 -1 1 0 9.39 7.61 17 17 17 0.55 0 1 -0.45 1 -1 v -3.5 c 0 -0.55 -0.45 -1 -1 -1 z" />
diff --git a/oeffi/res/drawable-anydpi/product_ferry_color_22dp.xml b/oeffi/res/drawable-anydpi/product_ferry_color_22dp.xml
index 20be0b1..7746bc9 100644
--- a/oeffi/res/drawable-anydpi/product_ferry_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_ferry_color_22dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="22dp" >
+    android:width="22dp">
 
     <path
         android:fillColor="#ffffff"
@@ -11,7 +12,7 @@
 
     <group
         android:translateX="-124"
-        android:translateY="-282.36217" >
+        android:translateY="-282.36217">
         <path
             android:fillColor="#0080c0"
             android:pathData="M 530.96544,727.09056 C 518.61233,731.51828 424.32729,729.55598
diff --git a/oeffi/res/drawable-anydpi/product_ferry_color_32dp.xml b/oeffi/res/drawable-anydpi/product_ferry_color_32dp.xml
index 03bdadf..80198ba 100644
--- a/oeffi/res/drawable-anydpi/product_ferry_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_ferry_color_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#ffffff"
@@ -11,7 +12,7 @@
 
     <group
         android:translateX="-124"
-        android:translateY="-282.36217" >
+        android:translateY="-282.36217">
         <path
             android:fillColor="#0080c0"
             android:pathData="M 530.96544,727.09056 C 518.61233,731.51828 424.32729,729.55598
diff --git a/oeffi/res/drawable-anydpi/product_ferry_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_ferry_darkgrey_32dp.xml
index ad0d279..f1964da 100644
--- a/oeffi/res/drawable-anydpi/product_ferry_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_ferry_darkgrey_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#ffffff"
@@ -11,7 +12,7 @@
 
     <group
         android:translateX="-124"
-        android:translateY="-282.36217" >
+        android:translateY="-282.36217">
         <path
             android:fillColor="#a9a9a9"
             android:pathData="M 530.96544,727.09056 C 518.61233,731.51828 424.32729,729.55598
diff --git a/oeffi/res/drawable-anydpi/product_highspeed_color_22dp.xml b/oeffi/res/drawable-anydpi/product_highspeed_color_22dp.xml
index d384a26..601ffee 100644
--- a/oeffi/res/drawable-anydpi/product_highspeed_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_highspeed_color_22dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="2200"
     android:viewportWidth="2200"
-    android:width="22dp" >
+    android:width="22dp">
 
     <group
         android:pivotX="1100"
         android:pivotY="1100"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#ff0000"
             android:pathData="M0,2200L2200,2200L2200,0l-2200,0Z" />
diff --git a/oeffi/res/drawable-anydpi/product_highspeed_color_32dp.xml b/oeffi/res/drawable-anydpi/product_highspeed_color_32dp.xml
index addbd25..db9dea3 100644
--- a/oeffi/res/drawable-anydpi/product_highspeed_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_highspeed_color_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="2200"
     android:viewportWidth="2200"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="1100"
         android:pivotY="1100"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#ff0000"
             android:pathData="M0,2200L2200,2200L2200,0l-2200,0Z" />
diff --git a/oeffi/res/drawable-anydpi/product_highspeed_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_highspeed_darkgrey_32dp.xml
index 68b78e5..d1185ba 100644
--- a/oeffi/res/drawable-anydpi/product_highspeed_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_highspeed_darkgrey_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="2200"
     android:viewportWidth="2200"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="1100"
         android:pivotY="1100"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#a9a9a9"
             android:pathData="M0,2200L2200,2200L2200,0l-2200,0Z" />
diff --git a/oeffi/res/drawable-anydpi/product_suburban_color_22dp.xml b/oeffi/res/drawable-anydpi/product_suburban_color_22dp.xml
index 5e804d7..b72e8fe 100644
--- a/oeffi/res/drawable-anydpi/product_suburban_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_suburban_color_22dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="353"
     android:viewportWidth="353"
-    android:width="22dp" >
+    android:width="22dp">
 
     <group
         android:scaleX="1.07"
         android:scaleY="1.07"
         android:translateX="-12"
-        android:translateY="-12" >
+        android:translateY="-12">
         <path
             android:fillColor="#006f35"
             android:pathData="M175.4,341.586c-91.5,0-165.899-74.399-165.899-165.9c0-91.5,74.399-165.9,165.899-165.9
diff --git a/oeffi/res/drawable-anydpi/product_suburban_color_32dp.xml b/oeffi/res/drawable-anydpi/product_suburban_color_32dp.xml
index ade22aa..2be1b47 100644
--- a/oeffi/res/drawable-anydpi/product_suburban_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_suburban_color_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="353"
     android:viewportWidth="353"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:scaleX="1.07"
         android:scaleY="1.07"
         android:translateX="-12"
-        android:translateY="-12" >
+        android:translateY="-12">
         <path
             android:fillColor="#006f35"
             android:pathData="M175.4,341.586c-91.5,0-165.899-74.399-165.899-165.9c0-91.5,74.399-165.9,165.899-165.9
diff --git a/oeffi/res/drawable-anydpi/product_suburban_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_suburban_darkgrey_32dp.xml
index d90097f..330c4c5 100644
--- a/oeffi/res/drawable-anydpi/product_suburban_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_suburban_darkgrey_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="353"
     android:viewportWidth="353"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:scaleX="1.07"
         android:scaleY="1.07"
         android:translateX="-12"
-        android:translateY="-12" >
+        android:translateY="-12">
         <path
             android:fillColor="#a9a9a9"
             android:pathData="M175.4,341.586c-91.5,0-165.899-74.399-165.899-165.9c0-91.5,74.399-165.9,165.899-165.9
diff --git a/oeffi/res/drawable-anydpi/product_subway_color_22dp.xml b/oeffi/res/drawable-anydpi/product_subway_color_22dp.xml
index 3ca33ac..0a85c63 100644
--- a/oeffi/res/drawable-anydpi/product_subway_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_subway_color_22dp.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="378.32739"
     android:viewportWidth="377.93851"
-    android:width="22dp" >
+    android:width="22dp">
 
     <group
         android:pivotX="189"
         android:pivotY="189"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <group
             android:translateX="-161.03075"
-            android:translateY="-343.19849" >
+            android:translateY="-343.19849">
             <path
                 android:fillColor="#156ab8"
                 android:pathData="M 161.03075,721.52588 L 538.96925,721.52588 L 538.96925,343.19849 L
diff --git a/oeffi/res/drawable-anydpi/product_subway_color_32dp.xml b/oeffi/res/drawable-anydpi/product_subway_color_32dp.xml
index c8cdf2b..2bb9761 100644
--- a/oeffi/res/drawable-anydpi/product_subway_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_subway_color_32dp.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="378.32739"
     android:viewportWidth="377.93851"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="189"
         android:pivotY="189"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <group
             android:translateX="-161.03075"
-            android:translateY="-343.19849" >
+            android:translateY="-343.19849">
             <path
                 android:fillColor="#156ab8"
                 android:pathData="M 161.03075,721.52588 L 538.96925,721.52588 L 538.96925,343.19849 L
diff --git a/oeffi/res/drawable-anydpi/product_subway_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_subway_darkgrey_32dp.xml
index e2c911c..cec68e1 100644
--- a/oeffi/res/drawable-anydpi/product_subway_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_subway_darkgrey_32dp.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="378.32739"
     android:viewportWidth="377.93851"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="189"
         android:pivotY="189"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <group
             android:translateX="-161.03075"
-            android:translateY="-343.19849" >
+            android:translateY="-343.19849">
             <path
                 android:fillColor="#a9a9a9"
                 android:pathData="M 161.03075,721.52588 L 538.96925,721.52588 L 538.96925,343.19849 L
diff --git a/oeffi/res/drawable-anydpi/product_train_color_22dp.xml b/oeffi/res/drawable-anydpi/product_train_color_22dp.xml
index 056d847..5cf1ec0 100644
--- a/oeffi/res/drawable-anydpi/product_train_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_train_color_22dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="173.43799"
     android:viewportWidth="173.45215"
-    android:width="22dp" >
+    android:width="22dp">
 
     <path
         android:fillColor="#444444"
diff --git a/oeffi/res/drawable-anydpi/product_train_color_32dp.xml b/oeffi/res/drawable-anydpi/product_train_color_32dp.xml
index 3717af6..65a455d 100644
--- a/oeffi/res/drawable-anydpi/product_train_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_train_color_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="173.43799"
     android:viewportWidth="173.45215"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#444444"
diff --git a/oeffi/res/drawable-anydpi/product_train_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_train_darkgrey_32dp.xml
index 6afdc8f..de971a2 100644
--- a/oeffi/res/drawable-anydpi/product_train_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_train_darkgrey_32dp.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="173.43799"
     android:viewportWidth="173.45215"
-    android:width="32dp" >
+    android:width="32dp">
 
     <path
         android:fillColor="#a9a9a9"
diff --git a/oeffi/res/drawable-anydpi/product_tram_color_22dp.xml b/oeffi/res/drawable-anydpi/product_tram_color_22dp.xml
index 2927fb2..2f6e71a 100644
--- a/oeffi/res/drawable-anydpi/product_tram_color_22dp.xml
+++ b/oeffi/res/drawable-anydpi/product_tram_color_22dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="22dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="22dp" >
+    android:width="22dp">
 
     <group
         android:pivotX="250"
         android:pivotY="250"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#cc0000"
             android:pathData="M 0 0 H 500 V 500 H 0 V 0 Z" />
diff --git a/oeffi/res/drawable-anydpi/product_tram_color_32dp.xml b/oeffi/res/drawable-anydpi/product_tram_color_32dp.xml
index d377afd..dccc0c4 100644
--- a/oeffi/res/drawable-anydpi/product_tram_color_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_tram_color_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="250"
         android:pivotY="250"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#cc0000"
             android:pathData="M 0 0 H 500 V 500 H 0 V 0 Z" />
diff --git a/oeffi/res/drawable-anydpi/product_tram_darkgrey_32dp.xml b/oeffi/res/drawable-anydpi/product_tram_darkgrey_32dp.xml
index b1ed597..1091f2f 100644
--- a/oeffi/res/drawable-anydpi/product_tram_darkgrey_32dp.xml
+++ b/oeffi/res/drawable-anydpi/product_tram_darkgrey_32dp.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:viewportHeight="500"
     android:viewportWidth="500"
-    android:width="32dp" >
+    android:width="32dp">
 
     <group
         android:pivotX="250"
         android:pivotY="250"
         android:scaleX="0.93"
-        android:scaleY="0.93" >
+        android:scaleY="0.93">
         <path
             android:fillColor="#a9a9a9"
             android:pathData="M 0 0 H 500 V 500 H 0 V 0 Z" />
diff --git a/oeffi/res/drawable/btn_zoom_down.xml b/oeffi/res/drawable/btn_zoom_down.xml
index 0818883..2d9dcdf 100644
--- a/oeffi/res/drawable/btn_zoom_down.xml
+++ b/oeffi/res/drawable/btn_zoom_down.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/btn_zoom_down_disabled" android:state_enabled="false"/>
-    <item android:drawable="@drawable/btn_zoom_down_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/btn_zoom_down_normal"/>
+    <item android:drawable="@drawable/btn_zoom_down_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_zoom_down_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_zoom_down_normal" />
 
 </selector>
diff --git a/oeffi/res/drawable/btn_zoom_up.xml b/oeffi/res/drawable/btn_zoom_up.xml
index f96940e..5f91aa9 100644
--- a/oeffi/res/drawable/btn_zoom_up.xml
+++ b/oeffi/res/drawable/btn_zoom_up.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/btn_zoom_up_disabled" android:state_enabled="false"/>
-    <item android:drawable="@drawable/btn_zoom_up_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/btn_zoom_up_normal"/>
+    <item android:drawable="@drawable/btn_zoom_up_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/btn_zoom_up_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_zoom_up_normal" />
 
 </selector>
diff --git a/oeffi/res/drawable/disclaimer_background.xml b/oeffi/res/drawable/disclaimer_background.xml
index 762af4a..43f32d3 100644
--- a/oeffi/res/drawable/disclaimer_background.xml
+++ b/oeffi/res/drawable/disclaimer_background.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid android:color="#bfff" />
 
diff --git a/oeffi/res/drawable/disclaimer_background_dark.xml b/oeffi/res/drawable/disclaimer_background_dark.xml
index 7db3bdd..e3ca332 100644
--- a/oeffi/res/drawable/disclaimer_background_dark.xml
+++ b/oeffi/res/drawable/disclaimer_background_dark.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <solid android:color="#3000" />
 
diff --git a/oeffi/res/drawable/ic_expand_black_24dp.xml b/oeffi/res/drawable/ic_expand_black_24dp.xml
index d85e51a..7a2e63b 100644
--- a/oeffi/res/drawable/ic_expand_black_24dp.xml
+++ b/oeffi/res/drawable/ic_expand_black_24dp.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_expand_more_black_24dp" android:state_checked="false"/>
-    <item android:drawable="@drawable/ic_expand_less_black_24dp" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_expand_more_black_24dp" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_expand_less_black_24dp" android:state_checked="true" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_expand_white_24dp.xml b/oeffi/res/drawable/ic_expand_white_24dp.xml
index 0d43b0b..cc7e386 100644
--- a/oeffi/res/drawable/ic_expand_white_24dp.xml
+++ b/oeffi/res/drawable/ic_expand_white_24dp.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_expand_more_white_24dp" android:state_checked="false"/>
-    <item android:drawable="@drawable/ic_expand_less_white_24dp" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_expand_more_white_24dp" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_expand_less_white_24dp" android:state_checked="true" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_filter_list_24dp.xml b/oeffi/res/drawable/ic_filter_list_24dp.xml
index 4df3bb5..b613f60 100644
--- a/oeffi/res/drawable/ic_filter_list_24dp.xml
+++ b/oeffi/res/drawable/ic_filter_list_24dp.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_filter_list_white_24dp" android:state_selected="false"/>
-    <item android:drawable="@drawable/ic_filter_list_yellow_24dp" android:state_selected="true"/>
+    <item android:drawable="@drawable/ic_filter_list_white_24dp" android:state_selected="false" />
+    <item android:drawable="@drawable/ic_filter_list_yellow_24dp" android:state_selected="true" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_location_white_24dp.xml b/oeffi/res/drawable/ic_location_white_24dp.xml
index 849ccb2..26be500 100644
--- a/oeffi/res/drawable/ic_location_white_24dp.xml
+++ b/oeffi/res/drawable/ic_location_white_24dp.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_location_disabled_white_24dp" android:state_checked="false"/>
-    <item android:drawable="@drawable/ic_location_searching_white_24dp" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_location_disabled_white_24dp" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_location_searching_white_24dp" android:state_checked="true" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_bus.xml b/oeffi/res/drawable/ic_menu_product_bus.xml
index b954351..2574642 100644
--- a/oeffi/res/drawable/ic_menu_product_bus.xml
+++ b/oeffi/res/drawable/ic_menu_product_bus.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_bus_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_bus_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_bus_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_bus_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_cablecar.xml b/oeffi/res/drawable/ic_menu_product_cablecar.xml
index a8abe63..445f460 100644
--- a/oeffi/res/drawable/ic_menu_product_cablecar.xml
+++ b/oeffi/res/drawable/ic_menu_product_cablecar.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_cablecar_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_cablecar_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_cablecar_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_cablecar_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_call.xml b/oeffi/res/drawable/ic_menu_product_call.xml
index b3e6a98..3548f83 100644
--- a/oeffi/res/drawable/ic_menu_product_call.xml
+++ b/oeffi/res/drawable/ic_menu_product_call.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_call_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_call_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_call_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_call_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_ferry.xml b/oeffi/res/drawable/ic_menu_product_ferry.xml
index 6b5db09..2fa975c 100644
--- a/oeffi/res/drawable/ic_menu_product_ferry.xml
+++ b/oeffi/res/drawable/ic_menu_product_ferry.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_ferry_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_ferry_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_ferry_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_ferry_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_highspeed.xml b/oeffi/res/drawable/ic_menu_product_highspeed.xml
index d416b41..601d633 100644
--- a/oeffi/res/drawable/ic_menu_product_highspeed.xml
+++ b/oeffi/res/drawable/ic_menu_product_highspeed.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_highspeed_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_highspeed_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_highspeed_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_highspeed_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_suburban.xml b/oeffi/res/drawable/ic_menu_product_suburban.xml
index b4e742e..bd28be7 100644
--- a/oeffi/res/drawable/ic_menu_product_suburban.xml
+++ b/oeffi/res/drawable/ic_menu_product_suburban.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_suburban_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_suburban_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_suburban_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_suburban_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_subway.xml b/oeffi/res/drawable/ic_menu_product_subway.xml
index e21780e..66c8dac 100644
--- a/oeffi/res/drawable/ic_menu_product_subway.xml
+++ b/oeffi/res/drawable/ic_menu_product_subway.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_subway_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_subway_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_subway_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_subway_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_train.xml b/oeffi/res/drawable/ic_menu_product_train.xml
index 13a7b10..e73b6dc 100644
--- a/oeffi/res/drawable/ic_menu_product_train.xml
+++ b/oeffi/res/drawable/ic_menu_product_train.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_train_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_train_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_train_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_train_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_menu_product_tram.xml b/oeffi/res/drawable/ic_menu_product_tram.xml
index a47f7f2..43a79e1 100644
--- a/oeffi/res/drawable/ic_menu_product_tram.xml
+++ b/oeffi/res/drawable/ic_menu_product_tram.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/product_tram_color_32dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/product_tram_darkgrey_32dp" android:state_checked="false"/>
+    <item android:drawable="@drawable/product_tram_color_32dp" android:state_checked="true" />
+    <item android:drawable="@drawable/product_tram_darkgrey_32dp" android:state_checked="false" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_oeffi_directions.xml b/oeffi/res/drawable/ic_oeffi_directions.xml
index f1716ed..a8f2db0 100644
--- a/oeffi/res/drawable/ic_oeffi_directions.xml
+++ b/oeffi/res/drawable/ic_oeffi_directions.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@mipmap/ic_oeffi_directions_color_48dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_oeffi_directions_grey600_36dp"/>
+    <item android:drawable="@mipmap/ic_oeffi_directions_color_48dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_oeffi_directions_grey600_36dp" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_oeffi_plans.xml b/oeffi/res/drawable/ic_oeffi_plans.xml
index 6f123dc..4d1ba28 100644
--- a/oeffi/res/drawable/ic_oeffi_plans.xml
+++ b/oeffi/res/drawable/ic_oeffi_plans.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@mipmap/ic_oeffi_plans_color_48dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_oeffi_plans_grey600_36dp"/>
+    <item android:drawable="@mipmap/ic_oeffi_plans_color_48dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_oeffi_plans_grey600_36dp" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_oeffi_stations.xml b/oeffi/res/drawable/ic_oeffi_stations.xml
index 61e18d4..fca01ed 100644
--- a/oeffi/res/drawable/ic_oeffi_stations.xml
+++ b/oeffi/res/drawable/ic_oeffi_stations.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@mipmap/ic_oeffi_stations_color_48dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_oeffi_stations_grey600_36dp"/>
+    <item android:drawable="@mipmap/ic_oeffi_stations_color_48dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_oeffi_stations_grey600_36dp" />
 
 </selector>
diff --git a/oeffi/res/drawable/ic_star_24dp.xml b/oeffi/res/drawable/ic_star_24dp.xml
index c0838ca..9f1f716 100644
--- a/oeffi/res/drawable/ic_star_24dp.xml
+++ b/oeffi/res/drawable/ic_star_24dp.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/space_24dp" android:state_enabled="false"/>
-    <item android:drawable="@drawable/ic_star_white_24dp" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_star_border_white_24dp"/>
+    <item android:drawable="@drawable/space_24dp" android:state_enabled="false" />
+    <item android:drawable="@drawable/ic_star_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_star_border_white_24dp" />
 
 </selector>
diff --git a/oeffi/res/drawable/list_entry_background.xml b/oeffi/res/drawable/list_entry_background.xml
index 7ce0299..7860976 100644
--- a/oeffi/res/drawable/list_entry_background.xml
+++ b/oeffi/res/drawable/list_entry_background.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- activated, plain -->
-    <item android:state_activated="true"><shape>
+    <item android:state_activated="true">
+        <shape>
             <solid android:color="#ffcfffaf" />
-        </shape></item>
+        </shape>
+    </item>
 
     <!-- plain -->
-    <item><shape>
+    <item>
+        <shape>
             <solid android:color="#ffffffff" />
-        </shape></item>
+        </shape>
+    </item>
 
 </selector>
diff --git a/oeffi/res/drawable/popup_dir_pointer_button.xml b/oeffi/res/drawable/popup_dir_pointer_button.xml
index dc86889..1963894 100644
--- a/oeffi/res/drawable/popup_dir_pointer_button.xml
+++ b/oeffi/res/drawable/popup_dir_pointer_button.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/popup_dir_pointer_button_selected" android:state_pressed="true"/>
-    <item android:drawable="@drawable/popup_dir_pointer_button_normal"/>
+    <item android:drawable="@drawable/popup_dir_pointer_button_selected" android:state_pressed="true" />
+    <item android:drawable="@drawable/popup_dir_pointer_button_normal" />
 
 </selector>
diff --git a/oeffi/res/drawable/space_24dp.xml b/oeffi/res/drawable/space_24dp.xml
index c4db9e1..ea325ba 100644
--- a/oeffi/res/drawable/space_24dp.xml
+++ b/oeffi/res/drawable/space_24dp.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <size
         android:height="24dp"
diff --git a/oeffi/res/drawable/space_48dp.xml b/oeffi/res/drawable/space_48dp.xml
index df62e6d..d324584 100644
--- a/oeffi/res/drawable/space_48dp.xml
+++ b/oeffi/res/drawable/space_48dp.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <size
         android:height="48dp"
diff --git a/oeffi/res/layout/action_bar.xml b/oeffi/res/layout/action_bar.xml
index d4d92e2..d54ac70 100644
--- a/oeffi/res/layout/action_bar.xml
+++ b/oeffi/res/layout/action_bar.xml
@@ -40,7 +40,7 @@
         android:minHeight="@dimen/action_bar_height"
         android:orientation="vertical"
         android:paddingLeft="@dimen/action_bar_padding"
-        android:paddingRight="@dimen/action_bar_padding" >
+        android:paddingRight="@dimen/action_bar_padding">
 
         <TextView
             android:id="@+id/action_bar_primary_title"
@@ -76,7 +76,7 @@
         android:layout_width="@dimen/action_bar_button_width"
         android:layout_height="match_parent"
         android:minHeight="@dimen/action_bar_height"
-        android:visibility="gone" >
+        android:visibility="gone">
 
         <ImageButton
             android:id="@+id/action_bar_progress_button"
diff --git a/oeffi/res/layout/changelog_dialog.xml b/oeffi/res/layout/changelog_dialog.xml
index d1ec2e8..8c1643b 100644
--- a/oeffi/res/layout/changelog_dialog.xml
+++ b/oeffi/res/layout/changelog_dialog.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <WebView
         android:id="@+id/changelog_dialog_webview"
diff --git a/oeffi/res/layout/create_launcher_shortcut_dialog.xml b/oeffi/res/layout/create_launcher_shortcut_dialog.xml
index 9528c06..ee2da94 100644
--- a/oeffi/res/layout/create_launcher_shortcut_dialog.xml
+++ b/oeffi/res/layout/create_launcher_shortcut_dialog.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
     android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
     android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
     <EditText
         android:id="@+id/create_launcher_shortcut_dialog_name"
diff --git a/oeffi/res/layout/directions_content.xml b/oeffi/res/layout/directions_content.xml
index c50aaa1..3db9122 100644
--- a/oeffi/res/layout/directions_content.xml
+++ b/oeffi/res/layout/directions_content.xml
@@ -18,7 +18,7 @@
             android:id="@+id/directions_content_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <include layout="@layout/action_bar" />
 
@@ -39,12 +39,12 @@
             <androidx.coordinatorlayout.widget.CoordinatorLayout
                 android:layout_width="match_parent"
                 android:layout_height="0px"
-                android:layout_weight="1" >
+                android:layout_weight="1">
 
                 <FrameLayout
                     android:id="@+id/directions_list_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" >
+                    android:layout_height="match_parent">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@android:id/list"
@@ -65,7 +65,7 @@
                         android:layout_height="match_parent"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:orientation="vertical" >
+                        android:orientation="vertical">
 
                         <TextView
                             android:layout_width="wrap_content"
diff --git a/oeffi/res/layout/directions_form_include.xml b/oeffi/res/layout/directions_form_include.xml
index f1bb238..502943c 100644
--- a/oeffi/res/layout/directions_form_include.xml
+++ b/oeffi/res/layout/directions_form_include.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/directions_form"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:divider="?android:attr/listDivider"
     android:orientation="vertical"
-    android:showDividers="middle" >
+    android:showDividers="middle">
 
     <LinearLayout
         android:id="@+id/directions_form_location_group"
@@ -14,7 +15,7 @@
         android:divider="?android:attr/listDivider"
         android:dividerPadding="@dimen/directions_form_location_divider_padding"
         android:orientation="vertical"
-        android:showDividers="middle" >
+        android:showDividers="middle">
 
         <de.schildbach.oeffi.directions.LocationView
             android:id="@+id/directions_from"
@@ -38,13 +39,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollbars="none"
-        android:visibility="gone" >
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/action_bar_button_width"
-            android:orientation="horizontal" >
+            android:orientation="horizontal">
 
             <de.schildbach.oeffi.util.ToggleImageButton
                 android:id="@+id/directions_products_i"
@@ -144,7 +145,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fillViewport="true"
-        android:scrollbars="none" >
+        android:scrollbars="none">
 
         <LinearLayout
             style="?android:attr/buttonBarStyle"
@@ -152,7 +153,7 @@
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
             android:baselineAligned="true"
-            android:orientation="horizontal" >
+            android:orientation="horizontal">
 
             <Button
                 android:id="@+id/directions_time_dep_arr"
diff --git a/oeffi/res/layout/directions_location_dropdown_entry.xml b/oeffi/res/layout/directions_location_dropdown_entry.xml
index a0a8372..5061a6f 100644
--- a/oeffi/res/layout/directions_location_dropdown_entry.xml
+++ b/oeffi/res/layout/directions_location_dropdown_entry.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<de.schildbach.oeffi.directions.LocationTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<de.schildbach.oeffi.directions.LocationTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:attr/dropDownItemStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/oeffi/res/layout/directions_map_pin.xml b/oeffi/res/layout/directions_map_pin.xml
index cc84ca3..d20b26c 100644
--- a/oeffi/res/layout/directions_map_pin.xml
+++ b/oeffi/res/layout/directions_map_pin.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/popup_dir_pointer_button"
     android:divider="?android:attr/listDivider"
     android:minWidth="208dp"
     android:orientation="vertical"
-    android:showDividers="middle" >
+    android:showDividers="middle">
 
     <de.schildbach.oeffi.directions.LocationTextView
         android:id="@+id/directions_map_pin_location"
@@ -23,7 +24,7 @@
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/directions_map_pin_button_from"
diff --git a/oeffi/res/layout/directions_query_history_entry.xml b/oeffi/res/layout/directions_query_history_entry.xml
index 9a162ac..0c82ef5 100644
--- a/oeffi/res/layout/directions_query_history_entry.xml
+++ b/oeffi/res/layout/directions_query_history_entry.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -7,19 +8,19 @@
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
+    android:minHeight="?android:attr/listPreferredItemHeight">
 
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="3"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <de.schildbach.oeffi.directions.LocationTextView
                 android:id="@+id/directions_query_history_entry_from"
diff --git a/oeffi/res/layout/directions_trip_details_content.xml b/oeffi/res/layout/directions_trip_details_content.xml
index 1aedc29..d9d7143 100644
--- a/oeffi/res/layout/directions_trip_details_content.xml
+++ b/oeffi/res/layout/directions_trip_details_content.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clipToPadding="false"
-                android:paddingBottom="48dp" >
+                android:paddingBottom="48dp">
 
                 <LinearLayout
                     android:id="@+id/directions_trip_details_legs_group"
@@ -34,7 +34,7 @@
                     android:layout_height="wrap_content"
                     android:divider="?android:attr/listDivider"
                     android:orientation="vertical"
-                    android:showDividers="middle" >
+                    android:showDividers="middle">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -44,7 +44,7 @@
                         android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
                         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
                         android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-                        android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+                        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
                         <de.schildbach.oeffi.directions.LocationTextView
                             android:id="@+id/directions_trip_details_location_from"
@@ -94,7 +94,7 @@
                 android:layout_margin="4dp"
                 android:background="@drawable/disclaimer_background"
                 android:baselineAligned="false"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/directions_trip_details_disclaimer_source"
diff --git a/oeffi/res/layout/directions_trip_details_fares_row.xml b/oeffi/res/layout/directions_trip_details_fares_row.xml
index d173f4b..07c2df4 100644
--- a/oeffi/res/layout/directions_trip_details_fares_row.xml
+++ b/oeffi/res/layout/directions_trip_details_fares_row.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android" >
+<TableRow
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_type"
diff --git a/oeffi/res/layout/directions_trip_details_individual_entry.xml b/oeffi/res/layout/directions_trip_details_individual_entry.xml
index a55fc97..d68fcb2 100644
--- a/oeffi/res/layout/directions_trip_details_individual_entry.xml
+++ b/oeffi/res/layout/directions_trip_details_individual_entry.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:attr/buttonBarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" >
+    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax">
 
     <TextView
         android:id="@+id/directions_trip_details_individual_entry_text"
diff --git a/oeffi/res/layout/directions_trip_details_public_entry.xml b/oeffi/res/layout/directions_trip_details_public_entry.xml
index 2f24f57..f1938bb 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp" >
+    android:paddingBottom="8dp">
 
     <LinearLayout
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="0px"
@@ -20,7 +20,7 @@
             android:baselineAligned="true"
             android:orientation="horizontal"
             android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-            android:paddingTop="6dp" >
+            android:paddingTop="6dp">
 
             <de.schildbach.oeffi.stations.LineView
                 android:id="@+id/directions_trip_details_public_entry_line"
@@ -35,7 +35,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:paddingBottom="4dp"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax" >
+                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax">
 
                 <TextView
                     android:id="@+id/directions_trip_details_public_entry_destination"
diff --git a/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml b/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
index 5f02169..6abfee2 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="?android:attr/selectableItemBackground" >
+<TableRow
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?android:attr/selectableItemBackground">
 
     <de.schildbach.oeffi.directions.PearlView
         android:id="@+id/directions_trip_details_public_entry_collapsed_pearl"
diff --git a/oeffi/res/layout/directions_trip_details_public_entry_stop.xml b/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
index b8ca61f..753d372 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android" >
+<TableRow
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <de.schildbach.oeffi.directions.PearlView
         android:id="@+id/directions_trip_details_public_entry_stop_pearl"
diff --git a/oeffi/res/layout/directions_trip_overview_content.xml b/oeffi/res/layout/directions_trip_overview_content.xml
index d449b34..185fb80 100644
--- a/oeffi/res/layout/directions_trip_overview_content.xml
+++ b/oeffi/res/layout/directions_trip_overview_content.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <include layout="@layout/action_bar" />
 
diff --git a/oeffi/res/layout/directions_trip_overview_custom_title.xml b/oeffi/res/layout/directions_trip_overview_custom_title.xml
index e0a3fd6..c8e38ea 100644
--- a/oeffi/res/layout/directions_trip_overview_custom_title.xml
+++ b/oeffi/res/layout/directions_trip_overview_custom_title.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:shrinkColumns="1"
-    android:stretchColumns="1" >
+    android:stretchColumns="1">
 
     <TableRow>
 
@@ -31,7 +32,7 @@
             android:textSize="@dimen/font_size_action_bar" />
     </TableRow>
 
-    <TableRow android:id="@+id/directions_trip_overview_custom_title_via_row" >
+    <TableRow android:id="@+id/directions_trip_overview_custom_title_via_row">
 
         <TextView
             android:paddingLeft="4dp"
diff --git a/oeffi/res/layout/favorites_content.xml b/oeffi/res/layout/favorites_content.xml
index 880ec3c..a62bbbd 100644
--- a/oeffi/res/layout/favorites_content.xml
+++ b/oeffi/res/layout/favorites_content.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <include layout="@layout/action_bar" />
 
diff --git a/oeffi/res/layout/favorites_list_entry.xml b/oeffi/res/layout/favorites_list_entry.xml
index 5a1e23a..c597836 100644
--- a/oeffi/res/layout/favorites_list_entry.xml
+++ b/oeffi/res/layout/favorites_list_entry.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
+    android:minHeight="?android:attr/listPreferredItemHeight">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
         android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
         android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
         <TextView
             android:id="@+id/favorites_list_entry_network"
diff --git a/oeffi/res/layout/hint_dialog.xml b/oeffi/res/layout/hint_dialog.xml
index 59dd34e..2252bd3 100644
--- a/oeffi/res/layout/hint_dialog.xml
+++ b/oeffi/res/layout/hint_dialog.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
     android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
     android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
     <WebView
         android:id="@+id/hint_dialog_webview"
diff --git a/oeffi/res/layout/map_trip_line.xml b/oeffi/res/layout/map_trip_line.xml
index 8c30fa9..09b0e1c 100644
--- a/oeffi/res/layout/map_trip_line.xml
+++ b/oeffi/res/layout/map_trip_line.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<de.schildbach.oeffi.stations.LineView xmlns:android="http://schemas.android.com/apk/res/android"
+<de.schildbach.oeffi.stations.LineView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/navigation_drawer.xml b/oeffi/res/layout/navigation_drawer.xml
index 7075595..d7ad681 100644
--- a/oeffi/res/layout/navigation_drawer.xml
+++ b/oeffi/res/layout/navigation_drawer.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/layout_navigation_drawer_width"
     android:layout_height="match_parent"
     android:layout_gravity="left"
     android:background="@android:color/white"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/navigation_drawer_list"
@@ -19,7 +20,7 @@
         android:layout_marginBottom="@dimen/list_entry_padding_vertical_verylax"
         android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
         android:gravity="center_vertical"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/navigation_drawer_footer_heart"
diff --git a/oeffi/res/layout/navigation_drawer_entry.xml b/oeffi/res/layout/navigation_drawer_entry.xml
index 0415e55..b49426e 100644
--- a/oeffi/res/layout/navigation_drawer_entry.xml
+++ b/oeffi/res/layout/navigation_drawer_entry.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_entry_background"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground" >
+    android:foreground="?android:attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -13,7 +14,7 @@
         android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
         android:paddingRight="0px"
-        android:paddingTop="@dimen/list_entry_padding_vertical_verylax" >
+        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
 
         <ImageView
             android:id="@+id/navigation_drawer_entry_icon"
@@ -27,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/navigation_drawer_entry_title"
diff --git a/oeffi/res/layout/network_picker_content.xml b/oeffi/res/layout/network_picker_content.xml
index da55438..95d262e 100644
--- a/oeffi/res/layout/network_picker_content.xml
+++ b/oeffi/res/layout/network_picker_content.xml
@@ -14,14 +14,14 @@
         android:id="@+id/network_picker_list_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <include layout="@layout/action_bar" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/network_picker_firsttime_message"
diff --git a/oeffi/res/layout/network_picker_entry.xml b/oeffi/res/layout/network_picker_entry.xml
index bdd75f9..e2802b9 100644
--- a/oeffi/res/layout/network_picker_entry.xml
+++ b/oeffi/res/layout/network_picker_entry.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
+    android:minHeight="?android:attr/listPreferredItemHeight">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -14,7 +15,7 @@
         android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
         android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
         <ImageView
             android:id="@+id/network_picker_entry_icon"
diff --git a/oeffi/res/layout/network_picker_separator.xml b/oeffi/res/layout/network_picker_separator.xml
index 59bdbcf..d733443 100644
--- a/oeffi/res/layout/network_picker_separator.xml
+++ b/oeffi/res/layout/network_picker_separator.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/oeffi/res/layout/plans_content.xml b/oeffi/res/layout/plans_content.xml
index d60850f..e0944bc 100644
--- a/oeffi/res/layout/plans_content.xml
+++ b/oeffi/res/layout/plans_content.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ViewAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+<ViewAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/plans_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:inAnimation="@android:anim/fade_in"
-    android:outAnimation="@android:anim/fade_out" >
+    android:outAnimation="@android:anim/fade_out">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center_horizontal"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <ProgressBar
             android:layout_width="wrap_content"
@@ -29,7 +30,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <de.schildbach.oeffi.plans.ScrollImageView
             android:id="@+id/plans_plan"
@@ -39,7 +40,7 @@
 
         <de.schildbach.oeffi.plans.BubbleLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:id="@+id/plans_bubble"
@@ -47,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/popup_dir_pointer_button"
                 android:minWidth="128dp"
-                android:orientation="vertical" >
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/plans_bubble_name"
diff --git a/oeffi/res/layout/plans_picker_content.xml b/oeffi/res/layout/plans_picker_content.xml
index d463421..883a551 100644
--- a/oeffi/res/layout/plans_picker_content.xml
+++ b/oeffi/res/layout/plans_picker_content.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/navigation_drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <include layout="@layout/action_bar" />
 
@@ -38,7 +39,7 @@
                 android:background="@color/bg_action_bar_appendix"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:visibility="gone" >
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/plans_picker_filter_text"
@@ -66,7 +67,7 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1" >
+                android:layout_weight="1">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@android:id/list"
diff --git a/oeffi/res/layout/plans_picker_entry.xml b/oeffi/res/layout/plans_picker_entry.xml
index 911c6cc..55e122c 100644
--- a/oeffi/res/layout/plans_picker_entry.xml
+++ b/oeffi/res/layout/plans_picker_entry.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_entry_background"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    android:minHeight="?android:attr/listPreferredItemHeight" >
+    android:minHeight="?android:attr/listPreferredItemHeight">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -14,7 +15,7 @@
         android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
         android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
         <FrameLayout
             android:id="@+id/plans_picker_entry_image"
@@ -23,7 +24,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
-            android:padding="2dp" >
+            android:padding="2dp">
 
             <ImageView
                 android:id="@+id/plans_picker_entry_thumb"
diff --git a/oeffi/res/layout/station_widget_content.xml b/oeffi/res/layout/station_widget_content.xml
index 2d58a8e..b79152b 100644
--- a/oeffi/res/layout/station_widget_content.xml
+++ b/oeffi/res/layout/station_widget_content.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/station_widget_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/appwidget_background"
     android:focusable="true"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal" >
+        android:paddingRight="@dimen/list_entry_padding_horizontal">
 
         <TextView
             android:id="@+id/station_widget_distance"
@@ -51,7 +52,7 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:paddingBottom="@dimen/list_entry_padding_vertical" >
+        android:paddingBottom="@dimen/list_entry_padding_vertical">
 
         <ListView
             android:id="@+id/station_widget_departures"
diff --git a/oeffi/res/layout/station_widget_entry.xml b/oeffi/res/layout/station_widget_entry.xml
index 4024fbd..6ea33e1 100644
--- a/oeffi/res/layout/station_widget_entry.xml
+++ b/oeffi/res/layout/station_widget_entry.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/station_widget_entry"
     android:layout_width="match_parent"
@@ -7,7 +8,7 @@
     android:baselineAligned="true"
     android:orientation="horizontal"
     android:paddingLeft="@dimen/list_entry_padding_horizontal"
-    android:paddingRight="@dimen/list_entry_padding_horizontal" >
+    android:paddingRight="@dimen/list_entry_padding_horizontal">
 
     <TextView
         android:id="@+id/station_widget_entry_line"
diff --git a/oeffi/res/layout/station_widget_entry_loading.xml b/oeffi/res/layout/station_widget_entry_loading.xml
index 4ea5776..0fed0a0 100644
--- a/oeffi/res/layout/station_widget_entry_loading.xml
+++ b/oeffi/res/layout/station_widget_entry_loading.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
diff --git a/oeffi/res/layout/stations_content.xml b/oeffi/res/layout/stations_content.xml
index 5db50af..2ea42d4 100644
--- a/oeffi/res/layout/stations_content.xml
+++ b/oeffi/res/layout/stations_content.xml
@@ -17,7 +17,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <include layout="@layout/action_bar" />
 
@@ -29,7 +29,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:animateLayoutChanges="true"
-                    android:orientation="vertical" >
+                    android:orientation="vertical">
 
                     <TextView
                         android:id="@+id/stations_connectivity_warning_box"
@@ -52,7 +52,7 @@
                         android:background="@color/bg_action_bar_appendix"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
-                        android:visibility="gone" >
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/stations_search_text"
@@ -84,7 +84,7 @@
                         android:background="@color/bg_action_bar_appendix"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
-                        android:visibility="gone" >
+                        android:visibility="gone">
 
                         <TextView
                             android:id="@+id/stations_location_text"
@@ -113,7 +113,7 @@
                         android:id="@+id/stations_list_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_weight="1" >
+                        android:layout_weight="1">
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/stations_list"
@@ -132,7 +132,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -161,7 +161,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -189,7 +189,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -225,7 +225,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <ProgressBar
                                 android:layout_width="wrap_content"
@@ -257,7 +257,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <ProgressBar
                                 android:layout_width="wrap_content"
@@ -283,7 +283,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <ProgressBar
                                 android:layout_width="wrap_content"
@@ -309,7 +309,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -345,7 +345,7 @@
                             android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
                             android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
-                            android:orientation="vertical" >
+                            android:orientation="vertical">
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -373,7 +373,7 @@
                     android:layout_margin="4dp"
                     android:background="@drawable/disclaimer_background"
                     android:baselineAligned="false"
-                    android:orientation="horizontal" >
+                    android:orientation="horizontal">
 
                     <TextView
                         android:id="@+id/stations_disclaimer_source"
diff --git a/oeffi/res/layout/stations_filter_popup_content.xml b/oeffi/res/layout/stations_filter_popup_content.xml
index 0e668ac..49b7165 100644
--- a/oeffi/res/layout/stations_filter_popup_content.xml
+++ b/oeffi/res/layout/stations_filter_popup_content.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal" >
+    android:layout_gravity="center_horizontal">
 
     <TableRow>
 
diff --git a/oeffi/res/layout/stations_location_provider_row.xml b/oeffi/res/layout/stations_location_provider_row.xml
index bb36cec..9540f17 100644
--- a/oeffi/res/layout/stations_location_provider_row.xml
+++ b/oeffi/res/layout/stations_location_provider_row.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android" >
+<TableRow
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/stations_location_provider_row_provider" />
 
diff --git a/oeffi/res/layout/stations_station_details_content.xml b/oeffi/res/layout/stations_station_details_content.xml
index c4d715d..6927233 100644
--- a/oeffi/res/layout/stations_station_details_content.xml
+++ b/oeffi/res/layout/stations_station_details_content.xml
@@ -24,7 +24,7 @@
             <ViewAnimator
                 android:id="@+id/stations_station_details_list_layout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" >
+                android:layout_height="match_parent">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/stations_station_details_list"
@@ -52,7 +52,7 @@
                 android:layout_margin="4dp"
                 android:background="@drawable/disclaimer_background"
                 android:baselineAligned="false"
-                android:orientation="horizontal" >
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/stations_station_details_disclaimer_source"
diff --git a/oeffi/res/layout/stations_station_details_entry.xml b/oeffi/res/layout/stations_station_details_entry.xml
index 2ee26a6..b2a57ad 100644
--- a/oeffi/res/layout/stations_station_details_entry.xml
+++ b/oeffi/res/layout/stations_station_details_entry.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_entry_background"
@@ -9,7 +10,7 @@
     android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
     android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
     android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
     <!-- first row -->
 
diff --git a/oeffi/res/layout/stations_station_details_header.xml b/oeffi/res/layout/stations_station_details_header.xml
index e50e53b..bbd9521 100644
--- a/oeffi/res/layout/stations_station_details_header.xml
+++ b/oeffi/res/layout/stations_station_details_header.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/listDivider"
@@ -7,7 +8,7 @@
     android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
     android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
     android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
     <LinearLayout
         android:id="@+id/stations_station_details_header_lines"
@@ -21,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
         android:baselineAligned="true"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <de.schildbach.oeffi.stations.LineView
             android:id="@+id/stations_station_details_header_additional_lines"
diff --git a/oeffi/res/layout/stations_station_details_header_line.xml b/oeffi/res/layout/stations_station_details_header_line.xml
index dea9ca7..81a5f99 100644
--- a/oeffi/res/layout/stations_station_details_header_line.xml
+++ b/oeffi/res/layout/stations_station_details_header_line.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:baselineAligned="true"
     android:orientation="horizontal"
-    android:paddingTop="1dp" >
+    android:paddingTop="1dp">
 
     <de.schildbach.oeffi.stations.LineView
         android:id="@+id/stations_station_details_header_line_line"
diff --git a/oeffi/res/layout/stations_station_entry.xml b/oeffi/res/layout/stations_station_entry.xml
index e69736c..e9a8eab 100644
--- a/oeffi/res/layout/stations_station_entry.xml
+++ b/oeffi/res/layout/stations_station_entry.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/list_entry_background"
     android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground" >
+    android:foreground="?android:attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -14,14 +15,14 @@
         android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
         android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
         android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_lax" >
+        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
 
         <!-- first row -->
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal" >
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/station_entry_favorite"
@@ -85,7 +86,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_cram" >
+            android:layout_marginTop="@dimen/list_entry_padding_vertical_cram">
 
             <LinearLayout
                 android:id="@+id/station_entry_departures"
diff --git a/oeffi/res/layout/stations_station_entry_departure.xml b/oeffi/res/layout/stations_station_entry_departure.xml
index 18847d0..e72585c 100644
--- a/oeffi/res/layout/stations_station_entry_departure.xml
+++ b/oeffi/res/layout/stations_station_entry_departure.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:baselineAligned="true"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <de.schildbach.oeffi.stations.LineView
         android:id="@+id/departure_entry_line"
diff --git a/oeffi/res/layout/stations_station_entry_message.xml b/oeffi/res/layout/stations_station_entry_message.xml
index d3fd1a2..d479ac2 100644
--- a/oeffi/res/layout/stations_station_entry_message.xml
+++ b/oeffi/res/layout/stations_station_entry_message.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/stations_station_entry_message"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/oeffi/res/layout/zoom_controls.xml b/oeffi/res/layout/zoom_controls.xml
index 7182a6b..28b8e49 100644
--- a/oeffi/res/layout/zoom_controls.xml
+++ b/oeffi/res/layout/zoom_controls.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ZoomButton
         android:id="@+id/zoomIn"
diff --git a/oeffi/res/menu/directions_location_context.xml b/oeffi/res/menu/directions_location_context.xml
index be5cac0..60349d7 100644
--- a/oeffi/res/menu/directions_location_context.xml
+++ b/oeffi/res/menu/directions_location_context.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/directions_location_current_location"
         android:icon="@drawable/ic_gps_fixed_grey600_24dp"
-        android:title="@string/directions_location_context_current_location"/>
+        android:title="@string/directions_location_context_current_location" />
     <item
         android:id="@+id/directions_location_contact"
         android:icon="@drawable/ic_contacts_grey600_24dp"
-        android:title="@string/directions_location_context_contact"/>
+        android:title="@string/directions_location_context_contact" />
     <item
         android:id="@+id/directions_location_favorite_station"
         android:icon="@drawable/ic_star_grey600_24dp"
-        android:title="@string/directions_location_context_favorite_station"/>
+        android:title="@string/directions_location_context_favorite_station" />
 
 </menu>
diff --git a/oeffi/res/menu/directions_options.xml b/oeffi/res/menu/directions_options.xml
index ecaeb72..732d2f5 100644
--- a/oeffi/res/menu/directions_options.xml
+++ b/oeffi/res/menu/directions_options.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/directions_options_clear_history"
-        android:title="@string/directions_options_clear_history_title"/>
+        android:title="@string/directions_options_clear_history_title" />
 
 </menu>
diff --git a/oeffi/res/menu/directions_query_history_context.xml b/oeffi/res/menu/directions_query_history_context.xml
index 91fcbc1..20c3380 100644
--- a/oeffi/res/menu/directions_query_history_context.xml
+++ b/oeffi/res/menu/directions_query_history_context.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/directions_query_history_context_show_trip"
-        android:title="@string/directions_query_history_context_show_trip"/>
+        android:title="@string/directions_query_history_context_show_trip" />
     <item
         android:id="@+id/directions_query_history_context_remove_trip"
-        android:title="@string/directions_query_history_context_remove_trip"/>
+        android:title="@string/directions_query_history_context_remove_trip" />
     <item
         android:id="@+id/directions_query_history_context_remove_entry"
-        android:title="@string/directions_query_history_context_remove_entry"/>
+        android:title="@string/directions_query_history_context_remove_entry" />
     <item
         android:id="@+id/directions_query_history_context_add_favorite"
-        android:title="@string/directions_query_history_context_add_favorite"/>
+        android:title="@string/directions_query_history_context_add_favorite" />
     <item
         android:id="@+id/directions_query_history_context_remove_favorite"
-        android:title="@string/directions_query_history_context_remove_favorite"/>
+        android:title="@string/directions_query_history_context_remove_favorite" />
 
 </menu>
diff --git a/oeffi/res/menu/directions_query_history_location_context.xml b/oeffi/res/menu/directions_query_history_location_context.xml
index 3e8b565..5d8d11e 100644
--- a/oeffi/res/menu/directions_query_history_location_context.xml
+++ b/oeffi/res/menu/directions_query_history_location_context.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/directions_query_history_location_context_details"
-        android:title="@string/station_context_details_title"/>
+        android:title="@string/station_context_details_title" />
     <item
         android:id="@+id/directions_query_history_location_context_map"
         android:title="@string/station_context_map_title">
@@ -11,9 +12,9 @@
     </item>
     <item
         android:id="@+id/directions_query_history_location_context_add_favorite"
-        android:title="@string/station_context_add_favorite_title"/>
+        android:title="@string/station_context_add_favorite_title" />
     <item
         android:id="@+id/directions_query_history_location_context_launcher_shortcut"
-        android:title="@string/station_context_launcher_shortcut_title"/>
+        android:title="@string/station_context_launcher_shortcut_title" />
 
 </menu>
diff --git a/oeffi/res/menu/directions_trip_details_action_share.xml b/oeffi/res/menu/directions_trip_details_action_share.xml
index 15d4697..83c1604 100644
--- a/oeffi/res/menu/directions_trip_details_action_share.xml
+++ b/oeffi/res/menu/directions_trip_details_action_share.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/directions_trip_details_action_share_short"
-        android:title="@string/directions_trip_details_action_share_short_title"/>
+        android:title="@string/directions_trip_details_action_share_short_title" />
     <item
         android:id="@+id/directions_trip_details_action_share_long"
-        android:title="@string/directions_trip_details_action_share_long_title"/>
+        android:title="@string/directions_trip_details_action_share_long_title" />
 
 </menu>
diff --git a/oeffi/res/menu/global_options.xml b/oeffi/res/menu/global_options.xml
index 7e6fe19..8aea4ff 100644
--- a/oeffi/res/menu/global_options.xml
+++ b/oeffi/res/menu/global_options.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/global_options_stations"
         android:icon="@drawable/ic_oeffi_stations"
         android:title="@string/stations_activity_title"
-        android:titleCondensed="@string/global_options_stations_comment"/>
+        android:titleCondensed="@string/global_options_stations_comment" />
     <item
         android:id="@+id/global_options_directions"
         android:icon="@drawable/ic_oeffi_directions"
         android:title="@string/directions_activity_title"
-        android:titleCondensed="@string/global_options_directions_comment"/>
+        android:titleCondensed="@string/global_options_directions_comment" />
     <item
         android:id="@+id/global_options_plans"
         android:icon="@drawable/ic_oeffi_plans"
         android:title="@string/plans_activity_title"
-        android:titleCondensed="@string/global_options_plans_comment"/>
+        android:titleCondensed="@string/global_options_plans_comment" />
     <item
         android:id="@+id/global_options_donate"
         android:icon="@drawable/ic_cash_multiple_grey600_24dp"
         android:orderInCategory="999"
-        android:title="@string/global_options_donate_title"/>
+        android:title="@string/global_options_donate_title" />
     <item
         android:id="@+id/global_options_report_bug"
         android:icon="@drawable/ic_ladybug_grey600_24dp"
         android:orderInCategory="999"
-        android:title="@string/global_options_report_bug_title"/>
+        android:title="@string/global_options_report_bug_title" />
     <item
         android:id="@+id/global_options_preferences"
         android:icon="@drawable/ic_settings_grey600_24dp"
         android:orderInCategory="999"
-        android:title="@string/global_options_preferences_title"/>
+        android:title="@string/global_options_preferences_title" />
     <item
         android:id="@+id/global_options_about"
         android:icon="@drawable/ic_info_outline_grey600_24dp"
         android:orderInCategory="999"
-        android:title="@string/global_options_about_title"/>
+        android:title="@string/global_options_about_title" />
 
 </menu>
diff --git a/oeffi/res/menu/network_picker_context.xml b/oeffi/res/menu/network_picker_context.xml
index e5ed49f..cc0cf41 100644
--- a/oeffi/res/menu/network_picker_context.xml
+++ b/oeffi/res/menu/network_picker_context.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/network_picker_context_remove"
-        android:title="@string/network_picker_context_remove_title"/>
+        android:title="@string/network_picker_context_remove_title" />
 
 </menu>
diff --git a/oeffi/res/menu/plans_picker_context.xml b/oeffi/res/menu/plans_picker_context.xml
index 118cf71..0c7252d 100644
--- a/oeffi/res/menu/plans_picker_context.xml
+++ b/oeffi/res/menu/plans_picker_context.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/plans_picker_context_open"
-        android:title="@string/plans_picker_context_open_title"/>
+        android:title="@string/plans_picker_context_open_title" />
     <item
         android:id="@+id/plans_picker_context_remove"
-        android:title="@string/plans_picker_context_remove_title"/>
+        android:title="@string/plans_picker_context_remove_title" />
     <item
         android:id="@+id/plans_picker_context_launcher_shortcut"
-        android:title="@string/plans_picker_context_launcher_shortcut_title"/>
+        android:title="@string/plans_picker_context_launcher_shortcut_title" />
 
 </menu>
diff --git a/oeffi/res/menu/station_map_context.xml b/oeffi/res/menu/station_map_context.xml
index a6628c9..ec816b3 100644
--- a/oeffi/res/menu/station_map_context.xml
+++ b/oeffi/res/menu/station_map_context.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/station_map_context_google_maps"
         android:orderInCategory="1"
-        android:title="@string/map_dialog_google_maps"/>
+        android:title="@string/map_dialog_google_maps" />
     <item
         android:id="@+id/station_map_context_amazon_maps"
         android:orderInCategory="1"
-        android:title="@string/map_dialog_amazon_maps"/>
+        android:title="@string/map_dialog_amazon_maps" />
     <item
         android:id="@+id/station_map_context_open_street_maps"
         android:orderInCategory="1"
-        android:title="@string/map_dialog_open_street_maps"/>
+        android:title="@string/map_dialog_open_street_maps" />
     <item
         android:id="@+id/station_map_context_google_street_view"
         android:orderInCategory="1"
-        android:title="@string/map_dialog_google_street_view"/>
+        android:title="@string/map_dialog_google_street_view" />
     <item
         android:id="@+id/station_map_context_google_navigation"
         android:orderInCategory="1"
-        android:title="@string/map_dialog_google_navigation"/>
+        android:title="@string/map_dialog_google_navigation" />
 
 </menu>
diff --git a/oeffi/res/menu/stations_options.xml b/oeffi/res/menu/stations_options.xml
index 00e6958..dfa7b1e 100644
--- a/oeffi/res/menu/stations_options.xml
+++ b/oeffi/res/menu/stations_options.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/stations_options_favorites"
-        android:title="@string/stations_options_favorites_title"/>
+        android:title="@string/stations_options_favorites_title" />
 
 </menu>
diff --git a/oeffi/res/menu/stations_station_context.xml b/oeffi/res/menu/stations_station_context.xml
index 6796e21..028027e 100644
--- a/oeffi/res/menu/stations_station_context.xml
+++ b/oeffi/res/menu/stations_station_context.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/station_context_add_favorite"
-        android:title="@string/station_context_add_favorite_title"/>
+        android:title="@string/station_context_add_favorite_title" />
     <item
         android:id="@+id/station_context_remove_favorite"
-        android:title="@string/station_context_remove_favorite_title"/>
+        android:title="@string/station_context_remove_favorite_title" />
     <item
         android:id="@+id/station_context_add_ignore"
-        android:title="@string/station_context_add_ignore_title"/>
+        android:title="@string/station_context_add_ignore_title" />
     <item
         android:id="@+id/station_context_remove_ignore"
-        android:title="@string/station_context_remove_ignore_title"/>
+        android:title="@string/station_context_remove_ignore_title" />
     <item
         android:id="@+id/station_context_details"
-        android:title="@string/station_context_details_title"/>
+        android:title="@string/station_context_details_title" />
     <item
         android:id="@+id/station_context_map"
         android:title="@string/station_context_map_title">
@@ -23,12 +24,12 @@
     </item>
     <item
         android:id="@+id/station_context_directions_from"
-        android:title="@string/station_context_directions_from_title"/>
+        android:title="@string/station_context_directions_from_title" />
     <item
         android:id="@+id/station_context_directions_to"
-        android:title="@string/station_context_directions_to_title"/>
+        android:title="@string/station_context_directions_to_title" />
     <item
         android:id="@+id/station_context_launcher_shortcut"
-        android:title="@string/station_context_launcher_shortcut_title"/>
+        android:title="@string/station_context_launcher_shortcut_title" />
 
 </menu>
diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml
index e4f5ed0..107eb4c 100644
--- a/oeffi/res/values-de/networks.xml
+++ b/oeffi/res/values-de/networks.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
 
     <string name="network_rt_label">Europa</string>
     <string name="network_rt_comment">nur Fernverkehr</string>
diff --git a/oeffi/res/values/directions.xml b/oeffi/res/values/directions.xml
index ad947e3..f61237c 100644
--- a/oeffi/res/values/directions.xml
+++ b/oeffi/res/values/directions.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources
+    xmlns:tools="http://schemas.android.com/tools">
 
     <string name="directions_location_context_current_location">My current location</string>
     <string name="directions_location_context_contact">Contact address</string>
diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml
index 4c1b871..bebe5ff 100644
--- a/oeffi/res/values/networks.xml
+++ b/oeffi/res/values/networks.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+<resources
+    xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
 
     <string name="network_rt_label">Europe</string>
     <string name="network_rt_comment">long-distance only</string>
diff --git a/oeffi/res/values/styles.xml b/oeffi/res/values/styles.xml
index b180a26..eb30030 100644
--- a/oeffi/res/values/styles.xml
+++ b/oeffi/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="My.Theme.Light" parent="@android:style/Theme.Holo.Light.NoActionBar">
         <item name="android:windowBackground">@android:color/white</item>
diff --git a/oeffi/res/xml/file_provider.xml b/oeffi/res/xml/file_provider.xml
index a957bd4..605afed 100644
--- a/oeffi/res/xml/file_provider.xml
+++ b/oeffi/res/xml/file_provider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android" >
+<paths>
 
     <files-path
         name="log"
diff --git a/oeffi/res/xml/nearest_favorite_station_widget.xml b/oeffi/res/xml/nearest_favorite_station_widget.xml
index dc61bc2..157e072 100644
--- a/oeffi/res/xml/nearest_favorite_station_widget.xml
+++ b/oeffi/res/xml/nearest_favorite_station_widget.xml
@@ -1,4 +1,6 @@
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialLayout="@layout/station_widget_content"
     android:minHeight="110dp"
     android:minResizeHeight="55dp"
diff --git a/oeffi/res/xml/plan_searchable.xml b/oeffi/res/xml/plan_searchable.xml
index 50bb83a..9f48335 100644
--- a/oeffi/res/xml/plan_searchable.xml
+++ b/oeffi/res/xml/plan_searchable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:hint="@string/plan_searchable_hint"
     android:icon="@mipmap/ic_oeffi_plans_color_48dp"
     android:label="@string/app_name" />
diff --git a/oeffi/res/xml/plans_searchable.xml b/oeffi/res/xml/plans_searchable.xml
index f53d6ab..b35e8be 100644
--- a/oeffi/res/xml/plans_searchable.xml
+++ b/oeffi/res/xml/plans_searchable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:hint="@string/plans_picker_searchable_hint"
     android:icon="@mipmap/ic_oeffi_plans_color_48dp"
     android:label="@string/app_name" />
diff --git a/oeffi/res/xml/preference_about.xml b/oeffi/res/xml/preference_about.xml
index 726096e..d2ebe68 100644
--- a/oeffi/res/xml/preference_about.xml
+++ b/oeffi/res/xml/preference_about.xml
@@ -1,52 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Preference
-            android:key="about_version"
-            android:title="Version"/>
+        android:key="about_version"
+        android:title="Version" />
     <Preference
-            android:summary="@string/about_copyright_summary"
-            android:title="@string/about_copyright_title"/>
+        android:summary="@string/about_copyright_summary"
+        android:title="@string/about_copyright_title" />
     <Preference
-            android:key="about_license"
-            android:summary="https://www.gnu.org/licenses/gpl-3.0.txt"
-            android:title="@string/about_license_title">
+        android:key="about_license"
+        android:summary="https://www.gnu.org/licenses/gpl-3.0.txt"
+        android:title="@string/about_license_title">
         <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://www.gnu.org/licenses/gpl-3.0.txt"/>
+            android:action="android.intent.action.VIEW"
+            android:data="https://www.gnu.org/licenses/gpl-3.0.txt" />
     </Preference>
     <Preference
-            android:key="about_changelog"
-            android:summary="@string/about_changelog_summary"
-            android:title="@string/about_changelog_title"/>
+        android:key="about_changelog"
+        android:summary="@string/about_changelog_summary"
+        android:title="@string/about_changelog_title" />
     <Preference
-            android:key="about_faq"
-            android:summary="@string/about_faq_summary"
-            android:title="@string/about_faq_title">
+        android:key="about_faq"
+        android:summary="@string/about_faq_summary"
+        android:title="@string/about_faq_title">
         <intent
-                android:action="android.intent.action.VIEW"
-                android:data="@string/about_faq_summary"/>
+            android:action="android.intent.action.VIEW"
+            android:data="@string/about_faq_summary" />
     </Preference>
 
     <PreferenceCategory android:title="@string/about_participate_title">
         <Preference
-                android:key="about_market_app"
-                android:title="@string/about_market_app_title"/>
+            android:key="about_market_app"
+            android:title="@string/about_market_app_title" />
         <Preference
-                android:key="about_source"
-                android:summary="https://gitlab.com/oeffi/oeffi"
-                android:title="@string/about_source_title">
+            android:key="about_source"
+            android:summary="https://gitlab.com/oeffi/oeffi"
+            android:title="@string/about_source_title">
             <intent
-                    android:action="android.intent.action.VIEW"
-                    android:data="https://gitlab.com/oeffi/oeffi"/>
+                android:action="android.intent.action.VIEW"
+                android:data="https://gitlab.com/oeffi/oeffi" />
         </Preference>
         <Preference
-                android:key="about_twitter"
-                android:summary="\@oeffi"
-                android:title="Twitter">
+            android:key="about_twitter"
+            android:summary="\@oeffi"
+            android:title="Twitter">
             <intent
-                    android:action="android.intent.action.VIEW"
-                    android:data="https://twitter.com/oeffi"/>
+                android:action="android.intent.action.VIEW"
+                android:data="https://twitter.com/oeffi" />
         </Preference>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/oeffi/res/xml/preference_common.xml b/oeffi/res/xml/preference_common.xml
index 63e7059..3ad6bf2 100644
--- a/oeffi/res/xml/preference_common.xml
+++ b/oeffi/res/xml/preference_common.xml
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Preference
-            android:key="network_provider"
-            android:summary="@string/global_preferences_network_provider_summary"
-            android:title="@string/global_preferences_network_provider_title">
+        android:key="network_provider"
+        android:summary="@string/global_preferences_network_provider_summary"
+        android:title="@string/global_preferences_network_provider_title">
         <intent
-                android:targetPackage="de.schildbach.oeffi"
-                android:targetClass="de.schildbach.oeffi.network.NetworkPickerActivity"/>
+            android:targetPackage="de.schildbach.oeffi"
+            android:targetClass="de.schildbach.oeffi.network.NetworkPickerActivity" />
     </Preference>
     <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="show_changelog"
-            android:summary="@string/global_preferences_show_changelog_summary"
-            android:title="@string/global_preferences_show_changelog_title"/>
+        android:defaultValue="true"
+        android:key="show_changelog"
+        android:summary="@string/global_preferences_show_changelog_summary"
+        android:title="@string/global_preferences_show_changelog_title" />
     <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="show_hints"
-            android:summary="@string/global_preferences_show_hints_summary"
-            android:title="@string/global_preferences_show_hints_title"/>
+        android:defaultValue="true"
+        android:key="show_hints"
+        android:summary="@string/global_preferences_show_hints_summary"
+        android:title="@string/global_preferences_show_hints_title" />
     <Preference
-            android:key="location_settings"
-            android:summary="@string/global_preferences_location_settings_summary"
-            android:title="@string/global_preferences_location_settings_title">
-        <intent android:action="android.settings.LOCATION_SOURCE_SETTINGS"/>
+        android:key="location_settings"
+        android:summary="@string/global_preferences_location_settings_summary"
+        android:title="@string/global_preferences_location_settings_title">
+        <intent android:action="android.settings.LOCATION_SOURCE_SETTINGS" />
     </Preference>
     <Preference
-            android:key="battery_optimizations"
-            android:summary="@string/global_preferences_battery_optimizations_summary"
-            android:title="@string/global_preferences_battery_optimizations_title">
-        <intent android:action="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"/>
+        android:key="battery_optimizations"
+        android:summary="@string/global_preferences_battery_optimizations_summary"
+        android:title="@string/global_preferences_battery_optimizations_title">
+        <intent android:action="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
     </Preference>
 
 </PreferenceScreen>
diff --git a/oeffi/res/xml/preference_directions.xml b/oeffi/res/xml/preference_directions.xml
index 0efac78..5576352 100644
--- a/oeffi/res/xml/preference_directions.xml
+++ b/oeffi/res/xml/preference_directions.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ListPreference
-            android:entries="@array/directions_optimize_trip"
-            android:entryValues="@array/directions_optimize_trip_values"
-            android:key="optimize_trip"
-            android:summary="@string/directions_preferences_optimize_trip_summary"
-            android:title="@string/directions_preferences_optimize_trip_title"/>
+        android:entries="@array/directions_optimize_trip"
+        android:entryValues="@array/directions_optimize_trip_values"
+        android:key="optimize_trip"
+        android:summary="@string/directions_preferences_optimize_trip_summary"
+        android:title="@string/directions_preferences_optimize_trip_title" />
     <ListPreference
-            android:defaultValue="NORMAL"
-            android:entries="@array/directions_walk_speed"
-            android:entryValues="@array/directions_walk_speed_values"
-            android:key="walk_speed"
-            android:summary="@string/directions_preferences_walk_speed_summary"
-            android:title="@string/directions_preferences_walk_speed_title"/>
+        android:defaultValue="NORMAL"
+        android:entries="@array/directions_walk_speed"
+        android:entryValues="@array/directions_walk_speed_values"
+        android:key="walk_speed"
+        android:summary="@string/directions_preferences_walk_speed_summary"
+        android:title="@string/directions_preferences_walk_speed_title" />
     <ListPreference
-            android:defaultValue="NEUTRAL"
-            android:entries="@array/directions_accessibility"
-            android:entryValues="@array/directions_accessibility_values"
-            android:key="accessibility"
-            android:summary="@string/directions_preferences_accessibility_summary"
-            android:title="@string/directions_preferences_accessibility_title"/>
+        android:defaultValue="NEUTRAL"
+        android:entries="@array/directions_accessibility"
+        android:entryValues="@array/directions_accessibility_values"
+        android:key="accessibility"
+        android:summary="@string/directions_preferences_accessibility_summary"
+        android:title="@string/directions_preferences_accessibility_title" />
 
 </PreferenceScreen>
diff --git a/oeffi/res/xml/preference_donate.xml b/oeffi/res/xml/preference_donate.xml
index 71ce8a3..78f34fb 100644
--- a/oeffi/res/xml/preference_donate.xml
+++ b/oeffi/res/xml/preference_donate.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Preference
-            android:key="about_donate_bitcoin"
-            android:summary="@string/about_donate_bitcoin_summary"
-            android:title="@string/about_donate_bitcoin_title"/>
+        android:key="about_donate_bitcoin"
+        android:summary="@string/about_donate_bitcoin_summary"
+        android:title="@string/about_donate_bitcoin_title" />
     <Preference
-            android:key="about_donate_euro"
-            android:summary="@string/about_donate_euro_summary"
-            android:title="@string/about_donate_euro_title">
+        android:key="about_donate_euro"
+        android:summary="@string/about_donate_euro_summary"
+        android:title="@string/about_donate_euro_title">
         <intent
-                android:action="android.intent.action.VIEW"
-                android:data="@string/about_donate_euro_summary"/>
+            android:action="android.intent.action.VIEW"
+            android:data="@string/about_donate_euro_summary" />
     </Preference>
 
 </PreferenceScreen>
diff --git a/oeffi/res/xml/preference_headers.xml b/oeffi/res/xml/preference_headers.xml
index 9c57f62..2e932fc 100644
--- a/oeffi/res/xml/preference_headers.xml
+++ b/oeffi/res/xml/preference_headers.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+<preference-headers
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <header
-            android:fragment="de.schildbach.oeffi.preference.CommonFragment"
-            android:title="@string/global_preferences_title"/>
+        android:fragment="de.schildbach.oeffi.preference.CommonFragment"
+        android:title="@string/global_preferences_title" />
     <header
-            android:fragment="de.schildbach.oeffi.preference.DirectionsFragment"
-            android:title="@string/directions_preferences_title"/>
+        android:fragment="de.schildbach.oeffi.preference.DirectionsFragment"
+        android:title="@string/directions_preferences_title" />
     <header
-            android:fragment="de.schildbach.oeffi.preference.AboutFragment"
-            android:title="@string/about_title"/>
+        android:fragment="de.schildbach.oeffi.preference.AboutFragment"
+        android:title="@string/about_title" />
 
 </preference-headers>
diff --git a/oeffi/res/xml/preference_headers_donate.xml b/oeffi/res/xml/preference_headers_donate.xml
index 1b0b600..5e2dfb2 100644
--- a/oeffi/res/xml/preference_headers_donate.xml
+++ b/oeffi/res/xml/preference_headers_donate.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+<preference-headers
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <header
-            android:fragment="de.schildbach.oeffi.preference.DonateFragment"
-            android:title="@string/about_donate_title"/>
+        android:fragment="de.schildbach.oeffi.preference.DonateFragment"
+        android:title="@string/about_donate_title" />
 
 </preference-headers>
diff --git a/oeffi/res/xml/stations_searchable.xml b/oeffi/res/xml/stations_searchable.xml
index ff14dad..82f589d 100644
--- a/oeffi/res/xml/stations_searchable.xml
+++ b/oeffi/res/xml/stations_searchable.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:hint="@string/stations_searchable_hint"
-    android:label="@string/app_name" >
-
-</searchable>
+    android:label="@string/app_name" />