diff --git a/README.md b/README.md
index 101c194..281692d 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,9 @@
 </h4>
 
 <p align="center">
-    <img src="https://raw.githubusercontent.com/sschueller/peertube-android/develop/Screenshot2.jpg" alt="screenshot" />
-    <img src="https://raw.githubusercontent.com/sschueller/peertube-android/develop/Screenshot1.png" alt="screenshot" />
+    <img width="250" src="https://raw.githubusercontent.com/sschueller/peertube-android/develop/Screenshot_1545425516.png" alt="screenshot" />
+    <img width="250" src="https://raw.githubusercontent.com/sschueller/peertube-android/develop/Screenshot_1545425431.png" alt="screenshot" />
+    <img width="250" src="https://raw.githubusercontent.com/sschueller/peertube-android/develop/Screenshot_1545425504.png" alt="screenshot" />
 </p>
 
 ## Download
@@ -23,16 +24,19 @@ Beta Test on Google Play: https://play.google.com/store/apps/details?id=net.schu
 - [X] Change Server
 - [X] Search
 - [X] App Icon and assets
-
+- [!] Themes / Dark mode (needs work)
+- [X] Background playback
+- [X] NSFW Filter option
+ 
 
 # TODO
+
 - [ ] Video Playback via WebRTC
-- [ ] Login
+- [ ] Authentication / Login
 - [ ] Like/dislike video
 - [ ] Comment video
 - [ ] Unit Tests
 
-
 - [ ] Lots more missing at this point...
 
 
diff --git a/Screenshot1.png b/Screenshot1.png
deleted file mode 100644
index a962100..0000000
Binary files a/Screenshot1.png and /dev/null differ
diff --git a/Screenshot2.jpg b/Screenshot2.jpg
deleted file mode 100644
index 841a96b..0000000
Binary files a/Screenshot2.jpg and /dev/null differ
diff --git a/Screenshot_1545425431.png b/Screenshot_1545425431.png
new file mode 100644
index 0000000..2d7c0f9
Binary files /dev/null and b/Screenshot_1545425431.png differ
diff --git a/Screenshot_1545425504.png b/Screenshot_1545425504.png
new file mode 100644
index 0000000..586bebc
Binary files /dev/null and b/Screenshot_1545425504.png differ
diff --git a/Screenshot_1545425516.png b/Screenshot_1545425516.png
new file mode 100644
index 0000000..a1ae020
Binary files /dev/null and b/Screenshot_1545425516.png differ
diff --git a/app/build.gradle b/app/build.gradle
index 0296fb0..e6774b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1010
-        versionName "1.0.10"
+        versionCode 1011
+        versionName "1.0.11"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         dependencies {
             implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3343545..6cc2ae4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
         tools:ignore="GoogleAppIndexingWarning">
 
         <activity android:name=".activity.VideoListActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -34,15 +35,17 @@
         </activity>
         <activity
             android:name=".activity.LoginActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:label="@string/title_activity_login" />
         <activity
             android:name=".activity.VideoPlayActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
             android:label="@string/title_activity_video_play"
-            android:launchMode="singleTop"
-            android:theme="@style/AppTheme" />
+            android:launchMode="singleTop" />
         <activity
             android:name=".activity.SettingsActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:label="@string/title_activity_settings" />
 
         <!-- Content provider for search suggestions -->
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
index 5ef84c4..d7d6797 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
@@ -15,6 +15,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SearchView;
@@ -116,6 +117,19 @@ public class VideoListActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // Set Night Mode
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        AppCompatDelegate.setDefaultNightMode(sharedPref.getBoolean("pref_dark_mode", false) ?
+                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
+
+        // Set theme
+        setTheme(getResources().getIdentifier(
+                sharedPref.getString("pref_theme", "AppTheme.ORANGE"),
+                "style",
+                getPackageName())
+        );
+
         setContentView(R.layout.activity_video_list);
 
         filter = "";
@@ -140,13 +154,17 @@ public class VideoListActivity extends AppCompatActivity {
 
         Menu navMenu = navigation.getMenu();
         navMenu.findItem(R.id.navigation_home).setIcon(
-                new IconDrawable(this, FontAwesomeIcons.fa_home));
+                new IconDrawable(this, FontAwesomeIcons.fa_home)
+                        .colorRes(R.color.primaryDarkColorDeepOrange));
         navMenu.findItem(R.id.navigation_trending).setIcon(
-                new IconDrawable(this, FontAwesomeIcons.fa_fire));
+                new IconDrawable(this, FontAwesomeIcons.fa_fire)
+                        .colorRes(R.color.primaryDarkColorDeepOrange));
         navMenu.findItem(R.id.navigation_subscriptions).setIcon(
-                new IconDrawable(this, FontAwesomeIcons.fa_folder));
+                new IconDrawable(this, FontAwesomeIcons.fa_folder)
+                        .colorRes(R.color.primaryDarkColorDeepOrange));
         navMenu.findItem(R.id.navigation_account).setIcon(
-                new IconDrawable(this, FontAwesomeIcons.fa_user_circle));
+                new IconDrawable(this, FontAwesomeIcons.fa_user_circle)
+                        .colorRes(R.color.primaryDarkColorDeepOrange));
 
         navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
 
