diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 149c4ba54..9bc531e72 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-#Contributing
+#Contribution
 
 This document contains guidelines on making contributions to NewPipe.
 
@@ -16,7 +16,7 @@ This document contains guidelines on making contributions to NewPipe.
  compatibility with all git tools
 * [This guide](http://chris.beams.io/posts/git-commit/) goes more in depth on what makes a good commit message
 
-## Translating
+## Translation
 
 * NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
 
@@ -30,4 +30,4 @@ This document contains guidelines on making contributions to NewPipe.
 ## Communication
 
 * For the time being, [Slack](http://invite.chschtsch.ml/) is being used for project communication
-* Feel free to post suggestions, changes ideas etc!
+* Feel free to post suggestions, changes, ideas etc!
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 987c416ec..45560906c 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -124,6 +124,7 @@
                     android:layout_below="@id/detailViewCountView"
                     android:layout_toLeftOf="@id/detailThumbsDownCountView"
                     android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
                     android:src="@drawable/thumbs_down" />
 
                 <TextView android:id="@+id/detailThumbsUpCountView"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 11478a6f7..a240f7be4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -42,7 +42,7 @@
     <string name="urlNotSupportedText">URL wird nicht unterstützt.</string>
     <string name="showSimilarVideosButtonText">Ähnliche Videos</string>
     <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryVideoInfoTitle">INFO</string>
     <string name="settingsCategoryEtcTitle">ETC</string>
 <string name="searchLanguageTitle">Bevorzugte Sprache des Inhalts</string>
     <string name="itemThumbnailViewDescription">Video-Vorschau-Bild</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9e241c54c..4bb753fad 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -38,7 +38,7 @@
     <string name="urlNotSupportedText">URL non supportée.</string>
     <string name="showSimilarVideosButtonText">Vidéos similaires</string>
     <string name="settingsCategoryVideoAudioTitle">VIDÉO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFORMATION</string>
+    <string name="settingsCategoryVideoInfoTitle">INFORMATION</string>
     <string name="settingsCategoryEtcTitle">DIVERS</string>
 
     <string name="itemThumbnailViewDescription">Miniature d\'aperçu vidéo</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d6dc6d25f..6a1e78f73 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -30,14 +30,14 @@
     <string name="showPlayWithKodiSummary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
     <string name="playAudio">Hang</string>
     <string name="defaultAudioFormatTitle">Alapértelmezett hang formátum</string>
-    <string name="webMAudioDescription">WebM - szabad formátum</string>
-    <string name="m4aAudioDescription">m4a - jobb minőség</string>
+    <string name="webMAudioDescription">WebM &#8212; szabad formátum</string>
+    <string name="m4aAudioDescription">m4a &#8212; jobb minőség</string>
     <string name="downloadDialogTitle">Letöltés</string>
     <string-array name="downloadOptions">
         <item>Videó</item>
         <item>Hang</item>
     </string-array>
-<string name="nextVideoTitle">Következő videó</string>
+    <string name="nextVideoTitle">Következő videó</string>
     <string name="urlNotSupportedText">A webcím nem támogatott.</string>
-<string name="showSimilarVideosButtonText">Hasonló videók</string>
+    <string name="showSimilarVideosButtonText">Hasonló videók</string>
     </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 931afc6c2..0bd72240f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -38,7 +38,7 @@
     <string name="showSimilarVideosButtonText">Video simili</string>
     <string name="searchLanguageTitle">Lingua preferita dei contenuti</string>
     <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryVideoInfoTitle">INFO</string>
     <string name="settingsCategoryEtcTitle">ETC</string>
 
     <string name="itemThumbnailViewDescription">Anteprima video</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index decc2ecba..2c22125c2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -29,8 +29,8 @@
     <string name="showPlayWithKodiSummary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
     <string name="playAudio">ｵｰﾃﾞｨｵ</string>
     <string name="defaultAudioFormatTitle">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
-    <string name="webMAudioDescription">.WebM - ﾌﾘｰﾌｫｰﾏｯﾄ</string>
-    <string name="m4aAudioDescription">.m4a - より良い品質</string>
+    <string name="webMAudioDescription">.WebM &#8212; ﾌﾘｰﾌｫｰﾏｯﾄ</string>
+    <string name="m4aAudioDescription">.m4a &#8212; より良い品質</string>
     <string name="downloadDialogTitle">ﾀﾞｳﾝﾛｰﾄﾞ</string>
     <string name="nextVideoTitle">次の動画</string>
     <string name="showNextAndSimilarTitle">次の同様の動画を表示します｡</string>
@@ -38,8 +38,6 @@
     <string name="showSimilarVideosButtonText">同様の動画</string>
     <string name="searchLanguageTitle">優先される言語</string>
     <string name="settingsCategoryVideoAudioTitle">動画とｵｰﾃﾞｨｵ</string>
-    <string name="settingsCategoryVideoInfoTittle">情報</string>
-    <string name="settingsCategoryEtcTitle">その他</string>
 <string name="viewCountText">%1$s ビュー</string>
     <string name="itemThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
     <string name="detailThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index bdb8b1084..83f2ab767 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -29,8 +29,8 @@
     <string name="showPlayWithKodiSummary">비디오를 Kodi media center를 사용해 재생하는 옵션을 표시합니다.</string>
     <string name="playAudio">오디오</string>
     <string name="defaultAudioFormatTitle">기본 오디오 포맷</string>
-    <string name="webMAudioDescription">WebM - 무료 자유 포맷입니다</string>
-    <string name="m4aAudioDescription">m4a - 보다 나은 품질</string>
+    <string name="webMAudioDescription">WebM &#8212; 무료 자유 포맷입니다</string>
+    <string name="m4aAudioDescription">m4a &#8212; 보다 나은 품질</string>
     <string name="downloadDialogTitle">다운로드</string>
     <string name="nextVideoTitle">다음 비디오</string>
     <string name="showNextAndSimilarTitle">다음 및 유사한 비디오 표시</string>
@@ -38,8 +38,6 @@
     <string name="showSimilarVideosButtonText">유사한 비디오</string>
     <string name="searchLanguageTitle">선호하는 컨텐츠 언어</string>
     <string name="settingsCategoryVideoAudioTitle">비디오 &amp; 오디오</string>
-    <string name="settingsCategoryVideoInfoTittle">정보</string>
-    <string name="settingsCategoryEtcTitle">기타</string>
 
     <string name="itemThumbnailViewDescription">비디오 미리보기 썸네일</string>
     <string name="detailThumbnailViewDescription">비디오 미리보기 썸네일</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0cf3b0dec..cba790e7d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -30,8 +30,8 @@
     <string name="showPlayWithKodiSummary">Toont een optie om een video op een Kodi media center af te spelen.</string>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Standaard audio formaat</string>
-    <string name="webMAudioDescription">Webam - open formaat</string>
-    <string name="m4aAudioDescription">m4a - betere kwaliteit</string>
+    <string name="webMAudioDescription">Webam &#8212; open formaat</string>
+    <string name="m4aAudioDescription">m4a &#8212; betere kwaliteit</string>
     <string name="downloadDialogTitle">Download</string>
     <string name="nextVideoTitle">Volgende video</string>
     <string name="urlNotSupportedText">URL wordt niet ondersteund.</string>
@@ -40,9 +40,7 @@
     <string name="searchLanguageTitle">Voorkeurs content taal</string>
 <string name="useExternalVideoPlayerTitle">Gebruik externe videospeler</string>
     <string name="useExternalAudioPlayerTitle">Gebruik externe audiospeler</string>
-    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; GELUID</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">ETC.</string>
+    <string name="settingsCategoryVideoAudioTitle">Video &amp; Geluid</string>
 
     <string name="itemThumbnailViewDescription">Videovoorbeeld thumbnail</string>
     <string name="detailThumbnailViewDescription">Videovoorbeeld thumbnail</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 348a2e689..07acea572 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -8,7 +8,7 @@
     <string name="download">Pobierz</string>
     <string name="search">Szukaj</string>
     <string name="settings">Ustawienia</string>
-    <string name="didYouMean">"Czy chodziło Ci o: "</string>
+    <string name="didYouMean">Czy chodziło Ci o: </string>
     <string name="shareDialogTitle">Udostępnij za pośrednictwem:</string>
     <string name="chooseBrowser">Wybierz przeglądarkę:</string>
     <string name="screenRotation">obrót</string>
@@ -27,18 +27,17 @@
     <string name="showPlayWithKodiSummary">Wyświetla opcję do odtwarzania wideo przez aplikację Kodi.</string>
     <string name="playAudio">Dźwięk</string>
     <string name="defaultAudioFormatTitle">Domyślny format dźwięku</string>
-    <string name="webMAudioDescription">WebM - otwarty format</string>
-    <string name="m4aAudioDescription">m4a - lepsza jakość</string>
+    <string name="webMAudioDescription">WebM &#8212; otwarty format</string>
+    <string name="m4aAudioDescription">m4a &#8212; lepsza jakość</string>
     <string name="downloadDialogTitle">Pobierz</string>
     <string name="nextVideoTitle">Następne wideo</string>
     <string name="showNextAndSimilarTitle">Wyświetl następne i podobne wideo</string>
     <string name="urlNotSupportedText">Niewspierany URL.</string>
     <string name="showSimilarVideosButtonText">Podobne wideo</string>
     <string name="searchLanguageTitle">Preferowany język zawartości</string>
-    <string name="settingsCategoryVideoAudioTitle">WIDEO &amp; DŹWIĘK</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">INNE</string>
-<string name="searchPage">"Szukaj strony: "</string>
+    <string name="settingsCategoryVideoAudioTitle">Wideo &amp; Dźwięk</string>
+
+    <string name="searchPage">"Szukaj strony: "</string>
     <string name="viewCountText">%1$s wyświetleń</string>
     <string name="uploadDateText">Opublikowany %1$s</string>
     <string name="itemThumbnailViewDescription">Miniaturka podglądowa wideo</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0a6cbe3c4..dad64d6f0 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -30,8 +30,8 @@
     <string name="showPlayWithKodiSummary">Mostra uma opção para reproduzir o vídeo com o Kodi.</string>
     <string name="playAudio">Áudio</string>
     <string name="defaultAudioFormatTitle">Formato áudio padrão</string>
-    <string name="webMAudioDescription">WebM - formato livre</string>
-    <string name="m4aAudioDescription">m4a - melhor qualidade</string>
+    <string name="webMAudioDescription">WebM &#8212; formato livre</string>
+    <string name="m4aAudioDescription">m4a &#8212; melhor qualidade</string>
     <string name="downloadDialogTitle">Descarregar</string>
     <string name="nextVideoTitle">Vídeo seguinte</string>
     <string name="showNextAndSimilarTitle">Mostrar vídeos seguintes e similares</string>
@@ -39,8 +39,6 @@
     <string name="showSimilarVideosButtonText">Vídeos similares</string>
     <string name="searchLanguageTitle">Idioma preferencial do conteúdo</string>
     <string name="settingsCategoryVideoAudioTitle">Vídeo e áudio</string>
-    <string name="settingsCategoryVideoInfoTittle">Informações</string>
-    <string name="settingsCategoryEtcTitle">Outras</string>
 
     <string name="itemThumbnailViewDescription">Miniatura de vídeos</string>
     <string name="detailThumbnailViewDescription">Miniatura de vídeos</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 36368fe09..367a6bed7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -30,8 +30,8 @@
     <string name="showPlayWithKodiSummary">Показать опцию воспроизведения видео через Kodi media center.</string>
     <string name="playAudio">Аудио</string>
     <string name="defaultAudioFormatTitle">Формат аудио по-умолчанию</string>
-    <string name="webMAudioDescription">WebM - свободный формат</string>
-    <string name="m4aAudioDescription">m4a - лучшее качество</string>
+    <string name="webMAudioDescription">WebM &#8212; свободный формат</string>
+    <string name="m4aAudioDescription">m4a &#8212; лучшее качество</string>
     <string name="downloadDialogTitle">Скачать</string>
     <string-array name="downloadOptions">
         <item>Видео</item>
@@ -42,9 +42,9 @@
     <string name="showSimilarVideosButtonText">Похожие видео</string>
     <string name="showNextAndSimilarTitle">Показывать следующее и предложенные видео</string>
     <string name="searchLanguageTitle">Предпочитаемый язык контента</string>
-<string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
-    <string name="settingsCategoryVideoInfoTittle">ИНФОРМАЦИЯ</string>
-    <string name="settingsCategoryEtcTitle">ПРОЧЕЕ</string>
+    <string name="settingsCategoryVideoAudioTitle">Видео и Аудио</string>
+    <string name="settingsCategoryAppearanceTitle">Внешний вид</string>
+    <string name="settingsCategoryOtherTitle">Прочее</string>
 
     <string name="itemThumbnailViewDescription">Миниатюра видео-превью</string>
     <string name="detailThumbnailViewDescription">Миниатюра видео-превью</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 412d9a56c..cee228d9b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -27,8 +27,8 @@
     <string name="showPlayWithKodiTitle">Pokaži možnost \"Predvajaj s Kodi\"</string>
     <string name="defaultAudioFormatTitle">Privzet zapis zvoka</string>
     <string name="playAudio">Zvok</string>
-    <string name="webMAudioDescription">WebM - prost zapis</string>
-    <string name="m4aAudioDescription">m4a - višja kakovost posnetkov</string>
+    <string name="webMAudioDescription">WebM &#8212; prost zapis</string>
+    <string name="m4aAudioDescription">m4a &#8212; višja kakovost posnetkov</string>
     <string name="downloadDialogTitle">Prejem</string>
     <string name="nextVideoTitle">Naslednji video</string>
     <string name="showNextAndSimilarTitle">Pokaži naslednji video in podobne posnetke</string>
@@ -36,14 +36,14 @@
     <string name="showSimilarVideosButtonText">Podobni posnetki</string>
     <string name="searchLanguageTitle">Prednostni jezik vsebine</string>
     <string name="settingsCategoryVideoAudioTitle">Video in Zvok</string>
-    <string name="settingsCategoryVideoInfoTittle">Podrobnosti</string>
+    <string name="settingsCategoryVideoInfoTitle">Podrobnosti</string>
     <string name="itemThumbnailViewDescription">Sličica predogleda videa</string>
     <string name="detailThumbnailViewDescription">Sličica predogleda videa</string>
     <string name="detailUploaderThumbnailViewDescription">Sličica pošiljalnika</string>
     <string name="autoPlayThroughIntentTitle">Samodejno predvajaj prek vmesnika Intent</string>
     <string name="autoPlayThroughIntentSummary">Začne samodejno predvajanje videa, ko je zagnan prek drugega programa.</string>
     <string name="showPlayWithKodiSummary">Pokaže možnost predvajanja videa preko predstavnega središča Kodi.</string>
-    <string name="settingsCategoryEtcTitle">Drugo</string>
+    <string name="settingsCategoryOtherTitle">Drugo</string>
 
     <string name="detailThumbsUpImgViewDescription">Všeč mi je</string>
 <string name="detailThumbsDownImgViewDescription">Ni mi všeč</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index e0c092d25..52d819c1c 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -30,8 +30,8 @@
     <string name="showPlayWithKodiSummary">Приказ опције за пуштање видеа у Коди медија центру.</string>
     <string name="playAudio">Аудио</string>
     <string name="defaultAudioFormatTitle">Подразумевани формат звука</string>
-    <string name="webMAudioDescription">WebM - слободни формат</string>
-    <string name="m4aAudioDescription">m4a - бољи квалитет</string>
+    <string name="webMAudioDescription">WebM &#8212; слободни формат</string>
+    <string name="m4aAudioDescription">m4a &#8212; бољи квалитет</string>
     <string name="downloadDialogTitle">Преузми</string>
     <string-array name="downloadOptions">
         <item>Видео</item>
@@ -42,10 +42,9 @@
     <string name="showNextAndSimilarTitle">Прикажи следећи и слични видео</string>
     <string name="showSimilarVideosButtonText">Слични видео</string>
     <string name="searchLanguageTitle">Пожељни језик садржаја</string>
-<string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
-    <string name="settingsCategoryVideoInfoTittle">ПОДАЦИ</string>
-    <string name="settingsCategoryEtcTitle">ОСТАЛО</string>
-<string name="itemThumbnailViewDescription">Сличица видео прегледа</string>
+    <string name="settingsCategoryVideoAudioTitle">Видео и Аудио</string>
+    <string name="settingsCategoryOtherTitle">ОСТАЛО</string>
+    <string name="itemThumbnailViewDescription">Сличица видео прегледа</string>
     <string name="detailThumbnailViewDescription">Сличица видео прегледа</string>
     <string name="detailUploaderThumbnailViewDescription">Сличица отпремаоца</string>
     <string name="detailThumbsDownImgViewDescription">Несвиђања</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index a909953ae..6fbfda5d0 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -2,8 +2,8 @@
 <resources>
     <!-- Categories -->
     <string name="settingsCategoryVideoAudio">settings_categoery_video_audio</string>
-    <string name="settingsCategoryVideoInfo">settings_category_video_info</string>
-    <string name="settingsCategoryEtc">settings_category_etc</string>
+    <string name="settingsCategoryAppearance">settings_category_appearance</string>
+    <string name="settingsCategoryOther">settings_category_other</string>
     <!-- Key values -->
     <string name="downloadPathPreference">download_path_preference</string>
     <string name="useExternalVideoPlayer">use_external_video_player</string>
@@ -28,6 +28,16 @@
         <item>m4a</item>
     </string-array>
     <string name="defaultAudioFormat">m4a</string>
+    <string name="themePreference">theme</string>
+    <string-array name="themeDescriptionList">
+        <item>@string/darkThemeDescription</item>
+        <item>@string/lightThemeDescription</item>
+    </string-array>
+    <string-array name="themeValueList">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string name="themeDefaultValue">0</string>
     <string name="showNextVideo">show_next_video</string>
     <string name="searchLanguagePreference">search_language</string>
     <string name="useTorKey">use_tor</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7058759e..228107d98 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,8 +37,11 @@
     <string name="showPlayWithKodiSummary">Displays an option to play a video via Kodi media center.</string>
     <string name="playAudio">Audio</string>
     <string name="defaultAudioFormatTitle">Default audio format</string>
-    <string name="webMAudioDescription">WebM - free format</string>
-    <string name="m4aAudioDescription">m4a - better quality</string>
+    <string name="webMAudioDescription">WebM &#8212; free format</string>
+    <string name="m4aAudioDescription">m4a &#8212; better quality</string>
+    <string name="themePreferenceTitle">Theme</string>
+    <string name="darkThemeDescription">Dark</string>
+    <string name="lightThemeDescription">Light</string>
     <string name="downloadDialogTitle">Download</string>
     <string-array name="downloadOptions">
         <item>Video</item>
@@ -49,10 +52,10 @@
     <string name="urlNotSupportedText">URL not supported.</string>
     <string name="showSimilarVideosButtonText">Similar videos</string>
     <string name="searchLanguageTitle">Preferable content language</string>
-    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">ETC</string>
-    <string name="backgroundPlayerTickerText" translatable="false">%1$s - NewPipe</string>
+    <string name="settingsCategoryVideoAudioTitle">Video &amp; Audio</string>
+    <string name="settingsCategoryAppearanceTitle">Appearance</string>
+    <string name="settingsCategoryOtherTitle">Other</string>
+    <string name="backgroundPlayerTickerText" translatable="false">%1$s &#8212; NewPipe</string>
     <string name="backgroundPlayerStartPlayingToast">Playing in background</string>
     <string name="c3sUrl" translatable="false">https://www.c3s.cc/</string>
     <string name="play">Play</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 000000000..1fa5ce354
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/primaryColorYoutube</item>
+        <item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
+        <item name="colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
+    </style>
+
+    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
+    </style>
+
+    <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
+        <item name="colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
+    <style name="VideoPlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/dark_overlay</item>
+        <item name="background">@color/dark_overlay</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
index 46ad3ecb9..4f2325ab8 100644
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -5,7 +5,8 @@
 
     <PreferenceCategory
         android:key="@string/settingsCategoryVideoAudio"
-        android:title="@string/settingsCategoryVideoAudioTitle">
+        android:title="@string/settingsCategoryVideoAudioTitle"
+        android:textAllCaps="true">
 
         <CheckBoxPreference
             android:key="@string/useExternalVideoPlayer"
@@ -33,8 +34,16 @@
 
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="@string/settingsCategoryVideoInfo"
-        android:title="@string/settingsCategoryVideoInfoTittle">
+        android:key="@string/settingsCategoryAppearance"
+        android:title="@string/settingsCategoryAppearanceTitle"
+        android:textAllCaps="true">
+
+        <ListPreference
+            android:key="@string/themePreference"
+            android:title="@string/themePreferenceTitle"
+            android:entries="@array/themeDescriptionList"
+            android:entryValues="@array/themeValueList"
+            android:defaultValue="@string/themeDefaultValue"/>
 
         <CheckBoxPreference
             android:key="@string/showPlayWithKodiPreference"
@@ -42,6 +51,7 @@
             android:summary="@string/showPlayWithKodiSummary"
             android:defaultValue="false" />
 
+<<<<<<< HEAD
         <ListPreference
             android:key="@string/searchLanguagePreference"
             android:title="@string/searchLanguageTitle"
@@ -49,16 +59,25 @@
             android:entryValues="@array/languageCodes"
             android:defaultValue="@string/defaultLanguageItem" />
 
+=======
+>>>>>>> 26f11d702fe9a4fc7036d1928440f98d12366510
         <CheckBoxPreference
             android:key="@string/showNextVideo"
             android:title="@string/showNextAndSimilarTitle"
             android:defaultValue="true" />
 
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:key="@string/settingsCategoryEtc"
-        android:title="@string/settingsCategoryEtcTitle">
+        android:key="@string/settingsCategoryOther"
+        android:title="@string/settingsCategoryOtherTitle"
+        android:textAllCaps="true">
+
+        <ListPreference
+            android:key="@string/searchLanguage"
+            android:title="@string/searchLanguageTitle"
+            android:entries="@array/languageNames"
+            android:entryValues="@array/languageCodes"
+            android:defaultValue="en" />
 
         <EditTextPreference
             android:key="@string/downloadPathPreference"