diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 8dfe830..30eb795 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 853e981..7eb7ab7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,7 +91,8 @@ dependencies {
 
     implementation 'com.onesignal:OneSignal:[3.9.1, 3.99.99]'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
-    implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
+    implementation 'io.github.inflationx:calligraphy3:3.1.1'
+    implementation 'io.github.inflationx:viewpump:2.0.3'
     implementation 'com.wdullaer:materialdatetimepicker:3.6.3'
     implementation 'io.nlopez.smartlocation:library:3.3.3'
     implementation 'q.rorbin:badgeview:1.1.0'
diff --git a/app/src/main/java/ch/pizzacucina/android/App.java b/app/src/main/java/ch/pizzacucina/android/App.java
index 01a60e5..9762ee2 100644
--- a/app/src/main/java/ch/pizzacucina/android/App.java
+++ b/app/src/main/java/ch/pizzacucina/android/App.java
@@ -8,7 +8,10 @@ import com.onesignal.OneSignal;
 import com.squareup.picasso.Picasso;
 
 import io.fabric.sdk.android.Fabric;
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
+import io.github.inflationx.calligraphy3.CalligraphyConfig;
+import io.github.inflationx.calligraphy3.CalligraphyInterceptor;
+import io.github.inflationx.calligraphy3.CalligraphyUtils;
+import io.github.inflationx.viewpump.ViewPump;
 
 /**
  * Created by cimenmus on 11/09/2017.
@@ -26,11 +29,13 @@ public class App extends MultiDexApplication {
     }
 
     private void initCalligraphy(){
-        CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
-                .setDefaultFontPath("fonts/Quicksand-Regular.ttf")
-                .setFontAttrId(R.attr.fontPath)
-                .build()
-        );
+        ViewPump.init(ViewPump.builder()
+                .addInterceptor(new CalligraphyInterceptor(
+                        new CalligraphyConfig.Builder()
+                                .setDefaultFontPath("fonts/Quicksand-Regular.ttf")
+                                .setFontAttrId(R.attr.fontPath)
+                                .build()))
+                .build());
     }
 
     private void initPicasso(){
diff --git a/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java b/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
index c1f40cc..3e10cde 100644
--- a/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
+++ b/app/src/main/java/ch/pizzacucina/android/activity/BaseActivity.java
@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import ch.pizzacucina.android.helper.DisplayHelper;
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
+import io.github.inflationx.viewpump.ViewPumpContextWrapper;
 
 /**
  * Created by cimenmus on 11/09/2017.
@@ -36,7 +36,7 @@ public class BaseActivity extends AppCompatActivity {
 
     @Override
     protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+        super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
     }
 
     public static void setCurrentActivity(BaseActivity currentActivity) {