diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89d6d1b3a7b65de4f69b985848b44351972888d0..9f16894aff3da95a5e16f7bd8d29a68910e37f92 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:fullBackupContent="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/DarkTheme">
 
         <activity
             android:name=".activity.LaunchActivity"
diff --git a/app/src/main/java/com/commit451/gitlab/activity/BaseActivity.kt b/app/src/main/java/com/commit451/gitlab/activity/BaseActivity.kt
index 54a27c78ae304c275195abe27cc5d10631359827..eaea52a1ab9bf6e71564763d9cd301e5927da94d 100644
--- a/app/src/main/java/com/commit451/gitlab/activity/BaseActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/BaseActivity.kt
@@ -1,8 +1,11 @@
 package com.commit451.gitlab.activity
 
+import android.os.Bundle
+import android.os.PersistableBundle
 import android.support.v7.app.AppCompatActivity
 import com.commit451.gitlab.App
 import com.commit451.gitlab.api.GitLab
+import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.model.Account
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs
 import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
@@ -24,6 +27,11 @@ abstract class BaseActivity : AppCompatActivity() {
         return false
     }
 
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+        setTheme(Prefs.theme)
+    }
+
     override fun onResume() {
         super.onResume()
         if (hasBrowsableLinks()) {
diff --git a/app/src/main/java/com/commit451/gitlab/activity/SettingsActivity.kt b/app/src/main/java/com/commit451/gitlab/activity/SettingsActivity.kt
index 6dcdfc85166e8c93dd50e1b516c9df3a002eb2e5..55c8bfc384f1fad0be3e8fae6a1a8930a98c8db4 100644
--- a/app/src/main/java/com/commit451/gitlab/activity/SettingsActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.support.v7.app.AlertDialog
 import android.view.View
 import butterknife.ButterKnife
 import com.commit451.gitlab.R
@@ -17,10 +18,7 @@ class SettingsActivity : BaseActivity() {
 
     companion object {
 
-        fun newIntent(context: Context): Intent {
-            val intent = Intent(context, SettingsActivity::class.java)
-            return intent
-        }
+        fun newIntent(context: Context) = Intent(context, SettingsActivity::class.java)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -40,9 +38,29 @@ class SettingsActivity : BaseActivity() {
             Prefs.isRequiredDeviceAuth = b
         }
         rootRequireDeviceAuth.setOnClickListener { switchRequireAuth.toggle() }
+
+        themeSettingLayout.setOnClickListener { showThemePickerDialog() }
+    }
+
+    private fun showThemePickerDialog() {
+        AlertDialog.Builder(this)
+            .setTitle(R.string.pick_a_theme)
+            .setSingleChoiceItems(R.array.themes, 0) { _, position->
+                val newTheme = when (resources.getStringArray(R.array.themes)[position]) {
+                    resources.getString(R.string.dark_theme) -> R.style.DarkTheme
+                    resources.getString(R.string.light_theme) -> R.style.LightTheme
+                    else -> throw IllegalArgumentException("This theme does not exist")
+                }
+
+                Prefs.theme = newTheme
+                finish()
+                startActivity(Intent(this, this::class.java))
+            }
+            .create()
+            .show()
     }
 
-    fun bindPrefs() {
+    private fun bindPrefs() {
         switchRequireAuth.isChecked = Prefs.isRequiredDeviceAuth
     }
 }
diff --git a/app/src/main/java/com/commit451/gitlab/data/Prefs.kt b/app/src/main/java/com/commit451/gitlab/data/Prefs.kt
index 686fc41597694033c71372d84eddab6a6600996e..55d6de72b3bcdda2b8b3059d9db80acc5203d283 100644
--- a/app/src/main/java/com/commit451/gitlab/data/Prefs.kt
+++ b/app/src/main/java/com/commit451/gitlab/data/Prefs.kt
@@ -5,15 +5,13 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
 import android.support.annotation.IntDef
+import android.support.annotation.StyleRes
+import com.commit451.gitlab.R
 import com.commit451.gitlab.api.MoshiProvider
 import com.commit451.gitlab.model.Account
-import java.io.IOException
-import java.util.*
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Types.newParameterizedType
 import com.squareup.moshi.Types
 import timber.log.Timber
+import java.io.IOException
 
 
 /**
@@ -24,6 +22,7 @@ object Prefs {
     private const val KEY_ACCOUNTS = "accounts"
     private const val KEY_STARTING_VIEW = "starting_view"
     private const val KEY_REQUIRE_DEVICE_AUTH = "require_device_auth"
+    private const val KEY_THEME_ID = "theme_id"
 
     const val STARTING_VIEW_PROJECTS = 0
     const val STARTING_VIEW_GROUPS = 1
@@ -106,4 +105,10 @@ object Prefs {
         set(value) = prefs.edit()
                 .putBoolean(KEY_REQUIRE_DEVICE_AUTH, value)
                 .apply()
+
+    var theme: Int
+        @StyleRes get() = prefs.getInt(KEY_THEME_ID, R.style.DarkTheme)
+        set(@StyleRes value) = prefs.edit()
+            .putInt(KEY_THEME_ID, value)
+            .apply()
 }
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f4b15d2d5ec594b5362c389e1abf4eb78ec154ec..57459466687bdfe03373b88f4356bc9b48d6748b 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary" />
+            android:background="?attr/colorPrimary"/>
 
     </android.support.design.widget.AppBarLayout>
 
@@ -31,7 +31,7 @@
             <LinearLayout
                 android:id="@+id/rootRequireDeviceAuth"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
                 android:orientation="horizontal"
                 android:paddingBottom="@dimen/activity_vertical_margin"
@@ -50,14 +50,14 @@
                         style="?android:attr/textAppearanceMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/setting_require_device_auth" />
+                        android:text="@string/setting_require_device_auth"/>
 
                     <TextView
                         style="?android:attr/textAppearance"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/setting_require_device_auth_description"
-                        android:textColor="@color/white_60" />
+                        android:textColor="@color/white_60"/>
                 </LinearLayout>
 
 
@@ -66,7 +66,42 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="8dp" />
+                    android:layout_marginLeft="8dp"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/themeSettingLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:orientation="horizontal"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="?android:attr/textAppearanceMedium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/setting_theme_title"/>
+
+                    <TextView
+                        style="?android:attr/textAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/white_60"
+                        tools:text="Dark"/>
+
+                </LinearLayout>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4014f2b34b58c161917de40db878728ef9a400de..5739ceeffa2423d067c183c1608b6e7291150c0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -530,4 +530,11 @@
 
     <string name="welcome">Welcome to LabCoat</string>
     <string name="welcome_message">We support GitLab.com, as well as any GitLab server running GitLab version 9.0 or later</string>
+    <string name="setting_theme_title">Theme</string>
+
+    <!-- Themes -->
+    <string name="light_theme">Light</string>
+    <string name="dark_theme">Dark</string>
+    <string name="pick_a_theme">Choose a theme</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dceedd0870d094425243e4a721a35a226a51b0c1..74931e8893ce338f14e478f12711bdc165844006 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Dark theme (default) -->
-    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="DarkTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/main_blue</item>
         <item name="colorAccent">@color/yellow</item>
         <item name="colorPrimaryDark">@color/main_blue_darker</item>
@@ -14,7 +14,20 @@
         <item name="alertDialogTheme">@style/AppDialogTheme</item>
     </style>
 
-    <style name="Activity" parent="AppTheme" />
+    <!-- Light theme -->
+    <style name="LightTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorAccent">@color/yellow</item>
+        <item name="colorPrimaryDark">@color/white_60</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/white_60</item>
+        <item name="android:windowContentTransitions" tools:ignore="NewApi">true</item>
+        <item name="android:windowBackground">@color/white</item>
+        <item name="dialogTheme">@style/AppDialogTheme</item>
+        <item name="alertDialogTheme">@style/AppDialogTheme</item>
+    </style>
+
+    <style name="Activity" parent="DarkTheme" />
 
     <style name="Activity.Login">
         <item name="android:windowBackground">?attr/colorPrimary</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ae1ea30bcf78f0d8814d404cb3f30cd6d73a6f6
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="themes">
+        <item>@string/dark_theme</item>
+        <item>@string/light_theme</item>
+    </string-array>
+</resources>
\ No newline at end of file