diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
index 68aef558..8cfc0123 100644
--- a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
@@ -45,7 +45,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
 
         mDb = DBHelper.newInstance(getApplicationContext());
         mNotes = mDb.getNotes();
-        updateSelectedNote(mConfig.getCurrentNoteId());
+        updateSelectedNote(getConfig().getCurrentNoteId());
 }
 
     @Override
@@ -64,7 +64,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mConfig.setFirstRun(false);
+        getConfig().setFirstRun(false);
     }
 
     @Override
@@ -117,7 +117,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
         mCurrentNote = mDb.getNote(id);
         mNotes = mDb.getNotes();
         if (mCurrentNote != null) {
-            mConfig.setCurrentNoteId(id);
+            getConfig().setCurrentNoteId(id);
             mNotesView.setText(mCurrentNote.getValue());
             mCurrNoteTitle.setText(mCurrentNote.getTitle());
         }
@@ -185,7 +185,7 @@ public class MainActivity extends SimpleActivity implements OpenNoteDialog.OpenN
 
         final int firstNoteId = mNotes.get(0).getId();
         updateSelectedNote(firstNoteId);
-        mConfig.setWidgetNoteId(firstNoteId);
+        getConfig().setWidgetNoteId(firstNoteId);
         invalidateOptionsMenu();
     }
 
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java
index f63e6d75..c3237515 100644
--- a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java
+++ b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java
@@ -22,7 +22,7 @@ public class SettingsActivity extends SimpleActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-        mConfig = Config.Companion.newInstance(getApplicationContext());
+        setConfig(Config.Companion.newInstance(getApplicationContext()));
         ButterKnife.bind(this);
 
         setupDarkTheme();
@@ -30,23 +30,23 @@ public class SettingsActivity extends SimpleActivity {
     }
 
     private void setupDarkTheme() {
-        mDarkThemeSwitch.setChecked(mConfig.isDarkTheme());
+        mDarkThemeSwitch.setChecked(getConfig().isDarkTheme());
     }
 
     private void setupFontSize() {
-        mFontSizeSpinner.setSelection(mConfig.getFontSize());
+        mFontSizeSpinner.setSelection(getConfig().getFontSize());
     }
 
     @OnClick(R.id.settings_dark_theme_holder)
     public void handleDarkTheme() {
         mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked());
-        mConfig.setDarkTheme(mDarkThemeSwitch.isChecked());
+        getConfig().setDarkTheme(mDarkThemeSwitch.isChecked());
         restartActivity();
     }
 
     @OnItemSelected(R.id.settings_font_size)
     public void handleFontSize() {
-        mConfig.setFontSize(mFontSizeSpinner.getSelectedItemPosition());
+        getConfig().setFontSize(mFontSizeSpinner.getSelectedItemPosition());
         Utils.INSTANCE.updateWidget(getApplicationContext());
     }
 
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java
deleted file mode 100644
index 0c2fc8f5..00000000
--- a/app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.simplemobiletools.notes.activities;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.MenuItem;
-
-import com.simplemobiletools.notes.Config;
-import com.simplemobiletools.notes.R;
-
-public class SimpleActivity extends AppCompatActivity {
-    protected Config mConfig;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        mConfig = Config.Companion.newInstance(getApplicationContext());
-        setTheme(mConfig.isDarkTheme() ? R.style.AppTheme_Dark : R.style.AppTheme);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-}
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt
new file mode 100644
index 00000000..220f7566
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt
@@ -0,0 +1,28 @@
+package com.simplemobiletools.notes.activities
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.view.MenuItem
+
+import com.simplemobiletools.notes.Config
+import com.simplemobiletools.notes.R
+
+open class SimpleActivity : AppCompatActivity() {
+    lateinit var config: Config
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        config = Config.newInstance(applicationContext)
+        setTheme(if (config.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                finish()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+}