diff --git a/app/src/main/res/color/bottom_bar.xml b/app/src/main/res/color/bottom_bar.xml
index e0f548d..1f394b4 100644
--- a/app/src/main/res/color/bottom_bar.xml
+++ b/app/src/main/res/color/bottom_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:color="@color/colorAccent"
+        android:color="?colorAccent"
         android:state_checked="true"
         android:state_pressed="true"
         android:state_focused="true"
@@ -10,7 +10,7 @@
         android:state_enabled="true"
         />
     <item
-        android:color="@color/viewBg"
+        android:color="?colorSecondary"
         android:state_checked="false"
         android:state_pressed="false"
         android:state_focused="false"
diff --git a/app/src/main/res/layout/activity_video_list.xml b/app/src/main/res/layout/activity_video_list.xml
index 354e31b..327947c 100644
--- a/app/src/main/res/layout/activity_video_list.xml
+++ b/app/src/main/res/layout/activity_video_list.xml
@@ -12,10 +12,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-        <include
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/tool_bar"
-            layout="@layout/tool_bar" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:background="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlways"
+            android:elevation="4dp" />
+
     </android.support.design.widget.AppBarLayout>
 
     <TextView
@@ -24,7 +31,6 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:visibility="gone"
-        android:textColor="@color/black"
         android:text="@string/no_data_available" />
 
     <android.support.v4.widget.SwipeRefreshLayout
diff --git a/app/src/main/res/layout/activity_video_play.xml b/app/src/main/res/layout/activity_video_play.xml
index 072f04d..abafd04 100644
--- a/app/src/main/res/layout/activity_video_play.xml
+++ b/app/src/main/res/layout/activity_video_play.xml
@@ -17,7 +17,6 @@
             android:id="@+id/video_view"
             android:layout_width="match_parent"
             android:layout_height="250dp"
-            android:background="@color/black"
 
             app:layout_constraintDimensionRatio="H,3:1"
             app:layout_constraintEnd_toEndOf="parent"
@@ -30,7 +29,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/video_view"
-            android:background="@color/black"
             android:indeterminate="false"
             android:max="100" />
 
