diff --git a/app/build.gradle b/app/build.gradle
index 8c6b37c..d420cf3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
@@ -57,6 +60,8 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
 
     testImplementation 'junit:junit:4.13'
@@ -69,4 +74,6 @@ dependencies {
     implementation "io.github.ponnamkarthik:richlinkpreview:1.0.9"
     implementation "com.squareup.picasso:picasso:2.71828"
 
+    implementation "androidx.preference:preference:1.1.1"
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d408354..601ad42 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,20 +6,21 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name=".STNApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:largeHeap="true"
         android:usesCleartextTraffic="false">
         <activity
             android:name=".activity.DetailsActivity"
-            android:theme="@style/AppTheme2">
-
-        </activity>
-        <activity android:name=".activity.PetitionDetailsActivity" android:theme="@style/AppTheme2"/>
+            android:theme="@style/AppTheme2"/>
+        <activity
+            android:name=".activity.PetitionDetailsActivity"
+            android:theme="@style/AppTheme2" />
         <activity
             android:name=".activity.MainActivity"
             android:theme="@style/AppTheme2">
@@ -37,5 +38,4 @@
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/io/saytheirnames/STNApplication.kt b/app/src/main/java/io/saytheirnames/STNApplication.kt
new file mode 100644
index 0000000..85161e1
--- /dev/null
+++ b/app/src/main/java/io/saytheirnames/STNApplication.kt
@@ -0,0 +1,18 @@
+package io.saytheirnames
+
+import android.app.Application
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.PreferenceManager
+
+class STNApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        initTheme()
+    }
+
+    private fun initTheme() {
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        ThemeManager.applyTheme(preferences.getInt(R.string.preference_key_theme.toString(), AppCompatDelegate.MODE_NIGHT_NO))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/saytheirnames/ThemeManager.kt b/app/src/main/java/io/saytheirnames/ThemeManager.kt
new file mode 100644
index 0000000..a695051
--- /dev/null
+++ b/app/src/main/java/io/saytheirnames/ThemeManager.kt
@@ -0,0 +1,34 @@
+package io.saytheirnames
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.PreferenceManager
+
+object ThemeManager {
+
+    fun applyTheme(mode: Int) {
+        if (AppCompatDelegate.getDefaultNightMode() == mode) return
+        AppCompatDelegate.setDefaultNightMode(mode)
+    }
+
+    fun setTheme(mode: Int, context: Context) {
+        applyTheme(mode)
+
+        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+        preferences.edit().putInt(R.string.preference_key_theme.toString(), mode)
+                .apply()
+    }
+
+    fun isNightMode(): Boolean {
+        return getCurrentTheme() == AppCompatDelegate.MODE_NIGHT_YES
+    }
+
+    private fun getCurrentTheme(): Int {
+        return AppCompatDelegate.getDefaultNightMode()
+    }
+
+    fun toggleTheme(context: Context) {
+        if (isNightMode()) setTheme(AppCompatDelegate.MODE_NIGHT_NO, context)
+        else setTheme(AppCompatDelegate.MODE_NIGHT_YES, context)
+    }
+}
diff --git a/app/src/main/java/io/saytheirnames/activity/DonationDetailsActivity.java b/app/src/main/java/io/saytheirnames/activity/DonationDetailsActivity.java
index 67d84aa..a8db414 100644
--- a/app/src/main/java/io/saytheirnames/activity/DonationDetailsActivity.java
+++ b/app/src/main/java/io/saytheirnames/activity/DonationDetailsActivity.java
@@ -21,6 +21,7 @@
 import io.saytheirnames.network.Utils;
 import io.saytheirnames.utils.CustomTabUtil;
 import io.saytheirnames.utils.ShareUtil;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.snackbar.Snackbar;
@@ -36,12 +37,12 @@
 
 public class DonationDetailsActivity extends AppCompatActivity implements View.OnClickListener {
 
-    String identifier,image, title, desc, donationLink;
+    String identifier, image, title, desc, donationLink;
 
     public static final String EXTRA_ID = "identifier";
 
     private BlurImageView blurImageView;
-    private ImageView donationImage,close;
+    private ImageView donationImage, close;
     private TextView donationTitle, subTitle, donationDesc, socialHashtags;
     private Button donationButton;
     private View progress;
@@ -54,14 +55,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_donation_details);
 
-
         initView();
-
         Intent intent = getIntent();
-
         identifier = intent.getStringExtra(EXTRA_ID);
-
-       loadData();
+        loadData();
     }
 
     @SuppressLint("StaticFieldLeak")
@@ -186,7 +183,6 @@ public void onClick(View v) {
             case R.id.close:
                 finish();
                 break;
-
             case R.id.imgShare:
                 share(donationLink);
                 break;
diff --git a/app/src/main/java/io/saytheirnames/activity/PetitionDetailsActivity.java b/app/src/main/java/io/saytheirnames/activity/PetitionDetailsActivity.java
index 7da715f..018c800 100644
--- a/app/src/main/java/io/saytheirnames/activity/PetitionDetailsActivity.java
+++ b/app/src/main/java/io/saytheirnames/activity/PetitionDetailsActivity.java
@@ -38,9 +38,9 @@ public class PetitionDetailsActivity extends AppCompatActivity implements View.O
 
     private ImageView imgClose, imgShare;
 
-    private TextView txtName, txtDescription, txtShareThisPetition;
+    private TextView txtName, txtDescription;
 
-    private Button btnSignThisPetition;
+    private Button btnSignThisPetition,  txtShareThisPetition;
 
     private ImageView actualImage;
     private BlurImageView blurImageView;
@@ -174,7 +174,6 @@ public void onClick(View v) {
                 visitPage(petitionLink);
                 break;
             case R.id.btnShareThisPetition:
-
             case R.id.imgShare:
                 share(petitionLink);
                 break;
@@ -184,7 +183,6 @@ public void onClick(View v) {
         }
     }
 
-
     private void visitPage(String url) {
         CustomTabUtil.openCustomTabForUrl(this, url);
     }
diff --git a/app/src/main/java/io/saytheirnames/fragments/HomeFragment.java b/app/src/main/java/io/saytheirnames/fragments/HomeFragment.java
index 0df05a8..96dd189 100644
--- a/app/src/main/java/io/saytheirnames/fragments/HomeFragment.java
+++ b/app/src/main/java/io/saytheirnames/fragments/HomeFragment.java
@@ -3,10 +3,12 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
@@ -21,6 +23,7 @@
 import java.util.ArrayList;
 
 import io.saytheirnames.R;
+import io.saytheirnames.ThemeManager;
 import io.saytheirnames.activity.MainActivity;
 import io.saytheirnames.adapters.FilterHomeAdapter;
 import io.saytheirnames.adapters.HeaderCardRecyclerAdapter;
@@ -77,6 +80,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         initializeRecyclerView();
         loadData();
 
+        initializeToolbar();
         return mContent;
     }
 
