diff --git a/app/src/main/res/drawable/bottom_navigation_colors.xml b/app/src/main/res/drawable/bottom_navigation_colors.xml
deleted file mode 100644
index f31450f..0000000
--- a/app/src/main/res/drawable/bottom_navigation_colors.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_checked="true"
-        android:color="?colorPrimary" />
-    <item
-        android:state_checked="false"
-        android:color="@color/gray" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_access_time_black_24dp.xml b/app/src/main/res/drawable/ic_access_time_black_24dp.xml
deleted file mode 100644
index 2239a4f..0000000
--- a/app/src/main/res/drawable/ic_access_time_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
deleted file mode 100644
index e3979cd..0000000
--- a/app/src/main/res/drawable/ic_add_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_alarm_white_24dp.xml b/app/src/main/res/drawable/ic_alarm_white_24dp.xml
deleted file mode 100644
index 6244bba..0000000
--- a/app/src/main/res/drawable/ic_alarm_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-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/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit_black_24dp.xml
deleted file mode 100644
index 2ab2fb7..0000000
--- a/app/src/main/res/drawable/ic_edit_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 2408e30..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#008577"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_list_white_24dp.xml b/app/src/main/res/drawable/ic_list_white_24dp.xml
deleted file mode 100644
index f470376..0000000
--- a/app/src/main/res/drawable/ic_list_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_perm_contact_calendar_black_24dp.xml b/app/src/main/res/drawable/ic_perm_contact_calendar_black_24dp.xml
deleted file mode 100644
index 0d6b3bb..0000000
--- a/app/src/main/res/drawable/ic_perm_contact_calendar_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,6c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,18L6,18v-1c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1z"/>
-</vector>
diff --git a/app/src/main/res/layout/block_temporarily_dialog.xml b/app/src/main/res/layout/block_temporarily_dialog.xml
deleted file mode 100644
index 5dba493..0000000
--- a/app/src/main/res/layout/block_temporarily_dialog.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  TimeLimit Copyright <C> 2019 - 2020 Jonas Lochmann
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-    <io.timelimit.android.ui.view.SafeViewFlipper
-        android:measureAllChildren="false"
-        android:id="@+id/flipper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/end_time_option_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TimePicker
-                android:id="@+id/time"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <Button
-                android:text="@string/generic_ok"
-                android:id="@+id/time_confirm_button"
-                android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <DatePicker
-                android:id="@+id/calendar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <Button
-                android:text="@string/generic_ok"
-                android:id="@+id/calendar_confirm_button"
-                android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-    </io.timelimit.android.ui.view.SafeViewFlipper>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_blocked_time_areas_help_dialog.xml b/app/src/main/res/layout/fragment_blocked_time_areas_help_dialog.xml
index cec5f94..8916241 100644
--- a/app/src/main/res/layout/fragment_blocked_time_areas_help_dialog.xml
+++ b/app/src/main/res/layout/fragment_blocked_time_areas_help_dialog.xml
@@ -27,7 +27,6 @@
         android:text="@string/generic_help" />
 
     <TextView
-        android:id="@+id/text1"
         android:paddingTop="8dp"
         android:text="@string/blocked_time_areas_help_about"
         android:textAppearance="?android:textAppearanceSmall"
diff --git a/app/src/main/res/layout/manage_parent_blocked_times_fragment.xml b/app/src/main/res/layout/manage_parent_blocked_times_fragment.xml
deleted file mode 100644
index 8f3fc1b..0000000
--- a/app/src/main/res/layout/manage_parent_blocked_times_fragment.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-  TimeLimit Copyright <C> 2019 - 2020 Jonas Lochmann
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <https://www.gnu.org/licenses/>.
--->
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="io.timelimit.android.ui.manage.parent.blockedtimes.ManageParentBlockedTimesFragment">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/coordinator">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                app:layout_scrollFlags="scroll|enterAlways|snap"
-                android:background="?android:windowBackground"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <Spinner
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="2"
-                        android:id="@+id/spinner_day"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content" />
-
-                    <Button
-                        android:layout_marginEnd="8dp"
-                        style="?materialButtonOutlinedStyle"
-                        android:id="@+id/btn_help"
-                        android:layout_weight="1"
-                        android:text="@string/generic_help"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content" />
-
-                </LinearLayout>
-
-                <Button
-                    style="?materialButtonOutlinedStyle"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:id="@+id/btn_copy_to_other_days"
-                    android:text="@string/blocked_time_areas_copy_to_other_days"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-                <CheckBox
-                    android:text="@string/blocked_time_areas_checkbox_detailed"
-                    android:id="@+id/detailed_mode"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:id="@+id/recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            app:fabSize="normal"
-            android:src="@drawable/ic_lock_open_white_24dp"
-            android:layout_margin="16dp"
-            android:layout_gravity="end|bottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-</layout>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 506ec2c..c7ab506 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -16,7 +16,6 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_graph"
     app:startDestination="@id/overviewFragment">
 
     <fragment
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1ff33c9..b4d2240 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -27,11 +27,6 @@
     <string name="generic_enable">Aktivieren</string>
     <string name="generic_show_more">Mehr anzeigen</string>
 
