diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ccc8ec65943..4936c59f22a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -56,6 +56,7 @@ gradlew.bat @BenHenning
 # All resource files.
 /app/src/main/res/**/*.xml @rt4914
 /utility/src/main/res/**/*.xml @rt4914
+/app/src/main/res/values/colors_migrating.xml @ayush0402 @rt4914
 
 # App UI strings.
 /app/src/main/res/values*/strings.xml @BenHenning
diff --git a/app/src/main/res/drawable/color_cursor.xml b/app/src/main/res/drawable/color_cursor.xml
index 60d09b2a7a8..ad7f6dcbb4e 100644
--- a/app/src/main/res/drawable/color_cursor.xml
+++ b/app/src/main/res/drawable/color_cursor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
   <size android:width="0.5dp" />
-  <solid android:color="@color/oppia_primary_text" />
+  <solid android:color="@color/shared_edit_text_cursor_color" />
 </shape>
diff --git a/app/src/main/res/layout-land/admin_auth_activity.xml b/app/src/main/res/layout-land/admin_auth_activity.xml
index cfcbdae6ef1..e4f1bb04ba8 100644
--- a/app/src/main/res/layout-land/admin_auth_activity.xml
+++ b/app/src/main/res/layout-land/admin_auth_activity.xml
@@ -13,7 +13,7 @@
     android:id="@+id/admin_auth_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/add_profile_background">
+    android:background="@color/admin_auth_layout_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/admin_auth_app_bar_layout"
@@ -28,7 +28,7 @@
         android:id="@+id/admin_auth_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
+        android:background="@color/admin_auth_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         app:navigationContentDescription="@string/admin_auth_close"
@@ -80,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@string/admin_auth_sub"
-            android:textColor="@color/oppia_admin_auth_secondary_text"
+            android:textColor="@color/admin_auth_secondary_text_color"
             app:layout_constraintEnd_toEndOf="@+id/admin_auth_heading_textview"
             app:layout_constraintStart_toStartOf="@+id/admin_auth_heading_textview"
             app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
diff --git a/app/src/main/res/layout-land/admin_pin_activity.xml b/app/src/main/res/layout-land/admin_pin_activity.xml
index 0a76ce581c3..2660b0cd553 100644
--- a/app/src/main/res/layout-land/admin_pin_activity.xml
+++ b/app/src/main/res/layout-land/admin_pin_activity.xml
@@ -19,7 +19,7 @@
       android:id="@+id/admin_auth_container"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/oppia_background_yellow_ivory"
+      android:background="@color/admin_pin_activity_layout_background_color"
       android:paddingBottom="108dp">
 
       <View
diff --git a/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml b/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml
index 40413215ebc..c152e732de1 100644
--- a/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml
+++ b/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_account_actions_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/log_out_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/log_out_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onLogOutClicked()}"
       android:paddingStart="36dp"
       android:paddingTop="20dp"
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_log_out"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/administrator_controls_app_information_view.xml b/app/src/main/res/layout-land/administrator_controls_app_information_view.xml
index 2596f22270f..fcdd75e2b14 100644
--- a/app/src/main/res/layout-land/administrator_controls_app_information_view.xml
+++ b/app/src/main/res/layout-land/administrator_controls_app_information_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_information_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/app_version_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/app_version_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onAppVersionClicked()}"
       android:paddingStart="36dp"
       android:paddingTop="20dp"
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_version"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/administrator_controls_download_permissions_view.xml b/app/src/main/res/layout-land/administrator_controls_download_permissions_view.xml
index 8f38b8c255b..72740b141cb 100644
--- a/app/src/main/res/layout-land/administrator_controls_download_permissions_view.xml
+++ b/app/src/main/res/layout-land/administrator_controls_download_permissions_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_download_permissions_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/topic_update_on_wifi_constraint_layout"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,7 +33,7 @@
       android:id="@+id/topic_update_on_wifi_constraint_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:clickable="true"
       android:focusable="true"
       android:importantForAccessibility="yes"
@@ -50,10 +50,10 @@
       <TextView
         android:id="@+id/topic_update_on_wifi_title_text_view"
         style="@style/Body"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:paddingBottom="4dp"
         android:text="@string/administrator_controls_update_on_wifi_title"
-        android:textColor="@color/oppia_primary_text_dark"
+        android:textColor="@color/admin_controls_menu_options_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -61,9 +61,9 @@
         android:id="@+id/topic_update_on_wifi_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:text="@string/administrator_controls_update_on_wifi_message"
-        android:textColor="@color/accessible_light_grey"
+        android:textColor="@color/admin_controls_switch_description_color"
         app:layout_constraintEnd_toStartOf="@id/topic_update_on_wifi_switch"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/topic_update_on_wifi_title_text_view" />
@@ -99,7 +99,7 @@
       android:id="@+id/auto_update_topic_constraint_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:clickable="true"
       android:focusable="true"
       android:importantForAccessibility="yes"
@@ -116,10 +116,10 @@
       <TextView
         android:id="@+id/auto_update_topic_title_text_view"
         style="@style/Body"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:paddingBottom="4dp"
         android:text="@string/administrator_controls_auto_update_title"
-        android:textColor="@color/oppia_primary_text_dark"
+        android:textColor="@color/admin_controls_menu_options_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -127,9 +127,9 @@
         android:id="@+id/auto_update_topic_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:text="@string/administrator_controls_auto_update_message"
-        android:textColor="@color/accessible_light_grey"
+        android:textColor="@color/admin_controls_switch_description_color"
         app:layout_constraintEnd_toStartOf="@id/auto_update_topic_switch"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/administrator_controls_fragment.xml b/app/src/main/res/layout-land/administrator_controls_fragment.xml
index 329700a7360..30064fce6d8 100644
--- a/app/src/main/res/layout-land/administrator_controls_fragment.xml
+++ b/app/src/main/res/layout-land/administrator_controls_fragment.xml
@@ -13,7 +13,7 @@
     android:id="@+id/administrator_controls_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mid_grey_30"
+    android:background="@color/admin_controls_background_color"
     android:clipToPadding="false"
     android:overScrollMode="never"
     android:paddingBottom="108dp"