@@ -102,7 +106,8 @@ public int getSpanSize(int position) {
             @NotNull
             @Override
             public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup viewGroup, @NotNull LoadState loadState) {
-                return new RecyclerView.ViewHolder(progressBar){};
+                return new RecyclerView.ViewHolder(progressBar) {
+                };
             }
 
             @Override
@@ -110,7 +115,7 @@ public void onBindViewHolder(@NotNull RecyclerView.ViewHolder viewHolder, @NotNu
                 if (loadState.equals(LoadState.Loading.INSTANCE)) {
                     progressBar.setVisibility(View.VISIBLE);
                 } else {
-                   progressBar.setVisibility(View.GONE);
+                    progressBar.setVisibility(View.GONE);
                 }
             }
         });
@@ -124,6 +129,16 @@ private void loadData() {
         peoplePager.loadPeopleFromPagination();
     }
 
+    private void initializeToolbar() {
+        androidx.appcompat.widget.Toolbar toolbar = mContent.findViewById(R.id.toolbar);
+        toolbar.inflateMenu(R.menu.fragment_home_menu);
+        toolbar.setOnMenuItemClickListener(item -> onOptionsItemSelected(item));
+        if (ThemeManager.INSTANCE.isNightMode())
+            toolbar.getMenu().findItem(R.id.theme).setIcon(R.drawable.night_theme_white_24dp);
+        else
+            toolbar.getMenu().findItem(R.id.theme).setIcon(R.drawable.light_theme_white_24dp);
+    }
+
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -143,4 +158,15 @@ public void onHeaderClick() {
             ((MainActivity) getActivity()).updateBottomNavBasedOnTag(tag);
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.theme:
+                ThemeManager.INSTANCE.toggleTheme(getContext());
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/saytheirnames/utils/CustomTabUtil.java b/app/src/main/java/io/saytheirnames/utils/CustomTabUtil.java
index f570fd8..ed77c03 100644
--- a/app/src/main/java/io/saytheirnames/utils/CustomTabUtil.java
+++ b/app/src/main/java/io/saytheirnames/utils/CustomTabUtil.java
@@ -33,8 +33,8 @@ private static void openCustomChromeTab(Context context, Uri uri) {
         CustomTabsIntent.Builder intentBuilder = new CustomTabsIntent.Builder();
         CustomTabsIntent customTabsIntent = intentBuilder.build();
 
-        intentBuilder.setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary));
-        intentBuilder.setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.colorPrimaryDark));
+        intentBuilder.setToolbarColor(ContextCompat.getColor(context, R.color.Primary));
+        intentBuilder.setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.PrimaryDark));
 
         CustomTabActivityHelper.openCustomTab(context, customTabsIntent, uri, (activity, uri1) -> openWebView(context, uri1));
     }
diff --git a/app/src/main/res/color/bottom_nav_color.xml b/app/src/main/res/color/bottom_nav_color.xml
new file mode 100644
index 0000000..52d9bc8
--- /dev/null
+++ b/app/src/main/res/color/bottom_nav_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/OnSurface" android:state_checked="true" />
+    <item android:color="@color/Secondary" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml
index 3f990cc..b3277d4 100644
--- a/app/src/main/res/drawable/button_background.xml
+++ b/app/src/main/res/drawable/button_background.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white"/>
-            <stroke android:color="@color/colorPrimary" android:width="1dp"/>
+            <stroke android:color="@color/Primary" android:width="1dp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/card_border.xml b/app/src/main/res/drawable/card_border.xml
index b317527..ed192dc 100644
--- a/app/src/main/res/drawable/card_border.xml
+++ b/app/src/main/res/drawable/card_border.xml
@@ -5,6 +5,7 @@
         android:width="2dp"/>
 
     <padding android:top="2dp"
+        android:left="2dp"
         android:right="2dp"
         android:bottom="2dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/default_line.xml b/app/src/main/res/drawable/default_line.xml
index dbcbd47..9a6fb9e 100644
--- a/app/src/main/res/drawable/default_line.xml
+++ b/app/src/main/res/drawable/default_line.xml
@@ -9,7 +9,7 @@
             android:thickness="2dp"
             android:useLevel="false">
             <stroke android:width="1dp"
-                android:color="@color/colorSecondaryGrey"/>
+                android:color="@color/colorGrey"/>
             <size android:height="2dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/donation_btn.xml b/app/src/main/res/drawable/donation_btn.xml