-    <plurals name="generic_plural_app">
-        <item quantity="one">%d App</item>
-        <item quantity="other">%d Apps</item>
-    </plurals>
-
     <string name="generic_swipe_to_dismiss">Se können diesen Hinweis entfernen, indem Sie ihn zur Seite wischen</string>
     <string name="generic_runtime_permission_rejected">Berechtigung abgelehnt; Sie können die Berechtigungen in den Systemeinstellungen verwalten</string>
 
@@ -370,7 +365,6 @@
         Einige Optionen sind nicht verfügbar, weil kein Elternteil angemeldet ist
     </string>
 
-    <string name="contacts_title">Kontakte</string>
     <string name="contacts_snackbar_added">Kontakt wurde hinzugefügt</string>
     <string name="contacts_title_long">Erlaubte Kontakte</string>
     <string name="contacts_description">Das ist eine Liste von Telefonnummern.
@@ -562,7 +556,6 @@
 
     <string name="lock_disable_temporarily_lock_title">Vorübergehende Sperrung abschalten</string>
     <string name="lock_disable_temporarily_all_categories">Alle Kategorien</string>
-    <string name="lock_disable_temporarily_all_categories_disabled">Es wurde nur die Kategorie %s gesperrt</string>
 
     <string name="lock_confirm_time_title">Systemzeit manuell bestätigen</string>
     <string name="lock_confirm_time_btn">Diese Zeit ist richtig</string>
@@ -628,7 +621,6 @@
 
     <string name="login_user_selection_text">Wählen Sie einen Benutzer, um sich anzumelden</string>
     <string name="login_password_hint">Passwort</string>
-    <string name="login_btn_do">Anmelden</string>
     <string name="login_snackbar_wrong">Dieses Passwort ist nicht korrekt</string>
     <string name="login_dialog_password_text">Geben Sie Ihr Passwort ein, um sich anzumelden</string>
     <string name="login_assign_to_device">Mich als Benutzer dieses Gerätes festlegen</string>
@@ -690,10 +682,6 @@
 
     <string name="category_networks_toast_enable_location_service">Bitte den Standortzugriff aktivieren</string>
 
-    <string name="manage_category_section_assigned_apps">Zugeordnete Apps</string>
-    <string name="manage_category_section_all_apps">Alle Apps</string>
-
-    <string name="manage_child_tab_categories">Kategorien</string>
     <string name="manage_child_tab_other">erweiterte Einstellungen</string>
 
     <string name="manage_child_category_no_time_limits">Keine Zeitbegrenzung</string>
@@ -894,10 +882,6 @@
         Diese Berechtigung kann nur durch TimeLimit bzw. ein Elternteil, das TimeLimit deinstalliert, deaktiviert werden.
     </string>
 
-    <string name="manage_device_permission_tap_top_open_settings">
-        Berühren Sie diese Option, um den entsprechenden Bereich der Systemeinstellungen zu öffnen
-    </string>
-
     <string name="manage_device_permission_open_at_target_device">
         Öffnen Sie diesen Bildschirm am entsprechenden Gerät, um die Berechtigung festzulegen
     </string>
@@ -1007,7 +991,6 @@
     <string name="manage_user_key_add">Schlüssel hinzufügen</string>
     <string name="manage_user_key_remove">Schlüssel entfernen</string>
     <string name="manage_user_key_added">Der Schlüssel wurde hinzugefügt</string>
-    <string name="manage_user_key_removed">Der Schlüssel wurde entfernt</string>
     <string name="manage_user_key_invalid">Dies ist kein gültiger TimeLimit-Schlüssel</string>
     <string name="manage_user_key_other_user">Dieser Schlüssel ist schon bei einem anderen Benutzer hinterlegt</string>
 
