diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73348651..15250fb9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.Default.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/app/src/main/java/me/impy/aegis/AddProfileActivity.java b/app/src/main/java/me/impy/aegis/AddProfileActivity.java
index ef21b6c5..40ca3105 100644
--- a/app/src/main/java/me/impy/aegis/AddProfileActivity.java
+++ b/app/src/main/java/me/impy/aegis/AddProfileActivity.java
@@ -2,6 +2,8 @@ package me.impy.aegis;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -27,6 +29,7 @@ public class AddProfileActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setPreferredTheme();
         setContentView(R.layout.activity_add_profile);
 
         profileName = (EditText) findViewById(R.id.addProfileName);
@@ -87,4 +90,17 @@ public class AddProfileActivity extends AppCompatActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
+
+
+    private void setPreferredTheme()
+    {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        if(sharedPreferences.getBoolean("pref_night_mode", false))
+        {
+                setTheme(R.style.AppTheme_Dark_TransparentActionBar);
+        } else
+        {
+                setTheme(R.style.AppTheme_Default_TransparentActionBar);
+        }
+    }
 }
diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java
index 4f246da8..2e9a89c4 100644
--- a/app/src/main/java/me/impy/aegis/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/MainActivity.java
@@ -1,11 +1,14 @@
 package me.impy.aegis;
 