index dd3520d..3b342e9 100644
--- a/app/src/main/res/drawable/donation_btn.xml
+++ b/app/src/main/res/drawable/donation_btn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:color="@color/colorBlack"
+    <stroke android:color="@color/Primary"
         android:width="2dp"/>
 
     <padding android:top="2dp"
diff --git a/app/src/main/res/drawable/find_out_btn_border.xml b/app/src/main/res/drawable/find_out_btn_border.xml
index 33e6587..60c8cd2 100644
--- a/app/src/main/res/drawable/find_out_btn_border.xml
+++ b/app/src/main/res/drawable/find_out_btn_border.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <stroke android:color="@color/colorPrimary"
+    <stroke android:color="@color/Primary"
         android:width="2dp"/>
 
     <solid android:color="@android:color/white"/>
diff --git a/app/src/main/res/drawable/light_theme_white_24dp.xml b/app/src/main/res/drawable/light_theme_white_24dp.xml
new file mode 100644
index 0000000..400d03b
--- /dev/null
+++ b/app/src/main/res/drawable/light_theme_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM18,14.48L18,18h-3.52L12,20.48 9.52,18L6,18v-3.52L3.52,12 6,9.52L6,6h3.52L12,3.52 14.48,6L18,6v3.52L20.48,12 18,14.48zM12,6.5c-3.03,0 -5.5,2.47 -5.5,5.5s2.47,5.5 5.5,5.5 5.5,-2.47 5.5,-5.5 -2.47,-5.5 -5.5,-5.5zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/night_theme_white_24dp.xml b/app/src/main/res/drawable/night_theme_white_24dp.xml
new file mode 100644
index 0000000..68e3b9f
--- /dev/null
+++ b/app/src/main/res/drawable/night_theme_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM18,14.48L18,18h-3.52L12,20.48 9.52,18L6,18v-3.52L3.52,12 6,9.52L6,6h3.52L12,3.52 14.48,6L18,6v3.52L20.48,12 18,14.48zM12.29,7c-0.74,0 -1.45,0.17 -2.08,0.46 1.72,0.79 2.92,2.53 2.92,4.54s-1.2,3.75 -2.92,4.54c0.63,0.29 1.34,0.46 2.08,0.46 2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/selected_button_background.xml b/app/src/main/res/drawable/selected_button_background.xml
index 9e4131f..8d80a3c 100644
--- a/app/src/main/res/drawable/selected_button_background.xml
+++ b/app/src/main/res/drawable/selected_button_background.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" android:padding="10dp">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/colorPrimary"/>
-            <stroke android:color="@color/colorPrimary" android:width="1dp"/>
+            <solid android:color="@color/Primary"/>
+            <stroke android:color="@color/Primary" android:width="1dp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selected_line.xml b/app/src/main/res/drawable/selected_line.xml
index 2d50b11..61bc327 100644
--- a/app/src/main/res/drawable/selected_line.xml
+++ b/app/src/main/res/drawable/selected_line.xml
@@ -9,7 +9,7 @@
             android:thickness="2dp"
             android:useLevel="false">
             <stroke android:width="1dp"
-                android:color="@color/colorAccent"/>
+                android:color="@color/OnBackground"/>
             <size android:height="2dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/social_media_button.xml b/app/src/main/res/drawable/social_media_button.xml
index 3f990cc..b3277d4 100644
--- a/app/src/main/res/drawable/social_media_button.xml
+++ b/app/src/main/res/drawable/social_media_button.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white"/>
-            <stroke android:color="@color/colorPrimary" android:width="1dp"/>
+            <stroke android:color="@color/Primary" android:width="1dp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index d3eb552..9345a4f 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -19,8 +19,8 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingBottom="16dp"
+            android:background="@color/Background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -30,7 +30,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="@color/colorBlack"
+                android:background="@color/Primary"
                 android:theme="@style/ToolbarStyle"
                 app:title="@string/app_name"
                 android:textAlignment="center"
@@ -49,7 +49,7 @@
                         android:text="@string/app_name"
                         android:textAllCaps="true"
                         android:textSize="18sp"
-                        android:textColor="@android:color/white"
+                        android:textColor="@color/OnPrimary"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -75,9 +75,7 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"
                         />
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
-
             </androidx.appcompat.widget.Toolbar>
 
             <FrameLayout
@@ -86,7 +84,6 @@
                 android:layout_height="wrap_content"
                 android:minHeight="100dp"
                 android:maxHeight="700dp"
-                android:background="@color/colorBlack"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/toolbar">
 
@@ -116,7 +113,7 @@
                 android:layout_marginStart="32dp"
                 android:textSize="21sp"
                 android:textStyle="bold"
-                android:textColor="@android:color/primary_text_light"
+                android:textColor="@color/OnBackground"
                 app:layout_constraintTop_toBottomOf="@id/hero_container"
                 app:layout_constraintStart_toStartOf="parent"
                 tools:text="FIRSTNAME LAST"/>
@@ -313,18 +310,15 @@
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-
-
     </ScrollView>
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:orientation="vertical"
         android:layout_weight="0"
-        android:background="@android:color/white">
+        android:background="@color/Background">
 
         <View
             android:id="@+id/donate_divider"
@@ -336,9 +330,9 @@
             android:id="@+id/donate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorBlack"
+            android:background="@color/Primary"
             android:text="@string/donate"
-            android:textColor="@android:color/white"
+            android:textColor="@color/OnPrimary"
             android:layout_margin="16dp"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_donation_details.xml b/app/src/main/res/layout/activity_donation_details.xml
index 6190fc9..e87882f 100644
--- a/app/src/main/res/layout/activity_donation_details.xml
+++ b/app/src/main/res/layout/activity_donation_details.xml
@@ -10,7 +10,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorBlack"
+        android:background="@color/Primary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -35,7 +35,7 @@
                 android:fontFamily="@font/raleway"
                 android:text="@string/donations"
                 android:textAllCaps="true"