diff --git a/app/src/main/res/layout-land/administrator_controls_general_view.xml b/app/src/main/res/layout-land/administrator_controls_general_view.xml
index 3da1ddcb7ed..642f09143f7 100644
--- a/app/src/main/res/layout-land/administrator_controls_general_view.xml
+++ b/app/src/main/res/layout-land/administrator_controls_general_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_general_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/edit_account_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,13 +33,13 @@
       android:id="@+id/edit_account_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:paddingStart="36dp"
       android:paddingTop="20dp"
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_account"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/administrator_controls_profile_view.xml b/app/src/main/res/layout-land/administrator_controls_profile_view.xml
index f1525a6728b..78dfbc3750f 100644
--- a/app/src/main/res/layout-land/administrator_controls_profile_view.xml
+++ b/app/src/main/res/layout-land/administrator_controls_profile_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_profile_management_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/edit_profiles_text_view"
       style="@style/Body"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onEditProfilesClicked()}"
       android:paddingStart="36dp"
       android:paddingTop="20dp"
       android:paddingEnd="36dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_profiles"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
index 9cc7aed23ce..89d7d9398bf 100644
--- a/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
+++ b/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
@@ -13,7 +13,7 @@
     android:id="@+id/admin_auth_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/add_profile_background">
+    android:background="@color/admin_auth_layout_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/admin_auth_app_bar_layout"
@@ -28,7 +28,7 @@
         android:id="@+id/admin_auth_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
+        android:background="@color/admin_auth_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         app:navigationContentDescription="@string/admin_auth_close"
@@ -80,7 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@string/admin_auth_sub"
-            android:textColor="@color/oppia_admin_auth_secondary_text"
+            android:textColor="@color/admin_auth_secondary_text_color"
             app:layout_constraintEnd_toEndOf="@+id/admin_auth_heading_textview"
             app:layout_constraintStart_toStartOf="@+id/admin_auth_heading_textview"
             app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
diff --git a/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml b/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml
index 5457a1dc276..9a3dcd541d7 100644
--- a/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml
+++ b/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml
@@ -12,7 +12,7 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/oppia_background_yellow_ivory"
+    android:background="@color/admin_pin_activity_layout_background_color"
     android:orientation="vertical">
 
     <View
diff --git a/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
index e162b201426..d21f3c43d9b 100644
--- a/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
+++ b/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
@@ -13,7 +13,7 @@
     android:id="@+id/admin_auth_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/add_profile_background">
+    android:background="@color/admin_auth_layout_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/admin_auth_app_bar_layout"
@@ -28,7 +28,7 @@
         android:id="@+id/admin_auth_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
+        android:background="@color/admin_auth_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         app:navigationContentDescription="@string/admin_auth_close"
@@ -71,7 +71,7 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="12dp"
           android:text="@string/admin_auth_sub"
-          android:textColor="@color/oppia_admin_auth_secondary_text"
+          android:textColor="@color/admin_auth_secondary_text_color"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
diff --git a/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml b/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml
index f27211cc0b8..4ff4bb2a8f6 100644
--- a/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml
+++ b/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml
@@ -12,7 +12,7 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/oppia_background_yellow_ivory"
+    android:background="@color/admin_pin_activity_layout_background_color"
     android:orientation="vertical">
 
     <View
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml
index ef85f3f6733..0c753a80971 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_account_actions_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/log_out_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/log_out_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onLogOutClicked()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_log_out"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml
index e9e49532538..9eeefaa985c 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml
@@ -27,7 +27,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_information_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/app_version_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -37,14 +37,14 @@
       android:id="@+id/app_version_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex? @color/admin_highlighted : @color/white}"
+      android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex? @color/admin_controls_options_highlighted_background_color : @color/admin_controls_options_background_color}"
       android:onClick="@{(v) -> viewModel.onAppVersionClicked()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_version"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_download_permissions_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_download_permissions_view.xml
index f3f82e1f245..cb701d3a7bf 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_download_permissions_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_download_permissions_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_download_permissions_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/topic_update_on_wifi_constraint_layout"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,7 +33,7 @@
       android:id="@+id/topic_update_on_wifi_constraint_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:clickable="true"
       android:focusable="true"
       android:importantForAccessibility="yes"
@@ -50,10 +50,10 @@
       <TextView
         android:id="@+id/topic_update_on_wifi_title_text_view"
         style="@style/Body"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:paddingBottom="4dp"
         android:text="@string/administrator_controls_update_on_wifi_title"
-        android:textColor="@color/oppia_primary_text_dark"
+        android:textColor="@color/admin_controls_menu_options_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -61,9 +61,9 @@
         android:id="@+id/topic_update_on_wifi_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:text="@string/administrator_controls_update_on_wifi_message"
-        android:textColor="@color/accessible_light_grey"
+        android:textColor="@color/admin_controls_switch_description_color"
         app:layout_constraintEnd_toStartOf="@id/topic_update_on_wifi_switch"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/topic_update_on_wifi_title_text_view" />
@@ -100,7 +100,7 @@
       android:id="@+id/auto_update_topic_constraint_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:clickable="true"
       android:focusable="true"
       android:importantForAccessibility="yes"
@@ -117,10 +117,10 @@
       <TextView
         android:id="@+id/auto_update_topic_title_text_view"
         style="@style/Body"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:paddingBottom="4dp"
         android:text="@string/administrator_controls_auto_update_title"
-        android:textColor="@color/oppia_primary_text_dark"
+        android:textColor="@color/admin_controls_menu_options_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -128,9 +128,9 @@
         android:id="@+id/auto_update_topic_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:text="@string/administrator_controls_auto_update_message"
-        android:textColor="@color/accessible_light_grey"
+        android:textColor="@color/admin_controls_switch_description_color"
         app:layout_constraintEnd_toStartOf="@id/auto_update_topic_switch"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml b/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml
index 71c2f3b29ae..495ed63cfe6 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml
@@ -13,7 +13,7 @@
     android:id="@+id/administrator_controls_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/oppia_grey_background"
+    android:background="@color/admin_controls_background_color"
     android:clipToPadding="false"
     android:overScrollMode="never"
     android:paddingBottom="80dp"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml
index 17677e92ba9..7985c76d5dc 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_general_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/edit_account_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,13 +33,13 @@
       android:id="@+id/edit_account_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_account"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml
index ee2488acac2..6641f9d5c50 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml
@@ -27,7 +27,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_profile_management_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -37,14 +37,14 @@
       android:id="@+id/edit_profiles_text_view"
       style="@style/Body"
       android:layout_width="match_parent"
-      android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex? @color/admin_highlighted : @color/white}"
+      android:background="@{commonViewModel.selectedFragmentIndex == viewModel.itemIndex? @color/admin_controls_options_highlighted_background_color : @color/admin_controls_options_background_color}"
       android:onClick="@{(v) -> viewModel.onEditProfilesClicked()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_profiles"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml
