diff --git a/app/src/main/java/org/emunix/unipatcher/ui/activity/MainActivity.java b/app/src/main/java/org/emunix/unipatcher/ui/activity/MainActivity.java
index df45b62..50cf5a0 100644
--- a/app/src/main/java/org/emunix/unipatcher/ui/activity/MainActivity.java
+++ b/app/src/main/java/org/emunix/unipatcher/ui/activity/MainActivity.java
@@ -21,6 +21,7 @@ package org.emunix.unipatcher.ui.activity;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.design.widget.FloatingActionButton;
@@ -32,6 +33,8 @@ import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
@@ -54,6 +57,10 @@ import org.emunix.unipatcher.ui.fragment.PatchingFragment;
 import org.emunix.unipatcher.ui.fragment.SmdFixChecksumFragment;
 import org.emunix.unipatcher.ui.fragment.SnesSmcHeaderFragment;
 
+import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_AUTO;
+import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_NO;
+import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES;
+
 public class MainActivity extends AppCompatActivity
      implements NavigationView.OnNavigationItemSelectedListener {
     private static final String LOG_TAG = "org.emunix.unipatcher";
@@ -68,6 +75,7 @@ public class MainActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme();
         super.onCreate(savedInstanceState);
         context = this;
         setContentView(R.layout.activity_main);
@@ -153,6 +161,22 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
+    private void setTheme() {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+        String theme = sp.getString("theme","light");
+        switch (theme) {
+            case "light":
+                AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_NO);
+                break;
+            case "dark":
+                AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_YES);
+                break;
+            case "daynight":
+                AppCompatDelegate.setDefaultNightMode(MODE_NIGHT_AUTO);
+                break;
+        }
+    }
+
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
         int id = item.getItemId();
diff --git a/app/src/main/java/org/emunix/unipatcher/ui/fragment/SettingsFragment.java b/app/src/main/java/org/emunix/unipatcher/ui/fragment/SettingsFragment.java
index ea7ab94..ab084fb 100644
--- a/app/src/main/java/org/emunix/unipatcher/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/org/emunix/unipatcher/ui/fragment/SettingsFragment.java
@@ -19,15 +19,39 @@ along with UniPatcher.  If not, see <http://www.gnu.org/licenses/>.
 
 package org.emunix.unipatcher.ui.fragment;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
+import android.widget.Toast;
 
 import org.emunix.unipatcher.R;
 