-                android:textColor="@android:color/white"
+                android:textColor="@color/OnPrimary"
                 android:textSize="19dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -114,6 +114,7 @@
                 android:layout_marginTop="30dp"
                 android:layout_marginEnd="16dp"
                 android:orientation="vertical"
+                android:background="@color/Background"
                 app:layout_constraintEnd_toEndOf="@+id/frameLayout"
                 app:layout_constraintStart_toStartOf="@+id/frameLayout"
                 app:layout_constraintTop_toBottomOf="@+id/frameLayout">
@@ -123,7 +124,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textAlignment="center"
-                    android:textColor="@color/colorBlack"
+                    android:textColor="@color/OnBackground"
                     android:textSize="21sp"
                     android:textStyle="bold" />
 
@@ -133,7 +134,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="28dp"
                     android:text="@string/content"
-                    android:textColor="@color/colorBlack"
+                    android:textColor="@color/OnBackground"
                     android:textSize="18sp"
                     android:textStyle="bold" />
 
@@ -142,7 +143,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:textColor="@color/colorBlack" />
+                    android:textColor="@color/OnBackground" />
 
                 <TextView
                     android:id="@+id/tv_social_hashtags"
@@ -151,7 +152,7 @@
                     android:layout_marginTop="16dp"
                     android:text="@string/person.hashtags"
                     android:textAllCaps="true"
-                    android:textColor="@color/colorBlack"
+                    android:textColor="@color/OnBackground"
                     android:textSize="18sp"
                     android:textStyle="bold" />
 
@@ -170,7 +171,7 @@
                 android:layout_height="2dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
-                android:background="@color/colorSecondaryGrey" />
+                android:background="@color/colorGrey" />
 
 
             <Button
@@ -184,7 +185,7 @@
                 android:background="@drawable/selected_button_background"
                 android:text="@string/donate"
                 android:textAllCaps="true"
-                android:textColor="@android:color/white"
+                android:textColor="@color/OnPrimary"
                 android:textSize="18sp"
                 app:layout_constraintEnd_toEndOf="@+id/textView"
                 app:layout_constraintStart_toStartOf="@+id/textView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 22bdb0e..41ac5d3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,14 +12,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="0dp"
         android:layout_marginEnd="0dp"
-        app:itemTextAppearanceActive="@color/colorBlack"
-        app:itemTextAppearanceInactive="@color/colorSecondaryGrey"
-        app:labelVisibilityMode="labeled"
-        android:background="@android:color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        style="@style/UpperButtons"
+        style="@style/BottomNavigationView"
         app:menu="@menu/bottom_nav_menu" />
 
     <FrameLayout
diff --git a/app/src/main/res/layout/activity_petition_details.xml b/app/src/main/res/layout/activity_petition_details.xml
index 72845b7..54b6c22 100644
--- a/app/src/main/res/layout/activity_petition_details.xml
+++ b/app/src/main/res/layout/activity_petition_details.xml
@@ -20,7 +20,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorBlack"
+            android:background="@color/Primary"
             android:minHeight="?attr/actionBarSize"
             android:theme="?attr/actionBarTheme"
             app:contentInsetStart="20dp"
@@ -35,7 +35,7 @@
                 android:textAllCaps="true"
                 android:textSize="18sp"
                 android:fontFamily="@font/raleway"
-                android:textColor="@android:color/white"
+                android:textColor="@color/OnPrimary"
                 android:layout_gravity="center"
                 android:textStyle="bold"
                 />
@@ -92,7 +92,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/white"
+            android:background="@color/Background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -106,7 +106,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:gravity="center"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnSurface"
                 android:textSize="24sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -130,21 +130,22 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:background="@color/colorBlack"
                 android:text="@string/sign_this_petition"
-                android:textColor="@android:color/white"
+                android:background="@color/Primary"
+                android:textColor="@color/OnPrimary"
                 android:textSize="18sp"
                 app:layout_constraintEnd_toEndOf="@+id/txtName"
                 app:layout_constraintStart_toStartOf="@+id/txtName"
                 app:layout_constraintTop_toBottomOf="@+id/txtName" />
 
-            <TextView
+            <Button
                 android:id="@+id/btnShareThisPetition"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:text="@string/share_this_petition"
-                android:textColor="@color/colorBlack"
+                android:background="@color/Primary"
+                android:textColor="@color/OnPrimary"
                 android:textSize="18sp"
                 app:layout_constraintEnd_toEndOf="@+id/btnSignThisPetition"
                 app:layout_constraintStart_toStartOf="parent"
@@ -156,7 +157,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:text="@string/content"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnSurface"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="@+id/btnSignThisPetition"
@@ -169,7 +170,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnSurface"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/donation_item.xml b/app/src/main/res/layout/donation_item.xml
index a90fb72..9d2f231 100644
--- a/app/src/main/res/layout/donation_item.xml
+++ b/app/src/main/res/layout/donation_item.xml
@@ -6,9 +6,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    app:cardBackgroundColor="@android:color/white"
+    app:cardBackgroundColor="@color/Surface"
     app:cardCornerRadius="0dp"
-    app:cardElevation="0dp">
+    app:cardElevation="1dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -34,7 +34,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:text="NCCP Donation for Victims"
-            android:textColor="@color/colorBlack"
+            android:textColor="@color/OnSurface"
             android:textSize="17sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="@+id/donation_image"
@@ -50,7 +50,7 @@
             android:layout_marginEnd="16dp"
             android:maxLines="3"
             android:text="Following the tragic news surrounding the murder of George Floyd by Minneapolis police officers..."
