diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5be763c..a5c1662 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,16 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.payu.custombrowser"
     android:versionCode="5"
-    android:versionName="5.2.2" >
-
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="23" />
+    android:versionName="5.2.3" >
+    
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.READ_SMS" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission
-        android:name="android.permission.RECEIVE_SMS"
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+
+    <uses-permission android:name="android.permission.RECEIVE_SMS"
         android:protectionLevel="signature" />
 
-</manifest>
\ No newline at end of file
+
+
+</manifest>
diff --git a/CustomBrowser-release.aar b/CustomBrowser-release.aar
index 3849549..ca59738 100644
Binary files a/CustomBrowser-release.aar and b/CustomBrowser-release.aar differ
diff --git a/libs/classes.jar b/libs/classes.jar
index 02c7b15..1d51fdb 100644
Binary files a/libs/classes.jar and b/libs/classes.jar differ
diff --git a/res/anim/cb_animation.xml b/res/anim/cb_animation.xml
index a4cc4d3..7f8e427 100644
--- a/res/anim/cb_animation.xml
+++ b/res/anim/cb_animation.xml
@@ -24,4 +24,4 @@
     </set>
 
 
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
\ No newline at end of file
+</set>
\ No newline at end of file
diff --git a/res/anim/cb_face_out.xml b/res/anim/cb_face_out.xml
index 94b3d47..1bef0a0 100644
--- a/res/anim/cb_face_out.xml
+++ b/res/anim/cb_face_out.xml
@@ -8,4 +8,4 @@
         android:toAlpha="0.1"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="500"/>
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
\ No newline at end of file
+</set>
\ No newline at end of file
diff --git a/res/anim/cb_fade_in.xml b/res/anim/cb_fade_in.xml
index 3baf87b..67edb07 100644
--- a/res/anim/cb_fade_in.xml
+++ b/res/anim/cb_fade_in.xml
@@ -8,4 +8,4 @@
         android:toAlpha="1.0"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="500"/>
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
\ No newline at end of file
+</set>
\ No newline at end of file
diff --git a/res/anim/cb_tranlateup.xml b/res/anim/cb_tranlateup.xml
index 79391eb..d811474 100644
--- a/res/anim/cb_tranlateup.xml
+++ b/res/anim/cb_tranlateup.xml
@@ -9,4 +9,4 @@
         >
 
         </translate>
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
\ No newline at end of file
+</set>
\ No newline at end of file
diff --git a/res/anim/cb_translate.xml b/res/anim/cb_translate.xml
index 62cb7d4..8d0f99e 100644
--- a/res/anim/cb_translate.xml
+++ b/res/anim/cb_translate.xml
@@ -8,4 +8,4 @@
         android:toYDelta="70%"
         android:duration="500" />
 
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
\ No newline at end of file
+</set>
\ No newline at end of file
diff --git a/res/color/otp_approve_button_color.xml b/res/color/otp_approve_button_color.xml
index dace068..a7aa9e2 100644
--- a/res/color/otp_approve_button_color.xml
+++ b/res/color/otp_approve_button_color.xml
@@ -3,4 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/cb_otpDisabledTextColor" />
     <item android:color="@android:color/white"/>
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/res/drawable-xhdpi/rectangle_box.xml b/res/drawable-xhdpi/rectangle_box.xml
index 4610f49..8810a86 100644
--- a/res/drawable-xhdpi/rectangle_box.xml
+++ b/res/drawable-xhdpi/rectangle_box.xml
@@ -21,4 +21,4 @@
             <stroke android:color="@color/cb_input_gray" android:width="2dp" />
         </shape>
     </item>
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/res/drawable/approve_otp_button.xml b/res/drawable/approve_otp_button.xml
index 03d3694..39ed963 100644
--- a/res/drawable/approve_otp_button.xml
+++ b/res/drawable/approve_otp_button.xml
@@ -31,4 +31,4 @@
             <solid android:color="@color/cb_otpColor" />
         </shape>
     </item>
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/res/drawable/background_drawable.xml b/res/drawable/background_drawable.xml
index 37fe07c..f1624df 100644
--- a/res/drawable/background_drawable.xml
+++ b/res/drawable/background_drawable.xml
@@ -5,4 +5,4 @@
     <corners
         android:radius="0dp"/>
 