diff --git a/app/src/main/res/layout/tool_bar.xml b/app/src/main/res/layout/tool_bar.xml
deleted file mode 100644
index e70513a..0000000
--- a/app/src/main/res/layout/tool_bar.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/colorPrimary"
-    app:layout_scrollFlags="scroll|enterAlways"
-    android:elevation="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_list.xml b/app/src/main/res/layout/video_list.xml
deleted file mode 100644
index 0d11b42..0000000
--- a/app/src/main/res/layout/video_list.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Unused? delete? -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <!--<android.support.v7.widget.CardView-->
-
-        <!--android:layout_margin="16dp"-->
-        <!--android:layout_width="220dp"-->
-        <!--android:layout_gravity="center"-->
-        <!--android:layout_height="wrap_content">-->
-
-        <!--<LinearLayout-->
-            <!--android:id="@+id/linearLayout"-->
-            <!--android:padding="8dp"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:orientation="vertical">-->
-
-            <!--<ImageView-->
-                <!--android:id="@+id/thumb"-->
-                <!--android:layout_margin="5dp"-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content" />-->
-            <!--<TextView-->
-                <!--android:id="@+id/name"-->
-                <!--android:layout_margin="5dp"-->
-                <!--android:gravity="center"-->
-                <!--android:textAppearance="@style/Base.TextAppearance.AppCompat.Large"-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:text="username"/>-->
-
-            <!--<TextView-->
-                <!--android:id="@+id/description"-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--/>-->
-
-        <!--</LinearLayout>-->
-    <!--</android.support.v7.widget.CardView>-->
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
new file mode 100644
index 0000000..1625c00
--- /dev/null
+++ b/app/src/main/res/values/array.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="themeArray">
+        <item>@string/red</item>
+        <item>@string/pink</item>
+        <item>@string/purple</item>
+        <item>@string/deeppurple</item>
+        <item>@string/indigo</item>
+        <item>@string/blue</item>
+        <item>@string/lightblue</item>
+        <item>@string/cyan</item>
+        <item>@string/teal</item>
+        <item>@string/green</item>
+        <item>@string/lightgreen</item>
+        <item>@string/lime</item>
+        <item>@string/yellow</item>
+        <item>@string/amber</item>
+        <item>@string/orange</item>
+        <item>@string/deeporange</item>
+        <item>@string/brown</item>
+        <item>@string/gray</item>
+        <item>@string/bluegray</item>
+    </string-array>
+
+    <string-array name="themeValues">
+        <item>AppTheme.RED</item>
+        <item>AppTheme.PINK</item>
+        <item>AppTheme.PURPLE</item>
+        <item>AppTheme.DEEPPURPLE</item>
+        <item>AppTheme.INDIGO</item>
+        <item>AppTheme.BLUE</item>
+        <item>AppTheme.LIGHTBLUE</item>
+        <item>AppTheme.CYAN</item>
+        <item>AppTheme.TEAL</item>
+        <item>AppTheme.GREEN</item>
+        <item>AppTheme.LIGHTGREEN</item>
+        <item>AppTheme.LIME</item>
+        <item>AppTheme.YELLOW</item>
+        <item>AppTheme.AMBER</item>
+        <item>AppTheme.ORANGE</item>
+        <item>AppTheme.DEEPORANGE</item>
+        <item>AppTheme.BROWN</item>
+        <item>AppTheme.GRAY</item>
+        <item>AppTheme.BLUEGRAY</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7ce840e..21529c2 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,12 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels. -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="metaButtonBarStyle" format="reference" />
-        <attr name="metaButtonBarButtonStyle" format="reference" />
-    </declare-styleable>
+    <attr name="metaButtonBarStyle" format="reference" />
+    <attr name="metaButtonBarButtonStyle" format="reference" />
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 54e7120..7c9e076 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,201 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#f1680d</color>
-    <color name="colorPrimaryDark">#E64A19</color>
-    <color name="colorAccent">#FF4081</color>
-    <color name="viewBg">#f1f5f8</color>
-    <color name="album_title">#4c4c4c</color>
 
