diff --git a/app/build.gradle b/app/build.gradle
index 9c62010..ac8f845 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,8 +58,6 @@ dependencies {
     compile "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
     compile "com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion"
 
-    // font
-    compile "uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion"
 
     // network
     compile "com.amitshekhar.android:rx2-android-networking:$rootProject.rx2FastAndroidNetworking"
diff --git a/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java b/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java
index 5610862..f5248a9 100644
--- a/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java
+++ b/app/src/androidTest/java/com/mindorks/framework/mvp/di/module/ApplicationTestModule.java
@@ -39,7 +39,6 @@
 
 import dagger.Module;
 import dagger.Provides;
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 /**
  * Created by amitshekhar on 03/02/17.
@@ -118,12 +117,5 @@ ApiHeader.ProtectedApiHeader provideProtectedApiHeader(@ApiInfo String apiKey,
                 preferencesHelper.getAccessToken());
     }
 
-    @Provides
-    @Singleton
-    CalligraphyConfig provideCalligraphyDefaultConfig() {
-        return new CalligraphyConfig.Builder()
-                .setDefaultFontPath("fonts/source-sans-pro/SourceSansPro-Regular.ttf")
-                .setFontAttrId(R.attr.fontPath)
-                .build();
-    }
+
 }
diff --git a/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java b/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java
index 6c98613..ccbd30d 100644
--- a/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java
+++ b/app/src/main/java/com/mindorks/framework/mvp/MvpApp.java
@@ -27,7 +27,6 @@
 
 import javax.inject.Inject;
 
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 
 /**
@@ -39,9 +38,6 @@ public class MvpApp extends Application {
     @Inject
     DataManager mDataManager;
 
-    @Inject
-    CalligraphyConfig mCalligraphyConfig;
-
     private ApplicationComponent mApplicationComponent;
 
     @Override
@@ -60,7 +56,6 @@ public void onCreate() {
             AndroidNetworking.enableLogging(Level.BODY);
         }
 
-        CalligraphyConfig.initDefault(mCalligraphyConfig);
     }
 
     public ApplicationComponent getComponent() {
diff --git a/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java b/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java
index 59d2933..d4fea2a 100644
--- a/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java
+++ b/app/src/main/java/com/mindorks/framework/mvp/di/module/ApplicationModule.java
@@ -39,7 +39,6 @@
 
 import dagger.Module;
 import dagger.Provides;
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 /**
  * Created by janisharali on 27/01/17.
@@ -117,12 +116,4 @@ ApiHeader.ProtectedApiHeader provideProtectedApiHeader(@ApiInfo String apiKey,
                 preferencesHelper.getAccessToken());
     }
 
-    @Provides
-    @Singleton
-    CalligraphyConfig provideCalligraphyDefaultConfig() {
-        return new CalligraphyConfig.Builder()
-                .setDefaultFontPath("fonts/source-sans-pro/SourceSansPro-Regular.ttf")
-                .setFontAttrId(R.attr.fontPath)
-                .build();
-    }
 }
diff --git a/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java b/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java
index 019e899..ea40803 100644
--- a/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java
+++ b/app/src/main/java/com/mindorks/framework/mvp/ui/base/BaseActivity.java
@@ -41,7 +41,6 @@
 import com.mindorks.framework.mvp.utils.NetworkUtils;
 
 import butterknife.Unbinder;
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 /**
  * Created by janisharali on 27/01/17.
@@ -70,10 +69,7 @@ public ActivityComponent getActivityComponent() {
         return mActivityComponent;
     }
 
-    @Override
-    protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
-    }
+
 
     @TargetApi(Build.VERSION_CODES.M)
     public void requestPermissionsSafely(String[] permissions, int requestCode) {
diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Bold.ttf b/app/src/main/res/font/sourcesanspro_bold.ttf
similarity index 100%
rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Bold.ttf
rename to app/src/main/res/font/sourcesanspro_bold.ttf
diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Italic.ttf b/app/src/main/res/font/sourcesanspro_italic.ttf
similarity index 100%
rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Italic.ttf
rename to app/src/main/res/font/sourcesanspro_italic.ttf
diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Light.ttf b/app/src/main/res/font/sourcesanspro_light.ttf
similarity index 100%
rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Light.ttf
rename to app/src/main/res/font/sourcesanspro_light.ttf
diff --git a/app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Regular.ttf b/app/src/main/res/font/sourcesanspro_regular.ttf
similarity index 100%
rename from app/src/main/assets/fonts/source-sans-pro/SourceSansPro-Regular.ttf
rename to app/src/main/res/font/sourcesanspro_regular.ttf
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 13aa71c..f4a914a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,7 +28,7 @@
         <item name="android:textSize">16sp</item>
         <item name="android:typeface">sans</item>
         <item name="drawerArrowStyle">@style/MaterialDrawer.DrawerArrowStyle</item>
-        <item name="android:textAppearance">@style/TextAppearance.Text.Regular</item>
+        <item name="android:fontFamily">@font/sourcesanspro_regular</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24px</item>
     </style>
 
@@ -43,21 +43,6 @@
         <item name="color">@color/white</item>
     </style>
 
-    <style name="TextAppearance.Text.Regular" parent="android:TextAppearance">
-        <item name="fontPath">fonts/source-sans-pro/SourceSansPro-Regular.ttf</item>
-    </style>
-
-    <style name="TextAppearance.Text.Bold" parent="android:TextAppearance">
-        <item name="fontPath">fonts/source-sans-pro/SourceSansPro-Bold.ttf</item>
-    </style>
-
-    <style name="TextAppearance.Text.Light" parent="android:TextAppearance">
-        <item name="fontPath">fonts/source-sans-pro/SourceSansPro-Light.ttf</item>
-    </style>
-
-    <style name="TextAppearance.Text.Italic" parent="android:TextAppearance">
-        <item name="fontPath">fonts/source-sans-pro/SourceSansPro-Italic.ttf</item>
-    </style>
 
     <style name="TextStyle">
         <item name="android:layout_marginTop">2dp</item>
@@ -68,22 +53,22 @@
     </style>
 
     <style name="TextStyle.Title" parent="TextStyle">
-        <item name="android:textAppearance">@style/TextAppearance.Text.Regular</item>
+        <item name="android:fontFamily">@font/sourcesanspro_regular</item>
     </style>
 
     <style name="TextStyle.Title.Sub" parent="TextStyle.Title">
-        <item name="android:textAppearance">@style/TextAppearance.Text.Light</item>
+        <item name="android:fontFamily">@font/sourcesanspro_light</item>
         <item name="android:textSize">14sp</item>
     </style>
 
     <style name="TextStyle.Heading" parent="TextStyle">
         <item name="android:textSize">16sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Text.Bold</item>
+        <item name="android:fontFamily">@font/sourcesanspro_bold</item>
     </style>
 
     <style name="TextStyle.Comment" parent="TextStyle">
         <item name="android:textSize">16sp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Text.Italic</item>
+        <item name="android:fontFamily">@font/sourcesanspro_italic</item>
     </style>
 
     <style name="Toolbar" parent="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
diff --git a/build.gradle b/build.gradle
index 23972e7..3f6dfb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha5'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -42,16 +42,16 @@ task clean(type: Delete) {
 ext {
     // Sdk and tools
     minSdkVersion = 16
-    targetSdkVersion = 25
-    compileSdkVersion = 25
-    buildToolsVersion = '25.0.2'
+    targetSdkVersion = 26
+    compileSdkVersion = 26
+    buildToolsVersion = '26.0.0'
 
     // App dependencies
-    supportLibraryVersion = '25.3.1'
+    supportLibraryVersion = '26.+'
     gsonVersion = '2.8.0'
-    calligraphyVersion = '2.2.0'
     glideVersion = '3.7.0'
 
+
     rx2FastAndroidNetworking = '1.0.0'
 
     dagger2Version = '2.8'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b449c87..0e1fe61 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
+