diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 8e1b0dc..d8f686d 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/Capri.jks b/Capri.jks
new file mode 100644
index 0000000..878cd92
Binary files /dev/null and b/Capri.jks differ
diff --git a/app/build.gradle b/app/build.gradle
index 0972b94..c3c3e73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "ch.pizzapp.capri"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 6   // play store'daki version : 5
-        versionName "1.14"   // play store'daki version : 1.13
+        versionCode 5  // play store'daki version : 4
+        versionName "2.1"   // play store'daki version : 2.0
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/release/output.json b/app/release/output.json
index 20a7cf2..0d530ea 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.14","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java
index 843bb72..1f64ecd 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java
@@ -1,11 +1,17 @@
 package ch.pizzapp.android.activity;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.view.Window;
+import android.view.WindowManager;
 
+import ch.pizzapp.android.helper.DisplayHelper;
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 /**
@@ -20,6 +26,9 @@ public class BaseActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setCurrentActivity(this);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
+            DisplayHelper.changeStatusColor();
+        }
     }
 
     @Override
@@ -36,4 +45,5 @@ public class BaseActivity extends AppCompatActivity {
     public static void setCurrentActivity(BaseActivity currentActivity) {
         BaseActivity.currentActivity = currentActivity;
     }
+
 }
diff --git a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java
index 39c9a36..70c42eb 100644
--- a/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java
+++ b/app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java
@@ -34,7 +34,7 @@ public class DialogHelper {
                 .title(title)
                 .content(message)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
                 .onPositive(new MaterialDialog.SingleButtonCallback() {
@@ -59,7 +59,7 @@ public class DialogHelper {
                 .title(R.string.alert)
                 .content(content)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
                 .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
@@ -72,7 +72,7 @@ public class DialogHelper {
                 .title(R.string.alert)
                 .content(BaseActivity.currentActivity.getString(R.string.failed))
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .positiveColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary))
                 .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
@@ -85,7 +85,7 @@ public class DialogHelper {
                 .title(R.string.alert)
                 .content(BaseActivity.currentActivity.getString(R.string.no_network_message))
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .positiveColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary))
                 .onPositive(new MaterialDialog.SingleButtonCallback() {
@@ -104,7 +104,7 @@ public class DialogHelper {
         loadingDialog = new MaterialDialog.Builder(BaseActivity.currentActivity)
                 .content(BaseActivity.currentActivity.getString(R.string.loading))
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .cancelable(false)
                 .progress(true, 0)
                 .progressIndeterminateStyle(true)
@@ -141,7 +141,7 @@ public class DialogHelper {
                 .title(R.string.alert)
                 .content(message)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(positiveTextResId)
                 .onPositive(positiveButtonCallback)
                 .negativeText(negativeTextResId)
@@ -160,7 +160,7 @@ public class DialogHelper {
                 .title(title)
                 .content(message)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(positiveTextResId)
                 .onPositive(positiveButtonCallback)
                 .negativeText(negativeTextResId)
@@ -176,7 +176,7 @@ public class DialogHelper {
                 .title(R.string.alert)
                 .content(BaseActivity.currentActivity.getString(messageResourceId))
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.button_login)
                 .onPositive(new MaterialDialog.SingleButtonCallback() {
                     @Override
@@ -209,7 +209,7 @@ public class DialogHelper {
                 .title(R.string.alert)
                 .content(R.string.alert_update_app)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.update_app)
                 .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
                 .cancelable(false)
@@ -217,7 +217,7 @@ public class DialogHelper {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         Intent intent = new Intent(Intent.ACTION_VIEW);
-                        intent.setData(Uri.parse("market://details?id=ch.pizzalink.android"));
+                        intent.setData(Uri.parse("market://details?id=ch.pizzapp.capri"));
                         BaseActivity.currentActivity.startActivity(intent);
                         BaseActivity.currentActivity.finishAffinity();
                     }
@@ -232,7 +232,7 @@ public class DialogHelper {
                 .title(R.string.app_name)
                 .content(message)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .onPositive(singleButtonCallback)
                 .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
@@ -247,7 +247,7 @@ public class DialogHelper {
                 .title(R.string.app_name)
                 .content(R.string.password_reset)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
                 .cancelable(false)
@@ -270,7 +270,7 @@ public class DialogHelper {
                 .title(R.string.app_name)
                 .content(R.string.profile_updated)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .positiveText(R.string.ok)
                 .cancelable(false)
                 .onPositive(singleButtonCallback)
@@ -283,7 +283,7 @@ public class DialogHelper {
         new MaterialDialog.Builder(BaseActivity.currentActivity)
                 .title(R.string.choose)
                 .titleColorRes(R.color.red)
-                .contentColorRes(R.color.navy)
+                .contentColorRes(R.color.black)
                 .items(itemList)
                 .itemsCallback(listCallback)
                 .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
diff --git a/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java b/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java
index 5ae1a69..935c261 100644
--- a/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java
+++ b/app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java
@@ -39,6 +39,6 @@ public class DisplayHelper {
         Window window = BaseActivity.currentActivity.getWindow();
         window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
         window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.navy));
+        window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.main_black));
     }
 }
diff --git a/app/src/main/res/drawable/background_button_cart.xml b/app/src/main/res/drawable/background_button_cart.xml
index 950361d..fd39a38 100644
--- a/app/src/main/res/drawable/background_button_cart.xml
+++ b/app/src/main/res/drawable/background_button_cart.xml
@@ -4,12 +4,12 @@
     android:shape="oval">
 
     <!-- fill color -->
-    <solid android:color="@color/navy" />
+    <solid android:color="@color/main_black" />
 
     <!-- radius -->
     <stroke
         android:width="1dp"
-        android:color="@color/navy" />
+        android:color="@color/main_black" />
 
     <!-- corners -->
     <corners
diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml
index 07b031c..56d45d2 100644
--- a/app/src/main/res/layout/activity_add_address.xml
+++ b/app/src/main/res/layout/activity_add_address.xml
@@ -18,7 +18,7 @@
         app:title="@string/activity_title_add_address"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_campaign_product_details.xml b/app/src/main/res/layout/activity_campaign_product_details.xml
index 2b7ce3f..bbe43dd 100644
--- a/app/src/main/res/layout/activity_campaign_product_details.xml
+++ b/app/src/main/res/layout/activity_campaign_product_details.xml
@@ -71,7 +71,7 @@
                     android:id="@+id/productNameTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/navy"
+                    android:textColor="@color/black"
                     android:textSize="18sp"
                     android:padding="12sp"
                     android:text="Pizza Formaggio"
@@ -109,7 +109,7 @@
             android:paddingStart="24dp"
             android:paddingRight="24dp"
             android:paddingEnd="24dp"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
 
         <Button
@@ -149,7 +149,7 @@
                     android:paddingRight="12dp"
                     android:paddingEnd="12dp"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/ProductCountLayout"
@@ -182,7 +182,7 @@
                         android:layout_toRightOf="@+id/deccreaseProductCountImageView"
                         android:layout_toEndOf="@+id/deccreaseProductCountImageView"
                         android:layout_alignParentBottom="true"
-                        android:textColor="@color/navy"/>
+                        android:textColor="@color/black"/>
 
                     <ImageView
                         android:id="@+id/increaseProductCountImageView"
@@ -203,7 +203,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/navy"
+                    android:background="@color/black"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginRight="12dp"
@@ -218,7 +218,7 @@
                     android:visibility="gone"
                     android:text="Size"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/radioRecyclerView"
@@ -229,7 +229,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/navy"
+                    android:background="@color/black"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginRight="12dp"
@@ -243,7 +243,7 @@
                     android:padding="12dp"
                     android:visibility="gone"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/checkboxRecyclerView"
diff --git a/app/src/main/res/layout/activity_campaign_product_list.xml b/app/src/main/res/layout/activity_campaign_product_list.xml
index a329858..fb38f1a 100644
--- a/app/src/main/res/layout/activity_campaign_product_list.xml
+++ b/app/src/main/res/layout/activity_campaign_product_list.xml
@@ -20,7 +20,7 @@
         android:background="@color/white"
         app:showCloseIcon="true"
         app:title="@string/activity_title_login"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/campaignProductRecyclerView"
diff --git a/app/src/main/res/layout/activity_create_order.xml b/app/src/main/res/layout/activity_create_order.xml
index 08d1b5c..339640d 100644
--- a/app/src/main/res/layout/activity_create_order.xml
+++ b/app/src/main/res/layout/activity_create_order.xml
@@ -17,7 +17,7 @@
         app:title="@string/activity_title_create_order"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml
index a36211b..9a0b5c5 100644
--- a/app/src/main/res/layout/activity_forgot_password.xml
+++ b/app/src/main/res/layout/activity_forgot_password.xml
@@ -18,7 +18,7 @@
         android:background="@color/white"
         app:title="@string/activity_title_forgot_password"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index eb3d5c5..8af8f4f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         app:title="@string/activity_title_login"
         android:background="@color/white"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2a24d2a..4f6c500 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -50,7 +50,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             fontPath="fonts/Quicksand-Bold.ttf"
             android:layout_gravity="center_horizontal"
             android:text="@string/cart_total"
@@ -77,9 +77,9 @@
         android:layout_height="?android:attr/actionBarSize"
         app:itemIconTint="@drawable/selector_bottom_navigation_item"
         app:itemTextColor="@drawable/selector_bottom_navigation_item"
-        android:background="@color/navy"
+        android:background="@color/main_black"
         app:menu="@menu/menu_bottom_navigation"
-        app:itemBackground="@color/navy"
+        app:itemBackground="@color/main_black"
         android:layout_alignParentBottom="true"/>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_my_addresses.xml b/app/src/main/res/layout/activity_my_addresses.xml
index 8a46776..9e31beb 100644
--- a/app/src/main/res/layout/activity_my_addresses.xml
+++ b/app/src/main/res/layout/activity_my_addresses.xml
@@ -15,7 +15,7 @@
         app:title="@string/my_addresses"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_order_history_details.xml b/app/src/main/res/layout/activity_order_history_details.xml
index f04929c..6a4b7bd 100644
--- a/app/src/main/res/layout/activity_order_history_details.xml
+++ b/app/src/main/res/layout/activity_order_history_details.xml
@@ -19,7 +19,7 @@
         app:title="@string/activity_title_order_history_details"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -95,7 +95,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/order_products"
-                            android:textColor="@color/navy"
+                            android:textColor="@color/black"
                             android:textSize="12sp" />
 
                         <TextView
diff --git a/app/src/main/res/layout/activity_product_details.xml b/app/src/main/res/layout/activity_product_details.xml
index d7ca6bc..636e0cd 100644
--- a/app/src/main/res/layout/activity_product_details.xml
+++ b/app/src/main/res/layout/activity_product_details.xml
@@ -70,7 +70,7 @@
                     android:id="@+id/productNameTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/navy"
+                    android:textColor="@color/black"
                     android:textSize="18sp"
                     android:padding="12sp"
                     android:text="Pizza Formaggio"
@@ -108,7 +108,7 @@
             android:paddingStart="24dp"
             android:paddingRight="24dp"
             android:paddingEnd="24dp"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
 
         <Button
@@ -148,7 +148,7 @@
                     android:paddingRight="12dp"
                     android:paddingEnd="12dp"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/ProductCountLayout"
@@ -180,7 +180,7 @@
                         android:layout_toRightOf="@+id/deccreaseProductCountImageView"
                         android:layout_toEndOf="@+id/deccreaseProductCountImageView"
                         android:layout_alignParentBottom="true"
-                        android:textColor="@color/navy"/>
+                        android:textColor="@color/black"/>
 
                     <ImageView
                         android:id="@+id/increaseProductCountImageView"
@@ -200,7 +200,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/navy"
+                    android:background="@color/black"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginRight="12dp"
@@ -215,7 +215,7 @@
                     android:visibility="gone"
                     android:text="Size"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/radioRecyclerView"
@@ -226,7 +226,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/navy"
+                    android:background="@color/black"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginRight="12dp"
@@ -240,7 +240,7 @@
                     android:padding="12dp"
                     android:visibility="gone"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/checkboxRecyclerView"
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 3cf7e22..4e13f6d 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -18,7 +18,7 @@
         app:title="@string/activity_title_register"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/activity_update_password.xml b/app/src/main/res/layout/activity_update_password.xml
index 6efb7f0..99a6fda 100644
--- a/app/src/main/res/layout/activity_update_password.xml
+++ b/app/src/main/res/layout/activity_update_password.xml
@@ -17,7 +17,7 @@
         app:title="@string/activity_title_update_password"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_update_profile.xml b/app/src/main/res/layout/activity_update_profile.xml
index c12ef96..02fc134 100644
--- a/app/src/main/res/layout/activity_update_profile.xml
+++ b/app/src/main/res/layout/activity_update_profile.xml
@@ -17,7 +17,7 @@
         app:title="@string/activity_title_update_profile"
         android:background="@color/white"
         app:showBackIcon="true"
-        app:titleTextColor="@color/navy" />
+        app:titleTextColor="@color/black" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index 6b19175..2e6cb30 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -66,7 +66,7 @@
                 android:id="@+id/cartTotalLabelTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 fontPath="fonts/Quicksand-Bold.ttf"
                 android:layout_gravity="center_horizontal"/>
 
diff --git a/app/src/main/res/layout/fragment_create_order_note.xml b/app/src/main/res/layout/fragment_create_order_note.xml
index cd476e4..2c9730a 100644
--- a/app/src/main/res/layout/fragment_create_order_note.xml
+++ b/app/src/main/res/layout/fragment_create_order_note.xml
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:paddingLeft="20dp"
             android:paddingStart="20dp"
             android:paddingRight="20dp"
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/yes"
                 android:clickable="false"
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 android:checked="true"
                 fontPath="fonts/Quicksand-Bold.ttf"/>
 
@@ -73,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/no"
                 android:clickable="false"
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 fontPath="fonts/Quicksand-Bold.ttf"/>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_create_order_result.xml b/app/src/main/res/layout/fragment_create_order_result.xml
index 6d878db..ba44800 100644
--- a/app/src/main/res/layout/fragment_create_order_result.xml
+++ b/app/src/main/res/layout/fragment_create_order_result.xml
@@ -18,7 +18,7 @@
             android:layout_centerInParent="true"
             android:gravity="center"
             android:padding="16dp"
-            android:textColor="@color/navy" />
+            android:textColor="@color/black" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_payment_method.xml b/app/src/main/res/layout/fragment_payment_method.xml
index b809a5c..f1fb5fa 100644
--- a/app/src/main/res/layout/fragment_payment_method.xml
+++ b/app/src/main/res/layout/fragment_payment_method.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:text="@string/payment_method"
             android:layout_marginTop="24dp"
             android:layout_marginBottom="12dp"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 0bb3270..6736310 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -65,7 +65,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginEnd="16dp"
-                    android:background="@color/navy"/>
+                    android:background="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/myAddressesLayout"
@@ -78,7 +78,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/my_addresses"
                         android:layout_marginTop="4dp"
-                        android:textColor="@color/navy"
+                        android:textColor="@color/black"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_centerVertical="true"
                         android:layout_alignParentLeft="true"
@@ -94,7 +94,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:src="@drawable/ic_back"
-                        android:tint="@color/navy"
+                        android:tint="@color/black"
                         android:padding="6dp"
                         android:rotation="180"/>
 
@@ -107,7 +107,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginEnd="16dp"
-                    android:background="@color/navy"/>
+                    android:background="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/updateProfileLayout"
@@ -120,7 +120,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/update_profile"
                         fontPath="fonts/Quicksand-Bold.ttf"
-                        android:textColor="@color/navy"
+                        android:textColor="@color/black"
                         android:layout_centerVertical="true"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true" />
@@ -133,7 +133,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:src="@drawable/ic_back"
-                        android:tint="@color/navy"
+                        android:tint="@color/black"
                         android:padding="6dp"
                         android:rotation="180"/>
 
@@ -146,7 +146,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginEnd="16dp"
-                    android:background="@color/navy"/>
+                    android:background="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/updatePasswordLayout"
@@ -160,7 +160,7 @@
                         android:text="@string/update_password"
                         android:layout_marginTop="4dp"
                         fontPath="fonts/Quicksand-Bold.ttf"
-                        android:textColor="@color/navy"
+                        android:textColor="@color/black"
                         android:layout_centerVertical="true"
                         android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
@@ -175,7 +175,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:src="@drawable/ic_back"
-                        android:tint="@color/navy"
+                        android:tint="@color/black"
                         android:padding="6dp"
                         android:rotation="180"/>
 
@@ -188,7 +188,7 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginEnd="16dp"
-                    android:background="@color/navy"/>
+                    android:background="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/logoutLayout"
@@ -202,7 +202,7 @@
                         android:text="@string/button_logout"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_marginTop="4dp"
-                        android:textColor="@color/navy"
+                        android:textColor="@color/black"
                         android:layout_centerVertical="true" />
 
                 </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_bottomsheet.xml b/app/src/main/res/layout/layout_bottomsheet.xml
index d5be8e9..b2c8bc9 100644
--- a/app/src/main/res/layout/layout_bottomsheet.xml
+++ b/app/src/main/res/layout/layout_bottomsheet.xml
@@ -58,7 +58,7 @@
                     android:id="@+id/productNameTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/navy"
+                    android:textColor="@color/black"
                     android:textSize="18sp"
                     android:padding="12sp"
                     android:text="Pizza Formaggio"
@@ -123,7 +123,7 @@
                     android:paddingRight="12dp"
                     android:paddingEnd="12dp"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <RelativeLayout
                     android:id="@+id/ProductCountLayout"
@@ -155,7 +155,7 @@
                         android:layout_toRightOf="@+id/deccreaseProductCountImageView"
                         android:layout_toEndOf="@+id/deccreaseProductCountImageView"
                         android:layout_alignParentBottom="true"
-                        android:textColor="@color/navy"/>
+                        android:textColor="@color/black"/>
 
                     <ImageView
                         android:id="@+id/increaseProductCountImageView"
@@ -175,7 +175,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/navy"
+                    android:background="@color/black"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginRight="12dp"
@@ -190,7 +190,7 @@
                     android:visibility="gone"
                     android:text="Size"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/radioRecyclerView"
@@ -201,7 +201,7 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
-                    android:background="@color/navy"
+                    android:background="@color/black"
                     android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_marginRight="12dp"
@@ -215,7 +215,7 @@
                     android:padding="12dp"
                     android:visibility="gone"
                     android:textSize="16sp"
-                    android:textColor="@color/navy"/>
+                    android:textColor="@color/black"/>
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/checkboxRecyclerView"
diff --git a/app/src/main/res/layout/layout_pizzalink_dropdown.xml b/app/src/main/res/layout/layout_pizzalink_dropdown.xml
index 98ab9d4..04dd0be 100644
--- a/app/src/main/res/layout/layout_pizzalink_dropdown.xml
+++ b/app/src/main/res/layout/layout_pizzalink_dropdown.xml
@@ -25,7 +25,7 @@
             android:id="@+id/textview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:textSize="16sp"
             android:textColorHint="@color/row_product_ingredients_background"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/layout_pizzalink_toolbar.xml b/app/src/main/res/layout/layout_pizzalink_toolbar.xml
index db53c26..53bf59c 100644
--- a/app/src/main/res/layout/layout_pizzalink_toolbar.xml
+++ b/app/src/main/res/layout/layout_pizzalink_toolbar.xml
@@ -15,7 +15,7 @@
     android:contentInsetEnd="0dp"
     app:contentInsetRight="0dp"
     app:contentInsetEnd="0dp"
-    android:background="@color/red">
+    android:background="@color/main_black">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_pizzalink_view.xml b/app/src/main/res/layout/layout_pizzalink_view.xml
index f1c2f02..1c82eed 100644
--- a/app/src/main/res/layout/layout_pizzalink_view.xml
+++ b/app/src/main/res/layout/layout_pizzalink_view.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/order_person_fullname"
-        android:textColor="@color/navy"
+        android:textColor="@color/black"
         android:textSize="12sp"
         fontPath="fonts/Quicksand-Bold.ttf" />
 
diff --git a/app/src/main/res/layout/row_cart.xml b/app/src/main/res/layout/row_cart.xml
index c055708..682f267 100644
--- a/app/src/main/res/layout/row_cart.xml
+++ b/app/src/main/res/layout/row_cart.xml
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="2 x "
-                android:textColor="@color/navy" />
+                android:textColor="@color/black" />
 
         </LinearLayout>
 
@@ -48,7 +48,7 @@
                 android:id="@+id/dividerView"
                 android:layout_width="1dp"
                 android:layout_height="72dp"
-                android:background="@color/navy"
+                android:background="@color/black"
                 android:layout_centerVertical="true"/>
 
             <LinearLayout
@@ -69,7 +69,7 @@
                         android:layout_height="wrap_content"
                         android:text="Pizza Formaggio"
                         android:textSize="16sp"
-                        android:textColor="@color/navy"
+                        android:textColor="@color/black"
                         android:padding="12dp"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_toLeftOf="@+id/cartProductTotalPriceTextView"
@@ -82,7 +82,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="CHF 25.00"
-                        android:textColor="@color/navy"
+                        android:textColor="@color/black"
                         android:padding="8dp"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_alignParentRight="true"
@@ -96,7 +96,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="Gross"
-                    android:textColor="@color/navy"
+                    android:textColor="@color/black"
                     android:layout_marginLeft="32dp"
                     android:layout_marginStart="32dp"
                     fontPath="fonts/Quicksand-Regular-Italic.otf"
@@ -160,7 +160,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="2 x "
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 android:padding="12dp"
                 android:layout_centerVertical="true"/>
 
@@ -170,7 +170,7 @@
                 android:layout_height="wrap_content"
                 android:text="Pizza Formaggio"
                 android:textSize="16sp"
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 android:padding="12dp"
                 fontPath="fonts/Quicksand-Bold.ttf"
                 android:layout_centerVertical="true"
@@ -184,7 +184,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="CHF 25.00"
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 android:padding="8dp"
                 fontPath="fonts/Quicksand-Bold.ttf"
                 android:layout_centerVertical="true"
@@ -209,7 +209,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Gross"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:layout_marginLeft="64dp"
             android:layout_marginStart="64dp"
             fontPath="fonts/Quicksand-Regular-Italic.otf"
diff --git a/app/src/main/res/layout/row_category.xml b/app/src/main/res/layout/row_category.xml
index cea6f48..39cfb9a 100644
--- a/app/src/main/res/layout/row_category.xml
+++ b/app/src/main/res/layout/row_category.xml
@@ -16,7 +16,7 @@
         android:id="@+id/categoryNameItem"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/navy"
+        android:textColor="@color/black"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
         android:textSize="16sp"
@@ -26,7 +26,7 @@
         android:id="@+id/bottomLineView"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/navy"/>
+        android:background="@color/black"/>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/row_menu_product.xml b/app/src/main/res/layout/row_menu_product.xml
index 983ef1b..6c72473 100644
--- a/app/src/main/res/layout/row_menu_product.xml
+++ b/app/src/main/res/layout/row_menu_product.xml
@@ -18,7 +18,7 @@
             android:id="@+id/productNameTextView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:textSize="16sp"
             android:text="Anatoliajefjefje\nwhufjechfuhefu"
             android:padding="8dp"
@@ -61,7 +61,7 @@
             android:layout_height="match_parent"
             android:background="@color/row_product_ingredients_background"
             android:padding="8dp"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:gravity="center"
             android:layout_centerInParent="true"
             android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
diff --git a/app/src/main/res/layout/row_my_address.xml b/app/src/main/res/layout/row_my_address.xml
index 91943e7..aa45db2 100644
--- a/app/src/main/res/layout/row_my_address.xml
+++ b/app/src/main/res/layout/row_my_address.xml
@@ -27,7 +27,7 @@
             android:layout_centerVertical="true"
             android:text="Test Address"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/navy" />
+            android:textColor="@color/black" />
 
         <ImageView
             android:id="@+id/deleteAddressImageView"
@@ -48,6 +48,6 @@
         android:layout_marginStart="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@color/navy"/>
+        android:background="@color/black"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/row_option_checkbox.xml b/app/src/main/res/layout/row_option_checkbox.xml
index 617f792..c5cbf73 100644
--- a/app/src/main/res/layout/row_option_checkbox.xml
+++ b/app/src/main/res/layout/row_option_checkbox.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:clickable="false"
         android:text="Klein"
-        android:textColor="@color/navy"
+        android:textColor="@color/black"
         fontPath="fonts/Quicksand-Bold.ttf"/>
 
     <RelativeLayout
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:text="CHF 14.00"/>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/row_option_radio.xml b/app/src/main/res/layout/row_option_radio.xml
index b8bd3da..155cd00 100644
--- a/app/src/main/res/layout/row_option_radio.xml
+++ b/app/src/main/res/layout/row_option_radio.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:text="Klein"
         android:clickable="false"
-        android:textColor="@color/navy"
+        android:textColor="@color/black"
         fontPath="fonts/Quicksand-Bold.ttf"/>
 
     <RelativeLayout
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/navy"
+            android:textColor="@color/black"
             android:text="CHF 14.00"/>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/row_order_history.xml b/app/src/main/res/layout/row_order_history.xml
index 029beed..e5e4d50 100644
--- a/app/src/main/res/layout/row_order_history.xml
+++ b/app/src/main/res/layout/row_order_history.xml
@@ -43,7 +43,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="CHF 25.00"
-                android:textColor="@color/navy"
+                android:textColor="@color/black"
                 android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 fontPath="fonts/Quicksand-Bold.ttf"
@@ -56,7 +56,7 @@
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_back"
-                android:tint="@color/navy"
+                android:tint="@color/black"
                 android:padding="6dp"
                 android:rotation="180"/>
 
diff --git a/app/src/main/res/layout/row_payment_method.xml b/app/src/main/res/layout/row_payment_method.xml
index 25b1e01..f4a3579 100644
--- a/app/src/main/res/layout/row_payment_method.xml
+++ b/app/src/main/res/layout/row_payment_method.xml
@@ -16,6 +16,6 @@
         android:text="Gel ad"
         android:clickable="false"
         fontPath="fonts/Quicksand-Bold.ttf"
-        android:textColor="@color/navy"/>
+        android:textColor="@color/black"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_pizza_2.xml b/app/src/main/res/layout/row_pizza_2.xml
index 0f58f9b..e221685 100644
--- a/app/src/main/res/layout/row_pizza_2.xml
+++ b/app/src/main/res/layout/row_pizza_2.xml
@@ -109,7 +109,7 @@
                             android:text="Klein"
                             android:textSize="10sp"
                             android:layout_gravity="center_horizontal"
-                            android:textColor="@color/navy"/>
+                            android:textColor="@color/black"/>
 
                         <android.support.v7.widget.AppCompatCheckBox
                             android:id="@+id/pizzaSize1CheckBox"
@@ -127,7 +127,7 @@
                             android:textSize="12sp"
                             android:layout_marginTop="4dp"
                             android:layout_gravity="center_horizontal"
-                            android:textColor="@color/navy"/>
+                            android:textColor="@color/black"/>
 
                     </LinearLayout>
 
@@ -148,7 +148,7 @@
                             android:text="Normal"
                             android:textSize="10sp"
                             android:layout_gravity="center_horizontal"
-                            android:textColor="@color/navy"/>
+                            android:textColor="@color/black"/>
 
                         <android.support.v7.widget.AppCompatCheckBox
                             android:id="@+id/pizzaSize2CheckBox"
@@ -166,7 +166,7 @@
                             android:textSize="12sp"
                             android:layout_marginTop="4dp"
                             android:layout_gravity="center_horizontal"
-                            android:textColor="@color/navy"/>
+                            android:textColor="@color/black"/>
 
                     </LinearLayout>
 
@@ -187,7 +187,7 @@
                             android:text="Gross"
                             android:textSize="10sp"
                             android:layout_gravity="center_horizontal"
-                            android:textColor="@color/navy"/>
+                            android:textColor="@color/black"/>
 
                         <android.support.v7.widget.AppCompatCheckBox
                             android:id="@+id/pizzaSize3CheckBox"
@@ -205,7 +205,7 @@
                             android:textSize="12sp"
                             android:layout_marginTop="4dp"
                             android:layout_gravity="center_horizontal"
-                            android:textColor="@color/navy"/>
+                            android:textColor="@color/black"/>
 
                     </LinearLayout>
 
@@ -242,7 +242,7 @@
                         android:textSize="18sp"
                         fontPath="fonts/Quicksand-Bold.ttf"
                         android:layout_gravity="center_vertical"
-                        android:textColor="@color/navy"/>
+                        android:textColor="@color/black"/>
 
                     <ImageView
                         android:id="@+id/deccreasePizzaCountTextView"
diff --git a/app/src/main/res/layout/row_shipment_address.xml b/app/src/main/res/layout/row_shipment_address.xml
index 4c602f0..092ae8d 100644
--- a/app/src/main/res/layout/row_shipment_address.xml
+++ b/app/src/main/res/layout/row_shipment_address.xml
@@ -16,6 +16,6 @@
         android:text="Gel ad"
         android:clickable="false"
         fontPath="fonts/Quicksand-Bold.ttf"
-        android:textColor="@color/navy"/>
+        android:textColor="@color/black"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_shipment_method.xml b/app/src/main/res/layout/row_shipment_method.xml
index 92a0e98..27b9848 100644
--- a/app/src/main/res/layout/row_shipment_method.xml
+++ b/app/src/main/res/layout/row_shipment_method.xml
@@ -16,7 +16,7 @@
         android:text="Gel ad"
         android:clickable="false"
         fontPath="fonts/Quicksand-Bold.ttf"
-        android:textColor="@color/navy"/>
+        android:textColor="@color/black"/>
 
     <RelativeLayout
         android:layout_width="84dp"
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:text="CHF 14.00"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/navy"/>
+            android:textColor="@color/black"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/row_subcategory.xml b/app/src/main/res/layout/row_subcategory.xml
index cbbb4a8..d553470 100644
--- a/app/src/main/res/layout/row_subcategory.xml
+++ b/app/src/main/res/layout/row_subcategory.xml
@@ -25,7 +25,7 @@
         android:id="@+id/subcategoryNameItem"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/navy"
+        android:textColor="@color/black"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
         android:textSize="16sp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b4953ec..1f7612d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,6 +16,8 @@
     <color name="bottom_menu_selected_item">#E31E38</color>
     <color name="bottom_menu_unselected_item">#ffffff</color>
     <color name="navigation_drawer_background">#4C4B4A</color>
+    <color name="main_black">#4C4B4A</color>
+    <color name="black">#000000</color>
     <color name="row_product_ingredients_background">#EBECEC</color>
     <color name="transparent_white">#33ffffff</color>
     <color name="cart_dialog_background">#EEEEEE</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e14ff2..b145851 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,7 +92,7 @@
     <string name="add_to_cart">IN DEN WARENKORB LEGEN</string>    
     <string name="count">Stückzahl</string>    
     <string name="no_options_selected_part">wurde nicht ausgewählt.</string>
-    <!-- tr -->
+    <!--tr-->
     <string name="cannot_use_campaign">Bu kampanyadan daha önce yararlandığınız için sepetinize ekleyemezsiniz.</string>
     <string name="restaurant_out_of_order">Restorant şu anda hizmet vermemektedir. İleri bir tarih ve saat için sipariş oluşturmak ister misiniz?</string>
     <string name="restaurant_out_of_order_on_selected_date">Restorant seçtiğiniz tarih ve saatte hizmet vermemektedir. Başka bir tarih ve saat için sipariş oluşturmak ister misiniz?</string>
@@ -172,13 +172,9 @@
     <string name="order_payment_method">ZAHLUNGSWEISE</string>    
     <string name="order_total">ZWISCHENSUMME</string>
     <string name="order_notee">NACHRICHT</string>
-    <!--tr-->
-    <string name="unknown_payment_method">Bilinmeyen ödeme yöntemi.</string>
-    <string name="payment_canceled">Ödeme işlemi iptal edildi.</string>
-    <string name="andorid_pay_not_found">Android Pay Card not found.</string>
-    <string name="delivery_date">Teslimat Tarihi:</string>
-    <string name="delivery_time">Teslimat Saati:</string>
-    <string name="today">BUGÜN</string>
+    <string name="delivery_date">Lieferungsdatum:</string>
+    <string name="delivery_time">Lieferungszeit:</string>
+    <string name="today">HEUTE</string>
     <!-- CreateOrderSummaryFragment-->
 
     <!-- CreateOrderResultFragment-->
diff --git a/pizzapp_jks b/pizzapp_jks
deleted file mode 100644
index ef3fd0a..0000000
Binary files a/pizzapp_jks and /dev/null differ
diff --git a/pizzapp_keystore.txt b/pizzapp_keystore.txt
index ac4d2f2..20c466e 100644
--- a/pizzapp_keystore.txt
+++ b/pizzapp_keystore.txt
@@ -1,5 +1,17 @@
-keystore password : zuh07819
-key alias : pizzaapp
-key password :zuh07819
+keystore password : EnMkadcBsT26
+key alias : capri
+key password : EnMkadcBsT26
 
-jks dosyası "pizzapp_jks" dosyası. Sonunda .jks uzantısı yok, bu sekilde üretti. Sonuna .jks eklenirse hata veriyor.
+jks dosyası "capri.jks" dosyası.
+
+Hintlilerin gönderdiği "Keystore.txt" dosyasında sadece sunlar yazıyordu:
+
+
+
+EnMkadcBsT26
+
+Swiss-iApps
+
+
+
+keystore password olarak EnMkadcBsT26, key password olarak Swiss-iApps verince Build hata verdi. İkisine de EnMkadcBsT26 yazında kabul etti.
\ No newline at end of file