diff --git a/.gitignore b/.gitignore
index a1c018bec..660f31f5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@
 /build
 /captures
 keystore.jks
-signing.properties
+keystore.properties
diff --git a/app/build.gradle b/app/build.gradle
index fec06abda..d0aa925dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
 android {
     compileSdkVersion 28
     buildToolsVersion "28.0.3"
@@ -18,7 +22,12 @@ android {
     }
 
     signingConfigs {
-        release
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
     }
 
     buildTypes {
@@ -63,9 +72,9 @@ dependencies {
     implementation 'com.caverock:androidsvg-aar:1.3'
     kapt 'com.github.bumptech.glide:compiler:4.8.0' // keep it here too, not just in Commons, else loading SVGs wont work
 
-    kapt "androidx.room:room-compiler:2.0.0"
-    implementation "androidx.room:room-runtime:2.0.0"
-    annotationProcessor "androidx.room:room-compiler:2.0.0"
+    kapt 'androidx.room:room-compiler:2.0.0'
+    implementation 'androidx.room:room-runtime:2.0.0'
+    annotationProcessor 'androidx.room:room-compiler:2.0.0'
 
     //implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
     implementation 'com.github.tibbi:subsampling-scale-image-view:v3.10.1-fork'
@@ -73,22 +82,3 @@ dependencies {
     // implementation 'com.github.chrisbanes:PhotoView:2.1.4'
     implementation 'com.github.tibbi:PhotoView:2.2.1-fork'
 }
-
-Properties props = new Properties()
-def propFile = new File('signing.properties')
-if (propFile.canRead()) {
-    props.load(new FileInputStream(propFile))
-
-    if (props != null && props.containsKey('STORE_FILE') && props.containsKey('KEY_ALIAS') && props.containsKey('PASSWORD')) {
-        android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
-        android.signingConfigs.release.storePassword = props['PASSWORD']
-        android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
-        android.signingConfigs.release.keyPassword = props['PASSWORD']
-    } else {
-        println 'signing.properties found but some entries are missing'
-        android.buildTypes.release.signingConfig = null
-    }
-} else {
-    println 'signing.properties not found'
-    android.buildTypes.release.signingConfig = null
-}
diff --git a/app/release/gallery-release.apk b/app/release/gallery-release.apk
new file mode 100644
index 000000000..d0a357b69
Binary files /dev/null and b/app/release/gallery-release.apk differ
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt
index 54c3b1d0f..99d2f9399 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/databases/GalleryDatabase.kt
@@ -4,13 +4,13 @@ import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import com.simplemobiletools.gallery.pro.objects.MyExecutor
 import com.simplemobiletools.gallery.pro.interfaces.DirectoryDao
 import com.simplemobiletools.gallery.pro.interfaces.MediumDao
 import com.simplemobiletools.gallery.pro.models.Directory
 import com.simplemobiletools.gallery.pro.models.Medium
+import com.simplemobiletools.gallery.pro.objects.MyExecutor
 
-@Database(entities = [(Directory::class), (Medium::class)], version = 4)
+@Database(entities = [Directory::class, Medium::class], version = 4)
 abstract class GalleryDatabase : RoomDatabase() {
 
     abstract fun DirectoryDao(): DirectoryDao
diff --git a/keystore.properties_sample b/keystore.properties_sample
new file mode 100644
index 000000000..569edd736
--- /dev/null
+++ b/keystore.properties_sample
@@ -0,0 +1,4 @@
+storePassword=123456
+keyPassword=abcdef
+keyAlias=myAlias
+storeFile=../keystore.jks
diff --git a/signing.properties_sample b/signing.properties_sample
deleted file mode 100644
index cf8e23968..000000000
--- a/signing.properties_sample
+++ /dev/null
@@ -1,3 +0,0 @@
-STORE_FILE=/path/to/your.keystore
-KEY_ALIAS=projectkeyalias
-PASSWORD=yourpass