-public class SettingsFragment extends PreferenceFragmentCompat {
+public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.preferences, rootKey);
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                          String key) {
+        if (key.equals("theme")) {
+            Toast.makeText(getActivity(), R.string.settings_theme_message_restart_app, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getPreferenceScreen().getSharedPreferences()
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getPreferenceScreen().getSharedPreferences()
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
 }
diff --git a/app/src/main/res/drawable-night/drawer_header.png b/app/src/main/res/drawable-night/drawer_header.png
new file mode 100644
index 0000000..9b906bd
Binary files /dev/null and b/app/src/main/res/drawable-night/drawer_header.png differ
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 78f007f..3901096 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -11,12 +11,4 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="@string/app_name"
-        android:textColor="#ffffff"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Display1" />
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/patching_fragment.xml b/app/src/main/res/layout/patching_fragment.xml
index 817b4ae..8c43c4b 100644
--- a/app/src/main/res/layout/patching_fragment.xml
+++ b/app/src/main/res/layout/patching_fragment.xml
@@ -23,7 +23,7 @@
                     android:id="@+id/patchLabel"
                     android:padding="8dp"
                     android:text="@string/main_activity_patch_file"
-                    android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorHeaderText"
                     android:textSize="24sp"/>
 
                 <View
@@ -63,7 +63,7 @@
                     android:id="@+id/romLabel"
                     android:padding="8dp"
                     android:text="@string/main_activity_rom_file"
-                    android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorHeaderText"
                     android:textSize="24sp"/>
 
                 <View
@@ -103,7 +103,7 @@
                     android:id="@+id/outputLabel"
                     android:padding="8dp"
                     android:text="@string/main_activity_output_file"
-                    android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorHeaderText"
                     android:textSize="24sp"/>
 
                 <View
diff --git a/app/src/main/res/layout/smd_fix_checksum_fragment.xml b/app/src/main/res/layout/smd_fix_checksum_fragment.xml
index ad2b3c9..7864bca 100644
--- a/app/src/main/res/layout/smd_fix_checksum_fragment.xml
+++ b/app/src/main/res/layout/smd_fix_checksum_fragment.xml
@@ -23,7 +23,7 @@
                     android:id="@+id/romLabel"
                     android:padding="8dp"
                     android:text="@string/main_activity_rom_file"
-                    android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorHeaderText"
                     android:textSize="24sp"/>
 
                 <View
diff --git a/app/src/main/res/layout/snes_smc_header_fragment.xml b/app/src/main/res/layout/snes_smc_header_fragment.xml
index 80a1709..b2c7603 100644
--- a/app/src/main/res/layout/snes_smc_header_fragment.xml
+++ b/app/src/main/res/layout/snes_smc_header_fragment.xml
@@ -23,7 +23,7 @@
                     android:id="@+id/romLabel"
                     android:padding="8dp"
                     android:text="@string/main_activity_rom_file"
-                    android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorHeaderText"
                     android:textSize="24sp"/>
 
                 <View
@@ -79,7 +79,7 @@
                     android:id="@+id/headerLabel"
                     android:padding="8dp"
                     android:text="@string/main_activity_header_file"
-                    android:textColor="@color/colorPrimary"
+                    android:textColor="@color/colorHeaderText"
                     android:textSize="24sp"/>
 
                 <View
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..51fba99
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#393939</color>
+    <color name="colorPrimaryDark">#2d2d2d</color>
+    <color name="colorAccent">#f2777a</color>
+    <color name="colorPrimaryText">#eeeeee</color>
+    <color name="colorSecondaryText">#cccccc</color>
+    <color name="colorHeaderText">@color/colorPrimaryText</color>
+    <color name="colorIcons">#cccccc</color>
+    <color name="colorDivider">#393939</color>
+
+    <color name="line">#2d2d2d</color>
+    <color name="card_background">#393939</color>
+    <color name="drawer_background">#ff343434</color>
+    <color name="drawer_text">#cccccc</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 0b7ca65..8e5478c 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+    <style name="AppTheme" parent="Base.AppTheme">
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
 
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
new file mode 100644
index 0000000..5d26462
--- /dev/null
+++ b/app/src/main/res/values/array.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="theme_names">
+        <item>@string/settings_theme_name_light</item>
+        <item>@string/settings_theme_name_dark</item>
+        <item>@string/settings_theme_name_daynight</item>
+    </string-array>
+
+    <string-array name="theme_values">
+        <item>light</item>
+        <item>dark</item>
+        <item>daynight</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 02e9ded..626c57f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
     <color name="colorAccent">#f44336</color>
     <color name="colorPrimaryText">#212121</color>
     <color name="colorSecondaryText">#727272</color>
+    <color name="colorHeaderText">@color/colorPrimary</color>
     <color name="colorIcons">#FFFFFF</color>
     <color name="colorDivider">#B6B6B6</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb5a6a3..2542535 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,6 +95,14 @@
 
     <!-- Settings -->
     <string name="settings_activity_title">Settings</string>
+    <string name="settings_interface_header">User interface</string>
+    <string name="settings_theme">Theme</string>
+    <string name="settings_theme_description">Change the color palette. DayNight theme allows to switch between Light and Dark themes based on the time of day.</string>
+    <string name="settings_theme_dialog_title">Select theme</string>
+    <string name="settings_theme_name_light">Light</string>
+    <string name="settings_theme_name_dark">Dark</string>
+    <string name="settings_theme_name_daynight">DayNight</string>
+    <string name="settings_theme_message_restart_app">Please restart the application</string>
     <string name="settings_directories_header">Directories</string>
     <string name="settings_remember_last_directories">Remember last opened directories</string>
     <string name="settings_rom_directory">Specify ROM\'s directory</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d8e6579..747a854 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
+    <style name="Base.AppTheme" parent="Theme.AppCompat.DayNight">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme" parent="Base.AppTheme">
+    </style>
+
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index dad8eed..e5add65 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/settings_interface_header">
+        <ListPreference
+            android:key="theme"
+            android:title="@string/settings_theme"
+            android:summary="@string/settings_theme_description"
+            android:dialogTitle="@string/settings_theme_dialog_title"
+            android:entries="@array/theme_names"
+            android:entryValues="@array/theme_values"
+            android:defaultValue="light" />
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/settings_directories_header">
         <CheckBoxPreference
             android:key="remember_last_directories"