diff --git a/app/build.gradle b/app/build.gradle
index 15d6f24..a52bcb5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         minSdk 26
         targetSdk 32
         versionCode 1
-        versionName "0.3.2"
+        versionName "0.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 50909c4..5f2b1e9 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 9a655b0..86510ca 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.3.2",
+      "versionName": "0.3.4",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cc7bec3..6dff26a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,10 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="foodify-notification"/>
+        
+        <service android:name=".RefreshTokenService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            />
 
         <activity
             android:name=".Activity.TrackingOrderActivity"
diff --git a/app/src/main/assets/font/bebas.ttf b/app/src/main/assets/font/bebas.ttf
deleted file mode 100644
index ead2c4d..0000000
Binary files a/app/src/main/assets/font/bebas.ttf and /dev/null differ
diff --git a/app/src/main/assets/font/koho.ttf b/app/src/main/assets/font/koho.ttf
new file mode 100644
index 0000000..78e04aa
Binary files /dev/null and b/app/src/main/assets/font/koho.ttf differ
diff --git a/app/src/main/assets/font/koho_bold.ttf b/app/src/main/assets/font/koho_bold.ttf
new file mode 100644
index 0000000..a0123f5
Binary files /dev/null and b/app/src/main/assets/font/koho_bold.ttf differ
diff --git a/app/src/main/assets/font/opensans.ttf b/app/src/main/assets/font/opensans.ttf
deleted file mode 100644
index ba6db9b..0000000
Binary files a/app/src/main/assets/font/opensans.ttf and /dev/null differ
diff --git a/app/src/main/java/com/capstone/foodify/Activity/AccountAndProfileActivity.java b/app/src/main/java/com/capstone/foodify/Activity/AccountAndProfileActivity.java
index c9e153d..7b20aff 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/AccountAndProfileActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/AccountAndProfileActivity.java
@@ -359,12 +359,12 @@ public class AccountAndProfileActivity extends AppCompatActivity {
         txt_verify_email = findViewById(R.id.textview_verify_email);
     }
     private void setFontUI() {
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_phone.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_fullName.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_birthDay.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_email.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_phone.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_fullName.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_birthDay.setTypeface(Common.setFontKohoBold(getAssets()));
 
-        edt_birthday.setTypeface(Common.setFontBebas(getAssets()));
+        edt_birthday.setTypeface(Common.setFontKohoBold(getAssets()));
     }
     private void chooseDateOfBirth() {
         //Get date, month, year from user
diff --git a/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java b/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java
index c1c5fe6..f92d54d 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java
@@ -359,7 +359,7 @@ public class AddressManagerActivity extends AppCompatActivity {
         initComponent(view);
 
         //Set font
-        textInput_address.setTypeface(Common.setFontOpenSans(getAssets()));
+        textInput_address.setTypeface(Common.setFontKoho(getAssets()));
 
         //Set event when click on district spinner
         districtSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -597,7 +597,7 @@ public class AddressManagerActivity extends AppCompatActivity {
     private static class MySpinnerAdapter extends ArrayAdapter<String> {
         // Initialise custom font, for example:
         Typeface font = Typeface.createFromAsset(getContext().getAssets(),
-                "font/bebas.ttf");
+                "font/koho_bold.ttf");
 
         // (In reality I used a manager which caches the Typeface objects)
         // Typeface font = FontManager.getInstance().getFont(getContext(), BLAMBOT);
diff --git a/app/src/main/java/com/capstone/foodify/Activity/ChangePasswordActivity.java b/app/src/main/java/com/capstone/foodify/Activity/ChangePasswordActivity.java
index d82be37..b559ef5 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/ChangePasswordActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/ChangePasswordActivity.java
@@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import android.content.Context;
-import android.graphics.Typeface;
 import android.net.ConnectivityManager;
 import android.net.NetworkCapabilities;
 import android.os.Bundle;
@@ -27,10 +26,8 @@ import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
-import com.thecode.aestheticdialogs.AestheticDialog;
 import com.thecode.aestheticdialogs.DialogStyle;
 import com.thecode.aestheticdialogs.DialogType;
-import com.thecode.aestheticdialogs.OnDialogClickListener;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -217,8 +214,8 @@ public class ChangePasswordActivity extends AppCompatActivity {
     }
 
     private void setFontUI() {
-        textInput_password.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_old_password.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_password_confirm.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_password.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_old_password.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_password_confirm.setTypeface(Common.setFontKohoBold(getAssets()));
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/Activity/ForgotPasswordActivity.java b/app/src/main/java/com/capstone/foodify/Activity/ForgotPasswordActivity.java
index e75db84..c44277e 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/ForgotPasswordActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/ForgotPasswordActivity.java
@@ -6,43 +6,27 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import android.content.Context;
-import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkCapabilities;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Toast;
 
-import com.capstone.foodify.API.FoodApi;
 import com.capstone.foodify.Common;
-import com.capstone.foodify.Model.Response.CustomResponse;
-import com.capstone.foodify.Model.User;
 import com.capstone.foodify.R;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputLayout;
-import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.PhoneAuthCredential;
-import com.google.firebase.auth.PhoneAuthOptions;
-import com.google.firebase.auth.PhoneAuthProvider;
 import com.google.firebase.auth.SignInMethodQueryResult;
-import com.thecode.aestheticdialogs.AestheticDialog;
 import com.thecode.aestheticdialogs.DialogStyle;
 import com.thecode.aestheticdialogs.DialogType;
-import com.thecode.aestheticdialogs.OnDialogClickListener;
 
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
 public class ForgotPasswordActivity extends AppCompatActivity {
     private FirebaseAuth mAuth;
     private TextInputLayout textInput_email;
@@ -165,7 +149,7 @@ public class ForgotPasswordActivity extends AppCompatActivity {
     }
     private void setFontUI() {
 
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_email.setTypeface(Common.setFontKohoBold(getAssets()));
     }
 
     private void initComponent() {
diff --git a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
index 08185cc..57ee42f 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
@@ -2,6 +2,8 @@ package com.capstone.foodify.Activity;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -42,6 +44,7 @@ import com.capstone.foodify.Fragment.HomeFragment;
 import com.capstone.foodify.Model.Response.CustomResponse;
 import com.capstone.foodify.Model.User;
 import com.capstone.foodify.R;
+import com.capstone.foodify.RefreshTokenService;
 import com.capstone.foodify.ViewPagerAdapter;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.common.api.ResolvableApiException;
@@ -92,7 +95,7 @@ public class MainActivity extends AppCompatActivity {
     private static final long MAX_WAIT_TIME_IN_MILLISECONDS = 1000;
     private static final int LOCATION_REQUEST_CODE = 100;
     private static final String TAG = "MainActivity";
-
+    private static final int JOB_ID = 123;
     private FusedLocationProviderClient mFusedLocationClient;
     private SettingsClient mSettingsClient;
     private LocationRequest mLocationRequest;
@@ -113,6 +116,8 @@ public class MainActivity extends AppCompatActivity {
 
         if (user != null && Common.CURRENT_USER == null) {
 
+            Common.FIREBASE_USER = user;
+
             progressLayout.setVisibility(View.VISIBLE);
             user.getIdToken(true)
                     .addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
@@ -228,12 +233,28 @@ public class MainActivity extends AppCompatActivity {
 
         startPowerSaverIntent(this);
         checkNotificationPermission();
-
+        startRefreshTokenService();
 
         getLocation();
 
     }
 
+    private void startRefreshTokenService() {
+        ComponentName componentName = new ComponentName(this, RefreshTokenService.class);
+
+        JobInfo jobInfo = new JobInfo.Builder(JOB_ID, componentName)
+                .setPeriodic(59 * 60 * 1000)
+                .build();
+
+        JobScheduler jobScheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
+        jobScheduler.schedule(jobInfo);
+    }
+
+    private void stopRefreshTokenService() {
+        JobScheduler jobScheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
+        jobScheduler.cancel(JOB_ID);
+    }
+
     private void getLocation() {
         if (Common.CURRENT_LOCATION == null) {
             mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
@@ -320,6 +341,7 @@ public class MainActivity extends AppCompatActivity {
         viewPager2.setAdapter(viewPagerAdapter);
 
         viewPager2.setUserInputEnabled(false);
+
         bottomNavigationView.setOnItemSelectedListener(new NavigationBarView.OnItemSelectedListener() {
             @SuppressLint("NonConstantResourceId")
             @Override
@@ -509,6 +531,13 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        stopRefreshTokenService();
+    }
+
     //Check auto start permission
     public static List<Intent> POWER_MANAGER_INTENTS = Arrays.asList(
             new Intent().setComponent(new ComponentName("com.miui.securitycenter", "com.miui.permcenter.autostart.AutoStartManagementActivity")),
@@ -558,8 +587,6 @@ public class MainActivity extends AppCompatActivity {
             }
         }
     }
-
-
     private static boolean isCallable(Context context, Intent intent) {
         List<ResolveInfo> list = context.getPackageManager().queryIntentActivities(intent,
                 PackageManager.MATCH_DEFAULT_ONLY);
diff --git a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
index bbcc0d4..66b2f5c 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
@@ -77,7 +77,7 @@ import vn.zalopay.sdk.listeners.PayOrderListener;
 public class OrderCheckOutActivity extends AppCompatActivity {
     private static final String TAG = "OrderCheckOutActivity";
     private static final String TAKE_FOOD_FROM_SHOP = "Đến shop lấy";
-    private static final String ZALO_PAYMENT_METHOD = "Zalo Pay";
+    private static final String ZALO_PAYMENT_METHOD = "ZALO PAY";
     private static final String CASH_PAYMENT = "CASH";
     private static Double LAT_SHOP = 0.0;
     private static Double LNG_SHOP = 0.0;
@@ -840,7 +840,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
     private static class MySpinnerAdapter extends ArrayAdapter<String> {
         // Initialise custom font, for example:
         Typeface font = Typeface.createFromAsset(getContext().getAssets(),
-                "font/bebas.ttf");
+                "font/koho_bold.ttf");
 
         // (In reality I used a manager which caches the Typeface objects)
         // Typeface font = FontManager.getInstance().getFont(getContext(), BLAMBOT);
diff --git a/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java
index 58f55bf..81c9883 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java
@@ -15,11 +15,9 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.capstone.foodify.API.FoodApiToken;
 import com.capstone.foodify.Common;
-import com.capstone.foodify.Fragment.HomeFragment;
 import com.capstone.foodify.Model.User;
 import com.capstone.foodify.R;
 import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputEditText;
@@ -283,8 +281,8 @@ public class SignInActivity extends AppCompatActivity {
 
     }
     private void setFontUI() {
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_password.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_email.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_password.setTypeface(Common.setFontKohoBold(getAssets()));
     }
 
     // this event will enable the back
diff --git a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java
index 988d6cf..448801c 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java
@@ -24,7 +24,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.capstone.foodify.API.FoodApi;
 import com.capstone.foodify.Common;
@@ -569,7 +568,7 @@ public class SignUpActivity extends AppCompatActivity {
     private static class MySpinnerAdapter extends ArrayAdapter<String> {
         // Initialise custom font, for example:
         Typeface font = Typeface.createFromAsset(getContext().getAssets(),
-                "font/bebas.ttf");
+                "font/koho_bold.ttf");
 
         // (In reality I used a manager which caches the Typeface objects)
         // Typeface font = FontManager.getInstance().getFont(getContext(), BLAMBOT);
@@ -620,13 +619,13 @@ public class SignUpActivity extends AppCompatActivity {
     }
 
     private void setFontUI() {
-        textInput_password.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_phone.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_address.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_confirmPassword.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_fullName.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_birthDay.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_email.setTypeface(Common.setFontBebas(getAssets()));
-        textInput_id_card.setTypeface(Common.setFontBebas(getAssets()));
+        textInput_password.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_phone.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_address.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_confirmPassword.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_fullName.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_birthDay.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_email.setTypeface(Common.setFontKohoBold(getAssets()));
+        textInput_id_card.setTypeface(Common.setFontKohoBold(getAssets()));
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/Common.java b/app/src/main/java/com/capstone/foodify/Common.java
index 984cede..6cabb27 100644
--- a/app/src/main/java/com/capstone/foodify/Common.java
+++ b/app/src/main/java/com/capstone/foodify/Common.java
@@ -2,29 +2,20 @@ package com.capstone.foodify;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.AssetManager;
 import android.graphics.Typeface;
 import android.location.Location;
 import android.net.ConnectivityManager;
 import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.view.View;
-import android.widget.Toast;
 
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 
 import com.capstone.foodify.API.FoodApiToken;
-import com.capstone.foodify.Activity.MainActivity;
-import com.capstone.foodify.Activity.SignInActivity;
-import com.capstone.foodify.Fragment.HomeFragment;
 import com.capstone.foodify.Model.Basket;
 import com.capstone.foodify.Model.Food;
 import com.capstone.foodify.Model.User;
 import com.google.firebase.appdistribution.FirebaseAppDistribution;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.thecode.aestheticdialogs.AestheticDialog;
 import com.thecode.aestheticdialogs.DialogStyle;
@@ -45,6 +36,7 @@ public class Common {
     public static final String BASE_URL = "https://foodify-backend-production.up.railway.app/api/";
     public static String FCM_TOKEN = null;
     public static Location CURRENT_LOCATION = null;
+    public static FirebaseUser FIREBASE_USER = null;
     public static final String MAP_API = "AIzaSyAY14Ic32UP26Hg6GILznOfbBihiY5BUxw";
     public static final String FORMAT_DATE="dd-MM-yyyy";
     public static final String VALID_EMAIL_ADDRESS_REGEX = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$";
@@ -64,12 +56,12 @@ public class Common {
         return fmt.format(price);
     }
 
-    public static Typeface setFontBebas(AssetManager assetManager){
-        return Typeface.createFromAsset(assetManager, "font/bebas.ttf");
+    public static Typeface setFontKohoBold(AssetManager assetManager){
+        return Typeface.createFromAsset(assetManager, "font/koho_bold.ttf");
     }
 
-    public static Typeface setFontOpenSans(AssetManager assetManager){
-        return Typeface.createFromAsset(assetManager, "font/opensans.ttf");
+    public static Typeface setFontKoho(AssetManager assetManager){
+        return Typeface.createFromAsset(assetManager, "font/koho.ttf");
     }
 
     public static void reloadUser(Activity activity){
@@ -81,6 +73,10 @@ public class Common {
                     if(userData != null){
                         Common.CURRENT_USER =  userData;
                     }
+                } else if(response.code() == 401){
+                    //Unauthorized
+
+
                 }
             }
 
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
index a0dc1a3..096036c 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
@@ -1,5 +1,7 @@
 package com.capstone.foodify.Fragment;
 
+import android.content.Context;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/capstone/foodify/RefreshTokenService.java b/app/src/main/java/com/capstone/foodify/RefreshTokenService.java
new file mode 100644
index 0000000..11d37f8
--- /dev/null
+++ b/app/src/main/java/com/capstone/foodify/RefreshTokenService.java
@@ -0,0 +1,55 @@
+package com.capstone.foodify;
+
+import android.app.job.JobParameters;
+import android.app.job.JobService;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.GetTokenResult;
+
+public class RefreshTokenService extends JobService {
+
+    private static final String TAG = "RefreshTokenService";
+
+    @Override
+    public boolean onStartJob(JobParameters params) {
+
+        Log.d(TAG, "Refresh token service started!");
+
+        refreshToken(params);
+
+        return true;
+    }
+
+    private void refreshToken(JobParameters params) {
+
+        if(Common.FIREBASE_USER != null){
+            Common.FIREBASE_USER.getIdToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
+                @Override
+                public void onComplete(@NonNull Task<GetTokenResult> task) {
+                    if(task.isSuccessful()){
+                        Common.TOKEN = task.getResult().getToken();
+
+                        Log.i(TAG, "Refresh token completed!");
+                    } else {
+                        Log.e(TAG, "Error when refresh token!");
+                    }
+
+                    jobFinished(params, false);
+                }
+            });
+        }
+
+    }
+
+    @Override
+    public boolean onStopJob(JobParameters params) {
+
+        Log.d(TAG, "Stop serviced!");
+
+        return true;
+    }
+}
diff --git a/app/src/main/res/font/bebas.ttf b/app/src/main/res/font/bebas.ttf
deleted file mode 100644
index ead2c4d..0000000
Binary files a/app/src/main/res/font/bebas.ttf and /dev/null differ
diff --git a/app/src/main/res/font/koho.ttf b/app/src/main/res/font/koho.ttf
new file mode 100644
index 0000000..78e04aa
Binary files /dev/null and b/app/src/main/res/font/koho.ttf differ
diff --git a/app/src/main/res/font/koho_bold.ttf b/app/src/main/res/font/koho_bold.ttf
new file mode 100644
index 0000000..a0123f5
Binary files /dev/null and b/app/src/main/res/font/koho_bold.ttf differ
diff --git a/app/src/main/res/font/koho_italic.ttf b/app/src/main/res/font/koho_italic.ttf
new file mode 100644
index 0000000..e6cf346
Binary files /dev/null and b/app/src/main/res/font/koho_italic.ttf differ
diff --git a/app/src/main/res/layout/activity_account_and_profile.xml b/app/src/main/res/layout/activity_account_and_profile.xml
index 6a4f999..8982712 100644
--- a/app/src/main/res/layout/activity_account_and_profile.xml
+++ b/app/src/main/res/layout/activity_account_and_profile.xml
@@ -27,10 +27,10 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="35dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/account_and_profile"
             android:textColor="@color/black"
-            android:textSize="40sp"
+            android:textSize="30sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -50,8 +50,9 @@
         <Button
             android:id="@+id/change_image_button"
             android:text="Đổi ảnh"
+            android:textSize="13sp"
             android:textColor="@color/white"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
@@ -67,7 +68,7 @@
             android:layout_marginRight="20dp"
             android:layout_marginLeft="20dp"
             android:layout_marginBottom="20dp"
-            android:hint="@string/email_text"
+            android:hint="Email"
             app:boxBackgroundColor="@color/white"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toTopOf="@id/textInput_phone"
@@ -76,6 +77,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_email"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="textEmailAddress"
@@ -97,21 +99,20 @@
                 android:id="@+id/textview_resendCode"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="15sp"
+                android:textSize="13sp"
                 android:text="Gửi lại sau: "
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
-                android:textStyle="bold" />
+                />
 
             <TextView
                 android:id="@+id/textview_countdown"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:text="00:35"
                 android:textColor="@color/secondary"
-                android:textSize="15sp"
-                android:textStyle="bold"
+                android:textSize="13sp"
                 />
 
         </LinearLayout>
@@ -123,9 +124,8 @@
             android:textSize="15sp"
             android:text="Xác thực"
             android:layout_marginEnd="20dp"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/primaryColor"
-            android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/textInput_email"
             app:layout_constraintEnd_toEndOf="parent"
             android:visibility="gone"
@@ -138,9 +138,8 @@
             android:textSize="15sp"
             android:text="@string/resend_code"
             android:layout_marginEnd="20dp"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/primaryColor"
-            android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/textInput_email"
             app:layout_constraintEnd_toEndOf="parent"
             android:visibility="gone"
@@ -153,7 +152,7 @@
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="20dp"
-            android:hint="@string/phone_text"
+            android:hint="Số điện thoại"
             app:boxBackgroundColor="@color/white"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toTopOf="@id/textInput_fullName"
@@ -162,6 +161,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_phone"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="phone"
@@ -186,6 +186,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_fullName"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="text"
@@ -200,7 +201,7 @@
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="40dp"
-            android:hint="@string/birthday_text"
+            android:hint="Ngày tháng năm sinh"
             app:boxBackgroundColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -210,6 +211,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_birthDay"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clickable="false"
@@ -245,7 +247,7 @@
             <TextView
                 android:text="@string/change_password"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -267,9 +269,9 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/updated_button"
             style="@style/DefaultSolid"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/updated"
-            android:textSize="20sp"
+            android:textSize="15sp"
             android:padding="10dp"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="40dp"
diff --git a/app/src/main/res/layout/activity_address_manager.xml b/app/src/main/res/layout/activity_address_manager.xml
index dfc2720..da86324 100644
--- a/app/src/main/res/layout/activity_address_manager.xml
+++ b/app/src/main/res/layout/activity_address_manager.xml
@@ -26,9 +26,9 @@
 
         <TextView
             android:id="@+id/textView"
-            android:text="quản lý địa chỉ"
-            android:fontFamily="@font/bebas"
-            android:textSize="40sp"
+            android:text="Quản lý địa chỉ"
+            android:fontFamily="@font/koho_bold"
+            android:textSize="35sp"
             android:textColor="@color/black"
             android:layout_marginTop="10dp"
             android:layout_marginStart="10dp"
@@ -61,9 +61,8 @@
                     android:id="@+id/text_view_address"
                     android:text="Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu, thành phố Đà Nẵng"
                     android:textSize="16sp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_italic"
                     android:textColor="@color/gray"
-                    android:textStyle="italic|bold"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     />
@@ -78,9 +77,8 @@
                         android:id="@+id/default_text_view"
                         android:text="Mặc định"
                         android:textSize="13sp"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:textColor="@color/primaryColor"
-                        android:textStyle="bold"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="0.6"
@@ -91,9 +89,8 @@
                     <TextView
                         android:id="@+id/blank_text_view"
                         android:textSize="13sp"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:textColor="@color/primaryColor"
-                        android:textStyle="bold"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="0.6"
@@ -154,6 +151,8 @@
         <Button
             android:id="@+id/add_address_button"
             android:text="Thêm địa chỉ"
+            android:fontFamily="@font/koho_bold"
+            android:textAllCaps="false"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="70dp"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 33627a6..d1a9164 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="40dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/change_password"
             android:textColor="@color/black"
             android:textSize="40sp"
@@ -61,6 +61,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_old_password"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textPassword" />
@@ -86,6 +87,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_password"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textPassword" />
@@ -98,7 +100,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
-                android:hint="@string/repeat_password_text"
+                android:hint="Xác nhận mật khẩu"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -110,6 +112,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_confirmPassword"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textPassword" />
@@ -121,9 +124,10 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/change_password_button"
             style="@style/DefaultSolid"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/change_password"
-            android:textSize="20sp"
+            android:textSize="16sp"
+            android:textAllCaps="false"
             android:padding="10dp"
             android:layout_marginTop="80dp"
             android:layout_marginStart="40dp"
diff --git a/app/src/main/res/layout/activity_favorite_food.xml b/app/src/main/res/layout/activity_favorite_food.xml
index 41ec833..ef89835 100644
--- a/app/src/main/res/layout/activity_favorite_food.xml
+++ b/app/src/main/res/layout/activity_favorite_food.xml
@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Món ăn yêu thích"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:textSize="40sp"
                 android:layout_marginTop="20dp"
@@ -74,7 +74,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -109,7 +109,7 @@
             />
 
         <TextView
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/grayLight"
             android:layout_marginTop="10dp"
             android:text="Oops! Bạn chưa có món ăn yêu thích nào ở đây cả!"
diff --git a/app/src/main/res/layout/activity_food_detail.xml b/app/src/main/res/layout/activity_food_detail.xml
index 96a3280..f50213f 100644
--- a/app/src/main/res/layout/activity_food_detail.xml
+++ b/app/src/main/res/layout/activity_food_detail.xml
@@ -78,7 +78,7 @@
                         android:textSize="30sp"
                         android:text="Food Name"
                         android:textColor="@color/black"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -98,7 +98,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="-89%"
-                            android:textSize="18sp"
+                            android:fontFamily="@font/koho"
+                            android:textSize="14sp"
                             android:textColor="@color/red"
                             android:layout_gravity="right"
                             />
@@ -128,7 +129,7 @@
                     android:textSize="20sp"
                     android:text="Shop Name"
                     android:textColor="@color/secondary"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/linear_layout_1"
@@ -161,6 +162,7 @@
                     <TextView
                         android:id="@+id/count_rating_text_view"
                         android:textSize="13sp"
+                        android:fontFamily="@font/koho"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="235 đánh giá" />
@@ -169,6 +171,7 @@
                         android:id="@+id/count_sold"
                         android:textSize="13sp"
                         android:layout_marginTop="5dp"
+                        android:fontFamily="@font/koho"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textAlignment="center"
@@ -188,7 +191,7 @@
                     <TextView
                         android:text="Danh mục:"
                         android:textSize="18sp"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:textColor="@color/black"
                         android:layout_marginEnd="10dp"
                         android:layout_width="wrap_content"
@@ -207,7 +210,7 @@
                     android:id="@+id/description_text_view"
                     android:text="Mô tả"
                     android:textSize="18sp"
-                    android:fontFamily="@font/bebas"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/black"
                     android:layout_marginTop="20dp"
                     android:layout_width="wrap_content"
@@ -218,7 +221,7 @@
 
                 <TextView
                     android:id="@+id/content_description_text_view"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
@@ -245,7 +248,7 @@
                         >
                         <TextView
                             android:text="Số lượng"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:textColor="@color/primaryColor"
                             android:textSize="15sp"
                             android:layout_width="wrap_content"
@@ -274,7 +277,7 @@
                         <TextView
                             android:id="@+id/total_text_view"
                             android:text="Giá"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:textColor="@color/black"
                             android:textSize="15sp"
                             android:layout_width="wrap_content"
@@ -285,9 +288,9 @@
                         <TextView
                             android:id="@+id/price"
                             android:text="25.000 VND"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:textColor="@color/primaryColor"
-                            android:textSize="30sp"
+                            android:textSize="25sp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             />
@@ -304,10 +307,10 @@
                     android:layout_marginTop="40dp"
                     android:layout_marginStart="40dp"
                     android:layout_marginEnd="40dp"
-                    android:fontFamily="@font/bebas"
+                    android:fontFamily="@font/koho_bold"
                     android:padding="10dp"
                     android:text="Add to basket - 15000 VND"
-                    android:textSize="18sp"
+                    android:textSize="13sp"
                     app:layout_constraintTop_toBottomOf="@id/constraintLayout"
                     />
 
@@ -334,7 +337,7 @@
                         android:text="Bình luận"
                         android:backgroundTint="@color/yellow"
                         android:textColor="@color/black"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:textAllCaps="false"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -365,7 +368,7 @@
                         <TextView
                             android:id="@+id/user_name_text_view"
                             android:text="User A"
-                            android:fontFamily="@font/opensans"
+                            android:fontFamily="@font/koho"
                             android:textColor="@color/black"
                             android:textSize="16sp"
                             android:layout_width="wrap_content"
@@ -392,7 +395,7 @@
                         <TextView
                             android:id="@+id/comment_user"
                             android:text="Food is good!"
-                            android:fontFamily="@font/opensans"
+                            android:fontFamily="@font/koho"
                             android:textSize="15sp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -457,7 +460,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml
index 2d18fd5..f982e85 100644
--- a/app/src/main/res/layout/activity_forgot_password.xml
+++ b/app/src/main/res/layout/activity_forgot_password.xml
@@ -25,14 +25,14 @@
 
         <TextView
             android:id="@+id/textView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="90dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/forgot_password"
             android:textColor="@color/black"
-            android:textSize="50sp"
+            android:textSize="40sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -41,9 +41,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Vui lòng nhập địa chỉ email vào ô dưới đây để tiến hành đặt lại mật khẩu của bạn."
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
-            android:textStyle="bold"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:layout_marginTop="25dp"
@@ -61,7 +60,7 @@
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="40dp"
             android:layout_marginTop="50dp"
-            android:hint="@string/email_text"
+            android:hint="Email"
             app:boxBackgroundColor="@color/white"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -72,6 +71,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_email"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="textEmailAddress" />
@@ -83,13 +83,14 @@
             style="@style/DefaultSolid"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:padding="10dp"
             android:layout_marginStart="40dp"
             android:layout_marginEnd="40dp"
             android:layout_marginTop="30dp"
             android:text="Gửi email"
-            android:textSize="20sp"
+            android:textAllCaps="false"
+            android:textSize="17sp"
             app:layout_constraintTop_toBottomOf="@+id/textInput_email" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad7d876..86f246d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,7 +30,8 @@
             android:id="@+id/bottom_nav"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:menu="@menu/menu_bottom_nav" />
+            app:menu="@menu/menu_bottom_nav"
+            />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml
index 0c0ba08..2422009 100644
--- a/app/src/main/res/layout/activity_order.xml
+++ b/app/src/main/res/layout/activity_order.xml
@@ -28,7 +28,7 @@
             android:id="@+id/textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="Đơn hàng"
             android:textColor="@color/black"
             android:textSize="30sp"
@@ -43,7 +43,9 @@
         android:layout_below="@id/header"
         app:tabGravity="center"
         app:tabIndicatorColor="@color/primaryColor"
+        app:tabSelectedTextColor="@color/primaryColor"
         app:tabMode="scrollable"
+        app:tabTextAppearance="@style/tab_text"
         >
 
         <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/activity_order_check_out.xml b/app/src/main/res/layout/activity_order_check_out.xml
index 4ae14aa..1623e5e 100644
--- a/app/src/main/res/layout/activity_order_check_out.xml
+++ b/app/src/main/res/layout/activity_order_check_out.xml
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:layout_marginTop="35dp"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:text="Chi tiết đơn"
                 android:textColor="@color/black"
                 android:textSize="30sp"
@@ -68,7 +68,7 @@
                 android:text="Thông tin giao hàng"
                 android:layout_marginTop="10dp"
                 android:layout_marginStart="10dp"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:textSize="22sp"
                 android:layout_width="wrap_content"
@@ -92,9 +92,8 @@
                 >
                 <TextView
                     android:text="Tên:"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -103,8 +102,7 @@
 
                 <TextView
                     android:text="Nguyễn Văn A"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -128,9 +126,8 @@
                 >
                 <TextView
                     android:text="Số điện thoại: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -139,8 +136,7 @@
 
                 <TextView
                     android:text="0987654321"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -153,8 +149,7 @@
             <TextView
                 android:id="@+id/textView3"
                 android:text="Địa chỉ nhận hàng:"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold"
+                android:fontFamily="@font/koho"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="10dp"
                 android:textColor="@color/black"
@@ -182,6 +177,7 @@
                     android:buttonTint="@color/primaryColor"
                     android:layout_height="wrap_content"
                     android:text="Theo danh sách địa chỉ của bạn:"
+                    android:fontFamily="@font/koho"
                     android:onClick="onRadioButtonClicked"
                     />
 
@@ -197,11 +193,13 @@
                     android:layout_height="wrap_content"
                     android:buttonTint="@color/primaryColor"
                     android:onClick="onRadioButtonClicked"
+                    android:fontFamily="@font/koho"
                     android:text="Lấy vị trí thiết bị của bạn" />
 
                 <EditText
                     android:id="@+id/edt_address_detect"
                     android:hint="Đang lấy vị trí...."
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:enabled="false"
@@ -214,6 +212,7 @@
                     android:buttonTint="@color/primaryColor"
                     android:layout_height="wrap_content"
                     android:text="Tự nhập thủ công"
+                    android:fontFamily="@font/koho"
                     android:onClick="onRadioButtonClicked"
                     />
 
@@ -298,6 +297,7 @@
                     android:buttonTint="@color/primaryColor"
                     android:layout_height="wrap_content"
                     android:text="Đến shop lấy"
+                    android:fontFamily="@font/koho"
                     android:onClick="onRadioButtonClicked"
                     />
             </RadioGroup>
@@ -306,6 +306,7 @@
                 android:id="@+id/confirm_address_button"
                 android:text="XÁC NHẬN"
                 android:textSize="14sp"
+                android:fontFamily="@font/koho_bold"
                 android:textAllCaps="false"
                 android:backgroundTint="@color/primaryColor"
                 android:layout_width="120dp"
@@ -342,9 +343,8 @@
                 >
                 <TextView
                     android:text="Khoảng cách: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -354,8 +354,7 @@
                 <TextView
                     android:id="@+id/txt_distance"
                     android:text="- km"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/black"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -378,9 +377,8 @@
                 >
                 <TextView
                     android:text="Phí ship: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/black"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -390,8 +388,7 @@
                 <TextView
                     android:id="@+id/txt_ship_cost"
                     android:text="0 đ"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/black"
                     android:textSize="15sp"
                     android:layout_width="wrap_content"
@@ -414,9 +411,8 @@
                 >
                 <TextView
                     android:text="Tổng: "
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
-                    android:textStyle="bold"
                     android:layout_marginEnd="5dp"
                     android:textSize="20sp"
                     android:layout_width="wrap_content"
@@ -426,8 +422,7 @@
                 <TextView
                     android:id="@+id/txt_total"
                     android:text="500.000 VNĐ"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
                     android:textSize="20sp"
                     android:layout_width="wrap_content"
@@ -454,7 +449,7 @@
                     android:layout_alignParentBottom="true"
                     android:layout_gravity="center"
                     android:backgroundTint="#008FE5"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:gravity="center"
                     android:text="Thanh toán bằng ZaloPay"
                     android:textAllCaps="false"
@@ -469,7 +464,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
                     android:layout_gravity="center"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:gravity="center"
                     android:text="Thanh toán khi nhận hàng"
                     android:textAllCaps="false"
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index 81101c3..fbda281 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -44,9 +44,9 @@
                 <TextView
                     android:id="@+id/order_tracking_number"
                     android:text="Order #123456789"
-                    android:fontFamily="@font/bebas"
-                    android:textColor="@color/black"
-                    android:textSize="25sp"
+                    android:fontFamily="@font/koho_bold"
+                    android:textColor="@color/primaryColor"
+                    android:textSize="22sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toTopOf="parent"
@@ -57,8 +57,7 @@
                     android:id="@+id/user_name"
                     android:text="Tên: Nguyễn Văn A"
                     android:textSize="15sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_italic"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/order_tracking_number"
@@ -69,8 +68,7 @@
                     android:id="@+id/phone"
                     android:text="Số điện thoại: 0987654321"
                     android:textSize="15sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_italic"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/user_name"
@@ -81,8 +79,7 @@
                     android:id="@+id/address"
                     android:text="Địa chỉ nhận hàng: Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu"
                     android:textSize="15sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="italic"
+                    android:fontFamily="@font/koho_italic"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/phone"
@@ -93,8 +90,7 @@
                     android:id="@+id/order_time"
                     android:text="Thời gian đặt: 14:05 02/02/2023"
                     android:textSize="15sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="italic"
+                    android:fontFamily="@font/koho_italic"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/address"
@@ -105,8 +101,7 @@
                     android:id="@+id/status"
                     android:text="Trạng thái đơn hàng: Đang giao"
                     android:textSize="15sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="italic"
+                    android:fontFamily="@font/koho_italic"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/order_time"
@@ -117,8 +112,7 @@
                     android:id="@+id/total"
                     android:text="Tổng đơn hàng: 1.200.000"
                     android:textSize="15sp"
-                    android:fontFamily="@font/opensans"
-                    android:textStyle="bold"
+                    android:fontFamily="@font/koho_bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toBottomOf="@id/status"
@@ -189,7 +183,7 @@
 
     <TextView
         android:textSize="25sp"
-        android:fontFamily="@font/bebas"
+        android:fontFamily="@font/koho_bold"
         android:textColor="@color/black"
         android:layout_marginStart="12dp"
         android:text="Chi tiết các món ăn:"
diff --git a/app/src/main/res/layout/activity_shop_detail.xml b/app/src/main/res/layout/activity_shop_detail.xml
index 8a71dc0..06b85e5 100644
--- a/app/src/main/res/layout/activity_shop_detail.xml
+++ b/app/src/main/res/layout/activity_shop_detail.xml
@@ -64,7 +64,7 @@
                     <TextView
                         android:id="@+id/student_shop_text_view"
                         android:text="Shop sinh viên"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:textColor="@color/red"
                         android:layout_marginTop="20dp"
                         android:layout_width="wrap_content"
@@ -77,9 +77,9 @@
                     <TextView
                         android:id="@+id/txt_shop_name"
                         android:text="Shop name"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:textColor="@color/primaryColor"
-                        android:textSize="35sp"
+                        android:textSize="30sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         app:layout_constraintStart_toStartOf="parent"
@@ -89,7 +89,7 @@
                         android:id="@+id/description_text_view"
                         android:text="Mô tả"
                         android:textSize="18sp"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:textColor="@color/black"
                         android:layout_marginTop="20dp"
                         android:layout_width="wrap_content"
@@ -101,7 +101,7 @@
                     <TextView
                         android:id="@+id/content_description_text_view"
                         android:textColor="@color/gray"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
@@ -121,7 +121,7 @@
                     <TextView
                         android:id="@+id/textView"
                         android:text="Danh sách các món ăn"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:textColor="@color/black"
                         android:textSize="20sp"
                         android:layout_marginTop="10dp"
@@ -153,7 +153,7 @@
                     <TextView
                         android:id="@+id/end_of_list_text"
                         android:text="Đã hết"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:textColor="@color/grayLight"
                         android:visibility="gone"
                         app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -185,7 +185,7 @@
 
                     <TextView
                         android:gravity="center"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:text="Oops! Hiện cửa hàng này chưa có món ăn nào! Vui lòng quay lại sau!"
                         android:layout_marginTop="10dp"
                         android:layout_marginStart="30dp"
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index 3c3df09..f6d4163 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -29,10 +29,10 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="45dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/sign_in_text"
             android:textColor="@color/black"
-            android:textSize="50sp"
+            android:textSize="40sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -58,8 +58,8 @@
 
             <TextView
                 android:id="@+id/txt_name_app"
-                android:text="Foodify"
-                android:fontFamily="@font/bebas"
+                android:text="FOODIFY"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/primaryColor"
                 android:textSize="30sp"
                 android:layout_width="wrap_content"
@@ -77,7 +77,7 @@
                 android:layout_marginRight="20dp"
                 android:layout_marginLeft="20dp"
                 android:layout_marginBottom="10dp"
-                android:hint="@string/email_text"
+                android:hint="Email"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/txt_name_app"
@@ -86,6 +86,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_email"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textEmailAddress" />
@@ -111,6 +112,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_password"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textPassword" />
@@ -123,11 +125,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:layout_marginEnd="20dp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:text="@string/forgot_password"
                 android:textColor="@color/grayLight"
                 android:textSize="15sp"
-                android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textInput_password"
                 />
@@ -140,10 +141,11 @@
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="40dp"
                 android:layout_marginTop="80dp"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:padding="10dp"
                 android:text="@string/sign_in_text"
-                android:textSize="20sp"
+                android:textSize="18sp"
+                android:textAllCaps="false"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textInput_password" />
@@ -166,8 +168,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/dont_have_an_account"
                 android:textColor="@color/gray"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold" />
+                android:fontFamily="@font/koho"/>
 
             <TextView
                 android:id="@+id/sign_up_textView"
@@ -176,8 +177,8 @@
                 android:layout_marginStart="5dp"
                 android:text="@string/sign_up_text"
                 android:textColor="@color/secondary"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold" />
+                android:fontFamily="@font/koho"
+                />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 38b5e11..ce3f5c7 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -36,10 +36,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="30dp"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:text="@string/sign_up_text"
                 android:textColor="@color/black"
-                android:textSize="50sp"
+                android:textSize="45sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/back_image" />
 
@@ -50,7 +50,7 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
-                android:hint="@string/email_text"
+                android:hint="Email"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView"
@@ -59,6 +59,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_email"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textEmailAddress" />
@@ -72,7 +73,7 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
-                android:hint="@string/phone_text"
+                android:hint="Số điện thoại"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textInput_email"
@@ -81,6 +82,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_phone"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="phone" />
@@ -103,6 +105,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_fullName"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="text" />
@@ -125,6 +128,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_id_card"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="text" />
@@ -138,7 +142,7 @@
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
                 android:layout_marginTop="20dp"
-                android:hint="@string/birthday_text"
+                android:hint="Ngày tháng năm sinh"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -148,6 +152,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_birthDay"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:clickable="false"
@@ -166,7 +171,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_marginBottom="10dp"
                 android:layout_marginTop="20dp"
-                android:hint="@string/address_text"
+                android:hint="Địa chỉ"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textInput_birthDay"
@@ -175,6 +180,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_address"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="text" />
@@ -251,6 +257,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_password"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textPassword" />
@@ -264,7 +271,7 @@
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
                 android:layout_marginTop="20dp"
-                android:hint="@string/repeat_password_text"
+                android:hint="Xác nhận mật khẩu"
                 app:boxBackgroundColor="@color/white"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -276,6 +283,7 @@
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edt_confirmPassword"
+                    android:fontFamily="@font/koho"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:inputType="textPassword" />
@@ -297,9 +305,10 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/sign_up_button"
                 style="@style/DefaultSolid"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:text="@string/sign_up_text"
-                android:textSize="20sp"
+                android:textAllCaps="false"
+                android:textSize="18sp"
                 android:padding="10dp"
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="40dp"
@@ -325,20 +334,22 @@
                 >
                 <TextView
                     android:id="@+id/textView2"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/already_have_account"
                     android:textColor="@color/gray"
-                    android:textStyle="bold" />
+                    />
 
                 <TextView
                     android:id="@+id/signIn_textView"
+                    android:fontFamily="@font/koho"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:text="@string/sign_in_text"
                     android:textColor="@color/secondary"
-                    android:textStyle="bold" />
+                    />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_verify_account.xml b/app/src/main/res/layout/activity_verify_account.xml
index 84bb3c9..a9dfc2c 100644
--- a/app/src/main/res/layout/activity_verify_account.xml
+++ b/app/src/main/res/layout/activity_verify_account.xml
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="90dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/confirm_code"
             android:textColor="@color/black"
             android:textSize="50sp"
@@ -41,9 +41,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:text="@string/confirm_code_description"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
-            android:textStyle="bold"
             android:layout_marginEnd="20dp"
             android:layout_marginStart="20dp"
             app:layout_constraintStart_toStartOf="parent"
@@ -66,6 +65,7 @@
                 android:layout_width="48dp"
                 android:layout_height="50dp"
                 android:backgroundTint="@color/gray"
+                android:fontFamily="@font/koho"
                 android:gravity="center"
                 android:imeOptions="actionNext"
                 android:importantForAutofill="no"
@@ -73,7 +73,6 @@
                 android:maxLength="1"
                 android:textColor="@color/gray"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 android:hint="*"
                 />
 
@@ -81,6 +80,7 @@
                 android:id="@+id/inputCode2"
                 android:layout_width="48dp"
                 android:layout_height="50dp"
+                android:fontFamily="@font/koho"
                 android:backgroundTint="@color/gray"
                 android:gravity="center"
                 android:imeOptions="actionNext"
@@ -89,7 +89,6 @@
                 android:maxLength="1"
                 android:textColor="@color/gray"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 android:hint="*"
                 />
 
@@ -97,6 +96,7 @@
                 android:id="@+id/inputCode3"
                 android:layout_width="48dp"
                 android:layout_height="50dp"
+                android:fontFamily="@font/koho"
                 android:backgroundTint="@color/gray"
                 android:gravity="center"
                 android:imeOptions="actionNext"
@@ -105,7 +105,6 @@
                 android:maxLength="1"
                 android:textColor="@color/gray"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 android:hint="*"
                 />
 
@@ -113,6 +112,7 @@
                 android:id="@+id/inputCode4"
                 android:layout_width="48dp"
                 android:layout_height="50dp"
+                android:fontFamily="@font/koho"
                 android:backgroundTint="@color/gray"
                 android:gravity="center"
                 android:imeOptions="actionNext"
@@ -121,7 +121,6 @@
                 android:maxLength="1"
                 android:textColor="@color/gray"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 android:hint="*"
                 />
 
@@ -129,6 +128,7 @@
                 android:id="@+id/inputCode5"
                 android:layout_width="48dp"
                 android:layout_height="50dp"
+                android:fontFamily="@font/koho"
                 android:backgroundTint="@color/gray"
                 android:gravity="center"
                 android:imeOptions="actionNext"
@@ -137,7 +137,6 @@
                 android:maxLength="1"
                 android:textColor="@color/gray"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 android:hint="*"
                 />
 
@@ -145,6 +144,7 @@
                 android:id="@+id/inputCode6"
                 android:layout_width="48dp"
                 android:layout_height="50dp"
+                android:fontFamily="@font/koho"
                 android:backgroundTint="@color/gray"
                 android:gravity="center"
                 android:imeOptions="actionNext"
@@ -153,7 +153,6 @@
                 android:maxLength="1"
                 android:textColor="@color/gray"
                 android:textSize="24sp"
-                android:textStyle="bold"
                 android:hint="*"
                 />
         </LinearLayout>
@@ -173,11 +172,10 @@
             android:id="@+id/textview1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:text="@string/did_not_receive_code"
             android:textColor="@color/black"
             android:textSize="15sp"
-            android:textStyle="bold"
             android:layout_marginBottom="50dp"
             android:layout_marginStart="20dp"
             app:layout_constraintBottom_toTopOf="@+id/confirm_code"
@@ -189,9 +187,8 @@
             android:layout_height="wrap_content"
             android:textSize="15sp"
             android:text="Gửi lại sau: "
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/black"
-            android:textStyle="bold"
             android:layout_margin="20dp"
             app:layout_constraintBottom_toTopOf="@+id/confirm_code"
             app:layout_constraintStart_toStartOf="parent" />
@@ -200,12 +197,11 @@
             android:id="@+id/textview_countdown"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:text="00:35"
             android:layout_marginBottom="20dp"
             android:textColor="@color/secondary"
             android:textSize="15sp"
-            android:textStyle="bold"
             app:layout_constraintStart_toEndOf="@id/textview_resendCode"
             app:layout_constraintBottom_toTopOf="@+id/confirm_code"
             />
@@ -216,9 +212,8 @@
             android:layout_height="wrap_content"
             android:textSize="15sp"
             android:text="@string/resend_code"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/primaryColor"
-            android:textStyle="bold"
             android:layout_margin="20dp"
             app:layout_constraintBottom_toTopOf="@+id/confirm_code"
             app:layout_constraintStart_toStartOf="parent"
@@ -231,10 +226,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
-            android:fontFamily="@font/bebas"
+            android:fontFamily="@font/koho_bold"
+            android:textAllCaps="false"
             android:padding="10dp"
             android:text="@string/confirm"
-            android:textSize="20sp"
+            android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/add_address_dialog.xml b/app/src/main/res/layout/add_address_dialog.xml
index 5bc7a2c..e5c7264 100644
--- a/app/src/main/res/layout/add_address_dialog.xml
+++ b/app/src/main/res/layout/add_address_dialog.xml
@@ -28,6 +28,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edt_address"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:inputType="text" />
@@ -76,6 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
+            android:fontFamily="@font/koho"
             android:textSize="12sp"
             android:textColor="#b00020"
             app:layout_constraintTop_toBottomOf="@id/linearLayout_district_ward"
@@ -87,7 +89,7 @@
         <CheckBox
             android:id="@+id/checkbox_default_address"
             android:text="Đặt làm địa chỉ mặc định"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/chip_item.xml b/app/src/main/res/layout/chip_item.xml
index 0c80015..83828e9 100644
--- a/app/src/main/res/layout/chip_item.xml
+++ b/app/src/main/res/layout/chip_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
     android:text="Example"
+    android:fontFamily="@font/koho"
     android:id="@+id/chip_item"
     style="@style/Widget.MaterialComponents.Chip.Choice"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml
index 410570d..52c39d6 100644
--- a/app/src/main/res/layout/dialog_comment.xml
+++ b/app/src/main/res/layout/dialog_comment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="310dp"
+    android:layout_height="340dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_white_corner_16">
 
@@ -9,7 +9,7 @@
         android:id="@+id/text_view_1"
         android:text="Đánh giá"
         android:textSize="22sp"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:textColor="@color/black"
         android:textAlignment="center"
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
         android:id="@+id/text_view_2"
         android:text="Bạn vui lòng đánh giá tại đây!"
         android:textSize="15sp"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:textColor="@color/black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -53,6 +53,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="Đánh giá về món ăn..."
+        android:fontFamily="@font/koho"
         android:gravity="top"
         android:lines="5"
         android:inputType="textMultiLine"
@@ -69,10 +70,10 @@
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/confirm_button"
         android:text="Gửi"
+        android:textAllCaps="false"
         android:textSize="15sp"
         android:layout_width="90dp"
-        android:textStyle="bold"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_primary_color_dark_corner"
         android:layout_marginTop="10dp"
@@ -85,8 +86,8 @@
         android:id="@+id/cancel_button"
         android:text="Thoát"
         android:textSize="15sp"
-        android:textStyle="bold"
-        android:fontFamily="@font/opensans"
+        android:textAllCaps="false"
+        android:fontFamily="@font/koho_bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_grey_color_corner"
diff --git a/app/src/main/res/layout/dialog_comment_edit_delete.xml b/app/src/main/res/layout/dialog_comment_edit_delete.xml
index 24264bb..51f830f 100644
--- a/app/src/main/res/layout/dialog_comment_edit_delete.xml
+++ b/app/src/main/res/layout/dialog_comment_edit_delete.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="310dp"
+    android:layout_height="340dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_white_corner_16">
 
@@ -9,7 +9,7 @@
         android:id="@+id/text_view_1"
         android:text="Đánh giá"
         android:textSize="22sp"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:textColor="@color/black"
         android:textAlignment="center"
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
         android:id="@+id/text_view_2"
         android:text="Bạn vui lòng đánh giá tại đây!"
         android:textSize="15sp"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:textColor="@color/black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -53,6 +53,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="Đánh giá về món ăn..."
+        android:fontFamily="@font/koho"
         android:gravity="top"
         android:lines="5"
         android:inputType="textMultiLine"
@@ -72,8 +73,7 @@
         android:textAllCaps="false"
         android:textSize="15sp"
         android:layout_width="120dp"
-        android:textStyle="bold"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_primary_color_dark_corner"
         android:layout_marginTop="10dp"
@@ -87,8 +87,7 @@
         android:text="Thoát"
         android:textAllCaps="false"
         android:textSize="15sp"
-        android:textStyle="bold"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:layout_width="120dp"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_grey_color_corner"
diff --git a/app/src/main/res/layout/fragment_basket.xml b/app/src/main/res/layout/fragment_basket.xml
index ee19911..51afe13 100644
--- a/app/src/main/res/layout/fragment_basket.xml
+++ b/app/src/main/res/layout/fragment_basket.xml
@@ -39,9 +39,8 @@
             <TextView
                 android:id="@+id/text_view_header"
                 android:text="Quên chưa đặt món rồi nè bạn ơi!"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:textSize="18sp"
-                android:textStyle="bold"
                 android:textColor="@color/black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -55,9 +54,8 @@
                 android:id="@+id/text_view_description"
                 android:textAlignment="center"
                 android:text="Bạn sẽ nhìn thấy các món ăn tại đây sau khi bỏ những món ăn bạn muốn vào giỏ hàng."
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textSize="15sp"
-                android:textStyle="bold"
                 android:textColor="@color/gray"
                 android:layout_marginTop="5dp"
                 android:layout_marginEnd="40dp"
@@ -110,7 +108,7 @@
                 <TextView
                     android:text="Tổng cộng: "
                     android:textSize="20sp"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textColor="@android:color/white"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
@@ -118,7 +116,7 @@
                 <TextView
                     android:id="@+id/total_text_view"
                     android:text="900.000 ₫"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:textSize="24sp"
                     android:textColor="@android:color/white"
                     android:layout_width="wrap_content"
@@ -138,7 +136,7 @@
                 android:layout_marginRight="8dp"
                 android:layout_marginBottom="8dp"
                 android:text="Đặt hàng"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@android:color/white"
                 />
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_cancel_order.xml b/app/src/main/res/layout/fragment_cancel_order.xml
index af07bba..5033c6b 100644
--- a/app/src/main/res/layout/fragment_cancel_order.xml
+++ b/app/src/main/res/layout/fragment_cancel_order.xml
@@ -46,7 +46,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -79,7 +79,7 @@
             android:layout_gravity="center"
             />
         <TextView
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
             android:text="Không có đơn hàng nào ở đây cả!"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_complete_order.xml b/app/src/main/res/layout/fragment_complete_order.xml
index 70adc24..99244df 100644
--- a/app/src/main/res/layout/fragment_complete_order.xml
+++ b/app/src/main/res/layout/fragment_complete_order.xml
@@ -46,7 +46,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -79,7 +79,7 @@
             android:layout_gravity="center"
             />
         <TextView
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
             android:text="Không có đơn hàng nào ở đây cả!"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 7a72964..785d715 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -26,8 +26,7 @@
                 android:text="@string/hello_guest"
                 android:textSize="18sp"
                 android:layout_marginTop="40dp"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:layout_weight="0.7"
                 android:layout_width="0dp"
@@ -56,9 +55,8 @@
                 android:text="Cửa hàng"
                 android:layout_marginTop="5dp"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
-                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/slider"
diff --git a/app/src/main/res/layout/fragment_preparing.xml b/app/src/main/res/layout/fragment_preparing.xml
index 53031a7..f8cd65d 100644
--- a/app/src/main/res/layout/fragment_preparing.xml
+++ b/app/src/main/res/layout/fragment_preparing.xml
@@ -46,7 +46,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -79,7 +79,7 @@
             android:layout_gravity="center"
             />
         <TextView
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
             android:text="Không có đơn hàng nào ở đây cả!"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_process_order.xml b/app/src/main/res/layout/fragment_process_order.xml
index b8e9bbe..ce52e7b 100644
--- a/app/src/main/res/layout/fragment_process_order.xml
+++ b/app/src/main/res/layout/fragment_process_order.xml
@@ -46,7 +46,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -79,7 +79,7 @@
             android:layout_gravity="center"
             />
         <TextView
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
             android:text="Không có đơn hàng nào ở đây cả!"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index e56c59f..37fd367 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -32,7 +32,7 @@
             android:text="User Name"
             android:textColor="@color/black"
             android:textSize="25sp"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -69,7 +69,7 @@
             <TextView
                 android:text="Thông tin tài khoản"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
             <TextView
                 android:text="Quản lý địa chỉ"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -159,7 +159,7 @@
             <TextView
                 android:text="Món ăn yêu thích"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -207,7 +207,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="12dp"
                 android:layout_weight="1"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:text="Đơn hàng"
                 android:textColor="@color/black"
                 android:textSize="18sp"
@@ -251,7 +251,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="12dp"
                 android:layout_weight="1"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:text="Đóng góp ý kiến"
                 android:textColor="@color/black"
                 android:textSize="18sp"
@@ -292,7 +292,7 @@
             <TextView
                 android:text="Đăng xuất"
                 android:textSize="18sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/black"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 76e1a04..0d3d590 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -31,6 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:queryBackground="@android:color/transparent"
+                android:theme="@style/AppSearchView"
                 app:queryHint="Tìm kiếm tại đây..."
                 android:background="@color/white"
                 app:iconifiedByDefault="false"
@@ -79,7 +80,7 @@
 
             <TextView
                 android:text="Không có kết quả cần tìm. Vui lòng tìm thử với từ khoá khác."
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/gray"
                 android:layout_width="250dp"
                 android:layout_height="wrap_content"
@@ -100,7 +101,7 @@
         <TextView
             android:id="@+id/end_of_list_text"
             android:text="Đã hết"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/grayLight"
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/progress_bar"
diff --git a/app/src/main/res/layout/fragment_ship_order.xml b/app/src/main/res/layout/fragment_ship_order.xml
index d96579c..278b332 100644
--- a/app/src/main/res/layout/fragment_ship_order.xml
+++ b/app/src/main/res/layout/fragment_ship_order.xml
@@ -46,7 +46,7 @@
                 <TextView
                     android:id="@+id/end_of_list_text"
                     android:text="Đã hết"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/grayLight"
                     android:visibility="gone"
                     app:layout_constraintTop_toBottomOf="@id/progress_bar"
@@ -79,7 +79,7 @@
             android:layout_gravity="center"
             />
         <TextView
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:textColor="@color/gray"
             android:text="Không có đơn hàng nào ở đây cả!"
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/item_address.xml b/app/src/main/res/layout/item_address.xml
index 2450da0..c682dfc 100644
--- a/app/src/main/res/layout/item_address.xml
+++ b/app/src/main/res/layout/item_address.xml
@@ -26,9 +26,8 @@
             android:id="@+id/text_view_address"
             android:text="Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu, thành phố Đà Nẵng"
             android:textSize="16sp"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho_italic"
             android:textColor="@color/gray"
-            android:textStyle="italic|bold"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
@@ -42,9 +41,8 @@
             <TextView
                 android:id="@+id/blank_text_view"
                 android:textSize="13sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textColor="@color/primaryColor"
-                android:textStyle="bold"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.6"
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index e9ed113..3b96297 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -23,7 +23,7 @@
             <TextView
                 android:id="@+id/user_name_text_view"
                 android:text="User A"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 android:layout_width="wrap_content"
@@ -50,7 +50,7 @@
             <TextView
                 android:id="@+id/comment_user"
                 android:text="Food is good!"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:textSize="15sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_food.xml b/app/src/main/res/layout/item_food.xml
index 123543e..19cd6fd 100644
--- a/app/src/main/res/layout/item_food.xml
+++ b/app/src/main/res/layout/item_food.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="110dp"
-    android:layout_height="191dp"
+    android:layout_height="189dp"
     android:layout_marginBottom="10dp"
     android:layout_marginEnd="10dp"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="190dp"
+        android:layout_height="188dp"
         app:cardCornerRadius="10dp"
         >
 
@@ -36,7 +36,7 @@
                 android:layout_marginStart="3dp"
                 android:layout_marginEnd="3dp"
                 android:textSize="12sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:layout_marginTop="3dp"
                 app:layout_constraintTop_toBottomOf="@+id/image_view"
@@ -50,7 +50,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:layout_marginTop="5dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginStart="2dp"
                 app:layout_constraintTop_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -58,30 +58,33 @@
 
                 <TextView
                     android:id="@+id/price"
-                    android:textSize="17sp"
-                    android:text="1000000000"
+                    android:textSize="12sp"
+                    android:text="12345"
+                    android:layout_gravity="center_vertical"
                     android:textColor="@color/primaryColor"
-                    android:fontFamily="@font/bebas"
+                    android:fontFamily="@font/koho_bold"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent" />
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    />
 
                 <TextView
                     android:id="@+id/discount"
                     android:text="-59%"
                     android:textSize="6sp"
                     android:textColor="@color/red"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_weight="0.15"
                     android:layout_height="match_parent"
-                    android:visibility="gone"
                     />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_marginTop="2dp"
-                    android:layout_width="match_parent"
+                    android:layout_weight="0.2"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-
                     >
-
                     <ImageView
                         android:id="@+id/basket_icon"
                         android:layout_width="20dp"
diff --git a/app/src/main/res/layout/item_food_basket.xml b/app/src/main/res/layout/item_food_basket.xml
index 73ab321..cfccf86 100644
--- a/app/src/main/res/layout/item_food_basket.xml
+++ b/app/src/main/res/layout/item_food_basket.xml
@@ -10,15 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/red"
-        android:layout_margin="7dp"
+        android:layout_margin="5dp"
         >
 
         <TextView
             android:textColor="@color/white"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:text="@string/delete"
             android:textSize="15sp"
-            android:textStyle="bold"
             android:layout_toStartOf="@id/img_delete"
             android:layout_centerVertical="true"
             android:layout_marginEnd="5dp"
@@ -45,14 +44,14 @@
         android:layout_height="match_parent"
         android:orientation="horizontal"
         android:background="@color/white"
-        android:layout_margin="7dp"
+        android:layout_margin="5dp"
         android:gravity="center"
         >
 
         <ImageView
             android:id="@+id/image_view"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
+            android:layout_width="105dp"
+            android:layout_height="105dp"
             android:src="@drawable/food"
             android:scaleType="centerCrop"
             app:riv_corner_radius="10dip"
@@ -69,9 +68,9 @@
             <TextView
                 android:id="@+id/food_name_text_view"
                 android:text="@string/food_name"
-                android:textSize="15sp"
+                android:textSize="16sp"
                 android:textColor="@color/black"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="match_parent"
                 android:layout_height="47dp"
                 android:layout_marginStart="5dp"
@@ -101,7 +100,7 @@
                         android:text="Shop Name"
                         android:textSize="14sp"
                         android:textColor="@color/secondary"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho_bold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
@@ -120,9 +119,9 @@
                         <TextView
                             android:id="@+id/price_text_view"
                             android:text="$5.00"
-                            android:textSize="23sp"
+                            android:textSize="22sp"
                             android:textColor="@color/primaryColor"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             />
@@ -162,6 +161,7 @@
                     <TextView
                         android:id="@+id/value"
                         android:text="5"
+                        android:fontFamily="@font/koho"
                         android:textSize="20sp"
                         android:textColor="@color/primaryColor"
                         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_food_favorite.xml b/app/src/main/res/layout/item_food_favorite.xml
index 500ce65..16b729c 100644
--- a/app/src/main/res/layout/item_food_favorite.xml
+++ b/app/src/main/res/layout/item_food_favorite.xml
@@ -15,10 +15,9 @@
 
         <TextView
             android:textColor="@color/white"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho"
             android:text="@string/delete"
             android:textSize="15sp"
-            android:textStyle="bold"
             android:layout_toStartOf="@id/img_delete"
             android:layout_centerVertical="true"
             android:layout_marginEnd="5dp"
@@ -55,6 +54,7 @@
             android:src="@drawable/food"
             android:scaleType="centerCrop"
             app:riv_corner_radius="10dip"
+            android:layout_gravity="center_vertical"
             tools:ignore="ContentDescription" />
 
         <LinearLayout
@@ -67,10 +67,10 @@
             <TextView
                 android:id="@+id/food_name_text_view"
                 android:text="Food Name"
-                android:textSize="18sp"
+                android:textSize="15sp"
                 android:textColor="@color/black"
-                android:fontFamily="@font/opensans"
-                android:layout_width="wrap_content"
+                android:fontFamily="@font/koho_bold"
+                android:layout_width="match_parent"
                 android:layout_height="47dp"
                 android:layout_marginStart="12dp"
                 android:layout_marginTop="5dp"
@@ -83,9 +83,9 @@
             <TextView
                 android:id="@+id/shop_name_text_view"
                 android:text="Shop Name"
-                android:textSize="16sp"
+                android:textSize="14sp"
                 android:textColor="@color/secondary"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
@@ -105,9 +105,9 @@
                 <TextView
                     android:id="@+id/price_text_view"
                     android:text="$5.00"
-                    android:textSize="25sp"
+                    android:textSize="20sp"
                     android:textColor="@color/primaryColor"
-                    android:fontFamily="@font/bebas"
+                    android:fontFamily="@font/koho_bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
@@ -128,12 +128,12 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.1"
+            android:layout_weight="0.12"
             >
 
             <ImageView
                 android:id="@+id/basket_icon"
-                android:layout_width="20dp"
+                android:layout_width="25dp"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/basket_icon"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_food_search.xml b/app/src/main/res/layout/item_food_search.xml
index 745489e..4bed6dd 100644
--- a/app/src/main/res/layout/item_food_search.xml
+++ b/app/src/main/res/layout/item_food_search.xml
@@ -33,14 +33,13 @@
             <TextView
                 android:id="@+id/food_name_text_view"
                 android:text="Food Name"
-                android:textSize="16sp"
+                android:textSize="15sp"
                 android:textColor="@color/black"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginStart="12dp"
-                android:layout_weight="0.5"
-                android:layout_marginTop="5dp"
+                android:layout_weight="0.45"
                 app:layout_constraintStart_toEndOf="@id/image_view"
                 app:layout_constraintTop_toTopOf="parent"
                 android:maxLines="2"
@@ -58,11 +57,10 @@
                     android:text="Shop Name"
                     android:textSize="15sp"
                     android:textColor="@color/secondary"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho_bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
-                    android:layout_marginTop="2dp"
                     app:layout_constraintStart_toEndOf="@id/image_view"
                     app:layout_constraintTop_toBottomOf="@id/text_view_1"
                     android:maxLines="1"
@@ -72,15 +70,14 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
                     >
 
                     <TextView
                         android:id="@+id/price_text_view"
                         android:text="$5.00"
-                        android:textSize="20sp"
+                        android:textSize="18sp"
                         android:textColor="@color/primaryColor"
-                        android:fontFamily="@font/bebas"
+                        android:fontFamily="@font/koho_bold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="12dp"
@@ -104,12 +101,12 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.1"
+            android:layout_weight="0.11"
             >
 
             <ImageView
                 android:id="@+id/basket_icon"
-                android:layout_width="20dp"
+                android:layout_width="23dp"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/basket_icon"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_food_shop.xml b/app/src/main/res/layout/item_food_shop.xml
index 77ed937..7ac3cd5 100644
--- a/app/src/main/res/layout/item_food_shop.xml
+++ b/app/src/main/res/layout/item_food_shop.xml
@@ -15,10 +15,9 @@
 
         <TextView
             android:textColor="@color/white"
-            android:fontFamily="@font/opensans"
+            android:fontFamily="@font/koho_bold"
             android:text="@string/delete"
             android:textSize="20sp"
-            android:textStyle="bold"
             android:layout_toStartOf="@id/img_delete"
             android:layout_centerVertical="true"
             android:layout_marginEnd="5dp"
@@ -70,7 +69,7 @@
                 android:text="@string/food_name"
                 android:textSize="16sp"
                 android:textColor="@color/black"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
                 android:layout_marginStart="5dp"
@@ -101,7 +100,7 @@
                         android:text="Description"
                         android:textSize="14sp"
                         android:textColor="@color/gray"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho_bold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
@@ -120,9 +119,9 @@
                         <TextView
                             android:id="@+id/price_text_view"
                             android:text="$5.00"
-                            android:textSize="20sp"
+                            android:textSize="18sp"
                             android:textColor="@color/primaryColor"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             />
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 53b41f5..fb2c0f9 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -20,7 +20,7 @@
             <TextView
                 android:id="@+id/order_tracking_number"
                 android:text="Order #123456789"
-                android:fontFamily="@font/bebas"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/primaryColor"
                 android:textSize="25sp"
                 android:layout_width="wrap_content"
@@ -33,8 +33,7 @@
                 android:id="@+id/user_name"
                 android:text="Tên: Nguyễn Văn A"
                 android:textSize="15sp"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/order_tracking_number"
@@ -45,8 +44,7 @@
                 android:id="@+id/phone"
                 android:text="Số điện thoại: 0987654321"
                 android:textSize="15sp"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/user_name"
@@ -57,8 +55,7 @@
                 android:id="@+id/address"
                 android:text="Địa chỉ nhận hàng: Hẻm 215, đường Phạm Như Xương, phường Hoà Khánh Nam, quận Liên Chiểu"
                 android:textSize="15sp"
-                android:fontFamily="@font/opensans"
-                android:textStyle="italic"
+                android:fontFamily="@font/koho_italic"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/phone"
@@ -69,8 +66,7 @@
                 android:id="@+id/order_time"
                 android:text="Thời gian đặt: 14:05 02/02/2023"
                 android:textSize="15sp"
-                android:fontFamily="@font/opensans"
-                android:textStyle="italic"
+                android:fontFamily="@font/koho_italic"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/address"
@@ -81,8 +77,7 @@
                 android:id="@+id/total"
                 android:text="Tổng đơn hàng: 1.200.000"
                 android:textSize="15sp"
-                android:fontFamily="@font/opensans"
-                android:textStyle="bold"
+                android:fontFamily="@font/koho_bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintTop_toBottomOf="@id/order_time"
diff --git a/app/src/main/res/layout/item_order_detail.xml b/app/src/main/res/layout/item_order_detail.xml
index 2273264..23ee1ea 100644
--- a/app/src/main/res/layout/item_order_detail.xml
+++ b/app/src/main/res/layout/item_order_detail.xml
@@ -32,13 +32,12 @@
             <TextView
                 android:id="@+id/food_name_text_view"
                 android:text="@string/food_name"
-                android:textSize="15sp"
+                android:textSize="16sp"
                 android:textColor="@color/black"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginStart="5dp"
-                android:layout_marginTop="5dp"
                 android:layout_marginEnd="10dp"
                 android:layout_weight="0.4"
                 app:layout_constraintStart_toEndOf="@id/image_view"
@@ -67,10 +66,9 @@
                         android:text="Shop Name"
                         android:textSize="13sp"
                         android:textColor="@color/secondary"
-                        android:fontFamily="@font/opensans"
+                        android:fontFamily="@font/koho"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
                         app:layout_constraintStart_toEndOf="@id/image_view"
                         android:maxLines="1"
                         android:ellipsize="end"
@@ -85,9 +83,9 @@
                         <TextView
                             android:id="@+id/price_text_view"
                             android:text="$5.00"
-                            android:textSize="20sp"
+                            android:textSize="18sp"
                             android:textColor="@color/primaryColor"
-                            android:fontFamily="@font/bebas"
+                            android:fontFamily="@font/koho_bold"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             />
@@ -107,7 +105,7 @@
                 <TextView
                     android:id="@+id/quantity_text_view"
                     android:text="Số lượng: 10"
-                    android:fontFamily="@font/opensans"
+                    android:fontFamily="@font/koho"
                     android:textColor="@color/black"
                     android:textSize="13sp"
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_shop.xml b/app/src/main/res/layout/item_shop.xml
index 628b18e..5874039 100644
--- a/app/src/main/res/layout/item_shop.xml
+++ b/app/src/main/res/layout/item_shop.xml
@@ -31,12 +31,11 @@
                 android:id="@+id/shopName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textStyle="bold"
                 android:text="Shop Name"
                 android:layout_marginStart="3dp"
                 android:layout_marginEnd="3dp"
                 android:textSize="12sp"
-                android:fontFamily="@font/opensans"
+                android:fontFamily="@font/koho_bold"
                 android:textColor="@color/black"
                 android:layout_marginTop="3dp"
                 app:layout_constraintTop_toBottomOf="@id/imageView"
diff --git a/app/src/main/res/layout/menu.xml b/app/src/main/res/layout/menu.xml
index 9b9c092..fa2ac3e 100644
--- a/app/src/main/res/layout/menu.xml
+++ b/app/src/main/res/layout/menu.xml
@@ -9,9 +9,8 @@
         android:id="@+id/menuTitle"
         android:text="@string/title"
         android:textSize="18sp"
-        android:fontFamily="@font/opensans"
+        android:fontFamily="@font/koho_bold"
         android:textColor="@color/black"
-        android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ddb4d9d..5722ff4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,7 +22,7 @@
     <string name="forgot_password">Quên mật khẩu?</string>
     <string name="dont_have_an_account">Bạn chưa có tài khoản?</string>
     <string name="forgot_password_description">Chúng tôi sẽ gửi mã xác nhận qua số điện thoại của bạn.</string>
-    <string name="confirm_code">mã xác nhận</string>
+    <string name="confirm_code">Mã xác nhận</string>
     <string name="confirm_code_description">Chúng tôi đã gửi tin mã xác nhận qua số điện thoại của bạn.</string>
     <string name="did_not_receive_code">Chưa nhận được mã?</string>
     <string name="resend_code">Gửi lại</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index da44f45..257ef84 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -26,7 +26,7 @@
     </style>
 
     <style name="TextLabel" parent="TextAppearance.Design.Hint">
-        <item name="android:fontFamily">@font/bebas</item>
+        <item name="android:fontFamily">@font/koho_bold</item>
     </style>
 
 
@@ -50,5 +50,14 @@
         <item name="colorOnPrimary">@color/primaryColor</item>
     </style>
 
+    <style name="tab_text" parent="@android:style/TextAppearance.Widget.TabWidget">
+        <item name="android:fontFamily">@font/koho</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="AppSearchView" parent="Widget.AppCompat.SearchView" >
+        <item name="android:textSize">18sp</item>
+        <item name="fontFamily">@font/koho</item>
+    </style>
 
 </resources>
\ No newline at end of file