diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc94bd5b3..6024cdef7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changelog
 ==========
 
+Version 3.3.1 *(2018-01-29)*
+----------------------------
+
+ * Added a toggle for replacing deep zoomable images with better quality ones
+ * Added a toggle for hiding Extended details when the statusbar is hidden
+ * Added a toggle for switching media files by clicking on screen sides
+ * Disable "Temporarily show hidden" after 10 minutes of backgrounding
+ * Split Settings in separate sections
+
 Version 3.3.0 *(2018-01-23)*
 ----------------------------
 
diff --git a/app/build.gradle b/app/build.gradle
index 19eb2c665..45a3d649c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 158
-        versionName "3.3.0"
+        versionCode 159
+        versionName "3.3.1"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
     }
@@ -43,7 +43,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.8.12'
+    implementation 'com.simplemobiletools:commons:3.9.4'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
     implementation 'com.android.support:multidex:1.0.2'
     implementation 'com.google.code.gson:gson:2.8.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 6bb06015e..6b722080a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -52,6 +52,14 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     private var mAllowPickingMultiple = false
     private var mIsThirdPartyIntent = false
     private var mIsGettingDirs = false
+    private var mLoadedInitialPhotos = false
+    private var mIsPasswordProtectionPending = false
+    private var mLatestMediaId = 0L
+    private var mLastMediaHandler = Handler()
+    private var mTempShowHiddenHandler = Handler()
+    private var mCurrAsyncTask: GetDirectoriesAsynctask? = null
+    private var mZoomListener: MyRecyclerView.MyZoomListener? = null
+
     private var mStoredUseEnglish = false
     private var mStoredAnimateGifs = true
     private var mStoredCropThumbnails = true
@@ -59,12 +67,6 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     private var mStoredShowMediaCount = true
     private var mStoredShowInfoBubble = true
     private var mStoredTextColor = 0
-    private var mLoadedInitialPhotos = false
-    private var mIsPasswordProtectionPending = false
-    private var mLatestMediaId = 0L
-    private var mLastMediaHandler = Handler()
-    private var mCurrAsyncTask: GetDirectoriesAsynctask? = null
-    private var mZoomListener: MyRecyclerView.MyZoomListener? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -94,6 +96,11 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         mIsPasswordProtectionPending = config.appPasswordProtectionOn
     }
 
+    override fun onStart() {
+        super.onStart()
+        mTempShowHiddenHandler.removeCallbacksAndMessages(null)
+    }
+
     override fun onResume() {
         super.onResume()
         config.isThirdPartyIntent = false
@@ -156,9 +163,21 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         }
     }
 
+    override fun onStop() {
+        super.onStop()
+        if (config.temporarilyShowHidden) {
+            mTempShowHiddenHandler.postDelayed({
+                config.temporarilyShowHidden = false
+            }, SHOW_TEMP_HIDDEN_DURATION)
+        } else {
+            mTempShowHiddenHandler.removeCallbacksAndMessages(null)
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         config.temporarilyShowHidden = false
+        mTempShowHiddenHandler.removeCallbacksAndMessages(null)
         removeTempFolder()
     }
 
@@ -555,7 +574,9 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             setupAdapter()
         }
 