index 422c3277e62..11d99ad705d 100644
--- a/app/src/main/res/layout/add_profile_activity.xml
+++ b/app/src/main/res/layout/add_profile_activity.xml
@@ -28,7 +28,7 @@
         android:id="@+id/add_profile_activity_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/add_profile_background">
+        android:background="@color/add_profile_activity_layout_background_color">
 
         <androidx.constraintlayout.widget.ConstraintLayout
           android:layout_width="wrap_content"
@@ -71,7 +71,7 @@
             android:layout_marginTop="32dp"
             android:contentDescription="@string/required_fields_content_description"
             android:text="@{viewModel.requiredTextWithStar}"
-            android:textColor="@color/oppia_primary_text"
+            android:textColor="@color/add_profile_activity_label_text_color"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -105,6 +105,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/add_profile_pin_checkbox_margin_top"
+            android:textColor="@color/add_profile_activity_label_text_color"
             android:minHeight="48dp"
             android:text="@string/add_profile_create_a_3_digit_pin"
             app:layout_constraintStart_toStartOf="parent"
@@ -193,7 +194,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:text="@string/add_profile_allow_download_heading"
-                android:textColor="@{viewModel.validPin ? @color/oppia_primary_text_dark : @color/accessible_grey}"
+                android:textColor="@{viewModel.validPin ? @color/add_profile_activity_switch_text_color : @color/add_profile_activity_switch_description_color}"
                 android:textSize="16sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -205,7 +206,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:text="@string/add_profile_allow_download_sub"
-                android:textColor="@color/accessible_light_grey"
+                android:textColor="@color/add_profile_activity_switch_description_color"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_allow_download_heading_text_view"
diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml
index 50a80af36aa..da3634ebc40 100644
--- a/app/src/main/res/layout/admin_auth_activity.xml
+++ b/app/src/main/res/layout/admin_auth_activity.xml
@@ -13,7 +13,7 @@
     android:id="@+id/admin_auth_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/add_profile_background">
+    android:background="@color/admin_auth_layout_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/admin_auth_app_bar_layout"
@@ -28,7 +28,7 @@
         android:id="@+id/admin_auth_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
+        android:background="@color/admin_auth_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         app:navigationContentDescription="@string/admin_auth_close"
@@ -73,7 +73,7 @@
           android:layout_marginTop="12dp"
           android:layout_marginEnd="28dp"
           android:text="@string/admin_auth_sub"
-          android:textColor="@color/oppia_admin_auth_secondary_text"
+          android:textColor="@color/admin_auth_secondary_text_color"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
diff --git a/app/src/main/res/layout/admin_pin_activity.xml b/app/src/main/res/layout/admin_pin_activity.xml
index deef6be54e9..aed5c0ddcb9 100644
--- a/app/src/main/res/layout/admin_pin_activity.xml
+++ b/app/src/main/res/layout/admin_pin_activity.xml
@@ -19,7 +19,7 @@
       android:id="@+id/admin_auth_container"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/oppia_background_yellow_ivory"
+      android:background="@color/admin_pin_activity_layout_background_color"
       android:paddingBottom="96dp">
 
       <View
diff --git a/app/src/main/res/layout/administrator_controls_account_actions_view.xml b/app/src/main/res/layout/administrator_controls_account_actions_view.xml
index beb9bb4d639..516643df1ed 100644
--- a/app/src/main/res/layout/administrator_controls_account_actions_view.xml
+++ b/app/src/main/res/layout/administrator_controls_account_actions_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_account_actions_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/log_out_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/log_out_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onLogOutClicked()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_log_out"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_app_information_view.xml b/app/src/main/res/layout/administrator_controls_app_information_view.xml
index 31128938928..71cad7915b4 100644
--- a/app/src/main/res/layout/administrator_controls_app_information_view.xml
+++ b/app/src/main/res/layout/administrator_controls_app_information_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_information_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/app_version_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/app_version_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onAppVersionClicked()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_version"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_download_permissions_view.xml b/app/src/main/res/layout/administrator_controls_download_permissions_view.xml
index 0d8186f4d1f..867481df2f1 100644
--- a/app/src/main/res/layout/administrator_controls_download_permissions_view.xml
+++ b/app/src/main/res/layout/administrator_controls_download_permissions_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_download_permissions_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/topic_update_on_wifi_constraint_layout"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,7 +33,7 @@
       android:id="@+id/topic_update_on_wifi_constraint_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:clickable="true"
       android:focusable="true"
       android:importantForAccessibility="yes"
@@ -50,10 +50,10 @@
       <TextView
         android:id="@+id/topic_update_on_wifi_title_text_view"
         style="@style/Body"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:paddingBottom="4dp"
         android:text="@string/administrator_controls_update_on_wifi_title"
-        android:textColor="@color/oppia_primary_text_dark"
+        android:textColor="@color/admin_controls_menu_options_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -61,9 +61,9 @@
         android:id="@+id/topic_update_on_wifi_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:text="@string/administrator_controls_update_on_wifi_message"
-        android:textColor="@color/accessible_light_grey"
+        android:textColor="@color/admin_controls_switch_description_color"
         app:layout_constraintEnd_toStartOf="@id/topic_update_on_wifi_switch"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/topic_update_on_wifi_title_text_view" />
@@ -100,7 +100,7 @@
       android:id="@+id/auto_update_topic_constraint_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:clickable="true"
       android:focusable="true"
       android:importantForAccessibility="yes"
@@ -117,10 +117,10 @@
       <TextView
         android:id="@+id/auto_update_topic_title_text_view"
         style="@style/Body"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:paddingBottom="4dp"
         android:text="@string/administrator_controls_auto_update_title"
-        android:textColor="@color/oppia_primary_text_dark"
+        android:textColor="@color/admin_controls_menu_options_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -128,9 +128,9 @@
         android:id="@+id/auto_update_topic_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:background="@color/white"
+        android:background="@color/admin_controls_options_background_color"
         android:text="@string/administrator_controls_auto_update_message"
-        android:textColor="@color/accessible_light_grey"
+        android:textColor="@color/admin_controls_switch_description_color"
         app:layout_constraintEnd_toStartOf="@id/auto_update_topic_switch"
         app:layout_constraintHorizontal_weight="1"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_fragment.xml b/app/src/main/res/layout/administrator_controls_fragment.xml
index c95db5fd16b..495ed63cfe6 100644
--- a/app/src/main/res/layout/administrator_controls_fragment.xml
+++ b/app/src/main/res/layout/administrator_controls_fragment.xml
@@ -13,7 +13,7 @@
     android:id="@+id/administrator_controls_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/mid_grey_30"
