7 files changed, 22 insertions, 4 deletions
diff --git a/src/main/res/drawable/list_item_background_light.xml b/src/main/res/drawable/list_item_background_light.xml
index f064403da..917f85dab 100644
--- a/src/main/res/drawable/list_item_background_light.xml
+++ b/src/main/res/drawable/list_item_background_light.xml
@@ -28,5 +28,5 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/grey300" android:state_activated="true" />
+    <item android:drawable="@color/grey500" android:state_activated="true" />
 </selector>
 \ No newline at end of file
diff --git a/src/main/res/layout/activity_media_viewer.xml b/src/main/res/layout/activity_media_viewer.xml
index 2b64fb81a..c82ed1603 100644
--- a/src/main/res/layout/activity_media_viewer.xml
+++ b/src/main/res/layout/activity_media_viewer.xml
@@ -26,6 +26,10 @@
             android:id="@+id/messageVideoView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            app:played_color="?attr/colorAccent"
+            app:scrubber_color="?attr/colorAccent"
+            app:show_shuffle_button="false"
+            app:show_buffering="never"
             android:visibility="gone" />
 
         <com.leinardi.android.speeddial.SpeedDialOverlayLayout
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 178cd04c8..30a9d3906 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -92,7 +92,7 @@
                                 android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/disable_encryption"
-                                android:textColor="@color/accent" />
+                                android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 45ba43d61..2368e3c3e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -215,7 +215,6 @@
     <string name="channel_bare_jid_example">channel@conference.example.com</string>
     <string name="save_as_bookmark">Save as bookmark</string>
     <string name="delete_bookmark">Delete bookmark</string>
-    <string name="bookmark_already_exists">This bookmark already exists</string>
     <string name="topic">Topic</string>
     <string name="joining_conference">Joining group chat…</string>
     <string name="leave">Leave</string>
@@ -1005,4 +1004,5 @@
     <string name="show_videos_images_only">Only images/videos</string>
     <string name="show_avatar">Show avatar</string>
     <string name="action_delete">Delete</string>
+    <string name="hosted_on">hosted on %s</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 185699519..0b5fdc3ac 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -154,4 +154,12 @@
     <style name="Conversations.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert" >
         <item name="android:buttonStyle">@style/Widget.Conversations.Button.Borderless</item>
     </style>
+
+    <style name="ExoMediaButton.Previous">
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="ExoMediaButton.Next">
+        <item name="android:visibility">gone</item>
+    </style>
 </resources>
 \ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index d20d1c304..dfb07ab52 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -336,6 +336,9 @@
         <item name="color_bubble_warning">@color/lightred</item>
 
         <item name="chat_bg">@drawable/bg_light_orange</item>
+
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:actionModeBackground">@color/accent_orange</item>
     </style>
 
     <style name="ConversationsTheme.Orange.Dark" parent="ConversationsTheme.Dark">
@@ -351,6 +354,9 @@
         <item name="color_bubble_warning">@color/darkred</item>
 
         <item name="chat_bg">@drawable/bg_dark_orange</item>
+
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:actionModeBackground">@color/accent_orange</item>
     </style>
 
     <style name="ConversationsTheme.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
diff --git a/src/main/res/xml/file_paths.xml b/src/main/res/xml/file_paths.xml
index 847faf68f..0cc514a45 100644
--- a/src/main/res/xml/file_paths.xml
+++ b/src/main/res/xml/file_paths.xml
@@ -11,7 +11,7 @@
         path="Images/" />
     <files-path
         name="videos"
-        path="Videos" />
+        path="Videos/" />
     <files-path
         name="files"
         path="Files/" />