+import android.app.FragmentManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -37,7 +40,8 @@ public class MainActivity extends AppCompatActivity  {
     KeyProfileAdapter mKeyProfileAdapter;
     ArrayList<KeyProfile> mKeyProfiles;
     Database database;
-    
+
+    boolean nightMode = false;
     int count = 0;
 
     @Override
@@ -51,6 +55,16 @@ public class MainActivity extends AppCompatActivity  {
             startActivity(intro);
         }
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        if(sharedPreferences.getBoolean("pref_night_mode", false))
+        {
+            nightMode = true;
+            setTheme(R.style.AppTheme_Dark_NoActionBar);
+        } else
+        {
+            setPreferredTheme();
+        }
+
         setContentView(R.layout.activity_main);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -146,6 +160,12 @@ public class MainActivity extends AppCompatActivity  {
         }
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        setPreferredTheme();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -171,4 +191,28 @@ public class MainActivity extends AppCompatActivity  {
 
         return super.onOptionsItemSelected(item);
     }
+
+    private void setPreferredTheme()
+    {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        if(sharedPreferences.getBoolean("pref_night_mode", false))
+        {
+            if(!nightMode)
+            {
+                setTheme(R.style.AppTheme_Dark_NoActionBar);
+                finish();
+
+                startActivity(new Intent(this, this.getClass()));
+            }
+        } else
+        {
+            if(nightMode)
+            {
+                setTheme(R.style.AppTheme_Default_NoActionBar);
+                finish();
+
+                startActivity(new Intent(this, this.getClass()));
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/layout/activity_add_profile.xml b/app/src/main/res/layout/activity_add_profile.xml
index 0b53e4b8..f42d3d54 100644
--- a/app/src/main/res/layout/activity_add_profile.xml
+++ b/app/src/main/res/layout/activity_add_profile.xml
@@ -54,7 +54,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="0.4"
-            android:background="@color/background"
+            android:background="?attr/background"
             android:orientation="vertical">
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f548017f..071cea96 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -33,7 +33,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background"
+        android:background="?attr/background"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:context="me.impy.aegis.MainActivity"
         tools:showIn="@layout/activity_main">
diff --git a/app/src/main/res/layout/card_keyprofile.xml b/app/src/main/res/layout/card_keyprofile.xml
index 670166d8..0918b5ff 100644
--- a/app/src/main/res/layout/card_keyprofile.xml
+++ b/app/src/main/res/layout/card_keyprofile.xml
@@ -11,6 +11,7 @@
 
     <LinearLayout
         android:orientation="horizontal"
+        android:background="?attr/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -44,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/profile_name"
                 android:text="Post title"
-                android:textColor="@color/secondary_text"
+                android:textColor="?attr/secondaryText"
                 android:textSize="20sp"
                 android:layout_below="@+id/profile_code"
                 android:layout_alignLeft="@+id/profile_code"
@@ -59,7 +60,7 @@
                 android:text="Medium Text"
                 android:id="@+id/profile_code"
                 android:textSize="36sp"
-                android:textColor="@color/primary_text"
+                android:textColor="?attr/primaryText"
                 android:layout_marginLeft="6dp"
                 android:layout_marginStart="6dp"
                 android:layout_alignParentTop="true"
@@ -74,6 +75,7 @@
         android:padding="0dp"
         android:layout_margin="0dp"
         android:layout_width="match_parent"
+        android:background="?attr/background"
         android:layout_height="match_parent">
 
         <ProgressBar
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..81915459
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="primaryText" format="color" />
+    <attr name="secondaryText" format="color" />
+    <attr name="backgroundColor" format="color" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f6bca338..0fac2111 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,10 +6,14 @@
     <color name="colorPrimaryLight">#B3E5FC</color>
     <color name="colorAccent">#FF5252</color>
     <color name="primary_text">#212121</color>
-    <color name="secondary_text">#FF5252</color>
+    <color name="secondary_text">#434343</color>
     <color name="primary_text_inverted">#ffffff</color>
-    <color name="secondary_text_inverted">#efefef</color>
+    <color name="secondary_text_inverted">#efefef</color>b
     <color name="icons">#FFFFFF</color>
     <color name="divider">#BDBDBD</color>
     <color name="background">#ffffff</color>
+
+    <color name="primary_text_dark">#ffffff</color>
+    <color name="secondary_text_dark">#FF5252</color>
+    <color name="background_dark">#191919</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cb3b3ba7..a7afa7ea 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,4 +35,47 @@
         <!--<item name="colorAccent">@color/</item>-->
     </style>
 
+    <style name="AppTheme.Default">
+        <item name="android:windowBackground">@color/background</item>
+
+        <item name="android:textColorPrimary">@color/primary_text</item>
+        <item name="android:textColorSecondary">@color/secondary_text</item>
+        <item name="primaryText">@color/primary_text</item>
+        <item name="secondaryText">@color/secondary_text</item>
+        <item name="background">@color/background</item>
+    </style>
+    <style name="AppTheme.Default.NoActionBar" parent="AppTheme.Default">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.Default.TransparentActionBar" parent="AppTheme.Default">
+        <item name="android:actionBarStyle">@style/ThemeActionBar</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <!-- Support library compatibility -->
+        <item name="actionBarStyle">@style/ThemeActionBar</item>
+        <item name="windowActionBarOverlay">true</item>
+    </style>
+
+
+    <style name="AppTheme.Dark">
+        <item name="android:windowBackground">@color/background_dark</item>
+        <item name="android:textColorPrimary">@color/primary_text_dark</item>
+        <item name="android:textColorSecondary">@color/secondary_text_dark</item>
+        <item name="primaryText">@color/primary_text_dark</item>
+        <item name="secondaryText">@color/secondary_text_dark</item>
+        <item name="background">@color/background_dark</item>
+    </style>
+    <style name="AppTheme.Dark.NoActionBar" parent="AppTheme.Dark">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.Dark.TransparentActionBar" parent="AppTheme.Dark">
+        <item name="android:actionBarStyle">@style/ThemeActionBar</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <!-- Support library compatibility -->
+        <item name="actionBarStyle">@style/ThemeActionBar</item>
+        <item name="windowActionBarOverlay">true</item>
+    </style>
+
+
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
new file mode 100644
index 00000000..9f930092
--- /dev/null
+++ b/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/settings">
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="pref_night_mode"
+        android:title="@string/pref_night_mode" />
+</PreferenceScreen>
\ No newline at end of file