diff --git a/app/build.gradle b/app/build.gradle
index 70dcd464..9c7bb531 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,8 +47,9 @@ android {
         }
     }
     packagingOptions {
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
+        resources {
+            excludes += ['META-INF/AL2.0', 'META-INF/LGPL2.1']
+        }
     }
 }
 
@@ -68,7 +69,7 @@ dependencies {
      */
 
     testImplementation 'org.json:json:20200518'
-    testImplementation "com.fasterxml.jackson.core:jackson-databind:$jackson"
+    testImplementation "com.google.code.gson:gson:$gson"
     //testImplementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.8"
     testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp3"
 
@@ -77,7 +78,7 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion
     androidTestImplementation "androidx.test.ext:junit-ktx:" + rootProject.extJUnitVersion
-    androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jackson"
+    androidTestImplementation "com.google.code.gson:gson:$gson"
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:' + rootProject.espressoVersion
     androidTestImplementation "com.jakewharton.espresso:okhttp3-idling-resource:$jakeWhartonOkhttpOdlingResource"
 
diff --git a/app/src/androidTest/java/com/pixlee/pixleeandroidsdk/HMACTest.kt b/app/src/androidTest/java/com/pixlee/pixleeandroidsdk/HMACTest.kt
index 5382a850..8d76b38e 100644
--- a/app/src/androidTest/java/com/pixlee/pixleeandroidsdk/HMACTest.kt
+++ b/app/src/androidTest/java/com/pixlee/pixleeandroidsdk/HMACTest.kt
@@ -1,6 +1,7 @@
 package com.pixlee.pixleeandroidsdk
 
-import com.fasterxml.jackson.databind.ObjectMapper
+import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.pixlee.pixleesdk.network.HMAC
 import org.json.JSONException
 import org.junit.Assert
@@ -15,14 +16,15 @@ class HMACTest {
     @Test
     @Throws(JSONException::class, InvalidKeyException::class, NoSuchAlgorithmException::class)
     fun `test-HMAC-SHA1`() {
-        val text: String = ObjectMapper().createObjectNode().apply{
-            this.put("album_id", 12345)
-            this.put("title", "Testing Photo Upload")
-            this.put("approved", true)
-            this.put("email", "test@example.com")
-            this.put("username", "Submitter Person")
-            this.put("photo_uri", "https://example.com/test.jpg")
-        }.toString().replace("\\/", "/")
+        val text: String = Gson().toJson(JsonObject().apply {
+            addProperty("album_id", 12345)
+            addProperty("title", "Testing Photo Upload")
+            addProperty("approved", true)
+            addProperty("email", "test@example.com")
+            addProperty("username", "Submitter Person")
+            addProperty("photo_uri", "https://example.com/test.jpg")
+        }).replace("\\/", "/")
+
         val test = HMAC.computeHmac(text, "ABCDEFG")
         val targetResult = "epBvDlHbQho/rNDdQVJowWMtGsg="
         Assert.assertEquals(targetResult, test)
diff --git a/app/src/test/java/com/pixlee/pixleesdk/HMACTest.kt b/app/src/test/java/com/pixlee/pixleesdk/HMACTest.kt
index ddfa44fe..c18342f8 100644
--- a/app/src/test/java/com/pixlee/pixleesdk/HMACTest.kt
+++ b/app/src/test/java/com/pixlee/pixleesdk/HMACTest.kt
@@ -1,6 +1,7 @@
 package com.pixlee.pixleesdk
 
-import com.fasterxml.jackson.databind.ObjectMapper
+import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.pixlee.pixleesdk.network.HMAC
 import org.json.JSONException
 import org.junit.Assert
@@ -15,16 +16,17 @@ class HMACTest {
     @Test
     @Throws(JSONException::class, InvalidKeyException::class, NoSuchAlgorithmException::class)
     fun testHMAC() {
-    val text: String = ObjectMapper().createObjectNode().apply{
-        this.put("album_id", 12345)
-        this.put("title", "Testing Photo Upload")
-        this.put("approved", true)
-        this.put("email", "test@example.com")
-        this.put("username", "Submitter Person")
-        this.put("photo_uri", "https://example.com/test.jpg")
-    }.toString().replace("\\/", "/")
-    val test = HMAC.computeHmac(text, "ABCDEFG")
-    val targetResult = "epBvDlHbQho/rNDdQVJowWMtGsg="
+        val text: String = Gson().toJson(JsonObject().apply {
+            addProperty("album_id", 12345)
+            addProperty("title", "Testing Photo Upload")
+            addProperty("approved", true)
+            addProperty("email", "test@example.com")
+            addProperty("username", "Submitter Person")
+            addProperty("photo_uri", "https://example.com/test.jpg")
+        }).replace("\\/", "/")
+
+        val test = HMAC.computeHmac(text, "ABCDEFG")
+        val targetResult = "epBvDlHbQho/rNDdQVJowWMtGsg="
         Assert.assertEquals(targetResult, test)
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c60081f0..c728296d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.5.20'
-    ext.coroutines = "1.5.0"
+    ext.kotlin_version = '1.6.10'
+    ext.coroutines = "1.5.2"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -44,8 +44,8 @@ ext {
 
     jakeWhartonOkhttpOdlingResource = "1.0.0"
 
-    androidxAppcompat = "1.4.1"
-    androidxConstraint = "2.1.3"
+    androidxAppcompat = "1.4.2"
+    androidxConstraint = "2.1.4"
     material = "1.5.0"
 
     lifecycle = "2.4.0"
@@ -63,7 +63,7 @@ ext {
     checkerframeworkVersion = '3.13.0'
     exoPlayer="2.16.1"
     supportLibraryVersion = '27.0.0'
-    jackson = '2.10.3'
+    gson = '2.9.1'
     junit = '4.13.2'
     androidxRunner = '1.4.0'
     androidXrules = '1.4.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f8bc61d..abda7fe0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/pixleesdk/build.gradle b/pixleesdk/build.gradle
index b3177de5..41d5003e 100644
--- a/pixleesdk/build.gradle
+++ b/pixleesdk/build.gradle
@@ -44,35 +44,34 @@ android {
             }
         }
     }
-
     packagingOptions {
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
+        resources {
+            excludes += ['META-INF/AL2.0', 'META-INF/LGPL2.1']
+        }
     }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
-    implementation 'androidx.core:core-ktx:1.7.0'
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
 
     /**
      * testing
      */
     testImplementation "junit:junit:$junit"
     testImplementation 'org.json:json:20200518'
-    androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jackson"
+    androidTestImplementation "com.google.code.gson:gson:$gson"
     androidTestImplementation 'androidx.test.ext:junit-ktx:' + rootProject.extJUnitVersion
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:' + rootProject.espressoVersion
     androidTestImplementation "com.jakewharton.espresso:okhttp3-idling-resource:$jakeWhartonOkhttpOdlingResource"
 
-    implementation "com.fasterxml.jackson.core:jackson-databind:$jackson"
+    implementation "com.google.code.gson:gson:$gson"
+
+//    implementation "androidx.appcompat:appcompat:$androidxAppcompat"
 
-    implementation "androidx.appcompat:appcompat:$androidxAppcompat"
-    implementation "com.google.android.material:material:$material"
     /**
      * Network
      */
@@ -93,9 +92,6 @@ dependencies {
      * Glide(Image library)
      */
     implementation "com.github.bumptech.glide:glide:$glide"
-    implementation "com.github.bumptech.glide:annotations:$glide"
-    implementation "com.github.bumptech.glide:okhttp3-integration:$glide"
-    kapt "com.github.bumptech.glide:compiler:$glide"
 
     /**
      * Glide Transformation
@@ -111,13 +107,9 @@ dependencies {
 
     compileOnly "org.checkerframework:checker-qual:$checkerframeworkVersion"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoPlayer"
-    implementation "com.google.android.exoplayer:exoplayer-dash:$exoPlayer"
     implementation "com.google.android.exoplayer:exoplayer-ui:$exoPlayer"
-    implementation "com.google.android.exoplayer:extension-ima:$exoPlayer"
     implementation "com.google.android.exoplayer:extension-cronet:$exoPlayer"
 
-    implementation 'androidx.annotation:annotation:1.3.0'
-
 
     implementation "androidx.recyclerview:recyclerview:1.2.1"
 }
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/NetworkModule.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/NetworkModule.java
index 1f58d1db..c24f7eae 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/NetworkModule.java
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/NetworkModule.java
@@ -1,6 +1,5 @@
 package com.pixlee.pixleesdk.network;
 
-import android.os.Build;
 import android.util.Log;
 
 import com.orhanobut.logger.Logger;
@@ -116,18 +115,6 @@ public static synchronized OkHttpClient provideOkHttpClient() {
                     .readTimeout(timeout_read, TimeUnit.SECONDS)
                     .writeTimeout(timeout_write, TimeUnit.SECONDS);
 
-            // enable Tls12 on Pre Lollipop
-            try {
-                if (Build.VERSION.SDK_INT < 21) {
-                    TLSSocketFactory tlsSocketFactory = new TLSSocketFactory();
-                    if (tlsSocketFactory.getTrustManager() != null) {
-                        ok.sslSocketFactory(tlsSocketFactory, tlsSocketFactory.getTrustManager());
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
             if (BuildConfig.DEBUG) {
                 HttpLoggingInterceptor logging = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
                     @Override
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/TLSSocketFactory.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/TLSSocketFactory.java
deleted file mode 100644
index 094250eb..00000000
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/TLSSocketFactory.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.pixlee.pixleesdk.network;
-
-import androidx.annotation.Nullable;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-/**
- * Created by sungjun on 3/26/20.
- */
-public class TLSSocketFactory extends SSLSocketFactory {
-
-    private SSLSocketFactory delegate;
-    private TrustManager[] trustManagers;
-
-    public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException {
-        generateTrustManagers();
-        SSLContext context = SSLContext.getInstance("TLS");
-        context.init(null, trustManagers, null);
-        delegate = context.getSocketFactory();
-    }
-
-    private void generateTrustManagers() throws KeyStoreException, NoSuchAlgorithmException {
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        trustManagerFactory.init((KeyStore) null);
-        TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-
-        if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
-            throw new IllegalStateException("Unexpected default trust managers:"
-                    + Arrays.toString(trustManagers));
-        }
-
-        this.trustManagers = trustManagers;
-    }
-
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return delegate.getDefaultCipherSuites();
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return delegate.getSupportedCipherSuites();
-    }
-
-    @Override
-    public Socket createSocket() throws IOException {
-        return enableTLSOnSocket(delegate.createSocket());
-    }
-
-    @Override
-    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-        return enableTLSOnSocket(delegate.createSocket(s, host, port, autoClose));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(delegate.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(delegate.createSocket(host, port, localHost, localPort));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port) throws IOException {
-        return enableTLSOnSocket(delegate.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
-        return enableTLSOnSocket(delegate.createSocket(address, port, localAddress, localPort));
-    }
-
-    private Socket enableTLSOnSocket(Socket socket) {
-        if(socket != null && (socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
-        }
-        return socket;
-    }
-
-    @Nullable
-    public X509TrustManager getTrustManager() {
-        return  (X509TrustManager) trustManagers[0];
-    }
-}
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/adaptor/UploadedJsonAdapter.java b/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/adaptor/UploadedJsonAdapter.java
index d8dd5f9a..d298a0f0 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/adaptor/UploadedJsonAdapter.java
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/network/adaptor/UploadedJsonAdapter.java
@@ -1,18 +1,13 @@
 package com.pixlee.pixleesdk.network.adaptor;
 
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.gson.Gson;
 import com.pixlee.pixleesdk.network.annotation.FieldUploadedJson;
 import com.squareup.moshi.FromJson;
 import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.ToJson;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 public class UploadedJsonAdapter {
@@ -31,9 +26,7 @@ public JSONObject fromJson(@NonNull final JsonReader reader) throws Exception {
             return reader.nextNull();
         } else {
             try {
-                ObjectMapper mapper = new ObjectMapper();
-                String data = mapper.writeValueAsString(reader.readJsonValue());
-                return new JSONObject(data);
+                return new JSONObject(new Gson().toJson(reader.readJsonValue()));
             } catch (Exception e) {
                 e.printStackTrace();
             }
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoProductView.kt b/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoProductView.kt
index d6f3e408..de0cb4b3 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoProductView.kt
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoProductView.kt
@@ -9,14 +9,12 @@ import android.util.AttributeSet
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
-import android.view.animation.*
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.core.view.ViewCompat
-import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -42,7 +40,6 @@ import com.pixlee.pixleesdk.util.HotspotsReader
 import com.pixlee.pixleesdk.util.px
 import com.pixlee.pixleesdk.util.setCompatIconWithColor
 import kotlinx.coroutines.*
-import java.util.*
 
 
 /**
@@ -153,7 +150,7 @@ class PXLPhotoProductView : FrameLayout, LifecycleObserver {
         headerConfiguration.backButton?.apply {
             binding.vBack.setOnClickListener { onClickListener?.let { it() } }
             binding.vBack.background = GradientDrawable().apply {
-                shape = android.graphics.drawable.GradientDrawable.OVAL
+                shape = GradientDrawable.OVAL
                 setColor(backgroundColor)
             }
             binding.vBack.setPadding(padding, padding, padding, padding)
@@ -171,7 +168,7 @@ class PXLPhotoProductView : FrameLayout, LifecycleObserver {
                 onCheckedListener?.let { it1 -> it1(isMutted) }
             }
             binding.vMute.background = GradientDrawable().apply {
-                shape = android.graphics.drawable.GradientDrawable.OVAL
+                shape = GradientDrawable.OVAL
                 setColor(backgroundColor)
             }
             binding.vMute.setPadding(padding, padding, padding, padding)
@@ -276,7 +273,7 @@ class PXLPhotoProductView : FrameLayout, LifecycleObserver {
                                                     layoutParams = RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT)
                                                     setImageResource(R.drawable.outline_local_offer_black_24)
                                                     background = GradientDrawable().apply {
-                                                        shape = android.graphics.drawable.GradientDrawable.OVAL
+                                                        shape = GradientDrawable.OVAL
                                                         setColor(Color.WHITE)
                                                     }
                                                     val padding = 10.px.toInt()
@@ -284,7 +281,7 @@ class PXLPhotoProductView : FrameLayout, LifecycleObserver {
                                                     ViewCompat.setElevation(this, 20f)
                                                     val position = reader.getHotspotsPosition(boundingBoxProduct)
                                                     apply {
-                                                        doOnPreDraw {
+                                                        post {
                                                             x = position.x - (width.toFloat() / 2f)
                                                             y = position.y - (height.toFloat() / 2f)
                                                         }
diff --git a/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoView.kt b/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoView.kt
index 7c8aaf88..0ae0e46e 100644
--- a/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoView.kt
+++ b/pixleesdk/src/main/java/com/pixlee/pixleesdk/ui/widgets/PXLPhotoView.kt
@@ -29,7 +29,6 @@ import com.google.android.exoplayer2.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.ParametersBuilder
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.google.android.exoplayer2.upstream.DataSource
 import com.google.android.exoplayer2.util.ErrorMessageProvider
 import com.google.android.exoplayer2.util.EventLogger
diff --git a/pixleesdk/src/main/res/drawable/white_rounded.xml b/pixleesdk/src/main/res/drawable/white_rounded.xml
new file mode 100644
index 00000000..fe1b6aec
--- /dev/null
+++ b/pixleesdk/src/main/res/drawable/white_rounded.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="#ffffff" />
+
+    <padding
+        android:left="5dp"
+        android:right="5dp"
+        android:bottom="5dp"
+        android:top="5dp" />
+
+    <corners android:radius="5dp" />
+</shape>
diff --git a/pixleesdk/src/main/res/layout/activity_video_viewer.xml b/pixleesdk/src/main/res/layout/activity_video_viewer.xml
deleted file mode 100644
index 12ae4645..00000000
--- a/pixleesdk/src/main/res/layout/activity_video_viewer.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:background="#00ff00"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <com.pixlee.pixleesdk.ui.widgets.PXLPhotoProductView
-        android:id="@+id/pxlPhotoProductView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-    <RelativeLayout
-        android:id="@+id/bodyView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-        <ImageView
-            android:id="@+id/backButton"
-            android:layout_width="?attr/actionBarSize"
-            android:layout_height="?attr/actionBarSize"
-            app:tint="@android:color/white"
-            android:scaleType="center"
-            android:background="?android:attr/selectableItemBackground"
-            android:src="@drawable/baseline_arrow_back_white_24"/>
-
-        <TextView
-            android:id="@+id/tvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="?attr/actionBarSize"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:singleLine="false"
-            android:text="Pixlee"
-            android:gravity="center"
-            android:layout_centerHorizontal="true"
-            android:textStyle="bold"
-            android:textColor="@android:color/white"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Large"/>
-    </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/pixleesdk/src/main/res/layout/item_product.xml b/pixleesdk/src/main/res/layout/item_product.xml
index 0c4618fb..a7c9199a 100644
--- a/pixleesdk/src/main/res/layout/item_product.xml
+++ b/pixleesdk/src/main/res/layout/item_product.xml
@@ -1,11 +1,10 @@
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cardView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:foreground="?android:attr/selectableItemBackground"
-    app:cardCornerRadius="5dp"
+    android:background="@drawable/white_rounded"
     android:layout_marginLeft="10dp"
     android:layout_marginRight="10dp"
     android:layout_marginTop="5dp"
@@ -114,4 +113,4 @@
         </RelativeLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.cardview.widget.CardView>
+</FrameLayout>
diff --git a/pixleesdk/src/main/res/values-night/themes.xml b/pixleesdk/src/main/res/values-night/themes.xml
index 4b97013d..9224640d 100644
--- a/pixleesdk/src/main/res/values-night/themes.xml
+++ b/pixleesdk/src/main/res/values-night/themes.xml
@@ -19,17 +19,8 @@
     <style name="Pixlee.Theme.App" parent="Pixlee.Theme">
         <!--Material color attributes (dark theme) -->
         <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_600</item>
-        <item name="colorSecondary">@color/green_200</item>
-        <item name="colorSecondaryVariant">@color/green_500</item>
         <item name="android:colorBackground">@color/grey_900</item>
-        <item name="colorSurface">@color/black_800</item>
         <item name="colorError">@color/red_200</item>
-        <item name="colorOnPrimary">@color/grey_900</item>
-        <item name="colorOnSecondary">@color/black_900</item>
-        <item name="colorOnBackground">@color/white_50</item>
-        <item name="colorOnSurface">@color/white_50</item>
-        <item name="colorOnError">@color/black_900</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
     </style>
diff --git a/pixleesdk/src/main/res/values/styles.xml b/pixleesdk/src/main/res/values/styles.xml
deleted file mode 100644
index 2eae5433..00000000
--- a/pixleesdk/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<resources>
-    <style name="buttonDefault" parent="Widget.MaterialComponents.Button.UnelevatedButton">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">?attr/actionBarSize</item>
-        <item name="android:includeFontPadding">false</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="buttonOutLined" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">?attr/actionBarSize</item>
-        <item name="android:includeFontPadding">false</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-</resources>
diff --git a/pixleesdk/src/main/res/values/themes.xml b/pixleesdk/src/main/res/values/themes.xml
index 5a3079b8..a51e0431 100644
--- a/pixleesdk/src/main/res/values/themes.xml
+++ b/pixleesdk/src/main/res/values/themes.xml
@@ -15,38 +15,13 @@
 ~ limitations under the License.
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!--Top level DayNight theme to be used in AndroidManifest.xml-->
     <style name="Pixlee.Theme.App" parent="Pixlee.Theme"/>
-    <!--Base custom theme which will be shared between both light and dark theme variants-->
     <style name="Pixlee.Theme" parent="Base.Theme.MaterialThemeBuilder">
-        <!--Material color attributes (light theme) -->
-        <!--colorPrimary colors map to components and elements, such as app bars and buttons. -->
-        <!--colorSecondary colors are most often used as accents on components, such as FABs and -->
-        <!--selection controls.-->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorSecondary">@color/green_200</item>
-        <item name="colorSecondaryVariant">@color/green_500</item>
-        <!--colorBackground appears behind scrollable content and is used for the default window-->
-        <!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
-        <!--and menus. colorError is used to indicate an error state for components such as-->
-        <!--text fields.-->
         <item name="android:colorBackground">@color/white_50</item>
-        <item name="colorSurface">@color/white_50</item>
         <item name="colorError">@color/red_600</item>
-        <!--"On" colors define how text, icons and strokes are colored in relation to the surface-->
-        <!--on which they appear.-->
-        <item name="colorOnPrimary">@color/white_50</item>
-        <item name="colorOnSecondary">@color/black_900</item>
-        <item name="colorOnBackground">@color/black_900</item>
-        <item name="colorOnSurface">@color/black_900</item>
-        <item name="colorOnError">@color/white_50</item>
-        <!--Component styles-->
-        <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
-        <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.PrimarySurface</item>
     </style>
-    <style name="Base.Theme.MaterialThemeBuilder" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="android:statusBarColor" tools:ignore="NewApi">?attr/colorSurface</item>
+    <style name="Base.Theme.MaterialThemeBuilder" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
         <item name="android:navigationBarColor" tools:ignore="NewApi">?android:attr/colorBackground</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
diff --git a/simpleapp/build.gradle b/simpleapp/build.gradle
index f2a9edeb..f45a18e5 100644
--- a/simpleapp/build.gradle
+++ b/simpleapp/build.gradle
@@ -57,11 +57,12 @@ android {
             }
         }
     }
-
     packagingOptions {
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
+        resources {
+            excludes += ['META-INF/AL2.0', 'META-INF/LGPL2.1']
+        }
     }
+
 }
 
 dependencies {
@@ -71,7 +72,6 @@ dependencies {
     testImplementation "junit:junit:$junit"
     androidTestImplementation "androidx.test:runner:$androidxRunner"
     androidTestImplementation "androidx.test.ext:junit:$extJUnitVersion"
-    implementation "androidx.appcompat:appcompat:$androidxAppcompat"
     implementation "androidx.constraintlayout:constraintlayout:$androidxConstraint"
     implementation "com.google.android.material:material:$material"
     implementation "androidx.multidex:multidex:2.0.1"
diff --git a/simpleapp/src/main/res/layout/activity_index.xml b/simpleapp/src/main/res/layout/activity_index.xml
index 011bcd05..5a7738e5 100644
--- a/simpleapp/src/main/res/layout/activity_index.xml
+++ b/simpleapp/src/main/res/layout/activity_index.xml
@@ -12,12 +12,12 @@
             android:layout_height="wrap_content"
             android:text="PXLWidgetView"
             android:textStyle="bold"
-            android:textColor="?attr/colorOnSurface"
+            android:textColor="@color/colorPrimary"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Large"
             android:layout_marginTop="@dimen/margin"
             android:layout_marginLeft="@dimen/margin"
             android:layout_marginRight="@dimen/margin"/>
-        <com.google.android.material.button.MaterialButton
+        <Button
             style="@style/NextButtonDefault"
             android:id="@+id/mosaic"
             android:textSize="14sp"
@@ -27,7 +27,7 @@
             android:layout_marginLeft="@dimen/margin"
             android:layout_marginRight="@dimen/margin"
             />
-        <com.google.android.material.button.MaterialButton
+        <Button
             style="@style/NextButtonDefault"
             android:id="@+id/horizontal"
             android:textSize="14sp"
@@ -37,7 +37,7 @@
             android:layout_marginLeft="@dimen/margin"
             android:layout_marginRight="@dimen/margin"
             />
-        <com.google.android.material.button.MaterialButton
+        <Button
             style="@style/NextButtonDefault"
             android:id="@+id/grid"
             android:textSize="14sp"
@@ -48,7 +48,7 @@
             android:layout_marginRight="@dimen/margin"
             />
 
-        <com.google.android.material.button.MaterialButton
+        <Button
             style="@style/NextButtonDefault"
             android:id="@+id/list"
             android:textSize="14sp"
@@ -64,12 +64,12 @@
             android:layout_height="wrap_content"
             android:text="Advanced PXLWidgetView"
             android:textStyle="bold"
-            android:textColor="?attr/colorOnSurface"
+            android:textColor="@color/colorPrimary"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Large"
             android:layout_marginTop="@dimen/margin"
             android:layout_marginLeft="@dimen/margin"
             android:layout_marginRight="@dimen/margin"/>
-        <com.google.android.material.button.MaterialButton
+        <Button
             style="@style/NextButtonDefault"
             android:id="@+id/dynamic"
             android:textSize="14sp"
diff --git a/simpleapp/src/main/res/layout/activity_simple_demo.xml b/simpleapp/src/main/res/layout/activity_simple_demo.xml
index 55cfff08..2211ccc9 100644
--- a/simpleapp/src/main/res/layout/activity_simple_demo.xml
+++ b/simpleapp/src/main/res/layout/activity_simple_demo.xml
@@ -15,8 +15,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorSurface"
-            app:titleTextColor="?attr/colorOnSurface"
+            android:background="@color/colorPrimary"
+            app:titleTextColor="#ffffff"
             app:contentInsetStartWithNavigation="0dp"
             app:layout_scrollFlags="noScroll"
             />
diff --git a/simpleapp/src/main/res/values-night/themes.xml b/simpleapp/src/main/res/values-night/themes.xml
index 72abaf30..50edf4a7 100644
--- a/simpleapp/src/main/res/values-night/themes.xml
+++ b/simpleapp/src/main/res/values-night/themes.xml
@@ -1,16 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Androidsdk" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Androidsdk" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+<!--        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>-->
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file
diff --git a/simpleapp/src/main/res/values/styles.xml b/simpleapp/src/main/res/values/styles.xml
index 1ec9f547..a461db8a 100644
--- a/simpleapp/src/main/res/values/styles.xml
+++ b/simpleapp/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="NextButtonDefault" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="NextButtonDefault" >
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:includeFontPadding">false</item>
@@ -12,7 +12,7 @@
     </style>
 
 
-    <style name="NextButtonOutLined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="NextButtonOutLined" >
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:includeFontPadding">false</item>
@@ -27,7 +27,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center_vertical</item>
-        <item name="android:textAppearance">@style/Base.TextAppearance.AppCompat.Title</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:background">@color/red_200</item>
         <item name="android:fontFamily">sans-serif-medium</item>
@@ -50,7 +50,7 @@
         <item name="android:paddingRight">10dp</item>
     </style>
 
-    <style name="filterContentTextInputLayout" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="filterContentTextInputLayout" >
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginLeft">20dp</item>
diff --git a/simpleapp/src/main/res/values/themes.xml b/simpleapp/src/main/res/values/themes.xml
index 680eb8a2..346df8dd 100644
--- a/simpleapp/src/main/res/values/themes.xml
+++ b/simpleapp/src/main/res/values/themes.xml
@@ -1,20 +1,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Androidsdk" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Androidsdk" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+<!--        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>-->
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="Theme.Androidsdk.NoActionBar" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.Androidsdk.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
@@ -23,6 +16,6 @@
 
     <style name="Theme.Androidsdk.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file