-</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
\ No newline at end of file
+</shape>
\ No newline at end of file
diff --git a/res/drawable/cb_edit_text.xml b/res/drawable/cb_edit_text.xml
index 136b961..84d7dc1 100644
--- a/res/drawable/cb_edit_text.xml
+++ b/res/drawable/cb_edit_text.xml
@@ -20,4 +20,4 @@
             <solid android:color="#f6f6f6" />
         </shape>
     </item>
-</layer-list><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
\ No newline at end of file
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/inner_circle.xml b/res/drawable/inner_circle.xml
index e475cd1..25f9f6e 100644
--- a/res/drawable/inner_circle.xml
+++ b/res/drawable/inner_circle.xml
@@ -4,4 +4,4 @@
     <solid android:angle="360"
         android:color="#1E90FF"/>
     <size android:width="8dp" android:height="8dp"/>
-</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/inner_circle.xml -->
\ No newline at end of file
+</shape>
\ No newline at end of file
diff --git a/res/drawable/otp_button_selector.xml b/res/drawable/otp_button_selector.xml
index f7a7515..8de336d 100644
--- a/res/drawable/otp_button_selector.xml
+++ b/res/drawable/otp_button_selector.xml
@@ -5,4 +5,4 @@
     <item android:drawable="@drawable/otp_icon_large"
         android:state_focused="true" />
     <item android:drawable="@drawable/otp_icon_large" />
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/res/drawable/outer_circle.xml b/res/drawable/outer_circle.xml
index b5148e0..6add48a 100644
--- a/res/drawable/outer_circle.xml
+++ b/res/drawable/outer_circle.xml
@@ -9,4 +9,4 @@
         android:color="#FFFFFF"
         />
     <size android:width="8dp" android:height="8dp"/>
-</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/outer_circle.xml -->
\ No newline at end of file
+</shape>
\ No newline at end of file
diff --git a/res/drawable/pin_button_selector.xml b/res/drawable/pin_button_selector.xml
index 7db0dfa..8ffd475 100644
--- a/res/drawable/pin_button_selector.xml
+++ b/res/drawable/pin_button_selector.xml
@@ -5,4 +5,4 @@
     <item android:drawable="@drawable/password_icon_large"
         android:state_focused="true" />
     <item android:drawable="@drawable/password_icon_large" />
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/res/drawable/shape_progress.xml b/res/drawable/shape_progress.xml
index cd8db80..59f4d1b 100644
--- a/res/drawable/shape_progress.xml
+++ b/res/drawable/shape_progress.xml
@@ -11,4 +11,4 @@
         android:left="10dp"
         android:right="10dp"
         android:top="10dp" />
-</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
\ No newline at end of file
+</shape>
\ No newline at end of file
diff --git a/res/layout/bank.xml b/res/layout/bank.xml
index 54857b2..d4d4781 100644
--- a/res/layout/bank.xml
+++ b/res/layout/bank.xml
@@ -50,4 +50,4 @@
         </ImageView>-->
 
     </RelativeLayout>
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/cb_prog_dialog.xml b/res/layout/cb_prog_dialog.xml
index 245dddd..1438639 100644
--- a/res/layout/cb_prog_dialog.xml
+++ b/res/layout/cb_prog_dialog.xml
@@ -51,4 +51,4 @@
 
 
 
-</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/cb_progressdialog.xml b/res/layout/cb_progressdialog.xml
index fb446e4..3186527 100644
--- a/res/layout/cb_progressdialog.xml
+++ b/res/layout/cb_progressdialog.xml
@@ -108,4 +108,4 @@
         android:paddingTop="@dimen/cb_twelve" />
 
 