-    <color name="black_overlay">#66000000</color>
-    <color name="black">#000000</color>
+    <color name="themeDeselected">#d69b9b9b</color>
+    <color name="themeSelected">#e300aaff</color>
+    <color name="seperator">#7ca6a6a6</color>
+
+
+    <!-- RED Theme -->
+    <color name="primaryColorRed">#F44336</color>
+    <color name="primaryLightColorRed">#FFCDD2</color>
+    <color name="primaryDarkColorRed">#D32F2F</color>
+    <color name="secondaryColorRed">#FFC107</color>
+    <color name="secondaryLightColorRed">#fccf4a</color>
+    <color name="secondaryDarkColorRed">#e1a902</color>
+    <color name="primaryTextColorRed">#ffffff</color>
+    <color name="secondaryTextColorRed">#000000</color>
+
+    <!-- PINK Theme -->
+    <color name="primaryColorPink">#E91E63</color>
+    <color name="primaryLightColorPink">#F8BBD0</color>
+    <color name="primaryDarkColorPink">#C2185B</color>
+    <color name="secondaryColorPink">#448AFF</color>
+    <color name="secondaryLightColorPink">#89b3f8</color>
+    <color name="secondaryDarkColorPink">#1a62da</color>
+    <color name="primaryTextColorPink">#000000</color>
+    <color name="secondaryTextColorPink">#000000</color>
+
+    <!-- PURPLE Theme -->
+    <color name="primaryColorPurple">#9C27B0</color>
+    <color name="primaryLightColorPurple">#E1BEE7</color>
+    <color name="primaryDarkColorPurple">#7B1FA2</color>
+    <color name="secondaryColorPurple">#CDDC39</color>
+    <color name="secondaryLightColorPurple">#e1ea86</color>
+    <color name="secondaryDarkColorPurple">#b4c320</color>
+    <color name="primaryTextColorPurple">#ffffff</color>
+    <color name="secondaryTextColorPurple">#000000</color>
+
+
+    <!-- DEEPPURPLE Theme -->
+    <color name="primaryColorDeepPurple">#673AB7</color>
+    <color name="primaryLightColorDeepPurple">#D1C4E9</color>
+    <color name="primaryDarkColorDeepPurple">#512DA8</color>
+    <color name="secondaryColorDeepPurple">#FFEB3B</color>
+    <color name="secondaryLightColorDeepPurple">#fff599</color>
+    <color name="secondaryDarkColorDeepPurple">#e0cd24</color>
+    <color name="primaryTextColorDeepPurple">#ffffff</color>
+    <color name="secondaryTextColorDeepPurple">#000000</color>
+
+    <!-- INDIGO Theme -->
+    <color name="primaryColorIndigo">#3F51B5</color>
+    <color name="primaryLightColorIndigo">#C5CAE9</color>
+    <color name="primaryDarkColorIndigo">#303F9F</color>
+    <color name="secondaryColorIndigo">#FF9800</color>
+    <color name="secondaryLightColorIndigo">#feba56</color>
+    <color name="secondaryDarkColorIndigo">#cf7b00</color>
+    <color name="primaryTextColorIndigo">#ffffff</color>
+    <color name="secondaryTextColorIndigo">#000000</color>
+
+    <!-- BLUE Theme -->
+    <color name="primaryColorBlue">#1e88e5</color>
+    <color name="primaryLightColorBlue">#6ab7ff</color>
+    <color name="primaryDarkColorBlue">#005cb2</color>
+    <color name="secondaryColorBlue">#607D8B</color>
+    <color name="secondaryLightColorBlue">#CFD8DC</color>
+    <color name="secondaryDarkColorBlue">#455A64</color>
+    <color name="primaryTextColorBlue">#000000</color>
+    <color name="secondaryTextColorBlue">#000000</color>
+
+    <!-- LIGHTBLUE Theme -->
+    <color name="primaryColorLightBlue">#039be5</color>
+    <color name="primaryLightColorLightBlue">#63ccff</color>
+    <color name="primaryDarkColorLightBlue">#006db3</color>
+    <color name="secondaryColorLightBlue">#CDDC39</color>
+    <color name="secondaryLightColorLightBlue">#F0F4C3</color>
+    <color name="secondaryDarkColorLightBlue">#AFB42B</color>
+    <color name="primaryTextColorLightBlue">#000000</color>
+    <color name="secondaryTextColorLightBlue">#000000</color>
+
+    <!-- CYAN Theme -->
+    <color name="primaryColorCyan">#00acc1</color>
+    <color name="primaryLightColorCyan">#5ddef4</color>
+    <color name="primaryDarkColorCyan">#007c91</color>
+    <color name="secondaryColorCyan">#f50057</color>
+    <color name="secondaryLightColorCyan">#ff5983</color>
+    <color name="secondaryDarkColorCyan">#bb002f</color>
+    <color name="primaryTextColorCyan">#000000</color>
+    <color name="secondaryTextColorCyan">#000000</color>
+
+    <!-- TEAL Theme -->
+    <color name="primaryColorTeal">#00796b</color>
+    <color name="primaryLightColorTeal">#48a999</color>
+    <color name="primaryDarkColorTeal">#004c40</color>
+    <color name="secondaryColorTeal">#ffd180</color>
+    <color name="secondaryLightColorTeal">#ffffb1</color>
+    <color name="secondaryDarkColorTeal">#caa052</color>
+    <color name="primaryTextColorTeal">#ffffff</color>
+    <color name="secondaryTextColorTeal">#000000</color>
+
+
+
+    <!--  GREEN Theme -->
+    <color name="primaryColorGreen">#4CAF50</color>
+    <color name="primaryLightColorGreen">#C8E6C9</color>
+    <color name="primaryDarkColorGreen">#388E3C</color>
+    <color name="secondaryColorGreen">#00BCD4</color>
+    <color name="secondaryLightColorGreen">#6cd1de</color>
+    <color name="secondaryDarkColorGreen">#0197ab</color>
+    <color name="primaryTextColorGreen">#ffffff</color>
+    <color name="secondaryTextColorGreen">#000000</color>
+
+    <!-- LIGHTGREEN Theme -->
+    <color name="primaryColorLightGreen">#8BC34A</color>
+    <color name="primaryLightColorLightGreen">#DCEDC8</color>
+    <color name="primaryDarkColorLightGreen">#689F38</color>
+    <color name="secondaryColorLightGreen">#448AFF</color>
+    <color name="secondaryLightColorLightGreen">#83affa</color>
+    <color name="secondaryDarkColorLightGreen">#1e58b8</color>
+    <color name="primaryTextColorLightGreen">#ffffff</color>
+    <color name="secondaryTextColorLightGreen">#000000</color>
+
+    <!-- Lime Theme -->
+    <color name="primaryColorLime">#CDDC39</color>
+    <color name="primaryLightColorLime">#F0F4C3</color>
+    <color name="primaryDarkColorLime">#AFB42B</color>
+    <color name="secondaryColorLime">#7C4DFF</color>
+    <color name="secondaryLightColorLime">#ae94f5</color>
+    <color name="secondaryDarkColorLime">#4f2cb3</color>
+    <color name="primaryTextColorLime">#ffffff</color>
+    <color name="secondaryTextColorLime">#000000</color>
+
+    <!-- YELLOW Theme -->
+    <color name="primaryColorYellow">#FFEB3B</color>
+    <color name="primaryLightColorYellow">#FFF9C4</color>
+    <color name="primaryDarkColorYellow">#FBC02D</color>
+    <color name="secondaryColorYellow">#536DFE</color>
+    <color name="secondaryLightColorYellow">#8799fd</color>
+    <color name="secondaryDarkColorYellow">#3751e1</color>
+    <color name="primaryTextColorYellow">#ffffff</color>
+    <color name="secondaryTextColorYellow">#000000</color>
+
+    <!-- AMBER Theme -->
+    <color name="primaryColorAmber">#FFC107</color>
+    <color name="primaryLightColorAmber">#FFECB3</color>
+    <color name="primaryDarkColorAmber">#FFA000</color>
+    <color name="secondaryColorAmber">#03A9F4</color>
+    <color name="secondaryLightColorAmber">#65c4ef</color>
+    <color name="secondaryDarkColorAmber">#1e87b6</color>
+    <color name="primaryTextColorAmber">#ffffff</color>
+    <color name="secondaryTextColorAmber">#000000</color>
+
+    <!-- ORANGE Theme -->
+    <color name="primaryColorOrange">#FF9800</color>
+    <color name="primaryLightColorOrange">#FFE0B2</color>
+    <color name="primaryDarkColorOrange">#F57C00</color>
+    <color name="secondaryColorOrange">#8BC34A</color>
+    <color name="secondaryLightColorOrange">#b4e67a</color>
+    <color name="secondaryDarkColorOrange">#649131</color>
+    <color name="primaryTextColorOrange">#ffffff</color>
+    <color name="secondaryTextColorOrange">#000000</color>
+
+    <!-- DEEPORANGE Theme -->
+    <color name="primaryColorDeepOrange">#FF5722</color>
+    <color name="primaryLightColorDeepOrange">#FFCCBC</color>
+    <color name="primaryDarkColorDeepOrange">#E64A19</color>
+    <color name="secondaryColorDeepOrange">#00BCD4</color>
+    <color name="secondaryLightColorDeepOrange">#75e8f6</color>
+    <color name="secondaryDarkColorDeepOrange">#2a9cab</color>
+    <color name="primaryTextColorDeepOrange">#ffffff</color>
+    <color name="secondaryTextColorDeepOrange">#000000</color>
+
+    <!-- BROWN Theme -->
+    <color name="primaryColorBrown">#795548</color>
+    <color name="primaryLightColorBrown">#D7CCC8</color>
+    <color name="primaryDarkColorBrown">#5D4037</color>
+    <color name="secondaryColorBrown">#FFC107</color>
+    <color name="secondaryLightColorBrown">#f6c83f</color>
+    <color name="secondaryDarkColorBrown">#cf9c02</color>
+    <color name="primaryTextColorBrown">#ffffff</color>
+    <color name="secondaryTextColorBrown">#000000</color>
+
+    <!-- GRAY Theme -->
+    <color name="primaryColorGray">#9E9E9E</color>
+    <color name="primaryLightColorGray">#F5F5F5</color>
+    <color name="primaryDarkColorGray">#616161</color>
+    <color name="secondaryColorGray">#536DFE</color>
+    <color name="secondaryLightColorGray">#94a5ff</color>
+    <color name="secondaryDarkColorGray">#2c44c9</color>
+    <color name="primaryTextColorGray">#ffffff</color>
+    <color name="secondaryTextColorGray">#000000</color>
+
+    <!-- BLUEGRAY Theme -->
+    <color name="primaryColorBlueGray">#607D8B</color>
+    <color name="primaryLightColorBlueGray">#CFD8DC</color>
+    <color name="primaryDarkColorBlueGray">#455A64</color>
+    <color name="secondaryColorBlueGray">#CDDC39</color>
+    <color name="secondaryLightColorBlueGray">#e3f15c</color>
+    <color name="secondaryDarkColorBlueGray">#a6b320</color>
+    <color name="primaryTextColorBlueGray">#ffffff</color>
+    <color name="secondaryTextColorBlueGray">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a0fbc8..ab7744d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,5 +60,29 @@
     <string name="menu_share">Share</string>
     <string name="playback_channel_name">PeerTube</string>
     <string name="invalid_url">Invalid Url!</string>
