From 3c61e0e41817ea65ef170142656ef5abeb658bba Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Mar 2019 13:50:23 +0100
Subject: [PATCH] Renamed color to be easier to understand what they are

---
 .../java/org/linphone/LinphoneActivity.java   |   2 +-
 .../linphone/assistant/AssistantActivity.java |   4 +-
 .../java/org/linphone/call/CallActivity.java  |   2 +-
 .../linphone/chat/ChatMessagesOldAdapter.java |  17 ++-
 .../compatibility/ApiTwentyEightPlus.java     |   2 +-
 .../compatibility/ApiTwentyFourPlus.java      |   4 +-
 .../compatibility/ApiTwentyOnePlus.java       |  12 +-
 .../compatibility/ApiTwentySixPlus.java       |  14 +-
 .../org/linphone/fragments/AboutFragment.java |   3 +-
 .../linphone/fragments/StatusFragment.java    |   6 +-
 .../java/org/linphone/utils/DeviceUtils.java  |   4 +-
 .../res/color/dark_primary_text_color.xml     |   4 +-
 .../res/color/light_primary_text_color.xml    |   4 +-
 .../res/color/security_switch_track_color.xml |   6 +-
 .../drawable/assistant_button_text_color.xml  |   4 +-
 .../res/drawable/button_background_dark.xml   |   8 +-
 .../res/drawable/button_background_light.xml  |   8 +-
 app/src/main/res/drawable/call.xml            |   6 +-
 .../drawable/chat_bubble_incoming_full.xml    |   2 +-
 .../drawable/chat_bubble_incoming_split_1.xml |   2 +-
 .../drawable/chat_bubble_incoming_split_2.xml |   2 +-
 .../drawable/chat_bubble_incoming_split_3.xml |   2 +-
 .../drawable/chat_bubble_outgoing_full.xml    |   2 +-
 .../drawable/chat_bubble_outgoing_split_1.xml |   2 +-
 .../drawable/chat_bubble_outgoing_split_2.xml |   2 +-
 .../drawable/chat_bubble_outgoing_split_3.xml |   2 +-
 app/src/main/res/drawable/dialer.xml          |   6 +-
 app/src/main/res/drawable/divider.xml         |   2 +-
 .../res/drawable/event_decoration_red.xml     |   2 +-
 app/src/main/res/drawable/footer_button.xml   |   6 +-
 app/src/main/res/drawable/hangup.xml          |   6 +-
 .../round_button_background_default.xml       |   2 +-
 .../drawable/round_button_background_over.xml |   2 +-
 ...round_orange_button_background_default.xml |   2 +-
 .../round_orange_button_background_over.xml   |   2 +-
 .../res/drawable/security_switch_thumb.xml    |   2 +-
 .../res/drawable/unread_message_count_bg.xml  |   2 +-
 app/src/main/res/layout-land/about.xml        |   4 +-
 app/src/main/res/layout-land/call.xml         |  18 +--
 app/src/main/res/layout-land/dialer.xml       |   2 +-
 .../main/res/layout-land/launch_screen.xml    |   6 +-
 app/src/main/res/layout-land/main.xml         |   2 +-
 .../assistant_account_creation.xml            |  12 +-
 .../assistant_linphone_login.xml              |   8 +-
 .../layout-sw533dp-land/assistant_login.xml   |  10 +-
 .../main/res/layout-sw533dp-land/dialer.xml   |   4 +-
 app/src/main/res/layout-sw533dp-land/main.xml |   2 +-
 app/src/main/res/layout-sw533dp/dialer.xml    |   4 +-
 app/src/main/res/layout-sw533dp/main.xml      |   2 +-
 app/src/main/res/layout/about.xml             |   4 +-
 .../res/layout/assistant_account_creation.xml |  12 +-
 ...stant_account_creation_code_activation.xml |   2 +-
 .../res/layout/assistant_country_list.xml     |   6 +-
 .../res/layout/assistant_linphone_login.xml   |   8 +-
 app/src/main/res/layout/assistant_login.xml   |  10 +-
 .../layout/assistant_remote_provisioning.xml  |   2 +-
 .../assistant_remote_provisioning_login.xml   |   6 +-
 app/src/main/res/layout/call.xml              |  10 +-
 .../layout/call_incoming_answer_button.xml    |   2 +-
 .../layout/call_incoming_decline_button.xml   |   2 +-
 app/src/main/res/layout/chat.xml              |   6 +-
 .../main/res/layout/chat_bubble_content.xml   |   2 +-
 app/src/main/res/layout/chat_bubble_old.xml   |   2 +-
 app/src/main/res/layout/chat_create.xml       |   2 +-
 app/src/main/res/layout/chat_imdn.xml         |   8 +-
 app/src/main/res/layout/chat_imdn_old.xml     |   8 +-
 app/src/main/res/layout/chat_infos.xml        |   2 +-
 app/src/main/res/layout/chatlist.xml          |   2 +-
 app/src/main/res/layout/chatlist_cell.xml     |   2 +-
 app/src/main/res/layout/contact_edit.xml      |   6 +-
 app/src/main/res/layout/contact_edit_row.xml  |   2 +-
 app/src/main/res/layout/dialer.xml            |   6 +-
 app/src/main/res/layout/dialog.xml            |   6 +-
 app/src/main/res/layout/history.xml           |   2 +-
 app/src/main/res/layout/in_app.xml            |   2 +-
 app/src/main/res/layout/in_app_list.xml       |   4 +-
 .../main/res/layout/in_app_purchase_item.xml  |   2 +-
 app/src/main/res/layout/in_app_store.xml      |   4 +-
 app/src/main/res/layout/launch_screen.xml     |   6 +-
 app/src/main/res/layout/main.xml              |   2 +-
 app/src/main/res/layout/new_password.xml      |   4 +-
 .../res/layout/preference_list_content.xml    |   2 +-
 app/src/main/res/layout/recordings_list.xml   |   2 +-
 .../main/res/layout/search_contact_cell.xml   |   2 +-
 app/src/main/res/layout/settings.xml          |   2 +-
 app/src/main/res/layout/video.xml             |   2 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   2 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   2 +-
 app/src/main/res/values/color.xml             |  53 ++++---
 app/src/main/res/values/styles.xml            | 140 +++++++++---------
 90 files changed, 296 insertions(+), 289 deletions(-)

diff --git a/app/src/main/java/org/linphone/LinphoneActivity.java b/app/src/main/java/org/linphone/LinphoneActivity.java
index 3cee94457..c9e7ae584 100644
--- a/app/src/main/java/org/linphone/LinphoneActivity.java
+++ b/app/src/main/java/org/linphone/LinphoneActivity.java
@@ -1013,7 +1013,7 @@ public class LinphoneActivity extends LinphoneGenericActivity
     public Dialog displayDialog(String text) {
         Dialog dialog = new Dialog(this);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
+        Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.dark_grey_color));
         d.setAlpha(200);
         dialog.setContentView(R.layout.dialog);
         dialog.getWindow()
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index fc60bf399..58ed5304e 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -662,7 +662,7 @@ public class AssistantActivity extends ThemableActivity
     private void displayRegistrationInProgressDialog() {
         if (LinphoneManager.getLc().isNetworkReachable()) {
             mProgress = ProgressDialog.show(this, null, null);
-            Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorE));
+            Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.light_grey_color));
             d.setAlpha(200);
             mProgress
                     .getWindow()
@@ -679,7 +679,7 @@ public class AssistantActivity extends ThemableActivity
         mRemoteProvisioningInProgress = true;
 
         mProgress = ProgressDialog.show(this, null, null);
-        Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorE));
+        Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.light_grey_color));
         d.setAlpha(200);
         mProgress
                 .getWindow()
diff --git a/app/src/main/java/org/linphone/call/CallActivity.java b/app/src/main/java/org/linphone/call/CallActivity.java
index b1c0f485a..51acf3046 100644
--- a/app/src/main/java/org/linphone/call/CallActivity.java
+++ b/app/src/main/java/org/linphone/call/CallActivity.java
@@ -1217,7 +1217,7 @@ public class CallActivity extends LinphoneGenericActivity
         mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
         mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         mDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
+        Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.dark_grey_color));
         d.setAlpha(200);
         mDialog.setContentView(R.layout.dialog);
         mDialog.getWindow()
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
index a43ba0fae..c45eff20a 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
@@ -219,22 +219,26 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                     holder.imdmLayout.setVisibility(View.VISIBLE);
                     holder.imdmIcon.setImageResource(R.drawable.imdn_received);
                     holder.imdmLabel.setText(R.string.delivered);
-                    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));
+                    holder.imdmLabel.setTextColor(
+                            mContext.getResources().getColor(R.color.grey_color));
                 } else if (status == ChatMessage.State.Displayed) {
                     holder.imdmLayout.setVisibility(View.VISIBLE);
                     holder.imdmIcon.setImageResource(R.drawable.imdn_read);
                     holder.imdmLabel.setText(R.string.displayed);
-                    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorK));
+                    holder.imdmLabel.setTextColor(
+                            mContext.getResources().getColor(R.color.imdn_read_color));
                 } else if (status == ChatMessage.State.NotDelivered) {
                     holder.imdmLayout.setVisibility(View.VISIBLE);
                     holder.imdmIcon.setImageResource(R.drawable.imdn_error);
                     holder.imdmLabel.setText(R.string.error);
-                    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
+                    holder.imdmLabel.setTextColor(
+                            mContext.getResources().getColor(R.color.red_color));
                 } else if (status == ChatMessage.State.FileTransferError) {
                     holder.imdmLayout.setVisibility(View.VISIBLE);
                     holder.imdmIcon.setImageResource(R.drawable.imdn_error);
                     holder.imdmLabel.setText(R.string.file_transfer_error);
-                    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
+                    holder.imdmLabel.setTextColor(
+                            mContext.getResources().getColor(R.color.red_color));
                 }
 
                 // layoutParams allow bubbles alignment during selection mode
@@ -406,7 +410,8 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
             holder.bubbleLayout.setLayoutParams(layoutParams);
         } else { // Event is not chat message
             holder.eventLayout.setVisibility(View.VISIBLE);
-            holder.eventMessage.setTextColor(mContext.getResources().getColor(R.color.colorE));
+            holder.eventMessage.setTextColor(
+                    mContext.getResources().getColor(R.color.light_grey_color));
             holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_gray);
             holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_gray);
 