+    android:background="@color/admin_controls_background_color"
     android:clipToPadding="false"
     android:overScrollMode="never"
     android:paddingBottom="80dp"
diff --git a/app/src/main/res/layout/administrator_controls_general_view.xml b/app/src/main/res/layout/administrator_controls_general_view.xml
index 6469b072885..4ede13d45f4 100644
--- a/app/src/main/res/layout/administrator_controls_general_view.xml
+++ b/app/src/main/res/layout/administrator_controls_general_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_general_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/edit_account_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,13 +33,13 @@
       android:id="@+id/edit_account_text_view"
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_account"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_profile_view.xml b/app/src/main/res/layout/administrator_controls_profile_view.xml
index e62d287dbe1..3eac2354f81 100644
--- a/app/src/main/res/layout/administrator_controls_profile_view.xml
+++ b/app/src/main/res/layout/administrator_controls_profile_view.xml
@@ -23,7 +23,7 @@
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_profile_management_label"
-      android:textColor="@color/oppia_primary"
+      android:textColor="@color/admin_controls_sub_heading_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +33,14 @@
       android:id="@+id/edit_profiles_text_view"
       style="@style/Body"
       android:layout_width="match_parent"
-      android:background="@color/white"
+      android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onEditProfilesClicked()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_profiles"
-      android:textColor="@color/oppia_primary_text_dark"
+      android:textColor="@color/admin_controls_menu_options_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/pin_password_activity.xml b/app/src/main/res/layout/pin_password_activity.xml
index 844dcf33b3a..95eb1ea1bbe 100644
--- a/app/src/main/res/layout/pin_password_activity.xml
+++ b/app/src/main/res/layout/pin_password_activity.xml
@@ -17,7 +17,7 @@
     android:id="@+id/pin_password_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/add_profile_background">
+    android:background="@color/pin_password_activity_layout_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
       android:id="@+id/pin_passord_app_bar_layout"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index c4ce3aa8c2e..09b4ddb658c 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -4,7 +4,7 @@
   android:id="@+id/toolbar"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?attr/colorPrimary"
+  android:background="@color/shared_activity_toolbar_color"
   android:minHeight="?attr/actionBarSize"
   local:popupTheme="@style/ThemeOverlay.AppCompat.Light"
   local:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
diff --git a/app/src/main/res/values-night/color_palette.xml b/app/src/main/res/values-night/color_palette.xml
new file mode 100644
index 00000000000..2de094bdd0a
--- /dev/null
+++ b/app/src/main/res/values-night/color_palette.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="primary_color">@color/oppia_turquoise</color>
+  <color name="primary_dark_color">@color/oppia_bangladesh_green</color>
+  <color name="accent_color">@color/oppia_metallic_blue</color>
+  <color name="primary_text_color">@color/oppia_silver</color>
+  <color name="highlighted_text_color">@color/white</color>
+  <color name="background_color">@color/oppia_light_black</color>
+  <color name="dark_background_color">@color/oppia_light_black</color>
+  <color name="description_text_color">@color/oppia_silver</color>
+  <color name="text_input_background_color">@color/oppia_dark_grey</color>
+  <color name="dark_text_color">@color/white</color>
+  <color name="error_color">@color/oppia_pink</color>
+  <color name="container_background_color">@color/oppia_grayish_black</color>
+  <color name="toolbar_color">@color/oppia_green</color>
+  <color name="status_bar_color">@color/dark_green</color>
+  <color name="action_bar_color">@color/oppia_green</color>
+  <color name="highlighted_background_color">@color/highlight_blue</color>
+</resources>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index bb7c19b5504..2f70836894e 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -1,23 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+  <style name="OppiaTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/primary_color</item>
+    <item name="actionBarTheme">@style/OppiaActionBarTheme</item>
+    <item name="android:statusBarColor">@color/shared_activity_status_bar_color</item>
+  </style>
+
   <style name="OppiaThemeWithoutActionBar" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="colorPrimary">@color/oppia_primary</item>
-    <item name="colorPrimaryDark">@color/oppia_primary_dark</item>
-    <item name="colorAccent">@color/oppia_accent</item>
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/accent_color</item>
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
+    <item name="android:windowAnimationStyle">@style/Animation.Activity</item>
+    <item name="android:statusBarColor">@color/shared_activity_status_bar_color</item>
+  </style>
+
+  <style name="OppiaThemeWithoutActionBarColorAccentColorPrimary" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/primary_color</item>
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
     <item name="android:windowAnimationStyle">@style/Animation.Activity</item>
+    <item name="android:statusBarColor">@color/shared_activity_status_bar_color</item>
   </style>
 
   <style name="OppiaSwitchCompatTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="android:colorControlActivated">@color/oppia_primary</item>
+    <item name="android:colorControlActivated">@color/primary_color</item>
   </style>
 
   <style name="OppiaAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-    <item name="colorPrimary">@color/oppia_primary</item>
-    <item name="colorPrimaryDark">@color/oppia_primary_dark</item>
-    <item name="colorAccent">@color/oppia_primary</item>
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/primary_color</item>
     <item name="android:buttonBarNegativeButtonStyle">@style/textAllCaps</item>
     <item name="android:buttonBarPositiveButtonStyle">@style/textAllCaps</item>
   </style>
diff --git a/app/src/main/res/values/color_defs.xml b/app/src/main/res/values/color_defs.xml
index fb6bebcbf4b..b56d62ff05d 100644
--- a/app/src/main/res/values/color_defs.xml
+++ b/app/src/main/res/values/color_defs.xml
@@ -1,46 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="oppia_primary">#00645C</color>
-  <color name="oppia_primary_dark">#003933</color>
-  <color name="oppia_accent">#2D4A9D</color>
-  <color name="progress_background_tint">#081661</color>
-  <color name="concept_card_background">#FFFFF0</color>
-  <color name="concept_toolbar_background">#BE563C</color>
-  <color name="concept_toolbar_heading">#A6503A</color>
-  <color name="ic_launcher_background">#26A69A</color>
-  <!-- OPPIA COLORS -->
+  <color name="oppia_green">#00645C</color>
+  <color name="dark_green">#003933</color>
   <color name="oppia_dark_blue">#2D4A9D</color>
-  <color name="oppia_primary_text">#333333</color>
-  <color name="oppia_primary_light">#009688</color>
-  <color name="oppia_primary_text_30">#4D333333</color>
-  <color name="oppia_primary_text_dark">#DE000000</color>
-  <color name="oppia_secondary_text">#666666</color>
   <color name="oppia_light_green">#F0FFFF</color>
   <color name="oppia_light_yellow">#FFFFF0</color>
   <color name="oppia_brown_dark">#BE563C</color>
   <color name="oppia_brown">#C55F45</color>
   <color name="oppia_light_brown">#E76F51</color>