-</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/choose_action.xml b/res/layout/choose_action.xml
index 5d16077..466e919 100644
--- a/res/layout/choose_action.xml
+++ b/res/layout/choose_action.xml
@@ -189,4 +189,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/error_page.xml b/res/layout/error_page.xml
index 0d1f0a6..5bb9d1f 100644
--- a/res/layout/error_page.xml
+++ b/res/layout/error_page.xml
@@ -70,4 +70,4 @@
        </View>
    </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/loading.xml b/res/layout/loading.xml
index acf4994..0ef8cda 100644
--- a/res/layout/loading.xml
+++ b/res/layout/loading.xml
@@ -129,4 +129,4 @@
 
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mainprogress.xml b/res/layout/mainprogress.xml
index 945bb2d..043b41e 100644
--- a/res/layout/mainprogress.xml
+++ b/res/layout/mainprogress.xml
@@ -8,4 +8,3 @@
     layout="@layout/cb_progressdialog"
     ></include>
 </LinearLayout>
-<!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/mainprogress.xml -->
\ No newline at end of file
diff --git a/res/layout/nb_layout.xml b/res/layout/nb_layout.xml
index e2b38b3..b9543d3 100644
--- a/res/layout/nb_layout.xml
+++ b/res/layout/nb_layout.xml
@@ -38,4 +38,4 @@
             android:layout_alignParentRight="true"
             android:id="@+id/native_button">
         </Button>
-</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/nb_layout.xml -->
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/register.xml b/res/layout/register.xml
index 143eb93..6e72130 100644
--- a/res/layout/register.xml
+++ b/res/layout/register.xml
@@ -87,4 +87,3 @@
         </LinearLayout>
     </RelativeLayout>
 </LinearLayout>
-<!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/register.xml -->
\ No newline at end of file
diff --git a/res/layout/register_pin.xml b/res/layout/register_pin.xml
index 225326b..400cd7e 100644
--- a/res/layout/register_pin.xml
+++ b/res/layout/register_pin.xml
@@ -139,4 +139,4 @@
         </RelativeLayout>
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/register_pin.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/retry_otp.xml b/res/layout/retry_otp.xml
index d77e4fe..2be1fb3 100644
--- a/res/layout/retry_otp.xml
+++ b/res/layout/retry_otp.xml
@@ -239,4 +239,4 @@
 
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/retry_otp.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/wait_for_otp.xml b/res/layout/wait_for_otp.xml
index 848c6a8..2f0a184 100644
--- a/res/layout/wait_for_otp.xml
+++ b/res/layout/wait_for_otp.xml
@@ -49,6 +49,7 @@
                     android:layout_marginTop="@dimen/cb_four"
                     android:fontFamily="sans-serif-light"
                     android:textSize="18sp"
+                    android:textColor="@color/cb_dark_grey"
                     android:textStyle="normal"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
@@ -188,11 +189,6 @@
                             android:textStyle="bold"
                             android:text="@string/cb_regenerate_otp" />
                     </LinearLayout>
-
-
-
-
-
                 </LinearLayout>
                 </LinearLayout>
             <RelativeLayout
