diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1102e95..84d6527 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java b/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java
index 69a6a0e..6cac807 100644
--- a/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java
+++ b/app/src/main/java/ch/pizzapp/android/activity/MainActivity.java
@@ -162,7 +162,7 @@ public class MainActivity extends BaseActivity {
             bottomNavigationView.setCurrentItem(1);
         }
         else {
-            openProductsScreen(categoryList.get(2));
+            openProductsScreen(categoryList.get(3));
         }
     }
     private void initBottomNavigationView(){
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
index e3698a0..aaa3efc 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
@@ -158,6 +158,13 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
             }
         }
 
+        for(PaymentMethodModel paymentMethodModel : paymentMethodModels){
+            if(paymentMethodModel.getPaymentMethodType() == PaymentMethodModel.PaymentMethodType.TWINT){
+                paymentMethodModels.remove(paymentMethodModel);
+                break;
+            }
+        }
+
 
         /*
         // dummy //
diff --git a/app/src/main/java/ch/pizzapp/android/view/AppButton.java b/app/src/main/java/ch/pizzapp/android/view/AppButton.java
index 98a353d..da4e494 100644
--- a/app/src/main/java/ch/pizzapp/android/view/AppButton.java
+++ b/app/src/main/java/ch/pizzapp/android/view/AppButton.java
@@ -56,7 +56,7 @@ public class AppButton extends LinearLayout {
 
     private void setButtonAppearance(Context context){
         if(isEnabled){
-            pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled));
+            pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_enabled_red));
             pizzalinkButton.setTextColor(ContextCompat.getColor(context, R.color.colorPrimary));
         }else {
             pizzalinkButton.setBackground(ContextCompat.getDrawable(context, R.drawable.background_button_disabled));
diff --git a/app/src/main/java/ch/pizzapp/android/view/AppEditText.java b/app/src/main/java/ch/pizzapp/android/view/AppEditText.java
index cbcdddd..6eacfec 100644
--- a/app/src/main/java/ch/pizzapp/android/view/AppEditText.java
+++ b/app/src/main/java/ch/pizzapp/android/view/AppEditText.java
@@ -58,7 +58,7 @@ public class AppEditText extends LinearLayout implements View.OnClickListener {
         TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AppEditText, 0, 0);
         try {
             hint = a.getString(R.styleable.AppEditText_hint);
-            characterCount = a.getInt(R.styleable.AppEditText_characterCount, 5-1);
+            characterCount = a.getInt(R.styleable.AppEditText_characterCount, -1);
             inputType = a.getString(R.styleable.AppEditText_inputType);
             edittextTheme = a.getString(R.styleable.AppEditText_edittextTheme);
         } finally {
diff --git a/app/src/main/res/drawable/background_button_enabled_gray.xml b/app/src/main/res/drawable/background_button_enabled_gray.xml
new file mode 100644
index 0000000..504ee8d
--- /dev/null
+++ b/app/src/main/res/drawable/background_button_enabled_gray.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <stroke
+        android:color="@color/main_black"
+        android:width="1dp"/>
+    <corners android:radius="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_button_enabled.xml b/app/src/main/res/drawable/background_button_enabled_red.xml
similarity index 100%
rename from app/src/main/res/drawable/background_button_enabled.xml
rename to app/src/main/res/drawable/background_button_enabled_red.xml
diff --git a/app/src/main/res/drawable/background_button_pizzapp_gray.xml b/app/src/main/res/drawable/background_button_pizzapp_gray.xml
new file mode 100644
index 0000000..cd284ac
--- /dev/null
+++ b/app/src/main/res/drawable/background_button_pizzapp_gray.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/main_black"/>
+    <corners android:radius="8dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_address.xml b/app/src/main/res/layout/activity_add_address.xml
index 56d45d2..b819613 100644
--- a/app/src/main/res/layout/activity_add_address.xml
+++ b/app/src/main/res/layout/activity_add_address.xml
@@ -109,7 +109,7 @@
                     android:layout_height="48dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp"
-                    style="@style/PizzalinkRedButton"
+                    style="@style/PizzappGrayButton"
                     android:text="@string/add"
                     android:layout_alignParentBottom="true" />
 
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 bbe43dd..21999c4 100644
--- a/app/src/main/res/layout/activity_campaign_product_details.xml
+++ b/app/src/main/res/layout/activity_campaign_product_details.xml
@@ -117,7 +117,7 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:text="@string/add_to_cart"
-            style="@style/PizzalinkRedButton"
+            style="@style/PizzappGrayButton"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="12dp"/>
 
diff --git a/app/src/main/res/layout/activity_create_order.xml b/app/src/main/res/layout/activity_create_order.xml
index 339640d..771b842 100644
--- a/app/src/main/res/layout/activity_create_order.xml
+++ b/app/src/main/res/layout/activity_create_order.xml
@@ -55,6 +55,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_margin="16dp"
+                        app:stpi_indicatorColor="@color/red"
+                        app:stpi_lineDoneColor="@color/red"
                         app:stpi_labels="@array/stepperLabels" />
 
                     <View
diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml
index 9a0b5c5..063960d 100644
--- a/app/src/main/res/layout/activity_forgot_password.xml
+++ b/app/src/main/res/layout/activity_forgot_password.xml
@@ -58,7 +58,7 @@
 
             <Button
                 android:id="@+id/resetPasswordButton"
-                style="@style/PizzalinkRedButton"
+                style="@style/PizzappGrayButton"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8af8f4f..bacc349 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -67,7 +67,7 @@
 
             <Button
                 android:id="@+id/loginButton"
-                style="@style/PizzalinkRedButton"
+                style="@style/PizzappGrayButton"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 android:layout_marginBottom="16dp"
@@ -84,7 +84,7 @@
 
             <Button
                 android:id="@+id/registerButton"
-                style="@style/PizzalinkRedButton"
+                style="@style/PizzappGrayButton"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 android:layout_marginBottom="16dp"
diff --git a/app/src/main/res/layout/activity_my_addresses.xml b/app/src/main/res/layout/activity_my_addresses.xml
index 9e31beb..1faeef8 100644
--- a/app/src/main/res/layout/activity_my_addresses.xml
+++ b/app/src/main/res/layout/activity_my_addresses.xml
@@ -51,7 +51,7 @@
                     android:layout_height="48dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp"
-                    style="@style/PizzalinkRedButton"
+                    style="@style/PizzappGrayButton"
                     android:text="@string/add_new_address"
                     android:layout_alignParentBottom="true"/>
 
diff --git a/app/src/main/res/layout/activity_product_details.xml b/app/src/main/res/layout/activity_product_details.xml
index 636e0cd..c1b7782 100644
--- a/app/src/main/res/layout/activity_product_details.xml
+++ b/app/src/main/res/layout/activity_product_details.xml
@@ -116,7 +116,7 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:text="@string/add_to_cart"
-            style="@style/PizzalinkRedButton"
+            style="@style/PizzappGrayButton"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="12dp"/>
 
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 4e13f6d..db426e2 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -131,7 +131,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            style="@style/PizzalinkRedButton"
+            style="@style/PizzappGrayButton"
             android:text="@string/button_register"
             android:layout_alignParentBottom="true" />
 
diff --git a/app/src/main/res/layout/activity_update_password.xml b/app/src/main/res/layout/activity_update_password.xml
index 99a6fda..70ca370 100644
--- a/app/src/main/res/layout/activity_update_password.xml
+++ b/app/src/main/res/layout/activity_update_password.xml
@@ -76,7 +76,7 @@
                     android:layout_height="48dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp"
-                    style="@style/PizzalinkRedButton"
+                    style="@style/PizzappGrayButton"
                     android:text="@string/update_app" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/activity_update_profile.xml b/app/src/main/res/layout/activity_update_profile.xml
index 02fc134..8fc993b 100644
--- a/app/src/main/res/layout/activity_update_profile.xml
+++ b/app/src/main/res/layout/activity_update_profile.xml
@@ -87,7 +87,7 @@
                     android:layout_height="48dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp"
-                    style="@style/PizzalinkRedButton"
+                    style="@style/PizzappGrayButton"
                     android:text="@string/update_app"
                     android:layout_alignParentBottom="true" />
 
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index 2e6cb30..5c77105 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -93,7 +93,7 @@
                     android:layout_marginRight="6dp"
                     android:layout_marginEnd="6dp"
                     android:text="@string/clear_cart"
-                    style="@style/PizzalinkRedWithoutMargin"
+                    style="@style/PizzappGrayButtonWithoutMargin"
                     android:layout_weight="1"/>
 
                 <Button
@@ -104,7 +104,7 @@
                     android:layout_marginLeft="6dp"
                     android:layout_marginStart="6dp"
                     android:text="@string/continue_cart"
-                    style="@style/PizzalinkRedWithoutMargin"
+                    style="@style/PizzappGrayButtonWithoutMargin"
                     android:layout_weight="1"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_shipping_address.xml b/app/src/main/res/layout/fragment_shipping_address.xml
index 885f520..b2c8e8d 100644
--- a/app/src/main/res/layout/fragment_shipping_address.xml
+++ b/app/src/main/res/layout/fragment_shipping_address.xml
@@ -19,7 +19,7 @@
         android:layout_height="48dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
-        style="@style/PizzalinkRedButton"
+        style="@style/PizzappGrayButton"
         android:text="@string/add_new_address"
         android:layout_above="@+id/ordersBottomLayout"/>
 
diff --git a/app/src/main/res/layout/layout_bottomsheet.xml b/app/src/main/res/layout/layout_bottomsheet.xml
index b2c8bc9..1d2533b 100644
--- a/app/src/main/res/layout/layout_bottomsheet.xml
+++ b/app/src/main/res/layout/layout_bottomsheet.xml
@@ -61,7 +61,6 @@
                     android:textColor="@color/black"
                     android:textSize="18sp"
                     android:padding="12sp"
-                    android:text="Pizza Formaggio"
                     fontPath="fonts/Quicksand-Bold.ttf"
                     android:layout_gravity="center"
                     android:gravity="center" />
@@ -71,7 +70,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textColor="@color/red"
-                    android:text="CHF 25.00"
                     android:textSize="18sp"
                     android:paddingBottom="12dp"
                     android:paddingLeft="12dp"
@@ -91,7 +89,7 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:text="@string/add_to_cart"
-            style="@style/PizzalinkRedButton"
+            style="@style/PizzappGrayButton"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="12dp"/>
 
diff --git a/app/src/main/res/layout/layout_pizzalink_button.xml b/app/src/main/res/layout/layout_pizzalink_button.xml
index f072481..e9ae0f6 100644
--- a/app/src/main/res/layout/layout_pizzalink_button.xml
+++ b/app/src/main/res/layout/layout_pizzalink_button.xml
@@ -15,6 +15,6 @@
         android:layout_marginRight="24dp"
         android:layout_marginEnd="24dp"
         android:textColor="@color/white"
-        android:background="@drawable/background_button_enabled"/>
+        android:background="@drawable/background_button_enabled_red"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_pizzalink_view.xml b/app/src/main/res/layout/layout_pizzalink_view.xml
index 1c82eed..5184f6b 100644
--- a/app/src/main/res/layout/layout_pizzalink_view.xml
+++ b/app/src/main/res/layout/layout_pizzalink_view.xml
@@ -12,7 +12,6 @@
         android:id="@+id/descriptionTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/order_person_fullname"
         android:textColor="@color/black"
         android:textSize="12sp"
         fontPath="fonts/Quicksand-Bold.ttf" />
@@ -23,7 +22,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:text="Aytaç Cici"
         android:textColor="@color/red" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_cart.xml b/app/src/main/res/layout/row_cart.xml
index 682f267..c4d752a 100644
--- a/app/src/main/res/layout/row_cart.xml
+++ b/app/src/main/res/layout/row_cart.xml
@@ -31,7 +31,6 @@
                 android:id="@+id/cartProductCountTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="2 x "
                 android:textColor="@color/black" />
 
         </LinearLayout>
@@ -67,7 +66,6 @@
                         android:id="@+id/cartProductNameTextView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="Pizza Formaggio"
                         android:textSize="16sp"
                         android:textColor="@color/black"
                         android:padding="12dp"
@@ -81,7 +79,6 @@
                         android:id="@+id/cartProductTotalPriceTextView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="CHF 25.00"
                         android:textColor="@color/black"
                         android:padding="8dp"
                         fontPath="fonts/Quicksand-Bold.ttf"
@@ -95,7 +92,6 @@
                     android:id="@+id/cartProductInfoTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Gross"
                     android:textColor="@color/black"
                     android:layout_marginLeft="32dp"
                     android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/row_menu_product.xml b/app/src/main/res/layout/row_menu_product.xml
index 6c72473..e22a7f0 100644
--- a/app/src/main/res/layout/row_menu_product.xml
+++ b/app/src/main/res/layout/row_menu_product.xml
@@ -20,7 +20,6 @@
             android:layout_height="match_parent"
             android:textColor="@color/black"
             android:textSize="16sp"
-            android:text="Anatoliajefjefje\nwhufjechfuhefu"
             android:padding="8dp"
             fontPath="fonts/Quicksand-Bold.ttf"
             android:layout_centerInParent="true"
@@ -61,10 +60,10 @@
             android:layout_height="match_parent"
             android:background="@color/row_product_ingredients_background"
             android:padding="8dp"
+            android:textSize="12sp"
             android:textColor="@color/black"
             android:gravity="center"
-            android:layout_centerInParent="true"
-            android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
+            android:layout_centerInParent="true" />
 
     </RelativeLayout>
 
@@ -78,7 +77,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:text="CHF 25.00"
             android:padding="17dp"
             android:gravity="center_horizontal"
             fontPath="fonts/Quicksand-Bold.ttf"
diff --git a/app/src/main/res/layout/row_my_address.xml b/app/src/main/res/layout/row_my_address.xml
index aa45db2..5f01089 100644
--- a/app/src/main/res/layout/row_my_address.xml
+++ b/app/src/main/res/layout/row_my_address.xml
@@ -25,7 +25,6 @@
             android:layout_toLeftOf="@+id/deleteAddressImageView"
             android:layout_toStartOf="@+id/deleteAddressImageView"
             android:layout_centerVertical="true"
-            android:text="Test Address"
             fontPath="fonts/Quicksand-Bold.ttf"
             android:textColor="@color/black" />
 
diff --git a/app/src/main/res/layout/row_option_checkbox.xml b/app/src/main/res/layout/row_option_checkbox.xml
index c5cbf73..78c4f57 100644
--- a/app/src/main/res/layout/row_option_checkbox.xml
+++ b/app/src/main/res/layout/row_option_checkbox.xml
@@ -14,7 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="false"
-        android:text="Klein"
         android:textColor="@color/black"
         fontPath="fonts/Quicksand-Bold.ttf"/>
 
@@ -30,8 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/black"
-            android:text="CHF 14.00"/>
+            android:textColor="@color/black" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/row_option_radio.xml b/app/src/main/res/layout/row_option_radio.xml
index 155cd00..1f89b03 100644
--- a/app/src/main/res/layout/row_option_radio.xml
+++ b/app/src/main/res/layout/row_option_radio.xml
@@ -13,7 +13,6 @@
         android:id="@+id/productOptionRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Klein"
         android:clickable="false"
         android:textColor="@color/black"
         fontPath="fonts/Quicksand-Bold.ttf"/>
@@ -30,8 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fontPath="fonts/Quicksand-Bold.ttf"
-            android:textColor="@color/black"
-            android:text="CHF 14.00"/>
+            android:textColor="@color/black" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/row_order_history.xml b/app/src/main/res/layout/row_order_history.xml
index e5e4d50..f6b8d89 100644
--- a/app/src/main/res/layout/row_order_history.xml
+++ b/app/src/main/res/layout/row_order_history.xml
@@ -24,7 +24,6 @@
             android:id="@+id/orderDateTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="5 Oct. 2017"
             android:textColor="@color/red"
             android:padding="8dp"
             fontPath="fonts/Quicksand-Bold.ttf"
@@ -42,7 +41,6 @@
                 android:id="@+id/orderTotalTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="CHF 25.00"
                 android:textColor="@color/black"
                 android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/row_payment_method.xml b/app/src/main/res/layout/row_payment_method.xml
index f4a3579..d7084ba 100644
--- a/app/src/main/res/layout/row_payment_method.xml
+++ b/app/src/main/res/layout/row_payment_method.xml
@@ -13,7 +13,6 @@
         android:id="@+id/paymentMethodRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Gel ad"
         android:clickable="false"
         fontPath="fonts/Quicksand-Bold.ttf"
         android:textColor="@color/black"/>
diff --git a/app/src/main/res/layout/row_shipment_address.xml b/app/src/main/res/layout/row_shipment_address.xml
index 092ae8d..6c08033 100644
--- a/app/src/main/res/layout/row_shipment_address.xml
+++ b/app/src/main/res/layout/row_shipment_address.xml
@@ -13,7 +13,6 @@
         android:id="@+id/shipmentAddressRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Gel ad"
         android:clickable="false"
         fontPath="fonts/Quicksand-Bold.ttf"
         android:textColor="@color/black"/>
diff --git a/app/src/main/res/layout/row_shipment_method.xml b/app/src/main/res/layout/row_shipment_method.xml
index 27b9848..b562c43 100644
--- a/app/src/main/res/layout/row_shipment_method.xml
+++ b/app/src/main/res/layout/row_shipment_method.xml
@@ -13,7 +13,6 @@
         android:id="@+id/shipmentMethodRadioButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Gel ad"
         android:clickable="false"
         fontPath="fonts/Quicksand-Bold.ttf"
         android:textColor="@color/black"/>
@@ -29,7 +28,6 @@
             android:id="@+id/shipmentMethodPriceTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="CHF 14.00"
             fontPath="fonts/Quicksand-Bold.ttf"
             android:textColor="@color/black"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 667fc61..adc45a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,7 +135,7 @@
     <string name="done_order">FERTIG</string>    
     <string-array name="stepperLabels">
         <item>Lieferungsart</item>
-        <item>Lieferungadresse</item>        
+        <item>Lieferungsadresse</item>        
         <item>Bezahlverfahren</item>
         <item>Nachricht</item>        
         <item>Betrag</item>    
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 217f525..7503192 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,8 +3,8 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/main_black</item>
+        <item name="colorPrimaryDark">@color/main_black</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
@@ -21,8 +21,9 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <!--
     <style name="PizzalinkButtonWithoutMargin">
-        <item name="android:background">@drawable/background_button_enabled</item>
+        <item name="android:background">@drawable/background_button_enabled_red</item>
         <item name="android:textColor">@color/red</item>
         <item name="android:textSize">12sp</item>
         <item name="android:textAllCaps">false</item>
@@ -39,7 +40,8 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="PizzalinkRedWithoutMargin">
+
+    <style name="PizzalinkRedButtonWithoutMargin">
         <item name="android:background">@drawable/background_button_pizzalink_red</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">12sp</item>
@@ -56,5 +58,32 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textAllCaps">false</item>
     </style>
+    -->
+
+    <style name="PizzappButtonWithoutMargin">
+        <item name="android:background">@drawable/background_button_enabled_gray</item>
+        <item name="android:textColor">@color/main_black</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="PizzappGrayButtonWithoutMargin">
+        <item name="android:background">@drawable/background_button_pizzapp_gray</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+
+    <style name="PizzappGrayButton" parent="PizzappButtonWithoutMargin">
+        <item name="android:background">@drawable/background_button_pizzapp_gray</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_marginLeft">24dp</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginRight">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
 
 </resources>