-            android:textColor="@color/colorBlack"
+            android:textColor="@color/OnSurface"
             app:layout_constraintEnd_toEndOf="@+id/donation_title"
             app:layout_constraintStart_toStartOf="@+id/donation_title"
             app:layout_constraintTop_toBottomOf="@+id/donation_title" />
@@ -63,12 +63,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:background="@drawable/donation_btn"
             android:text="Find Out More"
-            android:textAllCaps="true"
-            android:textColor="@color/colorBlack"
-            android:textSize="17sp"
-            android:textStyle="bold"
+            style="@style/Button"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/donation_desc"
             app:layout_constraintStart_toStartOf="@+id/donation_desc"
diff --git a/app/src/main/res/layout/filter_item.xml b/app/src/main/res/layout/filter_item.xml
index 2e51d36..0772d7a 100644
--- a/app/src/main/res/layout/filter_item.xml
+++ b/app/src/main/res/layout/filter_item.xml
@@ -16,7 +16,7 @@
         android:background="@drawable/selected_button_background"
         android:padding="8dp"
         android:singleLine="true"
-        android:textColor="@android:color/white"
+        android:textColor="@color/OnPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 732f1ce..5d74eef 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -8,7 +8,6 @@
     android:orientation="vertical"
     tools:context=".fragments.AboutFragment">
 
-
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_home"
         android:layout_width="match_parent"
@@ -18,7 +17,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorBlack"
+            android:background="@color/Primary"
             android:minHeight="?attr/actionBarSize"
             android:theme="?attr/actionBarTheme"
             app:layout_scrollFlags="scroll|enterAlways"
@@ -33,7 +32,7 @@
                 android:layout_gravity="center"
                 android:fontFamily="@font/raleway"
                 android:text="@string/more"
-                android:textColor="@android:color/white"
+                android:textColor="@color/OnPrimary"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -48,8 +47,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
-
+            android:orientation="vertical"
+            android:background="@color/Background">
 
             <ImageView
                 android:id="@+id/imageView2"
@@ -73,7 +72,7 @@
                 android:layout_marginEnd="16dp"
                 android:text="@string/about_this_project.title"
                 android:textAllCaps="true"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -85,7 +84,7 @@
                 android:layout_marginTop="@dimen/margin_16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/about_this_project_details"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="16sp" />
 
             <TextView
@@ -96,7 +95,7 @@
                 android:layout_marginTop="@dimen/margin_16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/request_edit_or_removal.title"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -108,7 +107,7 @@
                 android:layout_marginTop="@dimen/margin_16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/request_edit_or_removal.details"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="16sp" />
 
             <TextView
@@ -119,7 +118,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/more_history.aboutTitle"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="@+id/imageView2"
@@ -134,7 +133,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/more_history.aboutDesc"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="@+id/textView"
                 app:layout_constraintStart_toStartOf="@+id/textView"
@@ -148,7 +147,7 @@
                 android:layout_marginTop="@dimen/margin_16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/did_we_miss_someone"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="@+id/textView3"
@@ -162,9 +161,9 @@
                 android:layout_marginStart="@dimen/margin_16dp"
                 android:layout_marginTop="22dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
-                android:background="@color/colorBlack"
+                android:background="@color/Primary"
+                android:textColor="@color/OnPrimary"
                 android:text="@string/request_to_add_new_name"
-                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="@+id/textView7"
                 app:layout_constraintStart_toStartOf="@+id/textView7"
@@ -178,7 +177,7 @@
                 android:layout_marginTop="@dimen/margin_16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/get_involved.slack.title"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="@+id/textView3"
@@ -192,9 +191,9 @@
                 android:layout_marginStart="@dimen/margin_16dp"
                 android:layout_marginTop="22dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
-                android:background="@color/colorBlack"
+                android:background="@color/Primary"
+                android:textColor="@color/OnPrimary"
                 android:text="@string/get_involved.slack.button"
-                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="@+id/textView7"
                 app:layout_constraintStart_toStartOf="@+id/textView7"
@@ -208,7 +207,7 @@
                 android:layout_marginTop="24dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/get_involved.developer.title"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="@+id/btnSlackChannel"
@@ -222,9 +221,9 @@
                 android:layout_marginStart="@dimen/margin_16dp"
                 android:layout_marginTop="22dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
-                android:background="@color/colorBlack"
+                android:backgroundTint="@color/Primary"
+                android:textColor="@color/OnPrimary"
                 android:text="@string/get_involved.developer.button"
-                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="@+id/textView11"
                 app:layout_constraintStart_toStartOf="@+id/textView11"
@@ -238,7 +237,7 @@
                 android:layout_marginTop="24dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:text="@string/get_involved.twitter.title"
-                android:textColor="@color/colorBlack"
+                android:textColor="@color/OnBackground"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="@+id/btnViewRepo"
@@ -253,9 +252,9 @@
                 android:layout_marginTop="22dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
                 android:layout_marginBottom="70dp"
-                android:background="@color/colorBlack"
+                android:background="@color/Primary"
+                android:textColor="@color/OnPrimary"
                 android:text="@string/get_involved.twitter.button"
-                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="@+id/textView15"
diff --git a/app/src/main/res/layout/fragment_donation.xml b/app/src/main/res/layout/fragment_donation.xml
index c89feba..bc23184 100644
--- a/app/src/main/res/layout/fragment_donation.xml
+++ b/app/src/main/res/layout/fragment_donation.xml
@@ -4,11 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
     android:orientation="vertical"
     tools:context=".fragments.DonationFragment">
 
-
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
@@ -18,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
+            android:background="@color/Primary"
             app:layout_scrollFlags="scroll|enterAlways">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -31,7 +29,7 @@
                     android:fontFamily="@font/raleway"
                     android:text="@string/donations"
                     android:textAllCaps="true"