@@ -1089,7 +1072,6 @@
         Sie haben TimeLimit im lokalen Modus eingerichtet.
         In diesem gibt es keine Vernetzung, sodass Sie kein Gerät hinzufügen können.
     </string>
-    <string name="overview_add_device_migrate_to_connected">Zum vernetzten Modus migrieren</string>
 
     <string name="overview_intro_title">Willkommen bei TimeLimit</string>
     <string name="overview_intro_text">
@@ -1419,7 +1401,6 @@
     <string name="update_unavailable">Momentan ist kein Update verfügbar</string>
     <string name="update_available">TimeLimit %s ist verfügbar. Änderungen:\n%s</string>
     <string name="update_available_download">Aktualisieren</string>
-    <string name="update_permission_required_text">TimeLimit benötigt Ihre Berechtigung, um sich zu aktualisieren</string>
     <string name="update_privacy">TimeLimit kann automatisch nach Updates suchen. Dafür
         wird regelmäßig %s abgefragt.
     </string>
@@ -1489,10 +1470,7 @@
     <string name="util_time_unused">Unbenutzt</string>
     <string name="util_time_used"><xliff:g example="4 minutes" id="used time">%1$s</xliff:g> benutzt</string>
 
-    <string name="util_time_until">bis <xliff:g id="value">%1$s</xliff:g>
-    </string>
-
-   <string name="widget_empty_view">Wenn dieses Gerät einem Kind zugeordnet
+    <string name="widget_empty_view">Wenn dieses Gerät einem Kind zugeordnet
         wird und dieses Kind Kategorien hat, dann sollten diese Kategorien
         hier angezeigt werden.
     </string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1c7c336..a74742f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -26,11 +26,6 @@
     <string name="generic_manage_card">Gerenciar</string>
     <string name="generic_enable">Ativar</string>
 
-    <plurals name="generic_plural_app">
-        <item quantity="one">%d App</item>
-        <item quantity="other">%d Apps</item>
-    </plurals>
-
     <string name="generic_swipe_to_dismiss">Deslize para o lado para remover esta mensagem</string>
     <string name="generic_runtime_permission_rejected">Permissão recusada; Você pode gerenciar as permissões nas configurações do sistema</string>
 
@@ -330,7 +325,6 @@ por exemplo, quando você quer adicionar o uso de tela
         Algumas opções não estão disponíveis porque nenhum usuário Pai está conectado
     </string>
 
-    <string name="contacts_title">Contatos</string>
     <string name="contacts_snackbar_added">O contato foi adicionado</string>
     <string name="contacts_title_long">Contatos permitidos</string>
     <string name="contacts_description">Esta é uma lista de números de telefone.
@@ -389,16 +383,6 @@ por exemplo, quando você quer adicionar o uso de tela
         <item>@string/day_of_week_sunday</item>
     </string-array>
 
-    <string-array name="days_of_week_array_short">
-        <item>@string/day_of_week_monday_short</item>
-        <item>@string/day_of_week_tuesday_short</item>
-        <item>@string/day_of_week_wednesday_short</item>
-        <item>@string/day_of_week_thursday_short</item>
-        <item>@string/day_of_week_friday_short</item>
-        <item>@string/day_of_week_saturday_short</item>
-        <item>@string/day_of_week_sunday_short</item>
-    </string-array>
-
     <string name="delete_child_title">Excluir usuário</string>
     <string name="delete_child_text">Tem certeza que quer excluir esta criança %s?</string>
 
@@ -538,7 +522,6 @@ por exemplo, quando você quer adicionar o uso de tela
 
     <string name="lock_disable_temporarily_lock_title">Desativar o bloqueio temporário</string>
     <string name="lock_disable_temporarily_all_categories">todas as categorias</string>
-    <string name="lock_disable_temporarily_all_categories_disabled">Somente a categoria %s é bloqueada</string>
 
     <string name="lock_confirm_time_title">Confirmar o tempo manualmente</string>
     <string name="lock_confirm_time_btn">Este tempo é correto</string>
@@ -606,7 +589,6 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
 
     <string name="login_user_selection_text">Escolha um usuário para autenticar</string>
     <string name="login_password_hint">Senha</string>
-    <string name="login_btn_do">Entrar</string>
     <string name="login_snackbar_wrong">A senha é inválida</string>
     <string name="login_dialog_password_text">Digite sua senha para entrar</string>
     <string name="login_assign_to_device">Definir-me como usuário atual deste dispositivo</string>