+    <string name="pref_title_dark_mode">Dark Mode</string>
+    <string name="pref_description_dark_mode">Restart App for Dark Mode to take effect.</string>
+    <string name="pref_title_app_theme">App Theme</string>
+    <string name="pref_description_app_theme">Restart App for theme to take effect.</string>
+
+    <string name="red">Red</string>
+    <string name="pink">Pink</string>
+    <string name="purple">Purple</string>
+    <string name="deeppurple">Deep Purple</string>
+    <string name="indigo">Indigo</string>
+    <string name="blue">Nlue</string>
+    <string name="lightblue">Light Blue</string>
+    <string name="cyan">Cyan</string>
+    <string name="teal">Teal</string>
+    <string name="green">Green</string>
+    <string name="lightgreen">Light Green</string>
+    <string name="lime">Lime</string>
+    <string name="yellow">Yellow</string>
+    <string name="amber">Amber</string>
+    <string name="orange">Orange</string>
+    <string name="deeporange">Deep Orange</string>
+    <string name="brown">Brown</string>
+    <string name="gray">Gray</string>
+    <string name="bluegray">Bluegray</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5d4e2e0..6bd6a6b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,26 +1,177 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorAmber</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorAmber</item>
+        <item name="colorAccent">@color/secondaryColorAmber</item>
     </style>
 
