diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c95ea48..c867451 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
   id("kotlin-android-extensions")
 
   id("org.jlleitschuh.gradle.ktlint") version "8.1.0"
-  id("com.gladed.androidgitversion") version "0.4.10"
+  id("com.gladed.androidgitversion") version "0.4.14"
   id("com.github.triplet.play") version "2.4.2"
 }
 
@@ -45,7 +45,9 @@ android {
 
     ndkVersion = "21.3.6528147"
 
-    versionCode = androidGitVersion.code()
+    androidGitVersion.code().let {
+      versionCode = if (it == 0) 1 else it
+    }
     versionName = androidGitVersion.name()
   }
 
@@ -135,7 +137,7 @@ dependencies {
   implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-opus:2.11.4") {
     isTransitive = false
   }
-  implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-flac:2.11.4" ){
+  implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-flac:2.11.4") {
     isTransitive = false
   }
 
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt
index 7a0db6b..1601fee 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/PlaylistTracksFragment.kt
@@ -12,7 +12,6 @@ import com.github.apognu.otter.adapters.PlaylistTracksAdapter
 import com.github.apognu.otter.repositories.FavoritesRepository
 import com.github.apognu.otter.repositories.ManagementPlaylistsRepository
 import com.github.apognu.otter.repositories.PlaylistTracksRepository
-import com.github.apognu.otter.repositories.Repository
 import com.github.apognu.otter.utils.*
 import com.squareup.picasso.Picasso
 import jp.wasabeef.picasso.transformations.RoundedCornersTransformation
@@ -198,4 +197,4 @@ class PlaylistTracksFragment : OtterFragment<PlaylistTrack, PlaylistTracksAdapte
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
index f7a3b60..4d9ef7c 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
@@ -3,7 +3,6 @@ package com.github.apognu.otter.fragments
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
 import androidx.lifecycle.lifecycleScope