@@ -664,11 +646,6 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
 
     <string name="category_networks_toast_enable_location_service">Favor ativar o acesso ao localização</string>
 
-    <string name="manage_category_section_assigned_apps">Aplicativos atribuídos</string>
-    <string name="manage_category_section_all_apps">todos os Aplicativos</string>
-
-    <string name="manage_child_tab_categories">Categorias</string>
-
     <string name="manage_child_category_no_time_limits">sem limite de tempo</string>
 
     <string name="manage_child_categories_intro_title">Categorias</string>
@@ -853,10 +830,6 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
         Esta permissão só pode ser desativada por o TimeLimit/ um Pai que desinstala TimeLimit.
     </string>
 
-    <string name="manage_device_permission_tap_top_open_settings">
-        Toque nesta opção para abrir a seção correspondente nas configurações do sistema
-    </string>
-
     <string name="manage_device_permission_open_at_target_device">
         Abrir a tela no outro dispositivo para modificar as permissões
     </string>
@@ -963,7 +936,6 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
     <string name="manage_user_key_add">adicionar chave</string>
     <string name="manage_user_key_remove">excluir chave</string>
     <string name="manage_user_key_added">A chave foi adicionada</string>
-    <string name="manage_user_key_removed">A chave foi excluída</string>
     <string name="manage_user_key_invalid">Esta não foi uma chave válida de TimeLimit</string>
     <string name="manage_user_key_other_user">Esta chave já está vinculada a um outro usuário</string>
 
@@ -1040,7 +1012,6 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
         Você configurou o TimeLimit no modo local.
         Não há vínculo, por isso você não pode adicionar dispositivos.
     </string>
-    <string name="overview_add_device_migrate_to_connected">Migrar para o modo conectado</string>
 
     <string name="overview_intro_title">Bem-vindo ao TimeLimit</string>
     <string name="overview_intro_text">
@@ -1365,7 +1336,6 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
     <string name="update_unavailable">Não há atualização disponível no momento</string>
     <string name="update_available">TimeLimit %s está disponível. Modificações:\n%s</string>
     <string name="update_available_download">Atualizar</string>
-    <string name="update_permission_required_text">TimeLimit precisa de sua permissão para atualizar</string>
     <string name="update_privacy">TimeLimit pode verificar automaticamente se há atualizações.
         Para isso, ele consulta %s.
     </string>
@@ -1432,16 +1402,13 @@ Esta %s só é permitida em algumas redes, mas nenhuma conexão com tal rede foi
     <string name="util_time_unused">Não utilizado</string>
     <string name="util_time_used">Used <xliff:g example="4 minutes" id="used time">%1$s</xliff:g></string>
 
-    <string name="util_time_until">até <xliff:g id="value">%1$s</xliff:g>
-    </string>
-
     <string name="widget_empty_view">Se este dispositivo for atribuído a uma criança
         e esta criança possui categorias, então as categorias devem
         aparecem aqui.
     </string>
 
     <string name="wiazrd_next">Próximo</string>
-    
+
     <string name="admin_description_google">Isto permite TimeLimit a detectar se foi interrompido.</string>
     <string name="admin_description_direct">Isto permite TimeLimit a evitar que seja desativado.</string>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2e5d693..78bb2a5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,10 +25,8 @@
     <color name="text_green">#0a0</color>
     <color name="text_red">#a00</color>
     <color name="background_red">#a00</color>
-    <color name="black">#000</color>
     <color name="orange_background">#E64A19</color>
     <color name="orange_text">#E64A19</color>
-    <color name="divider">#33000000</color>
     <color name="blockedtimes_yellow">#cccc00</color>
     <color name="blockedtimes_green">#0a0</color>
     <color name="blockedtimes_red">#a00</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b229aed..3c60297 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,11 +27,6 @@
     <string name="generic_enable">Enable</string>
     <string name="generic_show_more" tools:ignore="MissingTranslation">Show more</string>
 
-    <plurals name="generic_plural_app">
-        <item quantity="one">%d App</item>
-        <item quantity="other">%d Apps</item>
-    </plurals>
-
     <string name="generic_swipe_to_dismiss">Swipe to the side to remove this message</string>
     <string name="generic_runtime_permission_rejected">Permission rejected; You can manage permissions in the system settings</string>
 