-        storeDirectories()
+        if (!isFromCache) {
+            storeDirectories()
+        }
     }
 
     private fun storeDirectories() {
@@ -678,6 +699,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             add(Release(138, R.string.release_138))
             add(Release(143, R.string.release_143))
             add(Release(158, R.string.release_158))
+            add(Release(159, R.string.release_159))
             checkWhatsNew(this, BuildConfig.VERSION_CODE)
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 0be1d39e6..29b64841d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -9,7 +9,6 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.support.v4.view.MenuItemCompat
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.SearchView
 import android.view.Menu
@@ -53,17 +52,19 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     private var mAllowPickingMultiple = false
     private var mShowAll = false
     private var mLoadedInitialPhotos = false
+    private var mLatestMediaId = 0L
+    private var mLastMediaHandler = Handler()
+    private var mTempShowHiddenHandler = Handler()
+    private var mCurrAsyncTask: GetMediaAsynctask? = null
+    private var mZoomListener: MyRecyclerView.MyZoomListener? = null
+    private var mSearchMenuItem: MenuItem? = null
+
     private var mStoredUseEnglish = false
     private var mStoredAnimateGifs = true
     private var mStoredCropThumbnails = true
     private var mStoredScrollHorizontally = true
     private var mStoredShowInfoBubble = true
     private var mStoredTextColor = 0
-    private var mLatestMediaId = 0L
-    private var mLastMediaHandler = Handler()
-    private var mCurrAsyncTask: GetMediaAsynctask? = null
-    private var mZoomListener: MyRecyclerView.MyZoomListener? = null
-    private var mSearchMenuItem: MenuItem? = null
 
     companion object {
         var mMedia = ArrayList<Medium>()
@@ -90,6 +91,11 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        mTempShowHiddenHandler.removeCallbacksAndMessages(null)
+    }
+
     override fun onResume() {
         super.onResume()
         if (mStoredUseEnglish != config.useEnglish) {
@@ -136,16 +142,24 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
 
     override fun onStop() {
         super.onStop()
-        if (mSearchMenuItem != null) {
-            MenuItemCompat.collapseActionView(mSearchMenuItem)
+        mSearchMenuItem?.collapseActionView()
+
+        if (config.temporarilyShowHidden) {
+            mTempShowHiddenHandler.postDelayed({
+                config.temporarilyShowHidden = false
+            }, SHOW_TEMP_HIDDEN_DURATION)
+        } else {
+            mTempShowHiddenHandler.removeCallbacksAndMessages(null)
         }
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        if (config.showAll)
+        if (config.showAll) {
             config.temporarilyShowHidden = false
+        }
 
+        mTempShowHiddenHandler.removeCallbacksAndMessages(null)
         mMedia.clear()
     }
 
@@ -606,7 +620,10 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         runOnUiThread {
             setupAdapter()
         }
-        storeFolder()
+
+        if (!isFromCache) {
+            storeFolder()
+        }
     }
 
     private fun storeFolder() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index 5002bf781..9f10cbaa1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -316,8 +316,4 @@ class Config(context: Context) : BaseConfig(context) {
     var extendedDetails: Int
         get() = prefs.getInt(EXTENDED_DETAILS, EXT_RESOLUTION or EXT_LAST_MODIFIED or EXT_EXIF_PROPERTIES)
         set(extendedDetails) = prefs.edit().putInt(EXTENDED_DETAILS, extendedDetails).apply()
-
-    var lastFileCleanup: Long
-        get() = prefs.getLong(LAST_FILE_CLEANUP, 0L)
-        set(lastFileCleanup) = prefs.edit().putLong(LAST_FILE_CLEANUP, lastFileCleanup).apply()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
index 821d9f1e8..33a95e350 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Constants.kt
@@ -43,7 +43,6 @@ const val VIEW_TYPE_FILES = "view_type_files"
 const val SHOW_EXTENDED_DETAILS = "show_extended_details"
 const val EXTENDED_DETAILS = "extended_details"
 const val HIDE_EXTENDED_DETAILS = "hide_extended_details"
-const val LAST_FILE_CLEANUP = "last_file_cleanup"
 const val ONE_FINGER_ZOOM = "one_finger_zoom"
 const val ALLOW_INSTANT_CHANGE = "allow_instant_change"
 const val REPLACE_ZOOMABLE_IMAGES = "replace_zoomable_images"
@@ -62,6 +61,7 @@ const val SLIDESHOW_SCROLL_DURATION = 500L
 
 const val NOMEDIA = ".nomedia"
 const val MAX_COLUMN_COUNT = 20
+const val SHOW_TEMP_HIDDEN_DURATION = 600000L
 
 const val DIRECTORY = "directory"
 const val MEDIUM = "medium"
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
index e0e797f0f..f941b8f03 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
@@ -40,19 +40,6 @@ class MediaFetcher(val context: Context) {
             directories.remove(it)
         }
 
-        Thread {
-            val ONE_WEEK = 7 * 24 * 60 * 60 * 1000
-            if (System.currentTimeMillis() - context.config.lastFileCleanup > ONE_WEEK) {
-                media.forEach {
-                    val file = File(it.path)
-                    if (!it.path.contains("/.thumbnails") && !file.exists() && file.length() == 0L) {
-                        context.deleteFromMediaStore(file)
-                    }
-                }
-                context.config.lastFileCleanup = System.currentTimeMillis()
-            }
-        }.start()
-
         return directories
     }
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 3a9d14765..fae7b6b0a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -133,13 +133,13 @@
     <string name="manage_extended_details">Gestioneu els detalls ampliats</string>
     <string name="one_finger_zoom">Permet fer zoom amb un sol dit a pantalla complerta</string>
     <string name="allow_instant_change">Permet canviar els mitjans de manera instantània fent clic als costats de la pantalla</string>
-    <string name="replace_zoomable_images">Replace deep zoomable images with better quality ones</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="replace_zoomable_images">Substituïr imatges ampliades per les de millor quialitat</string>
+    <string name="hide_extended_details">Amaga els detalls estesos quan la barra d'estat està amagada</string>
 
     <!-- Setting sections -->
     <string name="thumbnails">Miniatures</string>
     <string name="fullscreen_media">Mitjans a pantalla completa</string>
-    <string name="extended_details">Extended details</string>
+    <string name="extended_details">Detalls estesos</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f8312ab60..39b4d3634 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -7,7 +7,7 @@
     <string name="hidden">(versteckt)</string>
     <string name="pin_folder">Ordner anheften</string>
     <string name="unpin_folder">Ordner loslösen</string>
-    <string name="pin_to_the_top">An den Start anheften</string>
+    <string name="pin_to_the_top">Oben anheften</string>
     <string name="show_all">Ansicht: Alle Medien</string>
     <string name="all_folders">Alle Medien</string>
     <string name="folder_view">Ansicht: Als Ordner</string>
@@ -34,7 +34,7 @@
     <string name="change_filters_underlined"><u>Filter ändern</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">Diese Funktion versteckt die ausgewählten Ordner (auch für andere Apps), indem dort im Dateisystem eine \'.nomedia\'-Datei abgelegt wird. Dadurch werden auch deren Unterordner versteckt. Solche Ordner werden nur gezeigt, wenn die Einstellung \'Versteckte Ordner zeigen\' aktiv ist (auch andere Apps bieten üblicherweise eine solche Option). Fortfahren?</string>
+    <string name="hide_folder_description">Diese Funktion versteckt die ausgewählten Ordner (auch für andere Apps), indem dort im Dateisystem eine \'.nomedia\'-Datei abgelegt wird. Dadurch werden auch deren Unterordner versteckt. Solche Ordner werden nur gezeigt, wenn die Einstellung \'Versteckte Elemente anzeigen\' aktiv ist (auch andere Apps bieten üblicherweise eine solche Option). Fortfahren?</string>
     <string name="exclude">Ordner ausschließen</string>
     <string name="excluded_folders">Ausgeschlossene Ordner</string>
     <string name="manage_excluded_folders">Ausgeschlossene Ordner verwalten</string>
@@ -45,13 +45,13 @@
     <string name="remove_all_description">Alle Ordner aus der Ausgeblendet-Liste entfernen? Die Ordner selbst werden nicht gelöscht.</string>
     <string name="hidden_folders">Versteckte Ordner</string>
     <string name="manage_hidden_folders">Versteckte Ordner verwalten</string>
-    <string name="hidden_folders_placeholder">Sieht so aus, als ob du keine Ordner mit einer \".nomedia\" Datei versteckt hast.</string>
+    <string name="hidden_folders_placeholder">Keinen mit einer \".nomedia\"-Datei versteckten Ordner gefunden.</string>
 
     <!-- Include folders -->
     <string name="include_folders">Einbezogene Ordner</string>
     <string name="manage_included_folders">Einbezogene Ordner verwalten</string>
     <string name="add_folder">Ordner hinzufügen</string>
-    <string name="included_activity_placeholder">Solltest du weitere Mediendateien haben, die von der App nicht erkannt wurden, kannst du ihre Ordner hier manuell hinzufügen.</string>
+    <string name="included_activity_placeholder">Solltest du weitere Mediendateien haben, die von der App nicht gefunden wurden, kannst du deren Ordner hier manuell hinzufügen.</string>
 
     <!-- Resizing -->
     <string name="resize">Größe ändern</string>
@@ -89,7 +89,7 @@
     <string name="wallpaper_set_successfully">Hintergrundbild erfolgreich festgelegt</string>
     <string name="portrait_aspect_ratio">Hochformat</string>
     <string name="landscape_aspect_ratio">Querformat</string>
-    <string name="home_screen">Home-Screen</string>
+    <string name="home_screen">Homescreen</string>
     <string name="lock_screen">Sperrbildschirm</string>
     <string name="home_and_lock_screen">Home- und Sperrbildschirm</string>
 
@@ -122,24 +122,24 @@
     <string name="screen_rotation_system_setting">Systemeinstellung</string>
     <string name="screen_rotation_device_rotation">Gerätedrehung</string>
     <string name="screen_rotation_aspect_ratio">Seitenverhältnis</string>
-    <string name="black_background_at_fullscreen">Schwarzer Hintergrund und Statusleiste bei Vollbild-Medien</string>
+    <string name="black_background_at_fullscreen">Schwarzer Hintergrund &amp; schwarze Systemleiste im Vollbild</string>
     <string name="scroll_thumbnails_horizontally">Kacheln horizontal scrollen</string>
-    <string name="hide_system_ui_at_fullscreen">Systemleisten in Vollbild ausblenden</string>
+    <string name="hide_system_ui_at_fullscreen">Systemleiste im Vollbild ausblenden</string>
     <string name="delete_empty_folders">Nach Löschen leere Ordner löschen</string>
-    <string name="allow_video_gestures">Gesten für Videolautstärke/Helligkeit</string>
+    <string name="allow_video_gestures">Gesten für Videolautstärke/Helligkeit zulassen</string>
     <string name="show_media_count">Medienanzahl bei Ordnern anzeigen</string>
     <string name="replace_share_with_rotate">Teilen/Drehen im Vollbild-Menü vertauschen</string>
-    <string name="show_extended_details">Eigenschaften anzeigen im Vollbild</string>
+    <string name="show_extended_details">Eigenschaften im Vollbild anzeigen</string>
     <string name="manage_extended_details">Eigenschaften auswählen</string>
-    <string name="one_finger_zoom">Erlaube Ein-Finger-Zoom im Vollbild</string>
-    <string name="allow_instant_change">Wechsle sofort zwischen Medien beim Klicken auf eine Bildschirmseite</string>
-    <string name="replace_zoomable_images">Replace deep zoomable images with better quality ones</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="one_finger_zoom">Ein-Finger-Zoom im Vollbild zulassen</string>
+    <string name="allow_instant_change">Beim Tippen auf eine Bildschirmseite sofort zwischen Medien wechseln</string>
+    <string name="replace_zoomable_images">Stark zoombare Bilder durch Bilder mit hoher Qualität ersetzen</string>
+    <string name="hide_extended_details">Erweiterte Details nicht anzeigen, wenn die Systemleiste versteckt ist</string>
 
     <!-- Setting sections -->
     <string name="thumbnails">Thumbnails</string>
     <string name="fullscreen_media">Vollbild-Medien</string>
-    <string name="extended_details">Extended details</string>
+    <string name="extended_details">Erweiterte Details</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 48d62891a..031a2c97d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -133,13 +133,13 @@
     <string name="manage_extended_details">Administrar detalles ampliados</string>
     <string name="one_finger_zoom">Permitir zoom con un dedo en pantalla completa</string>
     <string name="allow_instant_change">Permitir el cambio instantáneo de medios haciendo clic en los lados de la pantalla</string>
-    <string name="replace_zoomable_images">Replace deep zoomable images with better quality ones</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="replace_zoomable_images">Reemplace las imágenes con mucho zoom por otras de mejor calidad</string>
+    <string name="hide_extended_details">Ocultar detalles ampliados cuando la barra de estado está oculta</string>
 
     <!-- Setting sections -->
     <string name="thumbnails">Miniaturas</string>
     <string name="fullscreen_media">Medios a pantalla compelta</string>
-    <string name="extended_details">Extended details</string>
+    <string name="extended_details">Detalles ampliados</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 620635981..be82781f7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -133,13 +133,13 @@
     <string name="manage_extended_details">Uitgebreide informatie</string>
     <string name="one_finger_zoom">Met één vinger zoomen in volledig scherm</string>
     <string name="allow_instant_change">Direct naar vorige/volgende door op de zijkanten van het scherm te tikken</string>
-    <string name="replace_zoomable_images">Replace deep zoomable images with better quality ones</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="replace_zoomable_images">In hoge kwaliteit weergeven (ten koste van ver inzoomen)</string>
+    <string name="hide_extended_details">Uitgebreide informatie niet tonen als de statusbalk is verborgen</string>
 
     <!-- Setting sections -->
     <string name="thumbnails">Miniatuurvoorbeelden</string>
     <string name="fullscreen_media">Volledig scherm</string>
-    <string name="extended_details">Extended details</string>
+    <string name="extended_details">Uitgebreide informatie</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f7e31c054..bb2cdec30 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -7,7 +7,7 @@
     <string name="hidden">(oculto)</string>
     <string name="pin_folder">Fixar pasta</string>
     <string name="unpin_folder">Desfixar pasta</string>
-    <string name="pin_to_the_top">Pin to the top</string>
+    <string name="pin_to_the_top">Fixar no topo</string>
     <string name="show_all">Mostrar conteúdo de todas as pastas</string>
     <string name="all_folders">Todas as pastas</string>
     <string name="folder_view">Alternar para a visualização de pastas</string>
@@ -43,9 +43,9 @@
     <string name="excluded_activity_placeholder">A exclusão de uma pasta apenas oculta o seu conteúdo da galeria, pois todos os outros aplicativos poderão acessá-las.\\n\\nSe quiser ocultar de todos os aplicativos, utilize a função ocultar.</string>
     <string name="remove_all">Remover todas</string>
     <string name="remove_all_description">Remover todas as pastas da lista de exclusões? Esta ação não apaga as pastas.</string>
-    <string name="hidden_folders">Hidden folders</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
-    <string name="hidden_folders_placeholder">Seems like you don\'t have any folders hidden with a \".nomedia\" file.</string>
+    <string name="hidden_folders">Pastas ocultas</string>
+    <string name="manage_hidden_folders">Gerenciar pastas ocultas</string>
+    <string name="hidden_folders_placeholder">Parece que você não tem nenhuma pasta oculta com um arquivo \".nomedia\".</string>
 
     <!-- Include folders -->
     <string name="include_folders">Pastas incluídas</string>
@@ -122,7 +122,7 @@
     <string name="screen_rotation_system_setting">Padrão do sistema</string>
     <string name="screen_rotation_device_rotation">Sensor do aparelho</string>
     <string name="screen_rotation_aspect_ratio">Proporção da mídia</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Fundo de tela e barra de status preta quando em visualização de tela cheia</string>
     <string name="scroll_thumbnails_horizontally">Rolar miniaturas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Esconder interface do sistema automaticamente quando em tela cheia</string>
     <string name="delete_empty_folders">Apagar pastas vazias após deleter seu conteúdo</string>
@@ -131,15 +131,15 @@
     <string name="replace_share_with_rotate">Substituir botão "Compartilhar" por "Rotação de tela" quando em tela cheia</string>
     <string name="show_extended_details">Exibir detalhes extendidos quando em tela cheia</string>
     <string name="manage_extended_details">Gerenciar detalhes extendidos</string>
-    <string name="one_finger_zoom">Allow one finger zoom at fullscreen media</string>
-    <string name="allow_instant_change">Allow instantly changing media by clicking on screen sides</string>
-    <string name="replace_zoomable_images">Replace deep zoomable images with better quality ones</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="one_finger_zoom">Permitir zoom com um dedo quando em exibição de tela cheia</string>
+    <string name="allow_instant_change">Permitir alternância instantânia de mídia clicando nas laterais da tela</string>
+    <string name="replace_zoomable_images">Substituir imagens aptas a grande quantitade de zoom por imagens de melhor qualidade</string>
+    <string name="hide_extended_details">Ocultar detalhes extendidos quando a barra de status estiver oculta</string>
 
     <!-- Setting sections -->
-    <string name="thumbnails">Thumbnails</string>
-    <string name="fullscreen_media">Fullscreen media</string>
-    <string name="extended_details">Extended details</string>
+    <string name="thumbnails">Miniaturas</string>
+    <string name="fullscreen_media">Mídia em tela cheia</string>
+    <string name="extended_details">Detalhes extendidos</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 31a2665d4..9989b6f9d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -134,12 +134,12 @@
     <string name="one_finger_zoom">单指缩放</string>
     <string name="allow_instant_change">通过单击屏幕边缘来切换媒体</string>
     <string name="replace_zoomable_images">用质量更好的图像替换可深度缩放的图像</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="hide_extended_details">当状态栏隐藏时隐藏扩展详情</string>
 
     <!-- Setting sections -->
     <string name="thumbnails">缩略图</string>
     <string name="fullscreen_media">全屏显示媒体</string>
-    <string name="extended_details">Extended details</string>
+    <string name="extended_details">扩展详情</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d59ddb4f4..a00a943a1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -7,7 +7,7 @@
     <string name="hidden">(隱藏)</string>
     <string name="pin_folder">釘選資料夾</string>
     <string name="unpin_folder">取消釘選資料夾</string>
-    <string name="pin_to_the_top">Pin to the top</string>
+    <string name="pin_to_the_top">釘選在頂端</string>
     <string name="show_all">資料夾內容全部顯示</string>
     <string name="all_folders">全部資料夾</string>
     <string name="folder_view">切換成資料夾檢視</string>
@@ -43,9 +43,9 @@
     <string name="excluded_activity_placeholder">「排除資料夾」只會將選擇的資料夾與子資料夾一起從簡易相簿中隱藏，他們仍會出現在其他應用程式中。\n\n如果您要在其他應用程式中也隱藏，請使用「隱藏」功能。</string>
     <string name="remove_all">移除全部</string>
     <string name="remove_all_description">是否將排除列表中的所有資料夾都移除?這不會刪除資料夾。</string>
-    <string name="hidden_folders">Hidden folders</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
-    <string name="hidden_folders_placeholder">Seems like you don\'t have any folders hidden with a \".nomedia\" file.</string>
+    <string name="hidden_folders">隱藏的資料夾</string>
+    <string name="manage_hidden_folders">隱藏的資料夾</string>
+    <string name="hidden_folders_placeholder">您似乎沒有用\".nomedia\"檔案來隱藏的資料夾</string>
 
     <!-- Include folders -->
     <string name="include_folders">包含資料夾</string>
@@ -122,7 +122,7 @@
     <string name="screen_rotation_system_setting">系統設定方向</string>
     <string name="screen_rotation_device_rotation">裝置實際方向</string>
     <string name="screen_rotation_aspect_ratio">圖片長寬比</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">全螢幕時黑色背景和狀態欄</string>
     <string name="scroll_thumbnails_horizontally">橫向滑動縮圖</string>
     <string name="hide_system_ui_at_fullscreen">全螢幕時自動隱藏系統介面</string>
     <string name="delete_empty_folders">刪除內容後刪除空白資料夾</string>
@@ -131,15 +131,15 @@
     <string name="replace_share_with_rotate">將全螢幕選單的分享取代為旋轉</string>
     <string name="show_extended_details">全螢幕時顯示詳細資訊</string>
     <string name="manage_extended_details">管理詳細資訊</string>
-    <string name="one_finger_zoom">Allow one finger zoom at fullscreen media</string>
-    <string name="allow_instant_change">Allow instantly changing media by clicking on screen sides</string>
-    <string name="replace_zoomable_images">Replace deep zoomable images with better quality ones</string>
-    <string name="hide_extended_details">Hide extended details when status bar is hidden</string>
+    <string name="one_finger_zoom">全螢幕時允許單指縮放</string>
+    <string name="allow_instant_change">允許點擊螢幕邊緣來快速切換媒體檔案</string>
+    <string name="replace_zoomable_images">可深度縮放的圖片用品質更佳的來取代</string>
+    <string name="hide_extended_details">狀態欄隱藏時，同時隱藏詳細資訊</string>
 
     <!-- Setting sections -->
-    <string name="thumbnails">Thumbnails</string>
-    <string name="fullscreen_media">Fullscreen media</string>
-    <string name="extended_details">Extended details</string>
+    <string name="thumbnails">縮圖</string>
+    <string name="fullscreen_media">全螢幕媒體檔案</string>
+    <string name="extended_details">詳細資訊</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 9a25897f3..929e5a89d 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -2,6 +2,11 @@
 <resources>
 
     <!-- Release notes -->
+    <string name="release_159">
+        Added a toggle for replacing deep zoomable images with better quality ones\n
+        Added a toggle for hiding Extended details when the statusbar is hidden\n
+        Added a toggle for switching media files by clicking on screen sides
+    </string>
     <string name="release_158">Added optional one-finger drag zoom, disabled by default</string>
     <string name="release_143">
         Added new options to use english language on non-english devices, to password protect whole app and to lock screen orientation at fullscreen view