-                    android:textColor="@android:color/white"
+                    android:textColor="@color/OnPrimary"
                     android:textSize="19dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -41,24 +39,6 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.appcompat.widget.Toolbar>
 
-        <!--<LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/white"
-            android:orientation="vertical">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_behavior = "com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-        </LinearLayout>-->
-
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
@@ -92,6 +72,7 @@
                 android:numColumns="2"
                 android:overScrollMode="never"
                 android:padding="8dp"
+                android:background="@color/Background"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 2fda1ec..62d6d71 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,7 +7,6 @@
     android:background="@android:color/white"
     tools:context=".fragments.HomeFragment">
 
-
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_home"
         android:layout_width="match_parent"
@@ -17,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
+            android:background="@color/Primary"
             app:layout_scrollFlags="scroll|enterAlways">
 
             <RelativeLayout
@@ -45,19 +44,8 @@
                     android:fontFamily="@font/raleway"
                     android:text="@string/app_name"
                     android:textAllCaps="true"
-                    android:textColor="@android:color/white"
+                    android:textColor="@color/OnPrimary"
                     android:textSize="18sp" />
-
-                <ImageButton
-                    android:id="@+id/searchButton"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="16dp"
-                    android:background="@android:color/transparent"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/ic_search" />
-
             </RelativeLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
@@ -79,6 +67,7 @@
         android:columnWidth="150dp"
         android:numColumns="2"
         android:overScrollMode="never"
+        android:background="@color/Background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_petitions.xml b/app/src/main/res/layout/fragment_petitions.xml
index 20fea84..2a8735d 100644
--- a/app/src/main/res/layout/fragment_petitions.xml
+++ b/app/src/main/res/layout/fragment_petitions.xml
@@ -16,7 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorBlack"
+            android:background="@color/Primary"
             android:minHeight="?attr/actionBarSize"
             android:theme="?attr/actionBarTheme"
             app:contentInsetStart="20dp"
@@ -32,7 +32,7 @@
                 android:fontFamily="@font/raleway"
                 android:text="@string/petitions"
                 android:textAllCaps="true"
-                android:textColor="@android:color/white"
+                android:textColor="@color/OnPrimary"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -70,17 +70,6 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <View
-                android:id="@+id/view6"
-                android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:layout_marginStart="50dp"
-                android:layout_marginEnd="50dp"
-                android:background="@color/colorSecondaryGrey"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/toolbar" />
-
             <ProgressBar
                 android:id="@+id/progressBar"
                 android:layout_width="wrap_content"
@@ -96,10 +85,11 @@
                 android:layout_height="match_parent"
                 android:clipToPadding="false"
                 android:paddingBottom="68dp"
+                android:background="@color/Background"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/view6" />
+                app:layout_constraintTop_toBottomOf="@+id/toolbar" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/hashtag_item.xml b/app/src/main/res/layout/hashtag_item.xml
index 68b6262..2e2ce79 100644
--- a/app/src/main/res/layout/hashtag_item.xml
+++ b/app/src/main/res/layout/hashtag_item.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/social_media_button"
     android:layout_marginTop="16dp"
     android:layout_marginEnd="8dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -12,14 +11,9 @@
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
-        android:layout_height="28dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:textColor="@color/colorBlack"
-        android:textAllCaps="true"
-        android:textStyle="bold"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        android:layout_height="48dp"
         android:maxLines="1"
+        style="@style/Button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/header_card_item.xml b/app/src/main/res/layout/header_card_item.xml
index 482ac70..aac7d93 100644
--- a/app/src/main/res/layout/header_card_item.xml
+++ b/app/src/main/res/layout/header_card_item.xml
@@ -9,7 +9,7 @@
         android:id="@+id/fl_header_item"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorBlack">
+        android:background="@android:color/black">
 
         <LinearLayout
             android:id="@+id/ll_header_item"
diff --git a/app/src/main/res/layout/item_chip_location.xml b/app/src/main/res/layout/item_chip_location.xml
index d497ab4..2d93400 100644
--- a/app/src/main/res/layout/item_chip_location.xml
+++ b/app/src/main/res/layout/item_chip_location.xml
@@ -8,5 +8,5 @@
     android:paddingRight="8dp"
     style="@style/Widget.MaterialComponents.Chip.Choice"
     android:textAppearance="?android:attr/textAppearance"
-    android:textColor="@color/colorPrimary"
-    app:chipBackgroundColor="@color/colorAccent" />
\ No newline at end of file
+    android:textColor="@color/Primary"
+    app:chipBackgroundColor="@color/Secondary" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_item.xml b/app/src/main/res/layout/person_item.xml
index 92cf74d..127166a 100644
--- a/app/src/main/res/layout/person_item.xml
+++ b/app/src/main/res/layout/person_item.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardElevation="0dp"
+    app:cardElevation="1dp"
     app:cardCornerRadius="0dp"
     android:id="@+id/cardView"
     android:layout_margin="@dimen/default_margin"
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@color/Surface">
 
         <ImageView
             android:id="@+id/personImage"
@@ -31,13 +32,12 @@
             android:layout_marginTop="@dimen/default_margin"
             android:layout_marginEnd="@dimen/default_margin"
             android:text="@string/person_name"
-            android:textColor="@color/colorBlack"
+            android:textColor="@color/OnSurface"
             android:textSize="@dimen/default_font"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@+id/personImage"
             app:layout_constraintTop_toBottomOf="@+id/personImage" />
 
-
         <TextView
             android:id="@+id/dateOfIncident"
             android:layout_width="wrap_content"
@@ -45,6 +45,7 @@
             android:layout_marginBottom="@dimen/default_margin"
             android:text="@string/date_of_incident"
             android:textSize="@dimen/default_font"
+            android:textColor="@color/OnSurface"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/txtPersonName"
             app:layout_constraintTop_toBottomOf="@+id/txtPersonName" />
