diff --git a/app/build.gradle b/app/build.gradle
index 29d8babe..60789fd5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.17.14'
+    implementation 'com.simplemobiletools:commons:3.18.17'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.shawnlin:number-picker:2.4.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
index 5f171307..15f70901 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
@@ -23,7 +23,6 @@ import com.simplemobiletools.commons.models.FAQItem
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : SimpleActivity() {
-    private var storedUseEnglish = false
     private var storedTextColor = 0
     private var storedBackgroundColor = 0
     private var storedPrimaryColor = 0
@@ -48,11 +47,6 @@ class MainActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
-        if (storedUseEnglish != config.useEnglish) {
-            restartActivity()
-            return
-        }
-
         val configTextColor = config.textColor
         if (storedTextColor != configTextColor) {
             getInactiveTabIndexes(view_pager.currentItem).forEach {
@@ -114,7 +108,6 @@ class MainActivity : SimpleActivity() {
             storedTextColor = textColor
             storedBackgroundColor = backgroundColor
             storedPrimaryColor = primaryColor
-            storedUseEnglish = useEnglish
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt
index 7309a83b..15ee77c4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt
@@ -56,7 +56,7 @@ class SettingsActivity : SimpleActivity() {
         settings_use_english_holder.setOnClickListener {
             settings_use_english.toggle()
             config.useEnglish = settings_use_english.isChecked
-            useEnglishToggled()
+            System.exit(0)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
index 4ca63f2d..46dd8a72 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
@@ -101,15 +101,15 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
     }
 
     private fun pickBackgroundColor() {
-        ColorPickerDialog(this, mBgColorWithoutTransparency) {
-            mBgColorWithoutTransparency = it
+        ColorPickerDialog(this, mBgColorWithoutTransparency) { wasPositivePressed, color ->
+            mBgColorWithoutTransparency = color
             updateBgColor()
         }
     }
 
     private fun pickTextColor() {
-        ColorPickerDialog(this, mTextColor) {
-            mTextColorWithoutTransparency = it
+        ColorPickerDialog(this, mTextColor) { wasPositivePressed, color ->
+            mTextColorWithoutTransparency = color
             updateColors()
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt
index 19a05a9e..81cd08b2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/AlarmsAdapter.kt
@@ -22,6 +22,10 @@ class AlarmsAdapter(activity: SimpleActivity, var alarms: ArrayList<Alarm>, val
                     recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
     private val adjustedPrimaryColor = activity.getAdjustedPrimaryColor()
 
+    init {
+        setupDragListener(true)
+    }
+
     override fun getActionMenuId() = R.menu.cab_alarms
 
     override fun prepareActionMode(menu: Menu) {}
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt
index e399136b..25efe006 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimeZonesAdapter.kt
@@ -21,6 +21,10 @@ class TimeZonesAdapter(activity: SimpleActivity, var timeZones: ArrayList<MyTime
 
     var todayDateString = activity.getFormattedDate(Calendar.getInstance())
 
+    init {
+        setupDragListener(true)
+    }
+
     override fun getActionMenuId() = R.menu.cab_timezones
 
     override fun prepareActionMode(menu: Menu) {}
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt
index 946b6c8c..f8a9f32d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/dialogs/AddTimeZonesDialog.kt
@@ -19,8 +19,8 @@ class AddTimeZonesDialog(val activity: SimpleActivity, private val callback: ()
                 .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() })
                 .setNegativeButton(R.string.cancel, null)
                 .create().apply {
-            activity.setupDialogStuff(view, this)
-        }
+                    activity.setupDialogStuff(view, this)
+                }
     }
 
     private fun dialogConfirmed() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
index 5da9f2d6..703f816b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt
@@ -72,7 +72,6 @@ class AlarmFragment : Fragment(), ToggleAlarmInterface {
             AlarmsAdapter(activity as SimpleActivity, alarms, this, view.alarms_list) {
                 openEditAlarm(it as Alarm)
             }.apply {
-                setupDragListener(true)
                 view.alarms_list.adapter = this
             }
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt
index d610736f..591cee04 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt
@@ -125,7 +125,6 @@ class ClockFragment : Fragment() {
                     updateTimeZones()
                 }
             }.apply {
-                setupDragListener(true)
                 view.time_zones_list.adapter = this
             }
         } else {