diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index ece3082b..069b2e1e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -15,7 +15,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-        setTheme(R.style.AppThemeLight);
+        setTheme(R.style.AppTheme);
 
         super.onCreate(savedInstanceState);
         setContentView(getLayoutResourceId());
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
index 0ba362ca..8d86e082 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -30,7 +29,7 @@ import android.util.Log;
  * Author M M Arif
  */
 
-public class CreateTeamByOrgActivity extends AppCompatActivity implements View.OnClickListener {
+public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = CreateTeamByOrgActivity.this;
     private View.OnClickListener onClickListener;
@@ -44,6 +43,11 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
     private String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_team_by_org;
+    }
+
     private String[] accessControlsList = new String[] {
             "Code",
             "Issues",
@@ -67,9 +71,8 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
     };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_team_by_org);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -89,7 +92,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
 
                 pBuilder.setTitle(R.string.newTeamPermission);
                 if(permissionSelectedChoice != -1) {
@@ -141,7 +144,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
                 teamAccessControlsArray.setText("");
                 pushAccessList = Arrays.asList(accessControlsList);
 
-                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
 
                 aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
index 9c3bddb7..695113c0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -18,15 +17,19 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreditsActivity extends AppCompatActivity {
+public class CreditsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_credits;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_credits);
 
         ImageView closeActivity = findViewById(R.id.close);
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
index 2c858632..76eecc7d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@@ -403,7 +403,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                             return;
                         case UNSUPPORTED_OLD:
 
-                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
 
                             alertDialogBuilder
                                     .setTitle(getString(R.string.versionAlertDialogHeader))
diff --git a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
index 4acf0279..84d0b357 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -18,14 +17,18 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class SponsorsActivity extends AppCompatActivity {
+public class SponsorsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_sponsors;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sponsors);
 
         ImageView closeActivity = findViewById(R.id.close);
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index 70cace46..240a8421 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -90,9 +90,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index e83a39d3..fc93753e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -90,9 +90,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.issue_comment_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
index 262aabed..e6200440 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@@ -56,9 +56,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.labels_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index 2304d6cb..79b0d666 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -88,9 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 29668264..6244d642 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -91,9 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 26a99926..711ed4c5 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -88,9 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index f382f6e4..acd897e3 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -88,9 +88,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.AppThemeConfirmDialog);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
index 629fd2ec..244f486d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
@@ -68,7 +68,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
 
                     final Context context = v.getContext();
 