@@ -465,7 +470,7 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                     break;
                 case ConferenceSecurityEvent:
                     holder.eventMessage.setTextColor(
-                            mContext.getResources().getColor(R.color.colorI));
+                            mContext.getResources().getColor(R.color.red_color));
                     holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_red);
                     holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_red);
 
diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentyEightPlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentyEightPlus.java
index 13e89dfef..1235608ec 100644
--- a/app/src/main/java/org/linphone/compatibility/ApiTwentyEightPlus.java
+++ b/app/src/main/java/org/linphone/compatibility/ApiTwentyEightPlus.java
@@ -74,7 +74,7 @@ class ApiTwentyEightPlus {
                 .setNumber(notif.getMessages().size())
                 .setWhen(System.currentTimeMillis())
                 .setShowWhen(true)
-                .setColor(context.getColor(R.color.notification_color_led))
+                .setColor(context.getColor(R.color.notification_led_color))
                 .setStyle(style)
                 .addAction(ApiTwentyFourPlus.getReplyMessageAction(context, notif))
                 .addAction(ApiTwentyFourPlus.getMarkMessageAsReadAction(context, notif))
diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentyFourPlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentyFourPlus.java
index 96bb34636..a3e7995e9 100644
--- a/app/src/main/java/org/linphone/compatibility/ApiTwentyFourPlus.java
+++ b/app/src/main/java/org/linphone/compatibility/ApiTwentyFourPlus.java
@@ -84,7 +84,7 @@ class ApiTwentyFourPlus {
                 .setNumber(notif.getMessages().size())
                 .setWhen(System.currentTimeMillis())
                 .setShowWhen(true)
-                .setColor(context.getColor(R.color.notification_color_led))
+                .setColor(context.getColor(R.color.notification_led_color))
                 .setStyle(style)
                 .addAction(getReplyMessageAction(context, notif))
                 .addAction(getMarkMessageAsReadAction(context, notif))
@@ -114,7 +114,7 @@ class ApiTwentyFourPlus {
                         .setPriority(Notification.PRIORITY_HIGH)
                         .setWhen(System.currentTimeMillis())
                         .setShowWhen(true)
-                        .setColor(context.getColor(R.color.notification_color_led))
+                        .setColor(context.getColor(R.color.notification_led_color))
                         .addAction(getCallDeclineAction(context, callId));
 
         if (showAnswerAction) {
diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java
index 5c9067d33..dae668fb2 100644
--- a/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java
+++ b/app/src/main/java/org/linphone/compatibility/ApiTwentyOnePlus.java
@@ -60,7 +60,7 @@ class ApiTwentyOnePlus {
                                 | Notification.DEFAULT_LIGHTS)
                 .setLargeIcon(contactIcon)
                 .setLights(
-                        ContextCompat.getColor(context, R.color.notification_color_led),
+                        ContextCompat.getColor(context, R.color.notification_led_color),
                         context.getResources().getInteger(R.integer.notification_ms_on),
                         context.getResources().getInteger(R.integer.notification_ms_off))
                 .setCategory(Notification.CATEGORY_MESSAGE)
@@ -91,7 +91,7 @@ class ApiTwentyOnePlus {
                 .setVisibility(Notification.VISIBILITY_PUBLIC)
                 .setPriority(Notification.PRIORITY_HIGH)
                 .setLights(
-                        ContextCompat.getColor(context, R.color.notification_color_led),
+                        ContextCompat.getColor(context, R.color.notification_led_color),
                         context.getResources().getInteger(R.integer.notification_ms_on),
                         context.getResources().getInteger(R.integer.notification_ms_off))
                 .setShowWhen(true)
@@ -120,7 +120,7 @@ class ApiTwentyOnePlus {
                             .setCategory(Notification.CATEGORY_SERVICE)
                             .setVisibility(Notification.VISIBILITY_SECRET)
                             .setLights(
-                                    ContextCompat.getColor(context, R.color.notification_color_led),
+                                    ContextCompat.getColor(context, R.color.notification_led_color),
                                     context.getResources().getInteger(R.integer.notification_ms_on),
                                     context.getResources()
                                             .getInteger(R.integer.notification_ms_off))
@@ -138,7 +138,7 @@ class ApiTwentyOnePlus {
                             .setCategory(Notification.CATEGORY_SERVICE)
                             .setVisibility(Notification.VISIBILITY_SECRET)
                             .setLights(
-                                    ContextCompat.getColor(context, R.color.notification_color_led),
+                                    ContextCompat.getColor(context, R.color.notification_led_color),
                                     context.getResources().getInteger(R.integer.notification_ms_on),
                                     context.getResources()
                                             .getInteger(R.integer.notification_ms_off))
@@ -164,7 +164,7 @@ class ApiTwentyOnePlus {
                 .setCategory(Notification.CATEGORY_EVENT)
                 .setVisibility(Notification.VISIBILITY_PRIVATE)
                 .setLights(
-                        ContextCompat.getColor(context, R.color.notification_color_led),
+                        ContextCompat.getColor(context, R.color.notification_led_color),
                         context.getResources().getInteger(R.integer.notification_ms_on),
                         context.getResources().getInteger(R.integer.notification_ms_off))
                 .setPriority(Notification.PRIORITY_HIGH)
@@ -186,7 +186,7 @@ class ApiTwentyOnePlus {
                 .setCategory(Notification.CATEGORY_MESSAGE)
                 .setVisibility(Notification.VISIBILITY_PRIVATE)
                 .setLights(
-                        ContextCompat.getColor(context, R.color.notification_color_led),
+                        ContextCompat.getColor(context, R.color.notification_led_color),
                         context.getResources().getInteger(R.integer.notification_ms_on),
                         context.getResources().getInteger(R.integer.notification_ms_off))
                 .setWhen(System.currentTimeMillis())
diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java
index a632839a0..07ae1c969 100644
--- a/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java
+++ b/app/src/main/java/org/linphone/compatibility/ApiTwentySixPlus.java
@@ -90,7 +90,7 @@ class ApiTwentySixPlus {
         NotificationChannel channel =
                 new NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH);
         channel.setDescription(description);
-        channel.setLightColor(context.getColor(R.color.notification_color_led));
+        channel.setLightColor(context.getColor(R.color.notification_led_color));
         channel.enableLights(true);
         channel.enableVibration(true);
         channel.setShowBadge(true);
@@ -130,7 +130,7 @@ class ApiTwentySixPlus {
                 .setNumber(notif.getMessages().size())
                 .setWhen(System.currentTimeMillis())
                 .setShowWhen(true)
-                .setColor(context.getColor(R.color.notification_color_led))
+                .setColor(context.getColor(R.color.notification_led_color))
                 .setStyle(style)
                 .addAction(ApiTwentyFourPlus.getReplyMessageAction(context, notif))
                 .addAction(ApiTwentyFourPlus.getMarkMessageAsReadAction(context, notif))
@@ -162,7 +162,7 @@ class ApiTwentySixPlus {
                         .setPriority(Notification.PRIORITY_HIGH)
                         .setWhen(System.currentTimeMillis())
                         .setShowWhen(true)
-                        .setColor(context.getColor(R.color.notification_color_led))
+                        .setColor(context.getColor(R.color.notification_led_color))
                         .addAction(ApiTwentyFourPlus.getCallDeclineAction(context, callId));
 
         if (showAnswerAction) {
@@ -194,7 +194,7 @@ class ApiTwentySixPlus {
                     .setPriority(priority)
                     .setWhen(System.currentTimeMillis())
                     .setShowWhen(true)
-                    .setColor(context.getColor(R.color.notification_color_led))
+                    .setColor(context.getColor(R.color.notification_led_color))
                     .build();
         } else {
             return new Notification.Builder(
@@ -208,7 +208,7 @@ class ApiTwentySixPlus {
                     .setPriority(priority)
                     .setWhen(System.currentTimeMillis())
                     .setShowWhen(true)
-                    .setColor(context.getColor(R.color.notification_color_led))
+                    .setColor(context.getColor(R.color.notification_led_color))
                     .build();
         }
     }
@@ -228,7 +228,7 @@ class ApiTwentySixPlus {
                 .setPriority(Notification.PRIORITY_HIGH)
                 .setWhen(System.currentTimeMillis())
                 .setShowWhen(true)
-                .setColor(context.getColor(R.color.notification_color_led))
+                .setColor(context.getColor(R.color.notification_led_color))
                 .build();
     }
 
@@ -248,7 +248,7 @@ class ApiTwentySixPlus {
                 .setWhen(System.currentTimeMillis())
                 .setShowWhen(true)
                 .setColorized(true)
-                .setColor(context.getColor(R.color.notification_color_led))
+                .setColor(context.getColor(R.color.notification_led_color))
                 .build();
     }
 
diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java
index 98393916e..df9999757 100644
--- a/app/src/main/java/org/linphone/fragments/AboutFragment.java
+++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java
@@ -112,7 +112,8 @@ public class AboutFragment extends Fragment implements OnClickListener {
         mUploadInProgress = true;
 
         mProgress = ProgressDialog.show(LinphoneActivity.instance(), null, null);
-        Drawable d = new ColorDrawable(ContextCompat.getColor(getActivity(), R.color.colorE));
+        Drawable d =
+                new ColorDrawable(ContextCompat.getColor(getActivity(), R.color.light_grey_color));
         d.setAlpha(200);
         mProgress
                 .getWindow()
diff --git a/app/src/main/java/org/linphone/fragments/StatusFragment.java b/app/src/main/java/org/linphone/fragments/StatusFragment.java
index bed87640e..9d305efbc 100644
--- a/app/src/main/java/org/linphone/fragments/StatusFragment.java
+++ b/app/src/main/java/org/linphone/fragments/StatusFragment.java
@@ -175,7 +175,7 @@ public class StatusFragment extends Fragment {
             Window window = activity.getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
             window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.setStatusBarColor(ContextCompat.getColor(activity, R.color.colorADark10));
+            window.setStatusBarColor(ContextCompat.getColor(activity, R.color.primary_dark_color));
         }
 
         return view;
@@ -438,7 +438,9 @@ public class StatusFragment extends Fragment {
             mZrtpDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
             mZrtpDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
             mZrtpDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-            Drawable d = new ColorDrawable(ContextCompat.getColor(getActivity(), R.color.colorC));
+            Drawable d =
+                    new ColorDrawable(
+                            ContextCompat.getColor(getActivity(), R.color.dark_grey_color));
             d.setAlpha(200);
             mZrtpDialog.setContentView(R.layout.dialog);
             mZrtpDialog
diff --git a/app/src/main/java/org/linphone/utils/DeviceUtils.java b/app/src/main/java/org/linphone/utils/DeviceUtils.java
index 776f9850a..b7855ee21 100644
--- a/app/src/main/java/org/linphone/utils/DeviceUtils.java
+++ b/app/src/main/java/org/linphone/utils/DeviceUtils.java
@@ -142,7 +142,9 @@ public class DeviceUtils {
 
                     final Dialog dialog = new Dialog(context);
                     dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-                    Drawable d = new ColorDrawable(ContextCompat.getColor(context, R.color.colorC));
+                    Drawable d =
+                            new ColorDrawable(
+                                    ContextCompat.getColor(context, R.color.dark_grey_color));
                     d.setAlpha(200);
                     dialog.setContentView(R.layout.dialog);
                     dialog.getWindow()
diff --git a/app/src/main/res/color/dark_primary_text_color.xml b/app/src/main/res/color/dark_primary_text_color.xml
index be8a8c319..a0eaff7cb 100644
--- a/app/src/main/res/color/dark_primary_text_color.xml
+++ b/app/src/main/res/color/dark_primary_text_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/colorF"/>
-    <item android:color="@color/colorH"/>
+    <item android:state_enabled="false" android:color="@color/toolbar_color"/>
+    <item android:color="@color/white_color"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/light_primary_text_color.xml b/app/src/main/res/color/light_primary_text_color.xml
index 49b856089..13b5f1ece 100644
--- a/app/src/main/res/color/light_primary_text_color.xml
+++ b/app/src/main/res/color/light_primary_text_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/colorD"/>
-    <item android:color="@color/colorC"/>
+    <item android:state_enabled="false" android:color="@color/grey_color"/>
+    <item android:color="@color/dark_grey_color"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/security_switch_track_color.xml b/app/src/main/res/color/security_switch_track_color.xml
index 1adc098ec..2d884e585 100644
--- a/app/src/main/res/color/security_switch_track_color.xml
+++ b/app/src/main/res/color/security_switch_track_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/security_gray" android:state_enabled="false" />
-    <item android:color="@color/security_green" android:state_checked="true" />
-    <item android:color="@color/security_gray" />
+    <item android:color="@color/security_gray_color" android:state_enabled="false" />
+    <item android:color="@color/green_color" android:state_checked="true" />
+    <item android:color="@color/security_gray_color" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/assistant_button_text_color.xml b/app/src/main/res/drawable/assistant_button_text_color.xml
index 8e05da560..1797de9ce 100644
--- a/app/src/main/res/drawable/assistant_button_text_color.xml
+++ b/app/src/main/res/drawable/assistant_button_text_color.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_enabled="true"
-		android:color="@color/colorB"/>
+		android:color="@color/black_color"/>
 	<item
-		android:color="@color/colorE"/>
+		android:color="@color/light_grey_color"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_background_dark.xml b/app/src/main/res/drawable/button_background_dark.xml
index 8f3843085..034a4fd2e 100644
--- a/app/src/main/res/drawable/button_background_dark.xml
+++ b/app/src/main/res/drawable/button_background_dark.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		android:drawable="@color/colorD" />
+		android:drawable="@color/grey_color" />
 	<item android:state_enabled="false"
-		android:drawable="@color/colorC" />
+		android:drawable="@color/dark_grey_color" />
 	<item android:state_selected="true"
-		android:drawable="@color/colorC" />
+		android:drawable="@color/dark_grey_color" />
 	<item
-		android:drawable="@color/colorC" />
+		android:drawable="@color/dark_grey_color" />
 </selector>
diff --git a/app/src/main/res/drawable/button_background_light.xml b/app/src/main/res/drawable/button_background_light.xml
index bc101d5e2..c0df18fdd 100644
--- a/app/src/main/res/drawable/button_background_light.xml
+++ b/app/src/main/res/drawable/button_background_light.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		android:drawable="@color/colorE" />
+		android:drawable="@color/light_grey_color" />
 	<item android:state_enabled="false"
-		android:drawable="@color/colorF" />
+		android:drawable="@color/toolbar_color" />
 	<item android:state_selected="true"
-		android:drawable="@color/colorF" />
+		android:drawable="@color/toolbar_color" />
 	<item
-		android:drawable="@color/colorF" />
+		android:drawable="@color/toolbar_color" />
 </selector>
diff --git a/app/src/main/res/drawable/call.xml b/app/src/main/res/drawable/call.xml
index d664e9a76..9ed0f637e 100644
--- a/app/src/main/res/drawable/call.xml
+++ b/app/src/main/res/drawable/call.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorL" android:state_pressed="true" />
-    <item android:drawable="@color/colorL" android:state_enabled="false" />
-    <item android:drawable="@color/colorA" />
+    <item android:drawable="@color/green_color" android:state_pressed="true" />
+    <item android:drawable="@color/green_color" android:state_enabled="false" />
+    <item android:drawable="@color/primary_color" />
 </selector>
 
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_full.xml b/app/src/main/res/drawable/chat_bubble_incoming_full.xml
index 35f7e591e..f541f2504 100644
--- a/app/src/main/res/drawable/chat_bubble_incoming_full.xml
+++ b/app/src/main/res/drawable/chat_bubble_incoming_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming"/>
+    <solid android:color="@color/chat_bubble_incoming_color"/>
     <corners android:radius="6.7dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml b/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml
index 678862a48..46f1fe172 100644
--- a/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml
+++ b/app/src/main/res/drawable/chat_bubble_incoming_split_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming"/>
+    <solid android:color="@color/chat_bubble_incoming_color"/>
     <corners android:radius="6.7dp" android:bottomLeftRadius="0dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml b/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml
index 4379ce979..a3a9cfcc2 100644
--- a/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml
+++ b/app/src/main/res/drawable/chat_bubble_incoming_split_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming"/>
+    <solid android:color="@color/chat_bubble_incoming_color"/>
     <corners android:radius="6.7dp" android:topLeftRadius="0dp" android:bottomLeftRadius="0dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml b/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml
index 1c2b7da3e..af2af2629 100644
--- a/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml
+++ b/app/src/main/res/drawable/chat_bubble_incoming_split_3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_incoming"/>
+    <solid android:color="@color/chat_bubble_incoming_color"/>
     <corners android:radius="6.7dp" android:topLeftRadius="0dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_full.xml b/app/src/main/res/drawable/chat_bubble_outgoing_full.xml
index c5f1d2334..53c64a052 100644
--- a/app/src/main/res/drawable/chat_bubble_outgoing_full.xml
+++ b/app/src/main/res/drawable/chat_bubble_outgoing_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing"/>
+    <solid android:color="@color/chat_bubble_outgoing_color"/>
     <corners android:radius="6.7dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml b/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml
index 58caa05ee..74894387e 100644
--- a/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml
+++ b/app/src/main/res/drawable/chat_bubble_outgoing_split_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing"/>
+    <solid android:color="@color/chat_bubble_outgoing_color"/>
     <corners android:radius="6.7dp" android:bottomRightRadius="0dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml b/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml
index 6ab14f265..6d58ce71a 100644
--- a/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml
+++ b/app/src/main/res/drawable/chat_bubble_outgoing_split_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing"/>
+    <solid android:color="@color/chat_bubble_outgoing_color"/>
     <corners android:radius="6.7dp" android:topRightRadius="0dp" android:bottomRightRadius="0dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml b/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml
index d040399e1..e0df185f3 100644
--- a/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml
+++ b/app/src/main/res/drawable/chat_bubble_outgoing_split_3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/chat_bubble_outgoing"/>
+    <solid android:color="@color/chat_bubble_outgoing_color"/>
     <corners android:radius="6.7dp" android:topRightRadius="0dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/dialer.xml b/app/src/main/res/drawable/dialer.xml
index 525c33507..ea7c17f05 100644
--- a/app/src/main/res/drawable/dialer.xml
+++ b/app/src/main/res/drawable/dialer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorA" android:state_pressed="true" />
-    <item android:drawable="@color/colorD" android:state_selected="true" />
-    <item android:drawable="@color/colorD" />
+    <item android:drawable="@color/primary_color" android:state_pressed="true" />
+    <item android:drawable="@color/grey_color" android:state_selected="true" />
+    <item android:drawable="@color/grey_color" />
 </selector>
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
index 9afcc7d80..1ac7d6320 100644
--- a/app/src/main/res/drawable/divider.xml
+++ b/app/src/main/res/drawable/divider.xml
@@ -3,5 +3,5 @@
     <size
         android:width="1dp"
         android:height="1dp" />
-    <solid android:color="@color/colorE" />
+    <solid android:color="@color/light_grey_color" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/event_decoration_red.xml b/app/src/main/res/drawable/event_decoration_red.xml
index 45232fb87..f9e4927bf 100644
--- a/app/src/main/res/drawable/event_decoration_red.xml
+++ b/app/src/main/res/drawable/event_decoration_red.xml
@@ -2,6 +2,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="line">
-    <stroke android:width="1dp" android:color="@color/colorI"/>
+    <stroke android:width="1dp" android:color="@color/red_color"/>
     <size android:height="1dp" android:width="50dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/footer_button.xml b/app/src/main/res/drawable/footer_button.xml
index ff9921a98..e0e1f6cbb 100644
--- a/app/src/main/res/drawable/footer_button.xml
+++ b/app/src/main/res/drawable/footer_button.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		android:drawable="@color/colorA" />
+		android:drawable="@color/primary_color" />
 	<item android:state_selected="true"
-		android:drawable="@color/colorC" />
+		android:drawable="@color/dark_grey_color" />
 	<item
-		android:drawable="@color/colorC" />
+		android:drawable="@color/dark_grey_color" />
 </selector>
diff --git a/app/src/main/res/drawable/hangup.xml b/app/src/main/res/drawable/hangup.xml
index 6f845127d..2e55eaf93 100644
--- a/app/src/main/res/drawable/hangup.xml
+++ b/app/src/main/res/drawable/hangup.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorI" android:state_pressed="true" />
-    <item android:drawable="@color/colorD" android:state_enabled="false" />
-    <item android:drawable="@color/colorD" />
+    <item android:drawable="@color/red_color" android:state_pressed="true" />
+    <item android:drawable="@color/grey_color" android:state_enabled="false" />
+    <item android:drawable="@color/grey_color" />
 </selector>
 
diff --git a/app/src/main/res/drawable/round_button_background_default.xml b/app/src/main/res/drawable/round_button_background_default.xml
index dea53353a..70045e2d8 100644
--- a/app/src/main/res/drawable/round_button_background_default.xml
+++ b/app/src/main/res/drawable/round_button_background_default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorF"/>
+    <solid android:color="@color/toolbar_color"/>
     <size android:width="30dp" android:height="30dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/round_button_background_over.xml b/app/src/main/res/drawable/round_button_background_over.xml
index 309f91c56..211384486 100644
--- a/app/src/main/res/drawable/round_button_background_over.xml
+++ b/app/src/main/res/drawable/round_button_background_over.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorA"/>
+    <solid android:color="@color/primary_color"/>
     <size android:width="30dp" android:height="30dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/round_orange_button_background_default.xml b/app/src/main/res/drawable/round_orange_button_background_default.xml
index 309f91c56..211384486 100644
--- a/app/src/main/res/drawable/round_orange_button_background_default.xml
+++ b/app/src/main/res/drawable/round_orange_button_background_default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorA"/>
+    <solid android:color="@color/primary_color"/>
     <size android:width="30dp" android:height="30dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/round_orange_button_background_over.xml b/app/src/main/res/drawable/round_orange_button_background_over.xml
index 9e7ef1ff9..abad4e866 100644
--- a/app/src/main/res/drawable/round_orange_button_background_over.xml
+++ b/app/src/main/res/drawable/round_orange_button_background_over.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorL"/>
+    <solid android:color="@color/green_color"/>
     <size android:width="30dp" android:height="30dp"/>
 </shape>
diff --git a/app/src/main/res/drawable/security_switch_thumb.xml b/app/src/main/res/drawable/security_switch_thumb.xml
index e025e9c92..f5898deab 100644
--- a/app/src/main/res/drawable/security_switch_thumb.xml
+++ b/app/src/main/res/drawable/security_switch_thumb.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size android:height="20dp" android:width="20dp"/>
-    <solid android:color="@color/security_thumb"/>
+    <solid android:color="@color/white_color"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/unread_message_count_bg.xml b/app/src/main/res/drawable/unread_message_count_bg.xml
index 4a3f66cab..940a12693 100644
--- a/app/src/main/res/drawable/unread_message_count_bg.xml
+++ b/app/src/main/res/drawable/unread_message_count_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorA"/>
+    <solid android:color="@color/primary_color"/>
     <size android:width="20dp" android:height="20dp"/>
 </shape>
diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index fd2722636..d24ff39cb 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -10,7 +10,7 @@
         android:layout_height="0dp"
         android:layout_gravity="center"
         android:layout_weight="1"
-        android:background="@color/colorC"
+        android:background="@color/dark_grey_color"
         android:baselineAligned="false"
         android:orientation="horizontal">
 
@@ -93,7 +93,7 @@
             android:autoLink="web"
             android:gravity="center"
             android:text="@string/about_link"
-            android:textColorLink="@color/colorA" />
+            android:textColorLink="@color/primary_color" />
 
         <TextView
             android:id="@+id/about_text"
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index e2db164c5..3114567c3 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -4,7 +4,7 @@
     android:id="@+id/topLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorB">
+    android:background="@color/black_color">
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/side_menu"
@@ -51,7 +51,7 @@
                         android:layout_alignParentTop="true"
                         android:layout_centerHorizontal="true"
                         android:alpha="0.8"
-                        android:background="@color/colorH"
+                        android:background="@color/white_color"
                         android:orientation="vertical">
 
                         <TextView
@@ -90,7 +90,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:alpha="0.9"
-                        android:background="@color/colorC"
+                        android:background="@color/dark_grey_color"
                         android:gravity="center"
                         android:orientation="vertical"
                         android:visibility="gone">
@@ -139,7 +139,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
                     android:layout_gravity="bottom"
-                    android:background="@color/colorH"
+                    android:background="@color/white_color"
                     android:orientation="vertical"/>
 
                 <LinearLayout
@@ -147,7 +147,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_above="@id/calls_list"
-                    android:background="@color/colorC"
+                    android:background="@color/dark_grey_color"
                     android:gravity="center_vertical"
                     android:orientation="vertical"
                     android:visibility="gone">
@@ -201,7 +201,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="0.25"
-                        android:background="@color/colorC"
+                        android:background="@color/dark_grey_color"
                         android:contentDescription="@string/content_description_numpad"
                         android:padding="15dp"
                         android:src="@drawable/footer_dialer" />
@@ -228,7 +228,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_centerInParent="true"
-                            android:background="@color/colorC"
+                            android:background="@color/dark_grey_color"
                             android:contentDescription="@string/content_description_chat_button"
                             android:padding="15dp"
                             android:src="@drawable/footer_chat" />
@@ -429,7 +429,7 @@
                     android:layout_centerInParent="true"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
-                    android:background="@color/colorF"
+                    android:background="@color/toolbar_color"
                     android:contentDescription="@string/content_description_numpad"
                     android:visibility="gone" />
 
@@ -443,7 +443,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="left"
             android:layout_marginTop="40dp"
-            android:background="@color/colorH">
+            android:background="@color/white_color">
 
             <include
                 android:id="@+id/incall_stats"
diff --git a/app/src/main/res/layout-land/dialer.xml b/app/src/main/res/layout-land/dialer.xml
index e7ac3d318..a5dff820c 100644
--- a/app/src/main/res/layout-land/dialer.xml
+++ b/app/src/main/res/layout-land/dialer.xml
@@ -45,7 +45,7 @@
             android:inputType="textEmailAddress"
             android:paddingLeft="20dp"
             android:paddingRight="5dp"
-            android:textColorHint="@color/colorE" />
+            android:textColorHint="@color/light_grey_color" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout-land/launch_screen.xml b/app/src/main/res/layout-land/launch_screen.xml
index c96f0dee7..05de119aa 100644
--- a/app/src/main/res/layout-land/launch_screen.xml
+++ b/app/src/main/res/layout-land/launch_screen.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorC">
+    android:background="@color/dark_grey_color">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,13 +39,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
-        android:indeterminateTint="@color/colorA"
+        android:indeterminateTint="@color/primary_color"
         android:layout_marginBottom="20dp" />
 
     <View
         android:layout_width="100dp"
         android:layout_height="10dp"
         android:layout_gravity="center_horizontal|bottom"
-        android:background="@color/colorA" />
+        android:background="@color/primary_color" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index 94369e840..c7befb618 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -267,7 +267,7 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:cacheColorHint="@color/transparent"
+                    android:cacheColorHint="@color/transparent_color"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
                     android:dividerHeight="0dp" />
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
index b4671409b..6109edf22 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -110,7 +110,7 @@
                                     android:inputType="phone"
                                     android:maxLines="1"
                                     android:text="+"
-                                    android:textColor="@color/colorB" />
+                                    android:textColor="@color/black_color" />
 
                                 <EditText
                                     android:id="@+id/phone_number"
@@ -120,7 +120,7 @@
                                     android:contentDescription="@string/content_description_phone_number_field"
                                     android:inputType="phone"
                                     android:maxLines="1"
-                                    android:textColor="@color/colorB" />
+                                    android:textColor="@color/black_color" />
 
                             </LinearLayout>
 
@@ -178,7 +178,7 @@
                         android:contentDescription="@string/content_description_username_field"
                         android:inputType="text|textNoSuggestions"
                         android:maxLines="1"
-                        android:textColor="@color/colorB" />
+                        android:textColor="@color/black_color" />
 
                     <TextView
                         android:id="@+id/username_error"
@@ -217,7 +217,7 @@
                         android:maxLines="1"
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
-                        android:textColor="@color/colorB"
+                        android:textColor="@color/black_color"
                         android:textCursorDrawable="@null" />
 
                     <TextView
@@ -265,7 +265,7 @@
                         android:maxLines="1"
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
-                        android:textColor="@color/colorB"
+                        android:textColor="@color/black_color"
                         android:textCursorDrawable="@null" />
 
                     <TextView
@@ -306,7 +306,7 @@
                         android:maxLines="1"
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
-                        android:textColor="@color/colorB"
+                        android:textColor="@color/black_color"
                         android:textCursorDrawable="@null" />
 
                     <TextView
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
index bfb4aad45..2becbd868 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -97,7 +97,7 @@
                             android:inputType="phone"
                             android:maxLines="1"
                             android:text="+"
-                            android:textColor="@color/colorB" />
+                            android:textColor="@color/black_color" />
 
                         <EditText
                             android:id="@+id/phone_number"
@@ -107,7 +107,7 @@
                             android:contentDescription="@string/content_description_phone_number_field"
                             android:inputType="phone"
                             android:maxLines="1"
-                            android:textColor="@color/colorB" />
+                            android:textColor="@color/black_color" />
 
                     </LinearLayout>
 
@@ -154,7 +154,7 @@
                     android:contentDescription="@string/content_description_username_field"
                     android:inputType="text|textNoSuggestions"
                     android:maxLines="1"
-                    android:textColor="@color/colorB" />
+                    android:textColor="@color/black_color" />
 
             </LinearLayout>
 
@@ -182,7 +182,7 @@
                     android:background="@drawable/resizable_textfield"
                     android:inputType="textPassword"
                     android:maxLines="1"
-                    android:textColor="@color/colorB" />
+                    android:textColor="@color/black_color" />
 
                 <TextView
                     android:id="@+id/forgot_password"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
index e2cccbf0f..f0ab54b9e 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
@@ -57,7 +57,7 @@
                         android:contentDescription="@string/content_description_username_field"
                         android:inputType="text|textNoSuggestions"
                         android:maxLines="1"
-                        android:textColor="@color/colorB" />
+                        android:textColor="@color/black_color" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -81,7 +81,7 @@
                         android:background="@drawable/resizable_textfield"
                         android:inputType="textPassword"
                         android:maxLines="1"
-                        android:textColor="@color/colorB" />
+                        android:textColor="@color/black_color" />
                 </LinearLayout>
             </TableRow>
 
@@ -111,7 +111,7 @@
                         android:contentDescription="@string/content_description_display_field"
                         android:inputType="textPersonName"
                         android:maxLines="1"
-                        android:textColor="@color/colorB" />
+                        android:textColor="@color/black_color" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -136,7 +136,7 @@
                         android:contentDescription="@string/content_description_domain_field"
                         android:inputType="textUri"
                         android:maxLines="1"
-                        android:textColor="@color/colorB" />
+                        android:textColor="@color/black_color" />
                 </LinearLayout>
 
             </TableRow>
@@ -167,7 +167,7 @@
                         android:contentDescription="@string/content_description_username_field"
                         android:inputType="text|textNoSuggestions"
                         android:maxLines="1"
-                        android:textColor="@color/colorB" />
+                        android:textColor="@color/black_color" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout-sw533dp-land/dialer.xml b/app/src/main/res/layout-sw533dp-land/dialer.xml
index 34b4b7474..4083cb87e 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorD">
+    android:background="@color/grey_color">
 
     <ImageView
         android:layout_width="wrap_content"
@@ -50,7 +50,7 @@
                 android:inputType="textEmailAddress"
                 android:paddingLeft="20dp"
                 android:paddingRight="5dp"
-                android:textColorHint="@color/colorE" />
+                android:textColorHint="@color/light_grey_color" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index be5d084ab..95460d556 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -253,7 +253,7 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:cacheColorHint="@color/transparent"
+                    android:cacheColorHint="@color/transparent_color"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
                     android:dividerHeight="0dp" />
diff --git a/app/src/main/res/layout-sw533dp/dialer.xml b/app/src/main/res/layout-sw533dp/dialer.xml
index 2e7047dd9..a8efa4796 100644
--- a/app/src/main/res/layout-sw533dp/dialer.xml
+++ b/app/src/main/res/layout-sw533dp/dialer.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorD">
+    android:background="@color/grey_color">
 
     <ImageView
         android:layout_width="400dp"
@@ -50,7 +50,7 @@
                 android:inputType="textEmailAddress"
                 android:paddingLeft="20dp"
                 android:paddingRight="5dp"
-                android:textColorHint="@color/colorE" />
+                android:textColorHint="@color/light_grey_color" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index 46a45b32d..01e5b3174 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -253,7 +253,7 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:cacheColorHint="@color/transparent"
+                    android:cacheColorHint="@color/transparent_color"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
                     android:dividerHeight="0dp" />
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 2ee851511..8829563c0 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -10,7 +10,7 @@
         android:layout_height="0dp"
         android:layout_gravity="center"
         android:layout_weight="1"
-        android:background="@color/colorC"
+        android:background="@color/dark_grey_color"
         android:gravity="center"
         android:orientation="vertical"
         android:padding="10dp">
@@ -69,7 +69,7 @@
             android:gravity="center"
             android:paddingTop="20dp"
             android:text="@string/about_link"
-            android:textColorLink="@color/colorA" />
+            android:textColorLink="@color/primary_color" />
 
         <TextView
             android:id="@+id/about_text"
diff --git a/app/src/main/res/layout/assistant_account_creation.xml b/app/src/main/res/layout/assistant_account_creation.xml
index de04c9a1a..fc8da3557 100644
--- a/app/src/main/res/layout/assistant_account_creation.xml
+++ b/app/src/main/res/layout/assistant_account_creation.xml
@@ -86,7 +86,7 @@
 						<EditText
 							android:id="@+id/dial_code"
 							android:background="@drawable/resizable_textfield"
-							android:textColor="@color/colorB"
+							android:textColor="@color/black_color"
 							android:inputType="phone"
 							android:text="+"
 							android:layout_marginRight="10dp"
@@ -98,7 +98,7 @@
 						<EditText
 							android:id="@+id/phone_number"
 							android:background="@drawable/resizable_textfield"
-							android:textColor="@color/colorB"
+							android:textColor="@color/black_color"
 							android:contentDescription="@string/content_description_phone_number_field"
 							android:inputType="phone"
 							android:layout_width="match_parent"
@@ -142,7 +142,7 @@
 				<EditText
 					android:id="@+id/username"
 					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
+					android:textColor="@color/black_color"
 					android:contentDescription="@string/content_description_username_field"
 					android:inputType="text|textNoSuggestions"
 					android:layout_width="match_parent"
@@ -182,7 +182,7 @@
 					<EditText
 						android:id="@+id/email"
 						android:background="@drawable/resizable_textfield"
-						android:textColor="@color/colorB"
+						android:textColor="@color/black_color"
 						android:inputType="textEmailAddress"
 						android:contentDescription="@string/content_description_email_field"
 						android:textCursorDrawable="@null"
@@ -225,7 +225,7 @@
 						<EditText
 							android:id="@+id/password"
 							android:background="@drawable/resizable_textfield"
-							android:textColor="@color/colorB"
+							android:textColor="@color/black_color"
 							android:inputType="textPassword"
 							android:textCursorDrawable="@null"
 							android:layout_width="match_parent"
@@ -261,7 +261,7 @@
 						<EditText
 							android:id="@+id/confirm_password"
 							android:background="@drawable/resizable_textfield"
-							android:textColor="@color/colorB"
+							android:textColor="@color/black_color"
 							android:inputType="textPassword"
 							android:contentDescription="@string/content_description_confirm_password_field"
 							android:textCursorDrawable="@null"
diff --git a/app/src/main/res/layout/assistant_account_creation_code_activation.xml b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
index 1230aa1f8..d7e78dce3 100644
--- a/app/src/main/res/layout/assistant_account_creation_code_activation.xml
+++ b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
@@ -47,7 +47,7 @@
 		<EditText
 			android:id="@+id/assistant_code"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/black_color"
 			android:contentDescription="@string/content_description_activation_code_field"
 			android:inputType="number"
 			android:gravity="center_vertical|center_horizontal"
diff --git a/app/src/main/res/layout/assistant_country_list.xml b/app/src/main/res/layout/assistant_country_list.xml
index f9152b2b6..a795da5f3 100644
--- a/app/src/main/res/layout/assistant_country_list.xml
+++ b/app/src/main/res/layout/assistant_country_list.xml
@@ -32,7 +32,7 @@
             android:background="@drawable/resizable_textfield"
             android:gravity="center"
             android:inputType="textPersonName"
-            android:textColor="@color/colorB"
+            android:textColor="@color/black_color"
             android:textCursorDrawable="@null" />
 
         <ImageView
@@ -51,8 +51,8 @@
         android:id="@+id/countryList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:cacheColorHint="@color/transparent"
-        android:divider="@color/colorE"
+        android:cacheColorHint="@color/transparent_color"
+        android:divider="@color/light_grey_color"
         android:dividerHeight="1dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_linphone_login.xml b/app/src/main/res/layout/assistant_linphone_login.xml
index bee22dd40..5c662237c 100644
--- a/app/src/main/res/layout/assistant_linphone_login.xml
+++ b/app/src/main/res/layout/assistant_linphone_login.xml
@@ -93,7 +93,7 @@
 							<EditText
 								android:id="@+id/dial_code"
 								android:background="@drawable/resizable_textfield"
-								android:textColor="@color/colorB"
+								android:textColor="@color/black_color"
 								android:inputType="phone"
 								android:text="+"
 								android:layout_marginRight="10dp"
@@ -105,7 +105,7 @@
 							<EditText
 								android:id="@+id/phone_number"
 								android:background="@drawable/resizable_textfield"
-								android:textColor="@color/colorB"
+								android:textColor="@color/black_color"
 								android:contentDescription="@string/content_description_phone_number_field"
 								android:inputType="phone"
 								android:layout_width="match_parent"
@@ -144,7 +144,7 @@
 				<EditText
 					android:id="@+id/assistant_username"
 					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
+					android:textColor="@color/black_color"
 					android:inputType="text|textNoSuggestions"
 					android:contentDescription="@string/content_description_username_field"
 					android:layout_width="match_parent"
@@ -170,7 +170,7 @@
 				<EditText
 					android:id="@+id/assistant_password"
 					android:background="@drawable/resizable_textfield"
-					android:textColor="@color/colorB"
+					android:textColor="@color/black_color"
 					android:inputType="textPassword"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
diff --git a/app/src/main/res/layout/assistant_login.xml b/app/src/main/res/layout/assistant_login.xml
index 4c49549f7..ed48343cc 100644
--- a/app/src/main/res/layout/assistant_login.xml
+++ b/app/src/main/res/layout/assistant_login.xml
@@ -49,7 +49,7 @@
                 android:contentDescription="@string/content_description_username_field"
                 android:inputType="text|textNoSuggestions"
                 android:maxLines="1"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
             <TextView
                 style="@style/assistant_input_field_header_font"
@@ -67,7 +67,7 @@
                 android:contentDescription="@string/content_description_username_field"
                 android:inputType="text|textNoSuggestions"
                 android:maxLines="1"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
             <TextView
                 style="@style/assistant_input_field_header_font"
@@ -84,7 +84,7 @@
                 android:background="@drawable/resizable_textfield"
                 android:inputType="textPassword"
                 android:maxLines="1"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
             <TextView
                 style="@style/assistant_input_field_header_font"
@@ -102,7 +102,7 @@
                 android:contentDescription="@string/content_description_domain_field"
                 android:inputType="textUri"
                 android:maxLines="1"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
             <TextView
                 style="@style/assistant_input_field_header_font"
@@ -120,7 +120,7 @@
                 android:contentDescription="@string/content_description_display_field"
                 android:inputType="textPersonName"
                 android:maxLines="1"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
             <TextView
                 style="@style/assistant_input_field_header_font"
diff --git a/app/src/main/res/layout/assistant_remote_provisioning.xml b/app/src/main/res/layout/assistant_remote_provisioning.xml
index 95f270d22..fa459dc88 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning.xml
@@ -41,7 +41,7 @@
 		<EditText
 			android:id="@+id/assistant_remote_provisioning_url"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/black_color"
 			android:inputType="textUri"
 			android:contentDescription="@string/content_description_url_field"
 			android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/assistant_remote_provisioning_login.xml b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
index 7f41790aa..52cf3d70b 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning_login.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
@@ -41,7 +41,7 @@
 		<EditText
 			android:id="@+id/assistant_username"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/black_color"
 			android:textCursorDrawable="@null"
 			android:inputType="textNoSuggestions"
 			android:layout_width="match_parent"
@@ -61,7 +61,7 @@
 		<EditText
 			android:id="@+id/assistant_password"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/black_color"
 			android:textCursorDrawable="@null"
 			android:inputType="textPassword"
 			android:layout_width="match_parent"
@@ -83,7 +83,7 @@
 		<EditText
 			android:id="@+id/assistant_domain"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/black_color"
 			android:textCursorDrawable="@null"
 			android:inputType="textUri"
 			android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index 1af34b193..f775a4f1c 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -4,7 +4,7 @@
     android:id="@+id/topLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorB">
+    android:background="@color/black_color">
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/side_menu"
@@ -90,7 +90,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:alpha="0.9"
-                        android:background="@color/colorC"
+                        android:background="@color/dark_grey_color"
                         android:gravity="center"
                         android:orientation="vertical"
                         android:visibility="gone">
@@ -367,7 +367,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="0.25"
-                        android:background="@color/colorC"
+                        android:background="@color/dark_grey_color"
                         android:contentDescription="@string/content_description_numpad"
                         android:padding="15dp"
                         android:src="@drawable/footer_dialer" />
@@ -394,7 +394,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_centerInParent="true"
-                            android:background="@color/colorC"
+                            android:background="@color/dark_grey_color"
                             android:contentDescription="@string/content_description_chat_button"
                             android:padding="15dp"
                             android:src="@drawable/footer_chat" />
@@ -427,7 +427,7 @@
                     android:layout_centerInParent="true"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
-                    android:background="@color/colorF"
+                    android:background="@color/toolbar_color"
                     android:contentDescription="@string/content_description_numpad"
                     android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/call_incoming_answer_button.xml b/app/src/main/res/layout/call_incoming_answer_button.xml
index 0ad77356c..9770082ca 100644
--- a/app/src/main/res/layout/call_incoming_answer_button.xml
+++ b/app/src/main/res/layout/call_incoming_answer_button.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="@color/colorL"
+    android:background="@color/green_color"
     android:gravity="center"
     android:padding="12dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/layout/call_incoming_decline_button.xml b/app/src/main/res/layout/call_incoming_decline_button.xml
index a13d02808..87d0f7f3b 100644
--- a/app/src/main/res/layout/call_incoming_decline_button.xml
+++ b/app/src/main/res/layout/call_incoming_decline_button.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="@color/colorI"
+    android:background="@color/red_color"
     android:gravity="center"
     android:padding="12dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/layout/chat.xml b/app/src/main/res/layout/chat.xml
index 7fba1822f..1fed51300 100644
--- a/app/src/main/res/layout/chat.xml
+++ b/app/src/main/res/layout/chat.xml
@@ -160,7 +160,7 @@
                 android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
                 android:maxLines="6"
                 android:padding="5dp"
-                android:textColor="@color/colorB"
+                android:textColor="@color/black_color"
                 android:textCursorDrawable="@null" />
 
             <ImageView
@@ -189,10 +189,10 @@
         android:layout_height="match_parent"
         android:layout_above="@id/remote_composing"
         android:layout_below="@+id/top"
-        android:cacheColorHint="@color/transparent"
+        android:cacheColorHint="@color/transparent_color"
         android:choiceMode="multipleChoice"
         android:divider="@android:color/transparent"
-        android:listSelector="@color/transparent"
+        android:listSelector="@color/transparent_color"
         android:transcriptMode="normal" />
 
     <ImageView
diff --git a/app/src/main/res/layout/chat_bubble_content.xml b/app/src/main/res/layout/chat_bubble_content.xml
index 0d5615149..daf3cb997 100644
--- a/app/src/main/res/layout/chat_bubble_content.xml
+++ b/app/src/main/res/layout/chat_bubble_content.xml
@@ -25,7 +25,7 @@
         android:layout_width="150dp"
         android:layout_height="100dp"
         android:layout_margin="5dp"
-        android:background="@color/colorN"
+        android:background="@color/chat_bubble_text_color"
         android:ellipsize="end"
         android:gravity="center"
         android:textAlignment="center"
diff --git a/app/src/main/res/layout/chat_bubble_old.xml b/app/src/main/res/layout/chat_bubble_old.xml
index 3ce3c980d..ad585e00c 100644
--- a/app/src/main/res/layout/chat_bubble_old.xml
+++ b/app/src/main/res/layout/chat_bubble_old.xml
@@ -201,7 +201,7 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
                 android:paddingRight="5dp"
-                android:progressTint="@color/colorB" />
+                android:progressTint="@color/black_color" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml
index 3d250e5c0..a13c82c08 100644
--- a/app/src/main/res/layout/chat_create.xml
+++ b/app/src/main/res/layout/chat_create.xml
@@ -142,7 +142,7 @@
                 android:paddingRight="5dp"
                 android:queryBackground="@android:color/transparent"
                 android:queryHint="@string/chat_room_creation_filter_hint"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_imdn.xml b/app/src/main/res/layout/chat_imdn.xml
index 9f7871d48..7d7579fb4 100644
--- a/app/src/main/res/layout/chat_imdn.xml
+++ b/app/src/main/res/layout/chat_imdn.xml
@@ -66,7 +66,7 @@
                     android:id="@+id/read_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -94,7 +94,7 @@
                     android:id="@+id/delivered_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -122,7 +122,7 @@
                     android:id="@+id/sent_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -151,7 +151,7 @@
                     android:id="@+id/undelivered_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/chat_imdn_old.xml b/app/src/main/res/layout/chat_imdn_old.xml
index 5f9272507..31cf38fb9 100644
--- a/app/src/main/res/layout/chat_imdn_old.xml
+++ b/app/src/main/res/layout/chat_imdn_old.xml
@@ -73,7 +73,7 @@
                     android:id="@+id/read_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -101,7 +101,7 @@
                     android:id="@+id/delivered_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -129,7 +129,7 @@
                     android:id="@+id/sent_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -158,7 +158,7 @@
                     android:id="@+id/undelivered_layout_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorG"
+                    android:background="@color/header_background_color"
                     android:gravity="center"
                     android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/chat_infos.xml b/app/src/main/res/layout/chat_infos.xml
index 702c643d5..2340e3806 100644
--- a/app/src/main/res/layout/chat_infos.xml
+++ b/app/src/main/res/layout/chat_infos.xml
@@ -125,7 +125,7 @@
                 android:gravity="center"
                 android:text="@string/chat_room_leave_group"
                 android:textAllCaps="true"
-                android:textColor="@color/colorG"
+                android:textColor="@color/white_color"
                 android:textSize="15sp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/chatlist.xml b/app/src/main/res/layout/chatlist.xml
index e906cf8e2..4e35ed443 100644
--- a/app/src/main/res/layout/chatlist.xml
+++ b/app/src/main/res/layout/chatlist.xml
@@ -69,7 +69,7 @@
             android:id="@+id/chatList"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:cacheColorHint="@color/transparent"
+            android:cacheColorHint="@color/transparent_color"
             android:divider="?attr/dividerColor"
             android:dividerHeight="1dp" />
 
diff --git a/app/src/main/res/layout/chatlist_cell.xml b/app/src/main/res/layout/chatlist_cell.xml
index dc3dbf219..6883b6d68 100644
--- a/app/src/main/res/layout/chatlist_cell.xml
+++ b/app/src/main/res/layout/chatlist_cell.xml
@@ -100,7 +100,7 @@
         android:id="@+id/selected_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/notification_color_led"
+        android:background="@color/notification_led_color"
         android:visibility="invisible" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index 438b368d3..faa2e2731 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -91,7 +91,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
-                    android:textColor="@color/colorB"
+                    android:textColor="@color/black_color"
                     android:contentDescription="@string/content_description_contact_last_name"
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
@@ -112,7 +112,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
-                    android:textColor="@color/colorB"
+                    android:textColor="@color/black_color"
                     android:contentDescription="@string/content_description_contact_first_name"
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
@@ -134,7 +134,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:background="@drawable/resizable_textfield"
-                    android:textColor="@color/colorB"
+                    android:textColor="@color/black_color"
                     android:contentDescription="@string/content_description_contact_organization"
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
diff --git a/app/src/main/res/layout/contact_edit_row.xml b/app/src/main/res/layout/contact_edit_row.xml
index 1a86372bb..7fac5879c 100644
--- a/app/src/main/res/layout/contact_edit_row.xml
+++ b/app/src/main/res/layout/contact_edit_row.xml
@@ -13,7 +13,7 @@
         android:layout_toStartOf="@+id/delete_field"
         android:layout_toLeftOf="@+id/delete_field"
         android:background="@drawable/resizable_textfield"
-        android:textColor="@color/colorB"
+        android:textColor="@color/black_color"
         android:inputType="textEmailAddress"
         android:textCursorDrawable="@null" />
 
diff --git a/app/src/main/res/layout/dialer.xml b/app/src/main/res/layout/dialer.xml
index d918f8cc3..55ac5e1d2 100644
--- a/app/src/main/res/layout/dialer.xml
+++ b/app/src/main/res/layout/dialer.xml
@@ -38,14 +38,14 @@
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@id/erase"
-            android:background="@color/transparent"
-            android:backgroundTint="@color/transparent"
+            android:background="@color/transparent_color"
+            android:backgroundTint="@color/transparent_color"
             android:ellipsize="start"
             android:hint="@string/address_bar_hint"
             android:inputType="textEmailAddress"
             android:paddingLeft="20dp"
             android:paddingRight="5dp"
-            android:textColorHint="@color/colorE" />
+            android:textColorHint="@color/light_grey_color" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index a594f43e6..a16815c94 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -42,7 +42,7 @@
         android:hint="@string/password"
         android:inputType="textPassword"
         android:maxLines="1"
-        android:textColor="@color/colorB"
+        android:textColor="@color/black_color"
         android:textCursorDrawable="@null"
         android:visibility="gone" />
 
@@ -154,7 +154,7 @@
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
-            android:backgroundTint="@color/colorI"
+            android:backgroundTint="@color/red_color"
             android:ellipsize="end"
             android:padding="10dp"
             android:text="@string/delete" />
@@ -166,7 +166,7 @@
             android:layout_height="40dp"
             android:layout_margin="10dp"
             android:background="@drawable/resizable_assistant_button"
-            android:backgroundTint="@color/colorL"
+            android:backgroundTint="@color/green_color"
             android:ellipsize="end"
             android:padding="10dp"
             android:text="@string/ok"
diff --git a/app/src/main/res/layout/history.xml b/app/src/main/res/layout/history.xml
index 8715a3fc9..379932c94 100644
--- a/app/src/main/res/layout/history.xml
+++ b/app/src/main/res/layout/history.xml
@@ -86,7 +86,7 @@
             android:id="@+id/history_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:cacheColorHint="@color/transparent"
+            android:cacheColorHint="@color/transparent_color"
             android:divider="?attr/dividerColor"
             android:dividerHeight="1dp" />
 
diff --git a/app/src/main/res/layout/in_app.xml b/app/src/main/res/layout/in_app.xml
index d04c6f9c5..5b1146bca 100644
--- a/app/src/main/res/layout/in_app.xml
+++ b/app/src/main/res/layout/in_app.xml
@@ -19,7 +19,7 @@
         android:layout_height="60dp"
         android:layout_below="@+id/status"
         android:layout_gravity="center_horizontal"
-        android:background="@color/colorF"
+        android:background="@color/toolbar_color"
         android:orientation="horizontal">
 
         <ImageView
diff --git a/app/src/main/res/layout/in_app_list.xml b/app/src/main/res/layout/in_app_list.xml
index c927fb700..8f77e78a1 100644
--- a/app/src/main/res/layout/in_app_list.xml
+++ b/app/src/main/res/layout/in_app_list.xml
@@ -8,8 +8,8 @@
         android:id="@+id/inapp_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:cacheColorHint="@color/transparent"
-        android:divider="@color/colorE"
+        android:cacheColorHint="@color/transparent_color"
+        android:divider="@color/light_grey_color"
         android:dividerHeight="1dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/in_app_purchase_item.xml b/app/src/main/res/layout/in_app_purchase_item.xml
index ab4e45322..3b0ca8278 100644
--- a/app/src/main/res/layout/in_app_purchase_item.xml
+++ b/app/src/main/res/layout/in_app_purchase_item.xml
@@ -3,7 +3,7 @@
     android:id="@+id/inapp_purchase"
     android:layout_width="match_parent"
     android:layout_height="60dp"
-    android:background="@color/colorH">
+    android:background="@color/white_color">
 
     <ImageView
         android:id="@+id/inapp_icon"
diff --git a/app/src/main/res/layout/in_app_store.xml b/app/src/main/res/layout/in_app_store.xml
index 9a480be93..b02df8979 100644
--- a/app/src/main/res/layout/in_app_store.xml
+++ b/app/src/main/res/layout/in_app_store.xml
@@ -34,7 +34,7 @@
                 android:contentDescription="@string/content_description_username_field"
                 android:inputType="text|textEmailAddress"
                 android:maxLines="1"
-                android:textColor="@color/colorB" />
+                android:textColor="@color/black_color" />
 
             <TextView
                 android:id="@+id/username_error"
@@ -69,7 +69,7 @@
                 android:maxLines="1"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:textColor="@color/colorB"
+                android:textColor="@color/black_color"
                 android:textCursorDrawable="@null" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/launch_screen.xml b/app/src/main/res/layout/launch_screen.xml
index e81d8461d..819d17833 100644
--- a/app/src/main/res/layout/launch_screen.xml
+++ b/app/src/main/res/layout/launch_screen.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorC">
+    android:background="@color/dark_grey_color">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -38,13 +38,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
-        android:indeterminateTint="@color/colorA"
+        android:indeterminateTint="@color/primary_color"
         android:layout_marginBottom="20dp" />
 
     <View
         android:layout_width="100dp"
         android:layout_height="10dp"
         android:layout_gravity="center_horizontal|bottom"
-        android:background="@color/colorA" />
+        android:background="@color/primary_color" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index f1282f3d4..5b7116c73 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -265,7 +265,7 @@
                     android:id="@+id/accounts_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:cacheColorHint="@color/transparent"
+                    android:cacheColorHint="@color/transparent_color"
                     android:choiceMode="singleChoice"
                     android:divider="@android:color/transparent"
                     android:dividerHeight="0dp" />
diff --git a/app/src/main/res/layout/new_password.xml b/app/src/main/res/layout/new_password.xml
index c03d54a0d..0bd7ddeec 100644
--- a/app/src/main/res/layout/new_password.xml
+++ b/app/src/main/res/layout/new_password.xml
@@ -23,7 +23,7 @@
         android:hint="@string/password"
         android:inputType="textPassword"
         android:maxLines="1"
-        android:textColor="@color/colorB"
+        android:textColor="@color/black_color"
         android:textCursorDrawable="@null" />
 
     <TextView
@@ -44,7 +44,7 @@
         android:hint="@string/confirm_password"
         android:inputType="textPassword"
         android:maxLines="1"
-        android:textColor="@color/colorB"
+        android:textColor="@color/black_color"
         android:textCursorDrawable="@null" />
 
 
diff --git a/app/src/main/res/layout/preference_list_content.xml b/app/src/main/res/layout/preference_list_content.xml
index 83ffef932..36497c5ef 100644
--- a/app/src/main/res/layout/preference_list_content.xml
+++ b/app/src/main/res/layout/preference_list_content.xml
@@ -3,6 +3,6 @@
     android:id="@android:id/list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:cacheColorHint="@color/transparent"
+    android:cacheColorHint="@color/transparent_color"
     android:drawSelectorOnTop="false"
     android:scrollbarAlwaysDrawVerticalTrack="true" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/recordings_list.xml b/app/src/main/res/layout/recordings_list.xml
index db857d5c9..9c7a6897c 100644
--- a/app/src/main/res/layout/recordings_list.xml
+++ b/app/src/main/res/layout/recordings_list.xml
@@ -54,7 +54,7 @@
             android:id="@+id/recording_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:cacheColorHint="@color/transparent"
+            android:cacheColorHint="@color/transparent_color"
             android:divider="?attr/dividerColor"
             android:dividerHeight="1dp" />
 
diff --git a/app/src/main/res/layout/search_contact_cell.xml b/app/src/main/res/layout/search_contact_cell.xml
index 5de123c58..8c40fd97d 100644
--- a/app/src/main/res/layout/search_contact_cell.xml
+++ b/app/src/main/res/layout/search_contact_cell.xml
@@ -86,5 +86,5 @@
         android:id="@+id/disabled"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/contact_disabled"/>
+        android:background="@color/contact_disabled_color"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index 6001863b1..9a34ec0fa 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -8,7 +8,7 @@
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:cacheColorHint="@color/transparent"
+        android:cacheColorHint="@color/transparent_color"
         android:drawSelectorOnTop="false"
         android:scrollbarAlwaysDrawVerticalTrack="true" />
 
diff --git a/app/src/main/res/layout/video.xml b/app/src/main/res/layout/video.xml
index 3d06b8b0e..965d70926 100644
--- a/app/src/main/res/layout/video.xml
+++ b/app/src/main/res/layout/video.xml
@@ -3,7 +3,7 @@
     android:id="@+id/video_frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorB">
+    android:background="@color/black_color">
 
     <TextureView
         android:id="@+id/videoSurface"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index b5bfafdf1..e1c888e30 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/linphone_launcher_icon_background" />
+    <background android:drawable="@color/primary_color" />
     <foreground android:drawable="@mipmap/linphone_launcher_icon_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index b5bfafdf1..e1c888e30 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/linphone_launcher_icon_background" />
+    <background android:drawable="@color/primary_color" />
     <foreground android:drawable="@mipmap/linphone_launcher_icon_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index f9443534e..fb034201f 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorA">#ff5e00</color>
-    <!-- You can use https://material.io/design/color/#tools-for-picking-colors to get dark color value from primary -->
-    <color name="colorADark10">#e65000</color>
-    <color name="colorALight30">#ffab4d</color>
-    <color name="colorB">#000000</color>
-    <color name="colorC">#444444</color>
-    <color name="colorD">#808080</color>
-    <color name="colorE">#c4c4c4</color>
-    <color name="colorF">#e1e1e1</color>
-    <color name="colorG">#f3f3f3</color>
-    <color name="colorG2">#f5f5f5</color>
-    <color name="colorH">#ffffff</color>
-    <color name="colorI">#ff0000</color>
-    <color name="colorJ">#ffa645</color>
-    <color name="colorK">#3eb5c0</color>
-    <color name="colorL">#96c11f</color>
-    <color name="colorM">#a2a2a2</color>
-    <color name="colorN">#a1a1a1</color>
-    <color name="notification_color_led">#FF8000</color>
-    <color name="security_green">#96c11f</color>
-    <color name="security_gray">#c2c2c2</color>
-    <color name="security_thumb">#ffffff</color>
-    <color name="chat_bubble_incoming">#f3f3f3</color>
-    <color name="chat_bubble_outgoing">#ffeee5</color>
-    <color name="colorDisabled">#808080</color>
+    <color name="transparent_color">#00000000</color>
 
-    <color name="transparent">#00000000</color>
-    <color name="linphone_launcher_icon_background">@color/colorA</color>
-    <color name="contact_disabled">#99ffffff</color>
+    <color name="primary_color">#ff5e00</color> <!-- Try to have a color that renders well on both light & dark theme -->
+    <!-- You can use https://material.io/design/color/#tools-for-picking-colors to get dark color value from primary -->
+    <color name="primary_dark_color">#e65000</color>
+    <color name="primary_light_color">#ffab4d</color>
+    <color name="notification_led_color">#ff8000</color>
+
+    <color name="black_color">#000000</color>
+    <color name="dark_grey_color">#444444</color>
+    <color name="grey_color">#808080</color>
+    <color name="light_grey_color">#c4c4c4</color>
+    <color name="white_color">#ffffff</color>
+    <color name="red_color">#ff0000</color>
+    <color name="green_color">#96c11f</color>
+
+    <color name="imdn_read_color">#3eb5c0</color>
+    <color name="toolbar_color">#e1e1e1</color>
+    <color name="header_background_color">#f3f3f3</color>
+    <color name="security_gray_color">#c2c2c2</color>
+    <color name="chat_bubble_text_color">#a1a1a1</color>
+    <color name="chat_bubble_incoming_color">#f3f3f3</color>
+    <color name="chat_bubble_outgoing_color">#ffeee5</color>
+
+    <color name="disabled_color">#808080</color>
+    <color name="contact_disabled_color">#99ffffff</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1fc6edd7d..2fa9198ad 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,76 +3,76 @@
 
     <style name="LinphoneStyleLight" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Android theme override -->
-        <item name="colorAccent">@color/colorA</item>
-        <item name="android:colorPrimary">@color/colorA</item>
-        <item name="android:colorPrimaryDark">@color/colorADark10</item>
+        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark_color</item>
         <item name="android:textColorPrimary">@color/light_primary_text_color</item>
-        <item name="android:textColorSecondary">@color/colorD</item>
-        <item name="android:textColorHint">@color/colorE</item>
-        <item name="android:colorBackground">@color/colorH</item>
-        <item name="android:textColorPrimaryInverse">@color/colorH</item>
-        <item name="android:windowBackground">@color/colorH</item>
+        <item name="android:textColorSecondary">@color/grey_color</item>
+        <item name="android:textColorHint">@color/light_grey_color</item>
+        <item name="android:colorBackground">@color/white_color</item>
+        <item name="android:textColorPrimaryInverse">@color/white_color</item>
+        <item name="android:windowBackground">@color/white_color</item>
 
-        <item name="accentColor">@color/colorA</item>
-        <item name="accentColorLight30">@color/colorALight30</item>
-        <item name="accentTextColor">@color/colorH</item>
-        <item name="primaryTextColor">@color/colorC</item>
-        <item name="secondaryTextColor">@color/colorH</item>
-        <item name="primarySubtextDarkColor">@color/colorD</item>
-        <item name="primarySubtextLightColor">@color/colorE</item>
+        <item name="accentColor">@color/primary_color</item>
+        <item name="accentColorLight30">@color/primary_light_color</item>
+        <item name="accentTextColor">@color/white_color</item>
+        <item name="primaryTextColor">@color/dark_grey_color</item>
+        <item name="secondaryTextColor">@color/white_color</item>
+        <item name="primarySubtextDarkColor">@color/grey_color</item>
+        <item name="primarySubtextLightColor">@color/light_grey_color</item>
 
-        <item name="backgroundColor">@color/colorH</item>
-        <item name="backgroundColor2">@color/colorG2</item>
-        <item name="backgroundContastColor">@color/colorC</item>
-        <item name="dividerColor">@color/colorE</item>
+        <item name="backgroundColor">@color/white_color</item>
+        <item name="backgroundColor2">@color/header_background_color</item>
+        <item name="backgroundContastColor">@color/dark_grey_color</item>
+        <item name="dividerColor">@color/light_grey_color</item>
 
-        <item name="drawableTintColor">@color/colorC</item>
-        <item name="drawableTintDisabledColor">@color/colorDisabled</item>
-        <item name="drawableTintOverColor">@color/colorA</item>
+        <item name="drawableTintColor">@color/dark_grey_color</item>
+        <item name="drawableTintDisabledColor">@color/disabled_color</item>
+        <item name="drawableTintOverColor">@color/primary_color</item>
 
-        <item name="lighToolbarBackgroundColor">@color/colorF</item>
-        <item name="lighToolbarBackgroundDisabledColor">@color/colorE</item>
-        <item name="lighToolbarTextColor">@color/colorC</item>
-        <item name="darkToolbarBackgroundColor">@color/colorC</item>
-        <item name="darkToolbarTextColor">@color/colorH</item>
+        <item name="lighToolbarBackgroundColor">@color/toolbar_color</item>
+        <item name="lighToolbarBackgroundDisabledColor">@color/light_grey_color</item>
+        <item name="lighToolbarTextColor">@color/dark_grey_color</item>
+        <item name="darkToolbarBackgroundColor">@color/dark_grey_color</item>
+        <item name="darkToolbarTextColor">@color/white_color</item>
 
         <item name="button_background_drawable">@drawable/button_background_light</item>
     </style>
 
     <style name="LinphoneStyleDark" parent="Theme.AppCompat.NoActionBar">
         <!-- Android theme override -->
-        <item name="colorAccent">@color/colorA</item>
-        <item name="android:colorPrimary">@color/colorA</item>
-        <item name="android:colorPrimaryDark">@color/colorADark10</item>
+        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark_color</item>
         <item name="android:textColorPrimary">@color/dark_primary_text_color</item>
-        <item name="android:textColorSecondary">@color/colorG</item>
-        <item name="android:textColorHint">@color/colorF</item>
-        <item name="android:colorBackground">@color/colorC</item>
-        <item name="android:textColorPrimaryInverse">@color/colorC</item>
-        <item name="android:windowBackground">@color/colorC</item>
+        <item name="android:textColorSecondary">@color/header_background_color</item>
+        <item name="android:textColorHint">@color/toolbar_color</item>
+        <item name="android:colorBackground">@color/dark_grey_color</item>
+        <item name="android:textColorPrimaryInverse">@color/dark_grey_color</item>
+        <item name="android:windowBackground">@color/dark_grey_color</item>
 
-        <item name="accentColor">@color/colorA</item>
-        <item name="accentColorLight30">@color/colorALight30</item>
-        <item name="accentTextColor">@color/colorH</item>
-        <item name="primaryTextColor">@color/colorH</item>
-        <item name="secondaryTextColor">@color/colorC</item>
-        <item name="primarySubtextDarkColor">@color/colorG</item>
-        <item name="primarySubtextLightColor">@color/colorF</item>
+        <item name="accentColor">@color/primary_color</item>
+        <item name="accentColorLight30">@color/primary_light_color</item>
+        <item name="accentTextColor">@color/white_color</item>
+        <item name="primaryTextColor">@color/white_color</item>
+        <item name="secondaryTextColor">@color/dark_grey_color</item>
+        <item name="primarySubtextDarkColor">@color/header_background_color</item>
+        <item name="primarySubtextLightColor">@color/toolbar_color</item>
 
-        <item name="backgroundColor">@color/colorC</item>
-        <item name="backgroundColor2">@color/colorD</item>
-        <item name="backgroundContastColor">@color/colorH</item>
-        <item name="dividerColor">@color/colorE</item>
+        <item name="backgroundColor">@color/dark_grey_color</item>
+        <item name="backgroundColor2">@color/grey_color</item>
+        <item name="backgroundContastColor">@color/white_color</item>
+        <item name="dividerColor">@color/light_grey_color</item>
 
-        <item name="drawableTintColor">@color/colorH</item>
-        <item name="drawableTintDisabledColor">@color/colorE</item>
-        <item name="drawableTintOverColor">@color/colorA</item>
+        <item name="drawableTintColor">@color/white_color</item>
+        <item name="drawableTintDisabledColor">@color/light_grey_color</item>
+        <item name="drawableTintOverColor">@color/primary_color</item>
 
-        <item name="lighToolbarBackgroundColor">@color/colorC</item>
-        <item name="lighToolbarBackgroundDisabledColor">@color/colorE</item>
-        <item name="lighToolbarTextColor">@color/colorH</item>
-        <item name="darkToolbarBackgroundColor">@color/colorC</item>
-        <item name="darkToolbarTextColor">@color/colorH</item>
+        <item name="lighToolbarBackgroundColor">@color/dark_grey_color</item>
+        <item name="lighToolbarBackgroundDisabledColor">@color/light_grey_color</item>
+        <item name="lighToolbarTextColor">@color/white_color</item>
+        <item name="darkToolbarBackgroundColor">@color/dark_grey_color</item>
+        <item name="darkToolbarTextColor">@color/white_color</item>
 
         <item name="button_background_drawable">@drawable/button_background_dark</item>
     </style>
@@ -80,7 +80,7 @@
     <!-- Assistant related -->
 
     <style name="assistant_input_field_error_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorI</item>
+        <item name="android:textColor">@color/red_color</item>
         <item name="android:textSize">14sp</item>
     </style>
 
@@ -104,32 +104,32 @@
     </style>
 
     <style name="about_version_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorE</item>
+        <item name="android:textColor">@color/light_grey_color</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <!-- Chat related -->
 
     <style name="imdn_read_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorK</item>
+        <item name="android:textColor">@color/imdn_read_color</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="imdn_delivered_sent_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
+        <item name="android:textColor">@color/grey_color</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="imdn_undelivered_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorI</item>
+        <item name="android:textColor">@color/red_color</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="chat_bubble_time_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorM</item>
+        <item name="android:textColor">@color/chat_bubble_text_color</item>
         <item name="android:textSize">13sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
@@ -137,7 +137,7 @@
     </style>
 
     <style name="chat_bubble_message_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorC</item>
+        <item name="android:textColor">@color/dark_grey_color</item>
         <item name="android:textSize">15sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
@@ -160,7 +160,7 @@
     </style>
 
     <style name="group_chat_security_event_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorI</item>
+        <item name="android:textColor">@color/red_color</item>
         <item name="android:textSize">13sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:lineSpacingExtra">0sp</item>
@@ -215,7 +215,7 @@
     </style>
 
     <style name="contact_edit_form_label_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorE</item>
+        <item name="android:textColor">@color/light_grey_color</item>
         <item name="android:textSize">13sp</item>
     </style>
 
@@ -254,7 +254,7 @@
     <!-- Dialog related -->
 
     <style name="dialog_title_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">@color/white_color</item>
         <item name="android:textSize">21.7sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">sans-serif</item>
@@ -262,24 +262,24 @@
     </style>
 
     <style name="dialog_message_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">@color/white_color</item>
         <item name="android:textSize">21sp</item>
     </style>
 
     <style name="dialog_cancel_button_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorC</item>
+        <item name="android:textColor">@color/dark_grey_color</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="dialog_action_button_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">@color/white_color</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="dialog_zrtp_colored_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorL</item>
+        <item name="android:textColor">@color/green_color</item>
         <item name="android:textSize">20sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:fontFamily">sans-serif</item>
@@ -287,7 +287,7 @@
     </style>
 
     <style name="dialog_zrtp_white_font" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">@color/white_color</item>
         <item name="android:textSize">20sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:lineSpacingExtra">8.3sp</item>
@@ -390,7 +390,7 @@
     </style>
 
     <style name="unread_count_font" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">@color/colorH</item>
+        <item name="android:textColor">@color/white_color</item>
         <item name="android:textSize">10sp</item>
     </style>