diff --git a/app/build.gradle b/app/build.gradle
index 6016cfa..8ccfc90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -85,6 +85,7 @@ android {
 }
 
 dependencies {
+
     def room_version = "2.2.5"
     def archLifecycleVersion = '2.1.0'
 
@@ -104,4 +105,5 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion"
     annotationProcessor "androidx.lifecycle:lifecycle-common-java8:$archLifecycleVersion"
 
+    implementation 'androidx.preference:preference:1.1.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 32125e5..ee09a9b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,19 +2,26 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="net.schueller.peertube">
-    <!-- required for torrent downloading -->
+    <!-- required to play video in background via notification -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- connect to peertube server -->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- required for torrent downloading -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:name=".application.AppApplication"
         android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
+
+        <!-- Server Address Book -->
         <activity
             android:name=".activity.ServerAddressBookActivity"
             android:label="@string/title_activity_server_address_book"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar" /> <!-- Video Lists -->
         <activity
             android:name=".activity.VideoListActivity"
             android:launchMode="singleTop"
@@ -29,27 +36,29 @@
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
-        </activity>
+        </activity> <!-- Video Player -->
         <activity
             android:name=".activity.VideoPlayActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:label="@string/title_activity_video_play"
             android:launchMode="singleInstance"
             android:supportsPictureInPicture="true"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar" /> <!-- Settings -->
         <activity
             android:name=".activity.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar" /> <!-- Server Selection -->
         <activity
             android:name=".activity.SelectServerActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:label="@string/title_activity_select_server"
+            android:theme="@style/AppTheme.NoActionBar" /> <!-- Me -->
         <activity
             android:name=".activity.MeActivity"
-            android:label="@string/title_activity_account"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:label="@string/title_activity_me"
+            android:theme="@style/AppTheme.NoActionBar" /> <!-- Account -->
         <activity
             android:name=".activity.AccountActivity"
+            android:label="@string/title_activity_account"
             android:theme="@style/AppTheme.NoActionBar" /> <!-- Content provider for search suggestions -->
         <provider
             android:name=".provider.SearchSuggestionsProvider"
@@ -58,10 +67,6 @@
             android:exported="false" />
 
         <service android:name=".service.VideoPlayerService" />
-    </application> <!-- required to play video in background via notification -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- connect to peertube server -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
index 572bb68..9e0c6da 100644
--- a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
@@ -20,7 +20,6 @@ package net.schueller.peertube.activity;
 
 import android.content.Intent;
 import android.net.Uri;
-import android.nfc.Tag;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -108,7 +107,6 @@ public class MeActivity extends CommonActivity {
         logout.setOnClickListener(view -> {
             Session.getInstance().invalidate();
             account.setVisibility(View.GONE);
-
         });
 
         getUserData();
diff --git a/app/src/main/java/net/schueller/peertube/activity/SelectServerActivity.java b/app/src/main/java/net/schueller/peertube/activity/SelectServerActivity.java
index 26d56f2..a4c6186 100644
--- a/app/src/main/java/net/schueller/peertube/activity/SelectServerActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/SelectServerActivity.java
@@ -19,6 +19,7 @@ package net.schueller.peertube.activity;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -48,11 +49,12 @@ import net.schueller.peertube.network.GetVideoDataService;
 import net.schueller.peertube.network.RetrofitInstance;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import static net.schueller.peertube.helper.Constants.DEFAULT_THEME;
 import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;
 
-public class SelectServerActivity extends AppCompatActivity {
+public class SelectServerActivity extends CommonActivity {
 
     private ServerAdapter serverAdapter;
     private SwipeRefreshLayout swipeRefreshLayout;
@@ -65,11 +67,24 @@ public class SelectServerActivity extends AppCompatActivity {
 
     private boolean isLoading = false;
 
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish(); // close this activity as oppose to navigating up
+        return false;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_server_selection);
 
+        // Attaching the layout to the toolbar object
+        Toolbar toolbar = findViewById(R.id.tool_bar_server_selection);
+        // Setting toolbar as the ActionBar with setSupportActionBar() call
+        setSupportActionBar(toolbar);
+        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
+
         loadList();
 
     }
diff --git a/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.java b/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.java
index 8d2f934..3cbe68d 100644
--- a/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/ServerAddressBookActivity.java
@@ -21,12 +21,15 @@ import android.app.AlertDialog;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.widget.EditText;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
@@ -40,6 +43,7 @@ import net.schueller.peertube.database.Server;
 import net.schueller.peertube.database.ServerViewModel;
 import net.schueller.peertube.fragment.AddServerFragment;
 
+import java.util.Objects;
 
 public class ServerAddressBookActivity extends CommonActivity implements AddServerFragment.OnFragmentInteractionListener {
 
@@ -51,11 +55,23 @@ public class ServerAddressBookActivity extends CommonActivity implements AddServ
     private FloatingActionButton floatingActionButton;
     private FragmentManager fragmentManager;
 
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish(); // close this activity as oppose to navigating up
+        return false;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_server_address_book);
 
+        // Attaching the layout to the toolbar object
+        Toolbar toolbar = findViewById(R.id.tool_bar_server_address_book);
+        // Setting toolbar as the ActionBar with setSupportActionBar() call
+        setSupportActionBar(toolbar);
+        Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_baseline_close_24);
 
         mServerViewModel = new ViewModelProvider(this).get(ServerViewModel.class);
 
diff --git a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
index c8be62b..52db457 100644
--- a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
@@ -15,220 +15,39 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
 package net.schueller.peertube.activity;
 
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
-import android.preference.Preference;
 
 import androidx.appcompat.app.ActionBar;
-
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.view.MenuItem;
-import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
+import androidx.preference.PreferenceFragmentCompat;
 
 import net.schueller.peertube.R;
 
-import java.util.List;
+import java.util.Objects;
 
-import static net.schueller.peertube.helper.Constants.DEFAULT_THEME;
-import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;
-
-public class SettingsActivity extends AppCompatPreferenceActivity {
-
-    private static String previousThemeColorValue = "";
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                this.finish();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private static String getSelectedColor(Context context, String colorId) {
-
-        String res = "Color not found";
-        String[] themeArray = context.getResources().getStringArray(R.array.themeValues);
-        String[] colorArray = context.getResources().getStringArray(R.array.themeArray);
-
-        for (int i = 0; i < themeArray.length; i++) {
-            if (themeArray[i].equals(colorId)) {
-                res = colorArray[i];
-                break;
-            }
-        }
-        return res;
-    }
-
-    /**
-     * A preference value change listener that updates the preference's summary
-     * to reflect its new value.
-     */
-    private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = (preference, value) -> {
-        String stringValue = value.toString();
-
-        // check URL is valid
-//        if (preference.getKey().equals("pref_api_base") && !Patterns.WEB_URL.matcher(stringValue).matches()) {
-//            Toast.makeText(preference.getContext(), R.string.invalid_url, Toast.LENGTH_LONG).show();
-//            return false;
-//        }
-        // Check if Theme color has change & Provide selected color
-        if (preference.getKey().equals("pref_theme")) {
-
-            stringValue = getSelectedColor(preference.getContext(), stringValue);
-
-            if (!previousThemeColorValue.equals("") && !previousThemeColorValue.equals(stringValue)) {
-                Toast.makeText(preference.getContext(), R.string.pref_description_app_theme, Toast.LENGTH_LONG).show();
-            }
-
-            previousThemeColorValue = stringValue;
-            preference.setSummary(stringValue);
-            return true;
-        }
-
-        preference.setSummary(stringValue);
-
-        return true;
-    };
-
-    /**
-     * Helper method to determine if the device has an extra-large screen. For
-     * example, 10" tablets are extra-large.
-     */
-    private static boolean isXLargeTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout
-                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
-    }
-
-    /**
-     * Binds a preference's summary to its value. More specifically, when the
-     * preference's value is changed, its summary (line of text below the
-     * preference title) is updated to reflect the value. The summary is also
-     * immediately updated upon calling this method. The exact display format is
-     * dependent on the type of preference.
-     *
-     * @see #sBindPreferenceSummaryToValueListener
-     */
-    private static void bindPreferenceSummaryToValue(Preference preference) {
-        // Set the listener to watch for value changes.
-        preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
-
-        // Trigger the listener immediately with the preference's
-        // current value.
-        sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
-                PreferenceManager
-                        .getDefaultSharedPreferences(preference.getContext())
-                        .getString(preference.getKey(), ""));
-    }
+public class SettingsActivity extends CommonActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-
-
         super.onCreate(savedInstanceState);
 
-        setupActionBar();
-        getFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralPreferenceFragment()).commit();
-    }
-
-    /**
-     * Set up the {@link android.app.ActionBar}, if the API is available.
-     */
-    private void setupActionBar() {
+        setContentView(R.layout.activity_settings);
+        getSupportFragmentManager()
+                .beginTransaction()
+                .replace(R.id.settings, new SettingsFragment())
+                .commit();
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            // Show the Up button in the action bar.
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean onIsMultiPane() {
-        return isXLargeTablet(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public void onBuildHeaders(List<Header> target) {
-        //loadHeadersFromResource(R.xml.pref_headers, target);
-    }
-
-    /**
-     * This method stops fragment injection in malicious applications.
-     * Make sure to deny any unknown fragments here.
-     */
-    protected boolean isValidFragment(String fragmentName) {
-        return PreferenceFragment.class.getName().equals(fragmentName)
-                || GeneralPreferenceFragment.class.getName().equals(fragmentName);
-    }
-
-    /**
-     * This fragment shows general preferences only. It is used when the
-     * activity is showing a two-pane mainmenu UI.
-     */
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class GeneralPreferenceFragment extends PreferenceFragment {
+    public static class SettingsFragment extends PreferenceFragmentCompat {
         @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_general);
-            setHasOptionsMenu(true);
-
-            // Bind the summaries of EditText/List/Dialog/Ringtone preferences
-            // to their values. When their values change, their summaries are
-            // updated to reflect the new value, per the Android Design
-            // guidelines.
-            //bindPreferenceSummaryToValue(findPreference("pref_api_base"));
-            bindPreferenceSummaryToValue(findPreference("pref_theme"));
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                startActivity(new Intent(getActivity(), SettingsActivity.class));
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-                                             Preference preference) {
-//            String key = preference.getKey();
-//            if ("pref_api_base".equals(key)) {
-//                Intent intentServer = new Intent(preference.getContext(), SelectServerActivity.class);
-//                startActivity(intentServer);
-//                return true;
-//            }
-            return false;
-        }
-
-        @Override
-        public void onResume() {
-            setPreferenceScreen(null);
-            addPreferencesFromResource(R.xml.pref_general);
-            //bindPreferenceSummaryToValue(findPreference("pref_api_base"));
-
-            super.onResume();
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            setPreferencesFromResource(R.xml.root_preferences, rootKey);
         }
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 0a1283b..15c39b9 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:elevation="4dp"
-            app:layout_scrollFlags="scroll|enterAlways" />
+             />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_me.xml b/app/src/main/res/layout/activity_me.xml
index 6c694c0..ac01ec2 100644
--- a/app/src/main/res/layout/activity_me.xml
+++ b/app/src/main/res/layout/activity_me.xml
@@ -5,7 +5,6 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".activity.MeActivity"
-
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -18,7 +17,6 @@
             android:id="@+id/tool_bar_me"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways"
             android:elevation="4dp" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/activity_server_address_book.xml b/app/src/main/res/layout/activity_server_address_book.xml
index b085710..5de5eb8 100644
--- a/app/src/main/res/layout/activity_server_address_book.xml
+++ b/app/src/main/res/layout/activity_server_address_book.xml
@@ -7,6 +7,22 @@
     tools:context=".activity.ServerAddressBookActivity"
     android:id="@+id/server_book">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_server_address_book"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/tool_bar_server_address_book"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlways"
+            android:elevation="4dp" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_server"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_server_selection.xml b/app/src/main/res/layout/activity_server_selection.xml
index f2a835f..9a91455 100644
--- a/app/src/main/res/layout/activity_server_selection.xml
+++ b/app/src/main/res/layout/activity_server_selection.xml
@@ -6,41 +6,44 @@
     android:layout_height="match_parent"
     tools:context=".activity.SelectServerActivity">
 
-    <LinearLayout
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_server_selection"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
-        <LinearLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/tool_bar_server_selection"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:elevation="4dp"
+            app:layout_scrollFlags="scroll|enterAlways" />
 
-            <TextView
-                android:id="@+id/empty_server_selection_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/no_data_available"
-                android:visibility="gone" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                android:id="@+id/serversSwipeRefreshLayout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    <TextView
+        android:id="@+id/empty_server_selection_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/no_data_available"
+        android:visibility="gone" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/serverRecyclerView"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/serversSwipeRefreshLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/appbar_server_selection"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                </androidx.recyclerview.widget.RecyclerView>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/serverRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        </LinearLayout>
-    </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..de6591a
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,9 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 123efdd..9a70782 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -363,6 +363,16 @@
     <string name="server_book_del_alert_title">Remove Server</string>
     <string name="server_book_del_alert_msg">Are you sure you want to remove this server from the address book?</string>
 
+    <string name="title_activity_select_server">Select Server</string>
+    <string name="title_activity_me">Account</string>
+    <string name="title_activity_settings2">SettingsActivity2</string>
+
+    <string name="settings_activity_video_list_category_title">Video List</string>
+    <string name="settings_activity_video_playback_category_title">Video Playback</string>
+    <string name="settings_activity_about_category_title">About</string>
+    <string name="settings_activity_look_and_feel_category_title"><![CDATA[Look & Feel]]></string>
+
+
     <!-- Constants, Don't translate -->
     <string name="pref_token_access" translatable="false">pref_token_access</string>
     <string name="pref_token_refresh" translatable="false">pref_token_refresh</string>
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
new file mode 100644
index 0000000..6fd6103
--- /dev/null
+++ b/app/src/main/res/xml/backup_descriptor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude specific shared preferences that contain GCM registration Id -->
+</full-backup-content>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
new file mode 100644
index 0000000..e60c6cf
--- /dev/null
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -0,0 +1,84 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory app:title="@string/settings_activity_look_and_feel_category_title">
+
+        <ListPreference
+            app:defaultValue="@array/empty_array"
+            app:entries="@array/supportedLanguagesArray"
+            app:entryValues="@array/supportedLanguagesValues"
+            app:key="pref_language_app"
+            app:summary="@string/pref_description_language_app"
+            app:title="@string/pref_language_app" />
+
+        <ListPreference
+            app:defaultValue="AppTheme.BLUE"
+            app:entries="@array/themeArray"
+            app:entryValues="@array/themeValues"
+            app:key="pref_theme"
+            app:summary="@string/pref_description_app_theme"
+            app:title="@string/pref_title_app_theme" />
+
+        <SwitchPreference
+            app:defaultValue="false"
+            app:key="pref_dark_mode"
+            app:summary="@string/pref_description_dark_mode"
+            app:title="@string/pref_title_dark_mode" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/settings_activity_video_list_category_title">
+
+        <SwitchPreference
+            app:defaultValue="false"
+            app:key="pref_show_nsfw"
+            app:summary="@string/pref_description_show_nsfw"
+            app:title="@string/pref_title_show_nsfw" />
+
+        <MultiSelectListPreference
+            app:defaultValue="@array/empty_array"
+            app:entries="@array/languageArray"
+            app:entryValues="@array/languageValues"
+            app:key="pref_language"
+            app:summary="@string/pref_description_language"
+            app:title="@string/pref_language" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/settings_activity_video_playback_category_title">
+
+        <SwitchPreference
+            app:defaultValue="true"
+            app:key="pref_back_pause"
+            app:summary="@string/pref_description_back_pause"
+            app:title="@string/pref_title_back_pause" />
+
+        <ListPreference
+            app:defaultValue="@array/empty_array"
+            app:entries="@array/backgroundBehavior"
+            app:entryValues="@array/backgroundBehaviorValues"
+            app:key="pref_background_behavior"
+            app:summary="@string/pref_background_behavior_summary"
+            app:title="@string/pref_background_behavior" />
+
+        <SwitchPreference
+            app:defaultValue="false"
+            app:key="pref_torrent_player"
+            app:summary="@string/pref_description_torrent_player"
+            app:title="@string/pref_title_torrent_player" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/settings_activity_about_category_title">
+
+        <Preference
+            app:summary="@string/versionName"
+            app:title="@string/pref_title_version" />
+
+        <Preference
+            app:summary="@string/pref_description_license"
+            app:title="@string/pref_title_license" />
+
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file