-  <color name="oppia_background">#F2F2F2</color>
-  <color name="oppia_grey_background">#E5E5E5</color>
   <color name="oppia_stroke_blue">#4D395FD0</color>
   <color name="oppia_solid_blue">#4DA5D3EC</color>
   <color name="oppia_stroke_black">#CC333333</color>
-  <color name="oppia_progress_chapter_finished">#E76F51</color>
-  <color name="oppia_progress_chapter_in_progress">#E7AC9B</color>
-  <color name="oppia_progress_chapter_not_finished">#999999</color>
-  <color name="oppia_admin_auth_secondary_text">#555555</color>
-  <color name="oppia_onboarding_divider">#707070</color>
-  <color name="oppia_disabled_button_background">#33999999</color>
-  <color name="oppia_text_shadow">#1F000000</color>
-  <color name="oppia_grey_border">#DDDDDD</color>
-  <color name="oppia_grey_border_dark">#666666</color>
-  <color name="oppia_dashed_divider">#80707070</color>
-  <color name="oppia_submitted_answer_text_color">#777777</color>
-  <color name="oppia_background_yellow_ivory">#FFFFF0</color>
-  <color name="oppia_faq_divider">#707070</color>
-  <color name="oppia_profile_chooser_divider">#707070</color>
   <color name="oppia_red">#B92D00</color>
-  <!-- BASIC COLORS -->
   <color name="white">#FFFFFF</color>
   <color name="white_80">#CCFFFFFF</color>
   <color name="black">#000000</color>
@@ -48,37 +19,11 @@
   <color name="black_12">#1F000000</color>
   <color name="black_26">#42000000</color>
   <color name="black_54">#8A000000</color>
+  <color name="black_87">#DE000000</color>
   <color name="white_light">#F9F9F9</color>
   <color name="accessible_grey">#333333</color>
   <color name="accessible_light_grey">#555555</color>
-  <!--  CONFETTI COLORS -->
-  <color name="confetti_red">#FF1414</color>
-  <color name="confetti_yellow">#FFE558</color>
-  <color name="confetti_blue">#2D4A9D</color>
-  <!-- AUDIO COMPONENT -->
-  <color name="audio_component_background">@color/oppia_dark_blue</color>
-  <!-- PROFILE COMPONENT -->
-  <color name="avatar_border">#707070</color>
-  <color name="add_profile_background">#FFFFF0</color>
-  <color name="hints_and_solution_background">#E4F2F1</color>
-  <color name="profile_chooser_background">#212121</color>
-  <color name="profile_chooser_grey_text">#999999</color>
-  <color name="profile_edit_background">#E5E5E5</color>
-  <color name="general_navigation_background">#E5E5E5</color>
-  <color name="app_version_background">#E5E5E5</color>
-  <color name="highlighted_nav_menu_item">#BE563C</color>
-  <color name="highlighted_developer_options_nav_menu_item">#00609C</color>
-  <color name="navbar_header_background">#264653</color>
-  <!-- SUBMIT BUTTON INACTIVE -->
-  <color name="audio_language_activity_radio_button">#00A89F</color>
-  <color name="submit_button_inactive">#61999999</color>
-  <color name="submit_button_text_inactive">#61000000</color>
-  <color name="submit_button_inactive_text">#61000000</color>
   <color name="grey">#CCCCCC</color>
-  <!-- INPUT LAYOUT EDITTEXT -->
-  <color name="mtrl_textinput_default_box_stroke_color">#666666</color>
-  <color name="edit_text_error">#923026</color>
-  <color name="edit_text_hint">#80333333</color>
   <color name="light_grey">#61000000</color>
   <color name="mid_grey">#ff333333</color>
   <color name="mid_grey_05">#0D000000</color>
@@ -89,61 +34,16 @@
   <color name="grey_shade_20">#D6D6D6</color>
   <color name="blue_shade_100">#0F0086FB</color>
   <color name="blue_shade_200">#6B0086FB</color>
-  <color name="chapter_card_shadow">#AAFFFFFF</color>
-  <color name="chapter_card_grey_border">#666666</color>
-  <color name="divider">#61000000</color>
-  <color name="toolbar_drop_shadow">#3D000000</color>
   <color name="green_shade">#44A85A</color>
   <color name="green_shade_80">#CC44A85A</color>
   <color name="light_green">#D9F3E7</color>
-  <!-- QUESTION COMPONENT -->
-  <color name="question_player_background">#F0FFFF</color>
-  <color name="question_player_progress_bar_gradient_start">#00E4F2F1</color>
-  <color name="question_player_progress_bar_gradient_center">#E4F2F1</color>
-  <color name="question_player_progress_bar_gradient_end">#E4F2F1</color>
-  <!-- AVATAR BACKGROUND COLORS -->
-  <color name="avatar_background_1">#E65C5C</color>
-  <color name="avatar_background_2">#E6935C</color>
-  <color name="avatar_background_3">#FFDB4E</color>
-  <color name="avatar_background_4">#CAE65C</color>
-  <color name="avatar_background_5">#93E65C</color>
-  <color name="avatar_background_6">#5CE6CA</color>
-  <color name="avatar_background_7">#5CCAE6</color>
-  <color name="avatar_background_8">#5C93E6</color>
-  <color name="avatar_background_9">#5C5CE6</color>
-  <color name="avatar_background_10">#935CE6</color>
-  <color name="avatar_background_11">#E65CCF</color>
-  <color name="avatar_background_12">#E65C97</color>
-  <color name="avatar_background_13">#CC2929</color>
-  <color name="avatar_background_14">#CC6A29</color>
-  <color name="avatar_background_15">#E6C12E</color>
-  <color name="avatar_background_16">#ABCC29</color>
-  <color name="avatar_background_17">#6ACC29</color>
-  <color name="avatar_background_18">#29CCAB</color>
-  <color name="avatar_background_19">#29ABCC</color>
-  <color name="avatar_background_20">#296ACC</color>
-  <color name="avatar_background_21">#6A29CC</color>
-  <color name="avatar_background_22">#AB29CC</color>
-  <color name="avatar_background_23">#CC29B1</color>
-  <color name="avatar_background_24">#CC2970</color>
-  <!-- ReadingTextSizeActivity -->
-  <color name="seekbar_divider">#707070</color>
-  <color name="topic_thumbnail_background">#C6DCDA</color>
-  <color name="topic_title_background">#2F6687</color>
-  <!-- STATUS BAR COLORS -->
-  <color name="profile_status_bar">#000000</color>
-  <color name="hint_full_dialog_status_bar">#00236E</color>
-  <color name="slide_drawer_open_status_bar">#001F2A</color>
-  <color name="walkthrough_status_bar">#CCCCCC</color>
-  <color name="onboarding_1_status_bar">#00847A</color>
-  <color name="onboarding_2_status_bar">#8B2A15</color>
-  <color name="onboarding_3_status_bar">#AD8500</color>
-  <color name="onboarding_4_status_bar">#3B5893</color>
-  <!-- ICON COLORS -->
-  <color name="merge_icon_enabled">#FF000000</color>
-  <color name="merge_icon_disabled">#999999</color>
-  <!-- HIGHLIGHTED COLORS -->
-  <color name="admin_highlighted">#A5D3EC</color>
-  <color name="coming_soon_end">#674172</color>
-  <color name="coming_soon_start">#7659B6</color>
+  <color name="highlight_blue">#A5D3EC</color>
+  <color name="oppia_silver">#C4C4C4</color>
+  <color name="oppia_turquoise">#3bd1c4</color>
+  <color name="oppia_bangladesh_green">#03635B</color>
+  <color name="oppia_metallic_blue">#2B5F73</color>
+  <color name="oppia_light_black">#24282B</color>
+  <color name="oppia_dark_grey">#4D4D4D</color>
+  <color name="oppia_pink">#FF938F</color>
+  <color name="oppia_grayish_black">#32363B</color>
 </resources>