diff --git a/app/src/main/res/layout/petition_item.xml b/app/src/main/res/layout/petition_item.xml
index f530071..b61aada 100644
--- a/app/src/main/res/layout/petition_item.xml
+++ b/app/src/main/res/layout/petition_item.xml
@@ -7,9 +7,9 @@
     android:layout_height="wrap_content"
     android:layout_margin="16dp"
     android:orientation="vertical"
-    app:cardBackgroundColor="@android:color/white"
+    app:cardBackgroundColor="@color/Surface"
     app:cardCornerRadius="0dp"
-    app:cardElevation="0dp">
+    app:cardElevation="1dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:textColor="@color/colorBlack"
+            android:textColor="@color/OnSurface"
             android:textSize="18sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
-            android:textColor="@color/colorBlack"
+            android:textColor="@color/OnSurface"
             android:maxLines="3"
             android:ellipsize="middle"
             app:layout_constraintEnd_toEndOf="parent"
@@ -57,11 +57,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:background="@drawable/find_out_btn_border"
+            style="@style/Button"
             android:text="@string/find_out_more"
-            android:textColor="@color/colorBlack"
-            android:textSize="17sp"
-            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/txtDescription"
             app:layout_constraintStart_toStartOf="@+id/txtDescription"
diff --git a/app/src/main/res/menu/fragment_home_menu.xml b/app/src/main/res/menu/fragment_home_menu.xml
new file mode 100644
index 0000000..0b3862f
--- /dev/null
+++ b/app/src/main/res/menu/fragment_home_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/theme"
+        app:showAsAction="ifRoom"
+        android:title="Theme" />
+</menu>
\ No newline at end of file
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..074cf83
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="Primary">#212121</color>
+    <color name="PrimaryDark">#121212</color>
+    <color name="Secondary">@color/colorGrey</color>
+
+    <color name="Background">#121212</color>
+    <color name="Surface">#212121</color>
+
+    <color name="OnBackground">#FFFFFF</color>
+    <color name="OnSurface">#FFFFFF</color>
+    <color name="OnPrimary">#FFFFFF</color>
+    <color name="OnSecondary">#FFFFFF</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 07242f3..3862067 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#000000</color>
-    <color name="colorPrimaryDark">#000000</color>
-    <color name="colorAccent">#000000</color>
+    <color name="Primary">#000000</color>
+    <color name="PrimaryDark">#000000</color>
+    <color name="Secondary">@color/colorGrey</color>
 
     <color name="colorGrey">#9c9c9c</color>
     <color name="colorSecondaryGrey">#f2f2f2</color>
     <color name="colorBlack">#000000</color>
+
+    <color name="Background">#FFFFFF</color>
+    <color name="Surface">#FFFFFF</color>
+    <color name="OnBackground">#000000</color>
+    <color name="OnSurface">#000000</color>
+    <color name="OnPrimary">#FFFFFF</color>
+    <color name="OnSecondary">#000000</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2316821..307c205 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,9 +2,9 @@
 <resources>
     <string name="app_name">Say Their Names</string>
     <string name="say_their_names">Say their names</string>
-    <string name="home">Home</string>
-    <string name="donations">Donations</string>
-    <string name="petitions">Petitions</string>
+    <string name="home">HOME</string>
+    <string name="donations">DONATIONS</string>
+    <string name="petitions">PETITIONS</string>
     <string name="context">The death of George Floyd occurred on May 25, 2020, when Derek Chauvin, a white Minneapolis police officer, kneeled on his neck for at least seven minutes</string>
     <string name="settings">SETTINGS</string>
     <string name="full_name_title">FULL NAME</string>
@@ -20,9 +20,6 @@
     <string name="donate">Donate</string>
 
 
-
-
-
     <!-- person from ios -->
     <string name="person.say_their_names">Say their names</string>
     <string name="person.age">Age</string>
@@ -33,17 +30,11 @@
     <string name="person.news">News</string>
     <string name="person.media">Media</string>
     <string name="person.hashtags">Social Media Hashtags</string>
-<!--    <string name="person.hashtagCopyTip">Press and hold to copy</string>-->
-<!--    <string name="person.copied">Copied</string>-->
+    <!--    <string name="person.hashtagCopyTip">Press and hold to copy</string>-->
+    <!--    <string name="person.copied">Copied</string>-->
 
-    <string-array name="filters">
-        <item>Age</item>
-        <item>Location</item>
-        <item>State</item>
-
-    </string-array>
-    <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <!-- TODO: Remove or change this placeholder text -->
     <string name="filter">Filter</string>
     <string name="search">Search</string>
     <string name="george_floyd">GEORGE FLOYD</string>
@@ -52,18 +43,12 @@
     <string name="button">Button</string>
     <string name="date_of_incident">00.00.0000</string>
     <string name="person_name">Firstname Lastname</string>
-
     <string name="donation_image">donation image</string>
 
-    <string-array name="tag_donation">
-        <item>All</item>
-        <item>Victims</item>
-        <item>Protesters</item>
-        <item>Others</item>
-    </string-array>
-
     <string name="blacklivesmatter">#BLACKLIVESMATTER</string>
+
     <string name="how_to_get_involved">How to get involved</string>
+
     <string name="donate_now">DONATE NOW</string>
     <string name="name">Name</string>
     <string name="age">Age</string>
@@ -75,32 +60,55 @@
     <string name="share_this_petition">SHARE THIS PETITION</string>
     <string name="content">CONTENT</string>
     <string name="about">ABOUT</string>
-    <!-- Get Involved - Slack -->
-
     <string name="get_involved.slack.title">HOW DO I GET INVOLVED?</string>
     <string name="get_involved.slack.button">JOIN OUR SLACK CHANNEL</string>