@@ -411,7 +406,6 @@
         Some options are unavailable because no parent user is signed in
     </string>
 
-    <string name="contacts_title">Contacts</string>
     <string name="contacts_snackbar_added">Contact was added</string>
     <string name="contacts_title_long">Allowed contacts</string>
     <string name="contacts_description">This is a list of phone numbers.
@@ -470,16 +464,6 @@
         <item>@string/day_of_week_sunday</item>
     </string-array>
 
-    <string-array name="days_of_week_array_short">
-        <item>@string/day_of_week_monday_short</item>
-        <item>@string/day_of_week_tuesday_short</item>
-        <item>@string/day_of_week_wednesday_short</item>
-        <item>@string/day_of_week_thursday_short</item>
-        <item>@string/day_of_week_friday_short</item>
-        <item>@string/day_of_week_saturday_short</item>
-        <item>@string/day_of_week_sunday_short</item>
-    </string-array>
-
     <string name="delete_child_title">Delete user</string>
     <string name="delete_child_text">Are you sure that you want to delete the child user %s?</string>
 
@@ -624,7 +608,6 @@
 
     <string name="lock_disable_temporarily_lock_title">Disable temporary blocking</string>
     <string name="lock_disable_temporarily_all_categories">all categories</string>
-    <string name="lock_disable_temporarily_all_categories_disabled">Only the category %s is blocked</string>
 
     <string name="lock_confirm_time_title">Confirm time manually</string>
     <string name="lock_confirm_time_btn">This time is correct</string>
@@ -692,7 +675,6 @@
 
     <string name="login_user_selection_text">Choose an user to authenticate</string>
     <string name="login_password_hint">Password</string>
-    <string name="login_btn_do">Log in</string>
     <string name="login_snackbar_wrong">The password is invalid</string>
     <string name="login_dialog_password_text">Enter your password to sign in</string>
     <string name="login_assign_to_device">Set myself as current user of this device</string>
@@ -750,10 +732,6 @@
 
     <string name="category_networks_toast_enable_location_service">Please enable location access</string>
 
-    <string name="manage_category_section_assigned_apps">assigned Apps</string>
-    <string name="manage_category_section_all_apps">all Apps</string>
-
-    <string name="manage_child_tab_categories">Categories</string>
     <string name="manage_child_tab_other" tools:ignore="MissingTranslation">Advanced settings</string>
 
     <string name="manage_child_category_no_time_limits">no time limit</string>
@@ -946,10 +924,6 @@
         This permission can only be disabled by TimeLimit/ a parent which uninstalls TimeLimit.
     </string>
 
-    <string name="manage_device_permission_tap_top_open_settings">
-        Touch this option to open the corresponding section of the system settings
-    </string>
-
     <string name="manage_device_permission_open_at_target_device">
         Open the screen at the other device to modify the permissions
     </string>
@@ -1059,7 +1033,6 @@
     <string name="manage_user_key_add">add key</string>
     <string name="manage_user_key_remove">remove key</string>
     <string name="manage_user_key_added">The key was added</string>
-    <string name="manage_user_key_removed">The key was removed</string>
     <string name="manage_user_key_invalid">This was no valid TimeLimit key</string>
     <string name="manage_user_key_other_user">This key is already linked to an other user</string>
 
@@ -1141,7 +1114,6 @@
         You have set up TimeLimit in the local mode.
         There is no linking, therefore you can not add devices.
     </string>
-    <string name="overview_add_device_migrate_to_connected">Migrate to the connected mode</string>
 
     <string name="overview_intro_title">Welcome to TimeLimit</string>
     <string name="overview_intro_text">
@@ -1481,7 +1453,6 @@
     <string name="update_unavailable">There is currently no update available</string>
     <string name="update_available">TimeLimit %s is available. Changes:\n%s</string>
     <string name="update_available_download">Update</string>
-    <string name="update_permission_required_text">TimeLimit needs your permission to update itself</string>
     <string name="update_privacy">TimeLimit can automatically check for updates.
         For this, it queries %s.
     </string>
@@ -1549,9 +1520,6 @@
     <string name="util_time_unused">Unused</string>
     <string name="util_time_used">Used <xliff:g example="4 minutes" id="used time">%1$s</xliff:g></string>
 
-    <string name="util_time_until">until <xliff:g id="value">%1$s</xliff:g>
-    </string>
-
     <string name="widget_empty_view">If this device is assigned to a child
         and this child has got categories, then the categories should
         appear here.