diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5454153..dc5db03 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="disableWrapperSourceDistributionNotification" value="true" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4f801b7..860da66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15_PREVIEW" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 91e2c63..b0ed027 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 31
+    buildToolsVersion '31.0.0'
 
     defaultConfig {
         applicationId "in.sarangal.spannabletextview"
         minSdkVersion 15
-        targetSdkVersion 30
+        targetSdk 31
         versionCode 1
         versionName "1.0"
 
@@ -49,12 +49,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation "androidx.core:core-ktx:1.5.0"
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     /** Spantastic Library */
-    implementation project (":spantastic")
+    implementation project(":spantastic")
 }
 
 repositories {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index febf145..2ba0124 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,14 +11,18 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".KotlinActivity">
+        <activity
+            android:name=".KotlinActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/in/sarangal/spannabletextview/KotlinActivity.kt b/app/src/main/java/in/sarangal/spannabletextview/KotlinActivity.kt
index 7931809..09cd8e5 100644
--- a/app/src/main/java/in/sarangal/spannabletextview/KotlinActivity.kt
+++ b/app/src/main/java/in/sarangal/spannabletextview/KotlinActivity.kt
@@ -29,7 +29,7 @@ class KotlinActivity : AppCompatActivity() {
 
         /* Show Underline and make Text BOLD for Multiple words */
         sentence = "Spannable with underline and bold for multiple words."
-        var strings: ArrayList<String> = ArrayList()
+        val strings: ArrayList<String> = ArrayList()
         strings.add("spannable")
         strings.add("underline")
         strings.add("bold")
@@ -43,7 +43,7 @@ class KotlinActivity : AppCompatActivity() {
         /* Set Click on Multiple Words with Bold Style */
         sentence =
             "Spannable with click, color, underline and bold for multiple words."
-        strings = ArrayList()
+        strings.clear()
         strings.add("click")
         strings.add("color")
         strings.add("underline")
@@ -153,7 +153,7 @@ class KotlinActivity : AppCompatActivity() {
         /* Developed By Sarangal */
         sentence = "Developed with ❤ by Sarangal"
         val tvCredit = findViewById<TextView>(R.id.tv_credit)
-        val creditModelList: MutableList<SpanModel> = ArrayList<SpanModel>()
+        val creditModelList = ArrayList<SpanModel>()
         creditModelList.add(
             SpanModel(
                 "❤", Color.parseColor("#FFFF2F2F"),
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dde4c6c..9a9927b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -79,6 +79,6 @@
         android:layout_alignParentBottom="true"
         android:id="@+id/tv_credit"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a65717d..e22221d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.5.0'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
-        //noinspection DifferentKotlinGradleVersion
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 13e2bbb..e3170b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 05 23:44:04 IST 2021
+#Fri Mar 04 23:29:58 IST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/local.properties b/local.properties
index b01a688..0c8886d 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=D\:\\AndroidStudio\\AndroidSDK
+#Fri Mar 04 23:26:46 IST 2022
+sdk.dir=/Users/relinns/Library/Android/sdk
diff --git a/spantastic/build.gradle b/spantastic/build.gradle
index 65964f8..2d44833 100644
--- a/spantastic/build.gradle
+++ b/spantastic/build.gradle
@@ -4,14 +4,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdk 31
+    buildToolsVersion '31.0.0'
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 30
-        versionCode 10
-        versionName "2.1.0"
+        targetSdk 31
+        versionCode 11
+        versionName "2.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -43,8 +43,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/spantastic/src/main/java/in/sarangal/lib/spantastic/Spantastic.kt b/spantastic/src/main/java/in/sarangal/lib/spantastic/Spantastic.kt
index 5a342b6..7cc6a7c 100644
--- a/spantastic/src/main/java/in/sarangal/lib/spantastic/Spantastic.kt
+++ b/spantastic/src/main/java/in/sarangal/lib/spantastic/Spantastic.kt
@@ -1,6 +1,5 @@
 package `in`.sarangal.lib.spantastic
 
-import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
 import android.text.SpannableString
@@ -41,11 +40,11 @@ class Spantastic private constructor(builder: Builder) {
      * */
     private fun setSpannable() {
 
-        if (fullString.trim().isEmpty()) {
+        if (fullString.isBlank()) {
             return
         }
 
-        if (spanModelList == null || spanModelList.isEmpty()) {
+        if (spanModelList.isNullOrEmpty()) {
             return
         }
 
@@ -88,7 +87,8 @@ class Spantastic private constructor(builder: Builder) {
                             try {
                                 textPaint.color = spanModel.colorId ?: colorID
                                         ?: textView.currentTextColor
-                            } catch (ignored: Exception) {
+                            } catch (e: Exception) {
+                                e.printStackTrace()
                             }
 
                             /* Set Span Typeface for Styling */
@@ -107,7 +107,8 @@ class Spantastic private constructor(builder: Builder) {
                     spannableString.setSpan(clickSpan, start, end, 0)
                 }
 
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                e.printStackTrace()
             }
         }
 
@@ -126,23 +127,6 @@ class Spantastic private constructor(builder: Builder) {
         fun onSpanClick(spanString: String?, vararg `object`: Any?)
     }
 
-    /**
-     * Builder Class for Handling Spannable Operations
-     *
-     * Method Params:
-     *
-     * @param mContext    Instance or Reference
-     * @param mTextView   TextView on which spannable text will be applied
-     * @param mFullString Complete string value from which span(s) will be found.
-     *
-     * Deprecated: Use Builder class
-     */
-    @Deprecated(message = "Please Use 'Builder' class")
-    internal class SpantasticBuilder(
-        private val mContext: Context, private val mTextView: TextView,
-        private val mFullString: String
-    ) : Builder(mTextView, mFullString)
-
     /**
      * Builder Class for Handling Spannable Operations
      *