-                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
+                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
 
                     pBuilder.setTitle(R.string.newTeamPermission);
                     pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index 3ea7e686..69c116ec 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -140,7 +140,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.AppThemeLightConfirmDialog);
 
                 cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
                 if(customFontSelectedChoice != -1) {
@@ -178,7 +178,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
 
                 hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
                 if(homeScreenSelectedChoice != -1) {
@@ -214,7 +214,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
 
                 cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
                 if(codeBlockSelectedChoice != -1) {
@@ -273,7 +273,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
 
                 lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
                 if(langSelectedChoice != -1) {
@@ -359,7 +359,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
 
                 tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
                 if(timeSelectedChoice != -1) {
diff --git a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
index 3d37bbbe..595a9297 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
@@ -18,7 +18,7 @@ public class AlertDialogs {
 
     public static void authorizationTokenRevokedDialog(final Context context, String title, String message, String copyNegativeButton, String copyPositiveButton) {
 
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
 
         alertDialogBuilder
                 .setTitle(title)
@@ -52,7 +52,7 @@ public class AlertDialogs {
 
     public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton) {
 
-        new AlertDialog.Builder(context, R.style.confirmDialog)
+        new AlertDialog.Builder(context)
             .setTitle(title + labelTitle)
             .setMessage(message)
             .setIcon(R.drawable.ic_delete)
@@ -71,7 +71,7 @@ public class AlertDialogs {
 
     public static void collaboratorRemoveDialog(final Context context, final String userNameMain, String title, String message, String positiveButton, String negativeButton, final String searchKeyword) {
 
-        new AlertDialog.Builder(context, R.style.confirmDialog)
+        new AlertDialog.Builder(context)
                 .setTitle(title + userNameMain)
                 .setMessage(message)
                 .setIcon(R.drawable.ic_warning)
diff --git a/app/src/main/res/layout/activity_credits.xml b/app/src/main/res/layout/activity_credits.xml
index 09999d87..ce4b3423 100644
--- a/app/src/main/res/layout/activity_credits.xml
+++ b/app/src/main/res/layout/activity_credits.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCredits"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -52,7 +52,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
diff --git a/app/src/main/res/layout/activity_sponsors.xml b/app/src/main/res/layout/activity_sponsors.xml
index 30f1cbfc..7078ab9f 100644
--- a/app/src/main/res/layout/activity_sponsors.xml
+++ b/app/src/main/res/layout/activity_sponsors.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleSponsors"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -52,7 +52,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
diff --git a/app/src/main/res/layout/credits.xml b/app/src/main/res/layout/credits.xml
index 2c2b1749..00f39d97 100644
--- a/app/src/main/res/layout/credits.xml
+++ b/app/src/main/res/layout/credits.xml
@@ -7,14 +7,14 @@
     android:paddingTop="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/creditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textColorLink="@color/lightBlue"
         android:textSize="16sp" />
 
diff --git a/app/src/main/res/layout/sponsors.xml b/app/src/main/res/layout/sponsors.xml
index 7820d034..6982208c 100644
--- a/app/src/main/res/layout/sponsors.xml
+++ b/app/src/main/res/layout/sponsors.xml
@@ -7,14 +7,14 @@
     android:paddingTop="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/sponsorText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textColorLink="@color/lightBlue"
         android:textSize="16sp" />
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index aa54a526..7035e28e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,4 +5,5 @@
     <attr name="inputBackgroundColor" format="reference" />
     <attr name="inputTextColor" format="reference" />
     <attr name="selectedTextColor" format="reference" />
+    <attr name="alertDialogTheme" format="reference" />
 </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 ea5c013e..f4fc7905 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,22 +19,7 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="popupMenuStyle">
-        <item name="android:itemBackground">@color/colorPrimary</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:colorBackground">@color/colorPrimary</item>
-        <item name="android:layout_marginStart">3dp</item>
-        <item name="android:layout_marginEnd">3dp</item>
-    </style>
 
-    <style name="confirmDialog" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="android:background">@color/colorPrimary</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
-    </style>
 
     <style name="customTabLayout" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">16sp</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 08d65633..8c7a462e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,6 +6,7 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
 
         <item name="primaryTextColor">@color/colorWhite</item>
         <item name="primaryBackgroundColor">@color/colorPrimary</item>
@@ -13,6 +14,8 @@
         <item name="inputTextColor">@color/colorWhite</item>
         <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
         <item name="selectedTextColor">@color/darkGreen</item>
+        <item name="dialogTheme">@style/AppThemeConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
     </style>
 
     <!-- Light theme -->
@@ -20,6 +23,7 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/lightThemeBackground</item>
         <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
 
         <item name="primaryTextColor">@color/lightThemeTextColor</item>
         <item name="primaryBackgroundColor">@color/lightThemeBackground</item>
@@ -27,6 +31,42 @@
         <item name="inputTextColor">@color/lightThemeInputTextColor</item>
         <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
         <item name="selectedTextColor">@color/darkGreen</item>
+        <item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
+    </style>
+
+    <style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:background">@color/colorPrimary</item>
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="colorControlActivated">@color/white</item>
+    </style>
+
+    <style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:background">@color/colorPrimary</item>
+        <item name="android:textColorPrimary">@color/colorPrimary</item>
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="colorControlNormal">@color/lightThemeTextColor</item>
+        <item name="colorControlActivated">@color/lightThemeTextColor</item>
+    </style>
+
+    <style name="AppThemePopupMenuStyle">
+        <item name="android:itemBackground">@color/colorPrimary</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:colorBackground">@color/colorPrimary</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
+    </style>
+
+    <style name="AppThemeLightPopupMenuStyle">
+        <item name="android:itemBackground">@color/lightThemeBackground</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="android:colorBackground">@color/lightThemeBackground</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
     </style>
 
     <style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">