diff --git a/app/src/main/res/values/color_palette.xml b/app/src/main/res/values/color_palette.xml
new file mode 100644
index 00000000000..60446cd1033
--- /dev/null
+++ b/app/src/main/res/values/color_palette.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="primary_color">@color/oppia_green</color>
+  <color name="primary_dark_color">@color/dark_green</color>
+  <color name="accent_color">@color/oppia_dark_blue</color>
+  <color name="primary_text_color">@color/accessible_grey</color>
+  <color name="highlighted_text_color">@color/accessible_grey</color>
+  <color name="background_color">@color/oppia_light_yellow</color>
+  <color name="dark_background_color">@color/mid_grey_30</color>
+  <color name="description_text_color">@color/accessible_light_grey</color>
+  <color name="text_input_background_color">@color/white</color>
+  <color name="dark_text_color">@color/black_87</color>
+  <color name="error_color">@color/oppia_red</color>
+  <color name="container_background_color">@color/white</color>
+  <color name="toolbar_color">@color/oppia_green</color>
+  <color name="status_bar_color">@color/dark_green</color>
+  <color name="action_bar_color">@color/oppia_green</color>
+  <color name="highlighted_background_color">@color/highlight_blue</color>
+</resources>
diff --git a/app/src/main/res/values/colors_migrating.xml b/app/src/main/res/values/colors_migrating.xml
new file mode 100644
index 00000000000..684228ea6f8
--- /dev/null
+++ b/app/src/main/res/values/colors_migrating.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- TODO(#4147): Remove this file after dark mode implementation -->
+<resources>
+  <!-- All of these colors will be replaced with one in color_defs.xml.
+   This is a temporary measure to make sure other 4 color files follows the convention decided
+   for them. -->
+  <color name="oppia_primary">#00645C</color>
+  <color name="oppia_primary_dark">#003933</color>
+  <color name="oppia_accent">#2D4A9D</color>
+  <color name="progress_background_tint">#081661</color>
+  <color name="concept_card_background">#FFFFF0</color>
+  <color name="concept_toolbar_background">#BE563C</color>
+  <color name="concept_toolbar_heading">#A6503A</color>
+  <color name="ic_launcher_background">#26A69A</color>
+  <!-- OPPIA COLORS -->
+  <color name="oppia_primary_text">#333333</color>
+  <color name="oppia_primary_light">#009688</color>
+  <color name="oppia_primary_text_30">#4D333333</color>
+  <color name="oppia_primary_text_dark">#DE000000</color>
+  <color name="oppia_secondary_text">#666666</color>
+  <color name="oppia_background">#F2F2F2</color>
+  <color name="oppia_grey_background">#E5E5E5</color>
+  <color name="oppia_progress_chapter_finished">#E76F51</color>
+  <color name="oppia_progress_chapter_in_progress">#E7AC9B</color>
+  <color name="oppia_progress_chapter_not_finished">#999999</color>
+  <color name="oppia_admin_auth_secondary_text">#555555</color>
+  <color name="oppia_onboarding_divider">#707070</color>
+  <color name="oppia_disabled_button_background">#33999999</color>
+  <color name="oppia_text_shadow">#1F000000</color>
+  <color name="oppia_grey_border">#DDDDDD</color>
+  <color name="oppia_grey_border_dark">#666666</color>
+  <color name="oppia_dashed_divider">#80707070</color>
+  <color name="oppia_submitted_answer_text_color">#777777</color>
+  <color name="oppia_background_yellow_ivory">#FFFFF0</color>
+  <color name="oppia_faq_divider">#707070</color>
+  <color name="oppia_profile_chooser_divider">#707070</color>
+  <!--  CONFETTI COLORS -->
+  <color name="confetti_red">#FF1414</color>
+  <color name="confetti_yellow">#FFE558</color>
+  <color name="confetti_blue">#2D4A9D</color>
+  <!-- AUDIO COMPONENT -->
+  <color name="audio_component_background">@color/oppia_dark_blue</color>
+  <!-- PROFILE COMPONENT -->
+  <color name="avatar_border">#707070</color>
+  <color name="hints_and_solution_background">#E4F2F1</color>
+  <color name="profile_chooser_background">#212121</color>
+  <color name="profile_chooser_grey_text">#999999</color>
+  <color name="profile_edit_background">#E5E5E5</color>
+  <color name="general_navigation_background">#E5E5E5</color>
+  <color name="app_version_background">#E5E5E5</color>
+  <color name="highlighted_nav_menu_item">#BE563C</color>
+  <color name="highlighted_developer_options_nav_menu_item">#00609C</color>
+  <color name="navbar_header_background">#264653</color>
+  <!-- SUBMIT BUTTON INACTIVE -->
+  <color name="audio_language_activity_radio_button">#00A89F</color>
+  <color name="submit_button_inactive">#61999999</color>
+  <color name="submit_button_text_inactive">#61000000</color>
+  <color name="submit_button_inactive_text">#61000000</color>
+  <!-- INPUT LAYOUT EDITTEXT -->
+  <color name="mtrl_textinput_default_box_stroke_color">#666666</color>
+  <color name="edit_text_error">#923026</color>
+  <color name="edit_text_hint">#80333333</color>
+  <color name="chapter_card_shadow">#AAFFFFFF</color>
+  <color name="chapter_card_grey_border">#666666</color>
+  <color name="divider">#61000000</color>
+  <color name="toolbar_drop_shadow">#3D000000</color>
+  <!-- QUESTION COMPONENT -->
+  <color name="question_player_background">#F0FFFF</color>
+  <color name="question_player_progress_bar_gradient_start">#00E4F2F1</color>
+  <color name="question_player_progress_bar_gradient_center">#E4F2F1</color>
+  <color name="question_player_progress_bar_gradient_end">#E4F2F1</color>
+  <!-- AVATAR BACKGROUND COLORS -->
+  <color name="avatar_background_1">#E65C5C</color>
+  <color name="avatar_background_2">#E6935C</color>
+  <color name="avatar_background_3">#FFDB4E</color>
+  <color name="avatar_background_4">#CAE65C</color>
+  <color name="avatar_background_5">#93E65C</color>
+  <color name="avatar_background_6">#5CE6CA</color>
+  <color name="avatar_background_7">#5CCAE6</color>
+  <color name="avatar_background_8">#5C93E6</color>
+  <color name="avatar_background_9">#5C5CE6</color>
+  <color name="avatar_background_10">#935CE6</color>
+  <color name="avatar_background_11">#E65CCF</color>
+  <color name="avatar_background_12">#E65C97</color>
+  <color name="avatar_background_13">#CC2929</color>
+  <color name="avatar_background_14">#CC6A29</color>
+  <color name="avatar_background_15">#E6C12E</color>
+  <color name="avatar_background_16">#ABCC29</color>
+  <color name="avatar_background_17">#6ACC29</color>
+  <color name="avatar_background_18">#29CCAB</color>
+  <color name="avatar_background_19">#29ABCC</color>
+  <color name="avatar_background_20">#296ACC</color>
+  <color name="avatar_background_21">#6A29CC</color>
+  <color name="avatar_background_22">#AB29CC</color>
+  <color name="avatar_background_23">#CC29B1</color>
+  <color name="avatar_background_24">#CC2970</color>
+  <!-- ReadingTextSizeActivity -->
+  <color name="seekbar_divider">#707070</color>
+  <color name="topic_thumbnail_background">#C6DCDA</color>
+  <color name="topic_title_background">#2F6687</color>
+  <!-- STATUS BAR COLORS -->
+  <color name="profile_status_bar">#000000</color>
+  <color name="hint_full_dialog_status_bar">#00236E</color>
+  <color name="slide_drawer_open_status_bar">#001F2A</color>
+  <color name="walkthrough_status_bar">#CCCCCC</color>
+  <color name="onboarding_1_status_bar">#00847A</color>
+  <color name="onboarding_2_status_bar">#8B2A15</color>
+  <color name="onboarding_3_status_bar">#AD8500</color>
+  <color name="onboarding_4_status_bar">#3B5893</color>
+  <!-- ICON COLORS -->
+  <color name="merge_icon_enabled">#FF000000</color>
+  <color name="merge_icon_disabled">#999999</color>
+  <!-- HIGHLIGHTED COLORS -->
+  <color name="admin_highlighted">#A5D3EC</color>
+  <color name="coming_soon_end">#674172</color>
+  <color name="coming_soon_start">#7659B6</color>
+</resources>
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
new file mode 100644
index 00000000000..73f1d991bba
--- /dev/null
+++ b/app/src/main/res/values/component_colors.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="shared_edit_text_cursor_color">@color/primary_text_color</color>
+  <color name="shared_activity_toolbar_color">@color/toolbar_color</color>
+  <!-- Themes.xml -->
+  <color name="shared_activity_status_bar_color">@color/status_bar_color</color>
+  <color name="shared_activity_action_bar_color">@color/action_bar_color</color>
+  <!-- Styles.xml -->
+  <color name="shared_text_view_text_color">@color/primary_text_color</color>
+  <color name="shared_text_view_heading_text_color">@color/highlighted_text_color</color>
+  <color name="shared_text_input_layout_text_color">@color/primary_text_color</color>
+  <color name="shared_text_input_layout_stroke_color">@color/primary_text_color</color>
+  <color name="shared_text_input_edit_text_text_color">@color/primary_text_color</color>
+  <color name="shared_input_interaction_edit_text_text_color">@color/primary_text_color</color>
+  <color name="shared_text_input_layout_background_color">@color/text_input_background_color</color>
+  <color name="shared_text_input_layout_error_color">@color/error_color</color>
+  <!-- Admin Auth Activity -->
+  <color name="admin_auth_secondary_text_color">@color/description_text_color</color>
+  <color name="admin_auth_layout_background_color">@color/background_color</color>
+  <color name="admin_auth_activity_toolbar_color">@color/toolbar_color</color>
+  <!-- Add Profile Activity -->
+  <color name="add_profile_activity_label_text_color">@color/primary_text_color</color>
+  <color name="add_profile_activity_switch_text_color">@color/dark_text_color</color>
+  <color name="add_profile_activity_switch_description_color">@color/description_text_color</color>
+  <color name="add_profile_activity_layout_background_color">@color/background_color</color>
+  <!-- Administrator Controls -->
+  <color name="admin_controls_background_color">@color/dark_background_color</color>
+  <color name="admin_controls_options_background_color">@color/container_background_color</color>
+  <color name="admin_controls_options_highlighted_background_color">@color/highlighted_background_color</color>
+  <color name="admin_controls_sub_heading_color">@color/primary_color</color>
+  <color name="admin_controls_switch_description_color">@color/description_text_color</color>
+  <color name="admin_controls_menu_options_text_color">@color/dark_text_color</color>
+  <!-- Admin Pin Activity -->
+  <color name="admin_pin_activity_layout_background_color">@color/background_color</color>
+  <!-- Pin Password Activity -->
+  <color name="pin_password_activity_layout_background_color">@color/background_color</color>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7267e914c54..859538f1604 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -164,26 +164,27 @@
   </style>
 
   <style name="TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-    <item name="boxBackgroundColor">@color/white</item>
+    <item name="boxBackgroundColor">@color/shared_text_input_layout_background_color</item>
     <item name="boxCornerRadiusBottomEnd">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusBottomStart">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusTopEnd">@dimen/text_input_layout_corner_radius</item>
     <item name="boxCornerRadiusTopStart">@dimen/text_input_layout_corner_radius</item>
-    <item name="boxStrokeColor">@color/oppia_primary_text</item>
+    <item name="boxStrokeColor">@color/shared_text_input_layout_stroke_color</item>
     <item name="boxStrokeWidth">@dimen/text_input_layout_stroke_width</item>
     <item name="errorEnabled">true</item>
-    <item name="errorIconTint">@color/oppia_red</item>
-    <item name="errorTextColor">@color/oppia_red</item>
-    <item name="boxStrokeErrorColor">@color/oppia_red</item>
-    <item name="hintTextColor">@color/oppia_primary_text</item>
+    <item name="errorIconTint">@color/shared_text_input_layout_error_color</item>
+    <item name="errorTextColor">@color/shared_text_input_layout_error_color</item>
+    <item name="boxStrokeErrorColor">@color/shared_text_input_layout_error_color</item>
+    <item name="hintTextColor">@color/shared_text_input_layout_text_color</item>
     <item name="android:textAlignment">viewStart</item>
+    <item name="android:textColorHint">@color/shared_text_input_layout_text_color</item>
   </style>
 
   <style name="TextInputEditText" parent="Widget.AppCompat.EditText">
     <item name="fontFamily">sans-serif</item>
     <item name="android:fontFamily">sans-serif</item>
     <item name="textAllCaps">false</item>
-    <item name="android:textColor">@color/oppia_primary_text</item>
+    <item name="android:textColor">@color/shared_text_input_edit_text_text_color</item>
     <item name="android:textCursorDrawable">@drawable/color_cursor</item>
     <item name="android:textSize">14sp</item>
     <item name="android:textStyle">normal</item>
@@ -194,6 +195,7 @@
     <item name="android:fontFamily">sans-serif</item>
     <item name="android:textSize">24sp</item>
     <item name="fontFamily">sans-serif</item>
+    <item name="android:textColor">@color/shared_text_view_heading_text_color</item>
   </style>
 
   <style name="Heading1ViewStart" parent="Heading1">
@@ -216,6 +218,7 @@
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:textSize">20sp</item>
     <item name="fontFamily">sans-serif-medium</item>
+    <item name="android:textColor">@color/shared_text_view_heading_text_color</item>
   </style>
 
   <style name="Heading2ViewStart" parent="Heading2">
@@ -235,6 +238,7 @@
     <item name="android:textSize">18sp</item>
     <item name="fontFamily">sans-serif-medium</item>
     <item name="android:gravity">center_vertical</item>
+    <item name="android:textColor">@color/shared_text_view_heading_text_color</item>
   </style>
 
   <style name="Heading3ViewCenterVertical" parent="Heading3">
@@ -249,6 +253,7 @@
     <item name="android:fontFamily">sans-serif</item>
     <item name="android:textSize">18sp</item>
     <item name="fontFamily">sans-serif</item>
+    <item name="android:textColor">@color/shared_text_view_heading_text_color</item>
   </style>
 
   <style name="Heading4ViewCenterVertical" parent="Heading4">
@@ -263,6 +268,7 @@
     <item name="android:fontFamily">sans-serif-medium</item>
     <item name="android:textSize">14sp</item>
     <item name="fontFamily">sans-serif-medium</item>
+    <item name="android:textColor">@color/shared_text_view_heading_text_color</item>
   </style>
 
   <style name="Heading5ViewCenterVertical" parent="Heading5">
@@ -370,7 +376,7 @@
     <item name="android:paddingStart">12dp</item>
     <item name="android:paddingTop">8dp</item>
     <item name="android:singleLine">true</item>
-    <item name="android:textColor">@color/oppia_primary_text</item>
+    <item name="android:textColor">@color/shared_input_interaction_edit_text_text_color</item>
     <item name="android:textColorHint">@color/edit_text_hint</item>
     <item name="android:textSize">14sp</item>
     <item name="android:textStyle">italic</item>
@@ -390,7 +396,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:textAllCaps">false</item>
-    <item name="android:textColor">@color/oppia_primary_text</item>
+    <item name="android:textColor">@color/shared_text_view_text_color</item>
   </style>
   <!-- Start Over Lesson Button -->
   <style name="StartOverLessonButton" parent="TextAppearance.AppCompat.Widget.Button">
@@ -458,5 +464,4 @@
   <style name="TextViewCenterHorizontal" parent="TextView.Common1">
     <item name="android:gravity">center_horizontal</item>
   </style>
-
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2ba462ae5c1..83312e075c5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,40 +2,45 @@
 <resources>
 
   <style name="OppiaTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
-    <item name="colorPrimary">@color/oppia_primary</item>
-    <item name="colorPrimaryDark">@color/oppia_primary_dark</item>
-    <item name="colorAccent">@color/oppia_primary</item>
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/primary_color</item>
+    <item name="actionBarTheme">@style/OppiaActionBarTheme</item>
   </style>
 
   <style name="OppiaThemeWithoutActionBar" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="colorPrimary">@color/oppia_primary</item>
-    <item name="colorPrimaryDark">@color/oppia_primary_dark</item>
-    <item name="colorAccent">@color/oppia_accent</item>
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/accent_color</item>
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
     <item name="android:windowAnimationStyle">@style/Animation.Activity</item>
   </style>
 
   <style name="OppiaThemeWithoutActionBarColorAccentColorPrimary" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="colorPrimary">@color/oppia_primary</item>
-    <item name="colorPrimaryDark">@color/oppia_primary_dark</item>
-    <item name="colorAccent">@color/oppia_primary</item>
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/primary_color</item>
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
     <item name="android:windowAnimationStyle">@style/Animation.Activity</item>
   </style>
 
   <style name="OppiaDialogFragmentTheme" parent="OppiaTheme">
-    <item name="colorAccent">@color/oppia_primary</item>
+    <item name="colorAccent">@color/primary_color</item>
   </style>
 
   <style name="OppiaSwitchCompatTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="colorControlActivated">@color/oppia_primary</item>
+    <item name="colorControlActivated">@color/primary_color</item>
   </style>
 
   <style name="OppiaAlertDialogTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert.Bridge">
-    <item name="colorPrimary">@color/oppia_primary</item>
-    <item name="colorPrimaryDark">@color/oppia_primary_dark</item>
-    <item name="colorAccent">@color/oppia_primary</item>
+    <item name="colorPrimary">@color/primary_color</item>
+    <item name="colorPrimaryDark">@color/primary_dark_color</item>
+    <item name="colorAccent">@color/primary_color</item>
+  </style>
+
+  <style name="OppiaActionBarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" >
+    <item name="android:background">@color/shared_activity_action_bar_color</item>
   </style>
 </resources>