+    <!-- Get Involved - Slack -->
 
-    <!-- Get Involved - Developer -->
     <string name="get_involved.developer.title">HOW DO I GET INVOLVED AS A DEVELOPER?</string>
     <string name="get_involved.developer.button">VIEW OUR GITHUB</string>
 
-    <!-- Get Involved - Twitter -->
+    <!-- Get Involved - Developer -->
     <string name="get_involved.twitter.title">JOIN US ON TWITTER</string>
     <string name="get_involved.twitter.button">FOLLOW US</string>
-    <string name="more_history.aboutDesc">Say Their Names is a social movement to raise awareness for all the black victims of racial inequality all around the world. This movement is in support of the overall Black Lives Matter movement and aims to highlight individuals affected by anti-Black Violence. Say Their Names movement calls attention and demands justice for all victims.</string>
 
+    <!-- Get Involved - Twitter -->
+    <string name="more_history.aboutDesc">Say Their Names is a social movement to raise awareness for all the black victims of racial inequality all around the world. This movement is in support of the overall Black Lives Matter movement and aims to highlight individuals affected by anti-Black Violence. Say Their Names movement calls attention and demands justice for all victims.</string>
     <string name="more">MORE</string>
-    <!-- More -->
     <string name="hashtags">Social Media Hashtags</string>
+
     <string name="media">Media</string>
+    <!-- More -->
     <string name="news">News</string>
-
     <string name="about_this_project.title">About this project</string>
     <string name="about_this_project_details">Welcome to the Say Their Names Project. Our aim is to build an open-source platform to raise awareness of the injustice and often forgotten names of racial inequality. We strive to identify and amplify verified organizations to ensure donations are reaching those who can make the most impact with it.</string>
+
     <string name="request_edit_or_removal.title">REQUEST AN EDIT OR REMOVAL</string>
     <string name="request_edit_or_removal.details">If you would like to propose an edit to a victim page or if you are a representative of the victim and would like the victim to be removed from this directory please send us a message on Twitter.</string>
     <string name="more_history.aboutTitle">SOME HISTORY ON THE SAY THEIR NAMES MOVEMENT</string>
-
     <string name="did_we_miss_someone">DID WE MISS SOMEONE?</string>
     <string name="request_to_add_new_name">REQUEST TO ADD A NAME</string>
+
+    <string name="title_activity_settings">SettingsActivity</string>
+    <string name="first_fragment_label">First Fragment</string>
+    <string name="second_fragment_label">Second Fragment</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+    <string name="hello_first_fragment">Hello first fragment</string>
+    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+
+    <string-array name="filters">
+        <item>Age</item>
+        <item>Location</item>
+        <item>State</item>
+
+    </string-array>
+    <string-array name="tag_donation">
+        <item>All</item>
+        <item>Victims</item>
+        <item>Protesters</item>
+        <item>Others</item>
+    </string-array>
+
+    <string name="preference_key_theme">preference_key_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 6734864..f207633 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,50 +2,55 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/Primary</item>
+        <item name="colorPrimaryDark">@color/PrimaryDark</item>
+        <item name="colorAccent">@color/Secondary</item>
+        <item name="android:navigationBarColor">@color/PrimaryDark</item>
     </style>
 
-    <style name="AppTheme2" parent="Theme.AppCompat.Light.NoActionBar">
-
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+    <style name="AppTheme2" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/Primary</item>
+        <item name="colorPrimaryDark">@color/PrimaryDark</item>
+        <item name="colorAccent">@color/Secondary</item>
     </style>
 
-    <style name="Person"/>
-    <style name="Person.Information"/>
+    <style name="Person" />
+
+    <style name="Person.Information" />
+
     <style name="Person.Information.Label">
         <item name="android:textSize">12sp</item>
         <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/OnBackground</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">16dp</item>
         <item name="android:layout_marginStart">32dp</item>
     </style>
+
     <style name="Person.Information.Value">
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/colorBlack</item>
+        <item name="android:textColor">@color/OnBackground</item>
     </style>
+
     <style name="Person.Section">
         <item name="android:textSize">14sp</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/colorBlack</item>
+        <item name="android:textColor">@color/OnBackground</item>
     </style>
+
     <style name="Person.Section.Text">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_marginEnd">16dp</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layout_constraintHorizontal_bias">0</item>
     </style>
+
     <style name="Person.Section.List">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
@@ -53,9 +58,11 @@
         <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layoutManager">androidx.recyclerview.widget.LinearLayoutManager</item>
     </style>
+
     <style name="Person.Section.Label">
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/OnBackground</item>
         <item name="android:layout_marginTop">32dp</item>
         <item name="android:layout_marginStart">32dp</item>
     </style>
@@ -66,6 +73,28 @@
 
     </style>
 
+    <style name="BottomNavigationView" parent="Widget.Design.BottomNavigationView">
+        <item name="android:background">@color/Surface</item>
+        <item name="labelVisibilityMode">labeled</item>
+
+        <item name="itemIconTint">@color/bottom_nav_color</item>
+        <item name="itemTextColor">@color/bottom_nav_color</item>
+    </style>
+
+    <style name="Button" parent="ThemeOverlay.AppCompat">
+        <item name="android:backgroundTint">@color/Surface</item>
+        <item name="android:textColor">@color/OnSurface</item>
+
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:elevation">2dp</item>
+
+
+        <item name="strokeColor">@color/OnSurface</item>
+        <item name="strokeWidth">2dp</item>
+    </style>
+
     <!-- Added to transform menu items to uppercase -->
     <style name="UpperButtons" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/UpperButtons.ActionBarStyle</item>
@@ -78,4 +107,13 @@
     <style name="UpperButtons.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
         <item name="textAllCaps">true</item>
     </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file