@@ -226,4 +225,4 @@ class TracksFragment : OtterFragment<Track, TracksAdapter>() {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt
index 7837eac..cc351ea 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/PlaylistsRepository.kt
@@ -51,7 +51,7 @@ class ManagementPlaylistsRepository(override val context: Context?) : Repository
   fun add(id: Int, tracks: List<Track>) {
     val body = PlaylistAdd(tracks.map { it.id }, false)
 
-    val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/${id}/add/")).apply {
+    val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$id/add/")).apply {
       if (!Settings.isAnonymous()) {
         header("Authorization", "Bearer ${Settings.getAccessToken()}")
       }
@@ -68,7 +68,7 @@ class ManagementPlaylistsRepository(override val context: Context?) : Repository
   suspend fun remove(id: Int, track: Track, index: Int) {
     val body = mapOf("index" to index)
 
-    val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/${id}/remove/")).apply {
+    val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$id/remove/")).apply {
       if (!Settings.isAnonymous()) {
         header("Authorization", "Bearer ${Settings.getAccessToken()}")
       }
@@ -83,7 +83,7 @@ class ManagementPlaylistsRepository(override val context: Context?) : Repository
   fun move(id: Int, from: Int, to: Int) {
     val body = mapOf("from" to from, "to" to to)
 
-    val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/${id}/move/")).apply {
+    val request = Fuel.post(mustNormalizeUrl("/api/v1/playlists/$id/move/")).apply {
       if (!Settings.isAnonymous()) {
         header("Authorization", "Bearer ${Settings.getAccessToken()}")
       }
@@ -96,4 +96,4 @@ class ManagementPlaylistsRepository(override val context: Context?) : Repository
         .awaitByteArrayResponseResult()
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt b/app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt
index dbbf92c..84bdcbf 100644
--- a/app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt
+++ b/app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt
@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import android.widget.FrameLayout
 
-class  DisableableFrameLayout : FrameLayout {
+class DisableableFrameLayout : FrameLayout {
   var callback: ((MotionEvent?) -> Boolean)? = null
 
   constructor(context: Context) : super(context)
@@ -23,4 +23,4 @@ class  DisableableFrameLayout : FrameLayout {
   fun setShouldRegisterTouch(callback: (event: MotionEvent?) -> Boolean) {
     this.callback = callback
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/github/apognu/otter/views/LoaderViews.kt b/app/src/main/java/com/github/apognu/otter/views/LoadingImageView.kt
similarity index 100%
rename from app/src/main/java/com/github/apognu/otter/views/LoaderViews.kt
rename to app/src/main/java/com/github/apognu/otter/views/LoadingImageView.kt
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7ca20a1..e11a09f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -19,7 +19,7 @@
       android:layout_marginBottom="32dp"
       android:contentDescription="@string/alt_app_logo"
       android:src="@drawable/otter"
-      android:tint="@android:color/white" />
+      app:tint="@android:color/white" />
 
     <TextView
       android:layout_width="match_parent"
@@ -129,4 +129,4 @@
       android:textColor="@color/whiteWhileLight" />
   </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 818b65e..e71d2b4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -107,12 +107,12 @@
     <string name="settings_crash_report_description">Nur Otters Protokolle der letzten 5 Minuten vor dem Crash werden werden gespeichert</string>
     <string name="settings_crash_report_title">Kopiere Absturzberichte</string>
     <string name="radio_favorites_description">Spielen Sie Ihre Lieblingsmusik in einer nicht endenen Glücksschleife.</string>
-    <string name="only_my_music">Nur meine Musik</string>
     <plurals name="downloads_description">
         <item quantity="one">Lade %1$d Lied herunter</item>
         <item quantity="other">Lade %1$d Lieder herunter</item>
     </plurals>
-    <string name="settings_play_order_in_order">Alben in reihenfolgen spielen</string>
+    <string name="settings_play_order_in_order">Alben der Reihe nach abgespielt</string>
+    <string name="settings_play_order_in_order_summary">Alben werden der Reihe nach abgespielt</string>
     <string name="playback_queue_save">Speichern</string>
     <string name="playlist_add_to_new">Neue Playlist…</string>
     <string name="playlist_add_to_create">Playlist erstellen</string>
@@ -125,5 +125,6 @@
     <string name="playback_play">Abspielen</string>
     <string name="fiters_all">Alle Musikinhalte</string>
     <string name="filters_followed">Gefolgte Inhalte</string>
-    <string name="settings_play_order_shuffle">Alben zufällig wiedergeben</string>
-</resources>
\ No newline at end of file
+    <string name="settings_play_order_shuffle">Alben zufällig abgespielt</string>
+    <string name="settings_play_order_shuffle_summary">Alben werden zufällig abgespielt</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 592dd36..98ba639 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,7 +4,6 @@
         <item quantity="one">Descargando %1$d pista</item>
         <item quantity="other">Descargando %1$d pistas</item>
     </plurals>
-    <string name="only_my_music">Sólo mi música</string>
     <plurals name="playlist_description">
         <item quantity="one">%1$d pista • %2$s</item>
         <item quantity="other">%1$d pistas • %2$s</item>
@@ -127,4 +126,4 @@
     <string name="playlist_add_to_new">Nueva lista de reproducción…</string>
     <string name="playlist_add_to">Añadir a la lista de reproducción</string>
     <string name="playback_queue_save">Guardar</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 926dc56..fb189e6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -11,7 +11,7 @@
         <item quantity="other">%1$d pjesme • %2$s</item>
     </plurals>
     <plurals name="album_count">
-        <item quantity="one">Album</item>
+        <item quantity="one">%d Album</item>
         <item quantity="few">Albumi</item>
         <item quantity="other">Albumi</item>
     </plurals>
@@ -129,4 +129,4 @@
     <string name="login_cleartext">Dozvoli cleartext promet (HTTP)</string>
     <string name="login_hostname">Ime operatera</string>
     <string name="login_welcome">Molimo unesite detalje vaše Funkwhale \'instance\' kako bi pristupili njenom sadržaju</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
deleted file mode 100644
index eed7817..0000000
--- a/app/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="logout_content">Weet je zeker dat je wilt uitloggen bij je Funkwhale server\?</string>
-    <string name="settings_night_mode">Donkere modus</string>
-    <string name="settings_media_quality_summary_quality">Nummers worden in de hoogste kwaliteit afgespeeld</string>
-    <string name="albums">Albums</string>
-    <plurals name="playlist_description">
-        <item quantity="one">%1$d nummer • %2$s</item>
-        <item quantity="other">%1$d nummers • %2$s</item>
-    </plurals>
-    <string name="logout_title">Uitloggen</string>
-    <string name="radio_less_listened_description">Luister naar nummers die je meestal niet speelt. Tijd om de balans te herstellen.</string>
-    <string name="radio_less_listened_title">Niet vaak geluisterd</string>
-    <string name="radio_random_description">Een willekeurige selectie - misschien ontdek je wel wat nieuws\?</string>
-    <string name="radio_random_title">Willekeurig</string>
-    <string name="radio_playback_error">Er was een fout bij het starten van deze radio</string>
-    <string name="track_info_details_track_instance">Funkwhale-server</string>
-    <string name="track_info_details_track_bitrate">Bitrate</string>
-    <string name="settings_experiments">Experimentele functies activeren</string>
-    <string name="settings_night_mode_system_summary">Donkere modus zal systeeminstelling volgen</string>
-    <string name="settings_night_mode_system">Volg systeeminstellingen</string>
-    <string name="settings_night_mode_off">Altijd uit (lichte modus)</string>
-    <string name="settings_night_mode_on">Altijd aan (donkere modus)</string>
-    <string name="settings_other">Overige</string>
-    <string name="settings_media_cache_size_summary">%d GB zal gebruikt worden om nummers op te slaan om ze offline af te spelen</string>
-    <string name="settings_media_cache_size">Grootte van media-cache</string>
-    <string name="settings_media_quality_size">Kleine bestandsgrootte</string>
-    <string name="settings_media_quality_quality">Hoogste kwaliteit</string>
-    <string name="settings_media_quality">Media-kwaliteit</string>
-    <string name="settings_general">Algemeen</string>
-    <string name="search_no_results">Geen resultaten gevonden voor deze zoekopdracht</string>
-    <string name="search_welcome">Voer je zoektermen hierboven in en klik op enter om je bibliotheek te doorzoeken</string>
-    <string name="search_placeholder">Zoek artiesten, albums en nummers</string>
-    <string name="title_oss_licences">Open Source-licenties</string>
-    <string name="title_settings">Instellingen</string>
-    <string name="toolbar_search">Zoeken</string>
-    <string name="login_error_hostname">Dit werd niet herkent als geldige URL</string>
-    <string name="login_logging_in">Inloggen</string>
-    <string name="login_submit">Log in</string>
-    <string name="login_password">Wachtwoord</string>
-    <string name="login_username">Gebruikersnaam</string>
-    <string name="login_anonymous">Anoniem aanmelden</string>
-    <string name="login_hostname">Servernaam</string>
-    <string name="login_welcome">Voer de gegevens van je Funkwhale-server in om toegang te krijgen tot je media</string>
-    <string name="track_info_details_track_duration">Duur</string>
-    <string name="track_info_details_track_title">Nummer-titel</string>
-    <string name="track_info_details_album">Album</string>
-    <string name="track_info_details_artist">Artiest</string>
-    <string name="track_info_details_title">Nummer-details</string>
-    <string name="track_info_details">Informatie</string>
-    <string name="track_info_album">Ga naar album</string>
-    <string name="track_info_artist">Ga naar artiest</string>
-    <string name="alt_track_info">Informatie over het nummer</string>
-    <string name="alt_more_options">Meer opties</string>
-    <string name="alt_album_cover">Albumhoes</string>
-    <string name="alt_artist_art">Artiest-afbeelding</string>
-    <string name="alt_app_logo">App-logo</string>
-    <plurals name="album_count">
-        <item quantity="one">%d album</item>
-        <item quantity="other">%d albums</item>
-    </plurals>
-    <string name="error_playback">Dit nummer kan niet afgespeeld worden</string>
-    <string name="control_next">Volgende nummer</string>
-    <string name="control_previous">Vorige nummer</string>
-    <string name="control_toggle">Afspelen / Pauze</string>
-    <string name="manage_add_to_favorites">Aan favorieten toevoegen</string>
-    <string name="playback_queue_play_next">Volgende afspelen</string>
-    <string name="playback_queue_add_item">Toevoegen aan afspeellijst</string>
-    <string name="playback_queue_remove_item">Verwijder</string>
-    <string name="playback_queue_empty">De afspeellijst is leeg</string>
-    <string name="playback_queue">Afspeellijst</string>
-    <string name="playback_shuffle">Shuffle</string>
-    <string name="favorites">Favorieten</string>
-    <string name="radios">Radio\'s</string>
-    <string name="playlists">Afspeellijsten</string>
-    <string name="tracks">Nummers</string>
-    <string name="artists">Artiest</string>
-    <string name="settings_logout">Uitloggen</string>
-    <string name="settings_information_license_description">MIT-licentie</string>
-    <string name="settings_information_license_title">Licentie</string>
-    <string name="settings_version_title">Versie</string>
-    <string name="settings_information_repository_description">Otter door Antoine Popineau (apognu)</string>
-    <string name="settings_information">Informatie</string>
-    <string name="settings_experiments_restart_content">Beëindig en herstart de app om nieuwe instelling toe te passen</string>
-    <string name="settings_experiments_restart_title">Opnieuw opstarten vereist</string>
-    <string name="settings_experiments_description">Gebruik op eigen risico; kan de app bevriezen of crashen</string>
-    <string name="login_cleartext">Niet-versleutelde verbindingen toestaan (HTTP)</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 245013f..0f89bbd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -6,7 +6,6 @@
         <item quantity="few">Загрузка %1$d треков</item>
         <item quantity="many">Загрузка %1$d треков</item>
     </plurals>
-    <string name="only_my_music">Только моя музыка</string>
     <plurals name="playlist_description">
         <item quantity="one">%1$d трек • %2$s</item>
         <item quantity="few">%1$d трека • %2$s</item>
@@ -130,4 +129,4 @@
     <string name="settings_play_order_shuffle_summary">Перемешивать трэки в альбомах</string>
     <string name="settings_play_order_shuffle">Перемешать альбомы</string>
     <string name="settings_play_order">Предпочитаемый порядок</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
deleted file mode 100644
index e1ac470..0000000
--- a/app/src/main/res/values-si/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="filters">පෙරහන්</string>
-    <string name="title_oss_licences">විවෘත මූලාශ්‍ර බලපත්‍ර</string>
-    <string name="title_settings">සැකසුම්</string>
-    <string name="title_downloads">බාගැනීම්</string>
-    <string name="toolbar_search">සොයන්න</string>
-    <string name="login_logging_in">පිවිසෙමින්</string>
-    <string name="login_submit">පිවිසෙන්න</string>
-    <string name="login_password">මුර පදය</string>
-    <string name="login_username">පරිශීලක නාමය</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0701e79..6d10c82 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -4,7 +4,6 @@
         <item quantity="one">下载 %1$d 曲目</item>
         <item quantity="other"/>
     </plurals>
-    <string name="only_my_music">只有我的音乐</string>
     <plurals name="playlist_description">
         <item quantity="one">%1$d 曲目 • %2$s</item>
         <item quantity="other"/>
@@ -127,4 +126,4 @@
     <string name="playlist_add_to_new">新播放列表…</string>
     <string name="playlist_add_to">加入播放列表</string>
     <string name="playback_queue_save">保存</string>
-</resources>
\ No newline at end of file
+</resources>