@@ -265,4 +261,4 @@
 
 
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/layout/wait_for_otp.xml -->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..88af6ff
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="cb_background">#f6f6f6</color>
+    <color name="cb_border">#d4dee2</color>
+    <color name="cb_textColor">#8f8d8d</color>
+    <color name="cb_otpColor">#368ecd</color>
+    <color name="cb_otpReceivedColor">#769b12</color>
+    <color name="cb_otpDisabledColor">#7d88b3</color>
+    <color name="cb_otpDisabledTextColor">#bec4d9</color>
+    <color name="cb_errorRed">#e40000</color>
+    <color name="cb_input_gray">#FFDEE6E6</color>
+    <color name="cb_grey">#e9e7e7</color>
+    <color name="cb_blue_button">#368ecd</color>
+    <color name="cb_dark_blue_button">#094774</color>
+    <color name="cb_dark_grey">#464646</color>
+    <color name="cb_payu_blue">#368ecd</color>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 0000000..af90006
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,24 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="cb_activity_horizontal_margin">16dp</dimen>
+    <dimen name="cb_activity_vertical_margin">16dp</dimen>
+    <dimen name="cb_fourteen">14dp</dimen>
+    <dimen name="cb_twelve">12dp</dimen>
+    <dimen name="cb_twentyfour">24dp</dimen>
+    <dimen name="cb_thirtytwo">32dp</dimen>
+    <dimen name="cb_thirtysix">36dp</dimen>
+    <dimen name="cb_fourtytwo">48dp</dimen>
+
+    <dimen name="cb_two">2dp</dimen>
+    <dimen name="cb_eight">8dp</dimen>
+    <dimen name="cb_sixteen">16dp</dimen>
+    <dimen name="cb_four">4dp</dimen>
+    <dimen name="cb_eighteen">18dp</dimen>
+    <dimen name="cb_sixteenScaled">16sp</dimen>
+    <dimen name="cb_fourteenScaled">14sp</dimen>
+    <dimen name="cb_twelveScaled">12sp</dimen>
+
+    <!-- Progressbar circle -->
+    <dimen name="cb_circle_indicator_radius">3dp</dimen>
+    <dimen name="cb_circle_indicator_outer_radius">4dp</dimen>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 0000000..ba7ee1b
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cb_otp">otp</string>
+    <string name="cb_pin">pin</string>
+    <string name="cb_password_value">Password</string>
+    <string name="cb_pin_c">PIN</string>
+    <string name="cb_waiting_for_otp">Waiting for OTP</string>
+    <string name="cb_approve_otp">Approve</string>
+    <string name="cb_authenticate_with">Select an option for Faster Payment</string>
+    <string name="cb_incorrect_otp">INCORRECT OTP ENTERED</string>
+    <string name="cb_regenerate_otp">Regenerate OTP</string>
+    <string name="cb_regenerate_otp_text">It is taking long.You may...</string>
+    <string name="cb_enter_manually">Enter Manually</string>
+    <string name="cb_card_not_registered_with_pin">Your card has not been registered for PIN yet. Do you want to continue with PIN?</string>
+    <string name="cb_register_for_pin">REGISTER FOR PIN</string>
+    <string name="cb_use_sms_otp">USE SMS OTP</string>
+    <string name="cb_detect_otp">detectOtp</string>
+    <string name="cb_find_otp">findOtp</string>
+    <string name="cb_process_otp">process_otp</string>
+    <string name="cb_detect_bank">detectBank</string>
+    <string name="cb_init">init</string>
+    <string name="cb_result">result</string>
+    <string name="cb_regenerate">regenerate</string>
+    <string name="cb_skip_screen">skipScreen</string>
+    <string name="cb_enter_otp">enterOTP</string>
+    <string name="cb_enter_pin">enterPIN</string>
+    <string name="cb_retry_otp">retryOTP</string>
+    <string name="cb_error">error</string>
+    <string name="cb_register">register</string>
+    <string name="cb_choose">choose</string>
+    <string name="cb_sms_otp">SMS OTP</string>
+    <string name="cb_reg_otp">REGENERATE OTP</string>
+    <string name="cb_password">PASSWORD</string>
+    <string name="cb_regen_otp">regenerate_otp</string>
+    <string name="cb_bank_page_loading">Please wait. Bank page is loading..</string>
+    <string name="cb_missing_txn_id">Missing Transaction ID</string>
+    <string name="cb_approved_otp">approved OTP</string>
+    <string name="cb_enter_manually_log">enterManually</string>
+    <string name="cb_detecting_bank">detecting bank</string>
+    <string name="cb_detecting_page">detecting page</string>
+    <string name="cb_success">success</string>
+    <string name="cb_failure">failure</string>
+    <string name="cb_cancel">cancel</string>
+    <string name="cb_b_cancel">Cancel</string>
+    <string name="cb_b_retry">Retry</string>
+    <string name="cb_otp_wv">OTP_WV</string>
+    <string name="cb_pin_wv">PIN_WV</string>
+    <string name="cb_incorrect_OTP_2">incorrectOTP</string>
+    <string name="cb_incorrect_pin">incorrectPIN</string>
+    <string name="cb_otp_received">OTP Received</string>
+    <string name="cb_incorrect_password">Incorrect Password</string>
+    <string name="cb_retry">retry...</string>
+
+    <string name="cb_register_option">registerOption</string>
+
+    <!--Net Banking-->
+    <string name="cb_populate_user_id">populate_user_id</string>
+    <string name="cb_btn_action">btn_action</string>
+    <string name="cb_registeration_detail">Enter your registration details</string>
+
+    <string name="cb_analytics_waiting_for_otp">waiting_for_otp</string>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..0c64dee
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,25 @@
+<resources>
+    <style name="cb_approve_otp" parent="android:Widget.Button">
+        <item name="android:padding">0dp</item>
+        <item name="android:textSize">@dimen/cb_fourteenScaled</item>
+        <item name="android:textColor">#FFFFFF</item>
+
+    </style>
+
+    <style name="cb_edit_text" parent="android:Widget.EditText">
+        <item name="android:background">@drawable/cb_edit_text</item>
+
+    </style>
+    <style name="cb_progress_dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowTitleStyle">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
+</resources>
diff --git a/res/values/values.xml b/res/values/values.xml
deleted file mode 100644
index 3ccd015..0000000
--- a/res/values/values.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/values/colors.xml -->
-    <eat-comment/>
-    <color name="cb_background">#f6f6f6</color>
-    <color name="cb_blue_button">#368ecd</color>
-    <color name="cb_border">#d4dee2</color>
-    <color name="cb_dark_blue_button">#094774</color>
-    <color name="cb_dark_grey">#464646</color>
-    <color name="cb_errorRed">#e40000</color>
-    <color name="cb_grey">#e9e7e7</color>
-    <color name="cb_input_gray">#FFDEE6E6</color>
-    <color name="cb_otpColor">#368ecd</color>
-    <color name="cb_otpDisabledColor">#7d88b3</color>
-    <color name="cb_otpDisabledTextColor">#bec4d9</color>
-    <color name="cb_otpReceivedColor">#769b12</color>
-    <color name="cb_payu_blue">#368ecd</color>
-    <color name="cb_textColor">#8f8d8d</color>
-    <!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/values/dimens.xml -->
-    <eat-comment/>
-    <dimen name="cb_activity_horizontal_margin">16dp</dimen>
-    <dimen name="cb_activity_vertical_margin">16dp</dimen>
-    <dimen name="cb_circle_indicator_outer_radius">4dp</dimen>
-    <dimen name="cb_circle_indicator_radius">3dp</dimen>
-    <dimen name="cb_eight">8dp</dimen>
-    <dimen name="cb_eighteen">18dp</dimen>
-    <dimen name="cb_four">4dp</dimen>
-    <dimen name="cb_fourteen">14dp</dimen>
-    <dimen name="cb_fourteenScaled">14sp</dimen>
-    <dimen name="cb_fourtytwo">48dp</dimen>
-    <dimen name="cb_sixteen">16dp</dimen>
-    <dimen name="cb_sixteenScaled">16sp</dimen>
-    <dimen name="cb_thirtysix">36dp</dimen>
-    <dimen name="cb_thirtytwo">32dp</dimen>
-    <dimen name="cb_twelve">12dp</dimen>
-    <dimen name="cb_twelveScaled">12sp</dimen>
-    <dimen name="cb_twentyfour">24dp</dimen>
-    <dimen name="cb_two">2dp</dimen>
-    <!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/values/strings.xml -->
-    <eat-comment/>
-    <string name="cb_analytics_waiting_for_otp">waiting_for_otp</string>
-    <string name="cb_approve_otp">Approve</string>
-    <string name="cb_approved_otp">approved OTP</string>
-    <string name="cb_authenticate_with">Select an option for Faster Payment</string>
-    <string name="cb_b_cancel">Cancel</string>
-    <string name="cb_b_retry">Retry</string>
-    <string name="cb_bank_page_loading">Please wait. Bank page is loading..</string>
-    <string name="cb_btn_action">btn_action</string>
-    <string name="cb_cancel">cancel</string>
-    <string name="cb_card_not_registered_with_pin">Your card has not been registered for PIN yet. Do you want to continue with PIN?</string>
-    <string name="cb_choose">choose</string>
-    <string name="cb_detect_bank">detectBank</string>
-    <string name="cb_detect_otp">detectOtp</string>
-    <string name="cb_detecting_bank">detecting bank</string>
-    <string name="cb_detecting_page">detecting page</string>
-    <string name="cb_enter_manually">Enter Manually</string>
-    <string name="cb_enter_manually_log">enterManually</string>
-    <string name="cb_enter_otp">enterOTP</string>
-    <string name="cb_enter_pin">enterPIN</string>
-    <string name="cb_error">error</string>
-    <string name="cb_failure">failure</string>
-    <string name="cb_find_otp">findOtp</string>
-    <string name="cb_incorrect_OTP_2">incorrectOTP</string>
-    <string name="cb_incorrect_otp">INCORRECT OTP ENTERED</string>
-    <string name="cb_incorrect_password">Incorrect Password</string>
-    <string name="cb_incorrect_pin">incorrectPIN</string>
-    <string name="cb_init">init</string>
-    <string name="cb_missing_txn_id">Missing Transaction ID</string>
-    <string name="cb_otp">otp</string>
-    <string name="cb_otp_received">OTP Received</string>
-    <string name="cb_otp_wv">OTP_WV</string>
-    <string name="cb_password">PASSWORD</string>
-    <string name="cb_password_value">Password</string>
-    <string name="cb_pin">pin</string>
-    <string name="cb_pin_c">PIN</string>
-    <string name="cb_pin_wv">PIN_WV</string>
-    <string name="cb_populate_user_id">populate_user_id</string>
-    <string name="cb_process_otp">process_otp</string>
-    <string name="cb_reg_otp">REGENERATE OTP</string>
-    <string name="cb_regen_otp">regenerate_otp</string>
-    <string name="cb_regenerate">regenerate</string>
-    <string name="cb_regenerate_otp">Regenerate OTP</string>
-    <string name="cb_regenerate_otp_text">It is taking long.You may...</string>
-    <string name="cb_register">register</string>
-    <string name="cb_register_for_pin">REGISTER FOR PIN</string>
-    <string name="cb_register_option">registerOption</string>
-    <string name="cb_registeration_detail">Enter your registration details</string>
-    <string name="cb_result">result</string>
-    <string name="cb_retry">retry...</string>
-    <string name="cb_retry_otp">retryOTP</string>
-    <string name="cb_skip_screen">skipScreen</string>
-    <string name="cb_sms_otp">SMS OTP</string>
-    <string name="cb_success">success</string>
-    <string name="cb_use_sms_otp">USE SMS OTP</string>
-    <string name="cb_waiting_for_otp">Waiting for OTP</string>
-    <!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/gingerbreadfix/android-sdk-test-project/CustomBrowser/res/values/styles.xml -->
-    <eat-comment/>
-    <style name="cb_approve_otp" parent="android:Widget.Button">
-        <item name="android:padding">0dp</item>
-        <item name="android:textSize">@dimen/cb_fourteenScaled</item>
-        <item name="android:textColor">#FFFFFF</item>
-
-    </style>
-    <style name="cb_edit_text" parent="android:Widget.EditText">
-        <item name="android:background">@drawable/cb_edit_text</item>
-
-    </style>
-    <style name="cb_progress_dialog" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowTitleStyle">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        <item name="android:backgroundDimEnabled">true</item>
-
-    </style>
-</resources>
\ No newline at end of file