-    <style name="FullscreenTheme" parent="AppTheme">
-        <item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="metaButtonBarStyle">?android:attr/buttonBarStyle</item>
-        <item name="metaButtonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="FullscreenActionBarStyle" parent="Widget.AppCompat.ActionBar">
-        <item name="android:background">@color/black_overlay</item>
+    <style name="AppTheme.RED" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorRed</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorRed</item>
+        <item name="colorAccent">@color/secondaryColorRed</item>
     </style>
 
+    <style name="AppTheme.PINK" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorPink</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorPink</item>
+        <item name="colorAccent">@color/secondaryColorPink</item>
+    </style>
+
+    <style name="AppTheme.PURPLE" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorPurple</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorPurple</item>
+        <item name="colorAccent">@color/secondaryColorPurple</item>
+    </style>
+
+    <style name="AppTheme.DEEPPURPLE" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorDeepPurple</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorDeepPurple</item>
+        <item name="colorAccent">@color/secondaryColorDeepPurple</item>
+    </style>
+
+    <style name="AppTheme.INDIGO" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorIndigo</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorIndigo</item>
+        <item name="colorAccent">@color/secondaryColorIndigo</item>
+    </style>
+
+    <style name="AppTheme.BLUE" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorBlue</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorBlue</item>
+        <item name="colorAccent">@color/secondaryColorBlue</item>
+    </style>
+
+    <style name="AppTheme.LIGHTBLUE" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorLightBlue</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorLightBlue</item>
+        <item name="colorAccent">@color/secondaryColorLightBlue</item>
+    </style>
+
+    <style name="AppTheme.CYAN" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorCyan</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorCyan</item>
+        <item name="colorAccent">@color/secondaryColorCyan</item>
+    </style>
+
+    <style name="AppTheme.TEAL" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorTeal</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorTeal</item>
+        <item name="colorAccent">@color/secondaryColorTeal</item>
+    </style>
+
+    <style name="AppTheme.GREEN" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorGreen</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorGreen</item>
+        <item name="colorAccent">@color/secondaryColorGreen</item>
+    </style>
+
+    <style name="AppTheme.LIGHTGREEN" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorLightGreen</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorLightGreen</item>
+        <item name="colorAccent">@color/secondaryColorLightGreen</item>
+    </style>
+
+    <style name="AppTheme.LIME" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorLime</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorLime</item>
+        <item name="colorAccent">@color/secondaryColorLime</item>
+    </style>
+
+    <style name="AppTheme.YELLOW" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorYellow</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorYellow</item>
+        <item name="colorAccent">@color/secondaryColorYellow</item>
+    </style>
+
+    <style name="AppTheme.AMBER" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorAmber</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorAmber</item>
+        <item name="colorAccent">@color/secondaryColorAmber</item>
+    </style>
+
+    <style name="AppTheme.ORANGE" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorOrange</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorOrange</item>
+        <item name="colorAccent">@color/secondaryColorOrange</item>
+    </style>
+
+    <style name="AppTheme.DEEPORANGE" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorDeepOrange</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorDeepOrange</item>
+        <item name="colorAccent">@color/secondaryColorDeepOrange</item>
+    </style>
+
+    <style name="AppTheme.BROWN" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorBrown</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorBrown</item>
+        <item name="colorAccent">@color/secondaryColorBrown</item>
+    </style>
+
+    <style name="AppTheme.GRAY" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorGray</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorGray</item>
+        <item name="colorAccent">@color/secondaryColorGray</item>
+    </style>
+
+    <style name="AppTheme.BLUEGRAY" parent="AppTheme.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primaryColorBlueGray</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorBlueGray</item>
+        <item name="colorAccent">@color/secondaryColorBlueGray</item>
+    </style>
+
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
+
+    <!-- Text styles -->
+    <style name="Text" parent="TextAppearance.AppCompat"></style>
+    <style name="Text.Caption" parent="TextAppearance.AppCompat.Caption"></style>
+    <style name="Text.Small" parent="TextAppearance.AppCompat.Small"></style>
+    <style name="Text.Body1" parent="TextAppearance.AppCompat.Body1"></style>
+    <style name="Text.Body2" parent="TextAppearance.AppCompat.Body2"></style>
+    <style name="Text.Medium" parent="TextAppearance.AppCompat.Medium"></style>
+    <style name="Text.Large" parent="TextAppearance.AppCompat.Large"></style>
+    <style name="Text.Headline" parent="TextAppearance.AppCompat.Headline"></style>
+    <style name="Text.Title" parent="TextAppearance.AppCompat.Title"></style>
+    <style name="Text.Display1" parent="TextAppearance.AppCompat.Display1"></style>
+    <style name="Text.Subhead" parent="TextAppearance.AppCompat.Subhead"></style>
+    <style name="Text.Button" parent="TextAppearance.AppCompat.Button"></style>
+
+    <!-- Button Styles-->
+    <style name="Buton" parent="Widget.AppCompat.Button"></style>
+    <style name="Buton.Small" parent="Widget.AppCompat.Button.Small"></style>
+    <style name="Buton.Colored" parent="Widget.AppCompat.Button.Colored"></style>
+    <style name="Buton.Borderless" parent="Widget.AppCompat.Button.Borderless"></style>
+    <style name="Buton.Borderless.Colored" parent="Widget.AppCompat.Button.Borderless.Colored"></style>
+
+
 </resources>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 4da93e5..3e6af98 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -16,6 +16,20 @@
         android:summary="@string/pref_description_show_nsfw"
         android:defaultValue="false" />
 
+    <ListPreference
+        android:title="@string/pref_title_app_theme"
+        android:summary="@string/pref_description_app_theme"
+        android:key="pref_theme"
+        android:defaultValue="1"
+        android:entries="@array/themeArray"
+        android:entryValues="@array/themeValues" />
+
+    <SwitchPreference
+        android:key="pref_dark_mode"
+        android:title="@string/pref_title_dark_mode"
+        android:summary="@string/pref_description_dark_mode"
+        android:defaultValue="false" />
+
     <SwitchPreference
         android:key="pref_torrent_player"
         android:title="@string/pref_title_torrent_player"