diff --git a/README.md b/README.md
index b65d0d2..192a601 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Carousel Picker
 
-![alt downloads](https://img.shields.io/jitpack/dm/github/GoodieBag/CarouselPicker.svg)
+[![Download](https://jitpack.io/v/Husseinhj/KotlinCarouselPicker.svg)](https://jitpack.io/#Husseinhj/KotlinCarouselPicker)
+
 
  A Carousel picker library for android which supports both text and icons . :pouting_cat:
  
@@ -12,19 +13,17 @@
 Add this in your root build.gradle file at the end of repositories:
 ```java
 allprojects {
-		repositories {
-			...
-			maven { url 'https://jitpack.io' }
-		}
+	repositories {
+		...
+		maven { url 'https://jitpack.io' }
 	}
+}
 ```
 Add the dependency : 
 ```java
 dependencies {
-	        implementation 'com.github.GoodieBag:CarouselPicker:v1.2'
-		// v1.2 is the latest release with vertical orientation and font styling options. 
-		// For the previous stable release use v1.1
-	}
+	implementation 'com.github.Husseinhj:KotlinCarouselPicker:2.0.2'
+}
 ```
 Sync the gradle and that's it! :+1:
 
@@ -38,7 +37,7 @@ Sync the gradle and that's it! :+1:
 ### XML : 
 
 ```xml
-<in.goodiebag.carouselpicker.CarouselPicker
+<com.goodiebag.carouselpicker.CarouselPicker
         android:id="@+id/carousel"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="20dp"
@@ -75,6 +74,9 @@ textItems.add(new CarouselPicker.TextItem("hi", 20));
 CarouselPicker.CarouselViewAdapter textAdapter = new CarouselPicker.CarouselViewAdapter(this, textItems, 0);
 carouselPicker.setAdapter(textAdapter);
 
+textAdapter.selectedItemTextColor = Color.GREEN
+textAdapter.selectedIndex = 1
+
 //Case 3 : To populate the picker with both images and text
 List<CarouselPicker.PickerItem> mixItems = new ArrayList<>();
 mixItems.add(new CarouselPicker.DrawableItem(R.drawable.i1));
@@ -89,23 +91,18 @@ carouselPicker.setAdapter(mixAdapter);
 - Text color for text items can be set using ```adapter.setTextColor(colorInt)```
 
 ## Listeners :
-```java
-carouselPicker.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                //position of the selected item
-            }
+```kotlin
+carouselPicker.addOnPageChangeListener(object: ViewPager.OnPageChangeListener {
+	override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+	}
 
-            @Override
-            public void onPageScrollStateChanged(int state) {
+	override fun onPageSelected(position: Int) {
+		//position of the selected item
+	}
 
-            }
-        });
+	override fun onPageScrollStateChanged(state: Int) {
+	}
+})
 ```
 
 ## LICENSE : 
diff --git a/app/build.gradle b/app/build.gradle
index e177f06..59c8cbd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,13 @@
 apply plugin: 'com.android.application'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    compileSdkVersion 29
+    compileSdk 34
+    namespace "in.goodiebag.example"
     defaultConfig {
         applicationId "in.goodiebag.example"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdk 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -17,15 +19,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = 1.7
-        targetCompatibility = 1.7
+        sourceCompatibility = 11
+        targetCompatibility = 11
+    }
+    kotlinOptions {
+        jvmTarget = '11'
     }
-    buildToolsVersion = '29.0.2'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':carouselpicker')
 }
diff --git a/app/src/androidTest/java/in/goodiebag/example/ExampleInstrumentedTest.java b/app/src/androidTest/java/in/goodiebag/example/ExampleInstrumentedTest.java
deleted file mode 100644
index 555e667..0000000
--- a/app/src/androidTest/java/in/goodiebag/example/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package in.goodiebag.example;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("in.goodiebag.example.carouselview", appContext.getPackageName());
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 479e57c..db1f91c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="in.goodiebag.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
@@ -8,7 +7,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="in.goodiebag.example.MainActivity">
+        <activity android:name="in.goodiebag.example.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/in/goodiebag/example/MainActivity.java b/app/src/main/java/in/goodiebag/example/MainActivity.java
deleted file mode 100644
index 8cbf09d..0000000
--- a/app/src/main/java/in/goodiebag/example/MainActivity.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package in.goodiebag.example;
-
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.viewpager.widget.ViewPager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import in.goodiebag.carouselpicker.CarouselPicker;
-
-public class MainActivity extends AppCompatActivity {
-    CarouselPicker imageCarousel, textCarousel, mixCarousel;
-    TextView tvSelected;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        imageCarousel = findViewById(R.id.imageCarousel);
-        textCarousel = findViewById(R.id.textCarousel);
-        mixCarousel = findViewById(R.id.mixCarousel);
-        tvSelected = findViewById(R.id.tvSelectedItem);
-
-        List<CarouselPicker.PickerItem> imageItems = new ArrayList<>();
-        imageItems.add(new CarouselPicker.DrawableItem(R.drawable.i1));
-        imageItems.add(new CarouselPicker.DrawableItem(R.drawable.i2, getResources().getColor(android.R.color.holo_red_light)));
-        imageItems.add(new CarouselPicker.DrawableItem(R.drawable.i3));
-        imageItems.add(new CarouselPicker.DrawableItem(R.drawable.i4));
-        CarouselPicker.CarouselViewAdapter imageAdapter = new CarouselPicker.CarouselViewAdapter(this, imageItems, 0);
-        imageCarousel.setAdapter(imageAdapter);
-
-        List<CarouselPicker.PickerItem> textItems = new ArrayList<>();
-        textItems.add(new CarouselPicker.TextItem("hi", 20,
-                getResources().getColor(android.R.color.holo_blue_bright), Typeface.MONOSPACE,
-                CarouselPicker.TextItem.FontStyle.BOLD_ITALIC));
-        textItems.add(new CarouselPicker.TextItem("hi, welcome to the carousel picker", 20,
-                getResources().getColor(android.R.color.holo_red_light),
-                Typeface.SANS_SERIF, CarouselPicker.TextItem.FontStyle.NORMAL));
-        textItems.add(new CarouselPicker.TextItem("hi", 20,
-                Typeface.SERIF, CarouselPicker.TextItem.FontStyle.ITALIC));
-        textItems.add(new CarouselPicker.TextItem("hi", 20));
-        CarouselPicker.CarouselViewAdapter textAdapter = new CarouselPicker.CarouselViewAdapter(this, textItems, 0);
-        textCarousel.setAdapter(textAdapter);
-        // set default color
-        textAdapter.setTextColor(getResources().getColor(android.R.color.holo_green_light));
-
-        List<CarouselPicker.PickerItem> mixItems = new ArrayList<>();
-        mixItems.add(new CarouselPicker.DrawableItem(R.drawable.i1));
-        mixItems.add(new CarouselPicker.TextItem("hi", 20));
-        mixItems.add(new CarouselPicker.DrawableItem(R.drawable.i2));
-        mixItems.add(new CarouselPicker.TextItem("hi", 20));
-
-        CarouselPicker.CarouselViewAdapter mixAdapter = new CarouselPicker.CarouselViewAdapter(this, mixItems, 0);
-        mixAdapter.setTextColor(getResources().getColor(R.color.colorPrimary));
-        mixCarousel.setAdapter(mixAdapter);
-
-        imageCarousel.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                tvSelected.setText("Selected item in image carousel is  : "+position);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-        textCarousel.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                tvSelected.setText("Selected item in text carousel is  : "+position);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-        mixCarousel.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                tvSelected.setText("Selected item in mix carousel is  : "+position);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/in/goodiebag/example/MainActivity.kt b/app/src/main/java/in/goodiebag/example/MainActivity.kt
new file mode 100644
index 0000000..5b795dd
--- /dev/null
+++ b/app/src/main/java/in/goodiebag/example/MainActivity.kt
@@ -0,0 +1,131 @@
+package `in`.goodiebag.example
+
+import android.graphics.Color
+import android.os.Bundle
+import android.widget.TextView
+import android.graphics.Typeface
+import android.os.Build
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import com.goodiebag.carouselpicker.CarouselPicker
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener
+
+class MainActivity : AppCompatActivity() {
+
+    private lateinit var tvSelected: TextView
+    private lateinit var mixCarousel: CarouselPicker
+    private lateinit var imageCarousel: CarouselPicker
+    private lateinit var textCarousel: CarouselPicker
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        imageCarousel = findViewById(R.id.imageCarousel)
+        textCarousel = findViewById(R.id.textCarousel)
+        mixCarousel = findViewById(R.id.mixCarousel)
+        tvSelected = findViewById(R.id.tvSelectedItem)
+
+        val imageItems: MutableList<CarouselPicker.PickerItem> = ArrayList()
+        imageItems.add(CarouselPicker.DrawableItem(R.drawable.i1))
+        imageItems.add(
+            CarouselPicker.DrawableItem(
+                R.drawable.i2,
+                getResources().getColor(android.R.color.holo_red_light)
+            )
+        )
+
+        imageItems.add(CarouselPicker.DrawableItem(R.drawable.i3))
+        imageItems.add(CarouselPicker.DrawableItem(R.drawable.i4))
+
+        val imageAdapter = CarouselPicker.CarouselViewAdapter(imageItems, 0)
+        imageCarousel.setAdapter(imageAdapter)
+        val textItems: MutableList<CarouselPicker.PickerItem> = ArrayList()
+        textItems.add(
+            CarouselPicker.TextItem(
+                "hi", 20,
+                getResources().getColor(android.R.color.holo_blue_bright), Typeface.MONOSPACE,
+                CarouselPicker.TextItem.FontStyle.BOLD_ITALIC
+            )
+        )
+        textItems.add(
+            CarouselPicker.TextItem(
+                "hi, welcome to the carousel picker", 20,
+                getResources().getColor(android.R.color.holo_red_light),
+                Typeface.SANS_SERIF, CarouselPicker.TextItem.FontStyle.NORMAL
+            )
+        )
+        textItems.add(
+            CarouselPicker.TextItem(
+                "hi", 20,
+                Typeface.SERIF, CarouselPicker.TextItem.FontStyle.ITALIC
+            )
+        )
+        textItems.add(CarouselPicker.TextItem("hi", 20))
+        val textAdapter = CarouselPicker.CarouselViewAdapter(textItems, 0)
+        textCarousel.setAdapter(textAdapter)
+        // set default color
+        textAdapter.textColor = getResources().getColor(android.R.color.holo_green_light)
+        textAdapter.selectedItemTextColor = Color.GREEN
+        textAdapter.selectedIndex = 1
+
+        val mixItems: MutableList<CarouselPicker.PickerItem> = ArrayList()
+        mixItems.add(CarouselPicker.DrawableItem(R.drawable.i1))
+        mixItems.add(CarouselPicker.TextItem("hi", 20))
+        mixItems.add(CarouselPicker.DrawableItem(R.drawable.i2))
+        mixItems.add(CarouselPicker.TextItem("hi", 20))
+        val mixAdapter = CarouselPicker.CarouselViewAdapter(mixItems, 0)
+        mixAdapter.textColor = getResources().getColor(R.color.colorPrimary)
+        mixAdapter.selectedItemTextColor = getResources().getColor(R.color.colorAccent)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            mixAdapter.selectedItemTintColor = getResources().getColor(R.color.colorAccent)
+        }
+        mixCarousel.setAdapter(mixAdapter)
+        imageCarousel.addOnPageChangeListener(object : OnPageChangeListener {
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int,
+            ) {
+            }
+
+            override fun onPageSelected(position: Int) {
+                tvSelected.setText("Selected item in image carousel is  : $position")
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {}
+        })
+        textCarousel.addOnPageChangeListener(object : OnPageChangeListener {
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int,
+            ) {
+            }
+
+            override fun onPageSelected(position: Int) {
+                tvSelected.setText("Selected item in text carousel is  : $position")
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {}
+        })
+        mixCarousel.addOnPageChangeListener(object : OnPageChangeListener {
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int,
+            ) {
+            }
+
+            override fun onPageSelected(position: Int) {
+                tvSelected.setText("Selected item in mix carousel is  : $position")
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {}
+        })
+
+        findViewById<Button>(R.id.btJump).setOnClickListener {
+            mixAdapter.selectedIndex = 2
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ce0635c..c823b57 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
     android:gravity="center"
     tools:context="in.goodiebag.example.MainActivity">
 
-    <in.goodiebag.carouselpicker.CarouselPicker
+    <com.goodiebag.carouselpicker.CarouselPicker
         android:id="@+id/imageCarousel"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="20dp"
@@ -19,7 +19,7 @@
         app:items_visible="three"
         app:unselected_item_opacity="0.5"/>
 
-    <in.goodiebag.carouselpicker.CarouselPicker
+    <com.goodiebag.carouselpicker.CarouselPicker
         android:id="@+id/textCarousel"
         android:layout_below="@id/imageCarousel"
         android:layout_marginBottom="20dp"
@@ -31,13 +31,14 @@
         app:unselected_item_opacity="0.5"
         app:text_max_lines="1"/>
 
-    <in.goodiebag.carouselpicker.CarouselPicker
+    <com.goodiebag.carouselpicker.CarouselPicker
         android:id="@+id/mixCarousel"
         android:layout_below="@id/textCarousel"
         android:layout_marginBottom="20dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#CCC"
+        app:selected_item_text_color="@android:color/holo_orange_light"
         app:items_visible="three" />
 
     <TextView
@@ -45,4 +46,14 @@
         android:layout_below="@id/mixCarousel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/btJump"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tvSelectedItem"
+
+        android:layout_centerHorizontal="true"
+        android:text="Jump to item number 2"
+        />
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
index 07aecfa..91d248f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        agp_version = '7.4.2'
+        kotlin_version = '1.9.20'
+    }
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath "com.android.tools.build:gradle:$agp_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/carouselpicker/build.gradle b/carouselpicker/build.gradle
index e91ada5..33890f8 100644
--- a/carouselpicker/build.gradle
+++ b/carouselpicker/build.gradle
@@ -1,13 +1,15 @@
 apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    compileSdkVersion 29
+    compileSdk 34
+    namespace "com.goodiebag.carouselpicker"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdk 34
         versionCode 1
-        versionName "1.2"
+        versionName "2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -18,10 +20,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+    compileOptions {
+        sourceCompatibility 11
+        targetCompatibility 11
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/carouselpicker/src/androidTest/java/in/goodiebag/carouselpicker/ExampleInstrumentedTest.java b/carouselpicker/src/androidTest/java/in/goodiebag/carouselpicker/ExampleInstrumentedTest.java
deleted file mode 100644
index a8b945d..0000000
--- a/carouselpicker/src/androidTest/java/in/goodiebag/carouselpicker/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package in.goodiebag.carouselpicker;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("in.goodiebag.carouselview.test", appContext.getPackageName());
-    }
-}
diff --git a/carouselpicker/src/main/AndroidManifest.xml b/carouselpicker/src/main/AndroidManifest.xml
index a8c1d5c..9912c54 100644
--- a/carouselpicker/src/main/AndroidManifest.xml
+++ b/carouselpicker/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="in.goodiebag.carouselpicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:allowBackup="true" android:label="@string/app_name"
         android:supportsRtl="true">
diff --git a/carouselpicker/src/main/java/com/goodiebag/carouselpicker/CarouselPicker.kt b/carouselpicker/src/main/java/com/goodiebag/carouselpicker/CarouselPicker.kt
new file mode 100644
index 0000000..7edd270
--- /dev/null
+++ b/carouselpicker/src/main/java/com/goodiebag/carouselpicker/CarouselPicker.kt
@@ -0,0 +1,470 @@
+package com.goodiebag.carouselpicker
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.Typeface
+import android.os.Build
+import android.text.TextUtils
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.annotation.RequiresApi
+import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * Created by pavan on 25/04/17.
+ */
+class CarouselPicker @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    ViewPager(context, attrs) {
+    enum class Mode {
+        HORIZONTAL,
+        VERTICAL
+    }
+
+    private var itemsVisible = 3
+    private var divisor = 0f
+    private var opacity = 0f
+    private var textMaxLines = 0
+    private var mode = Mode.HORIZONTAL
+    private var tintColor: Int? = null
+    private var selectedItemTextColor: Int? = null
+    private var selectedItemTintColor: Int? = null
+
+    init {
+        initAttributes(context, attrs)
+        init()
+
+        addOnPageChangeListener(object : OnPageChangeListener {
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int
+            ) {
+            }
+
+            override fun onPageSelected(position: Int) {
+                (adapter as CarouselViewAdapter?)!!.applyOpacity(position)
+            }
+
+            override fun onPageScrollStateChanged(state: Int) {}
+        })
+    }
+
+    private fun initAttributes(context: Context, attrs: AttributeSet?) {
+        if (attrs != null) {
+            val array = context.obtainStyledAttributes(attrs, R.styleable.CarouselPicker)
+            itemsVisible = array.getInteger(R.styleable.CarouselPicker_items_visible, itemsVisible)
+            divisor = 1 + 1f / (itemsVisible - 1)
+            mode = Mode.entries[array.getInteger(R.styleable.CarouselPicker_orientation, 0)]
+            opacity = array.getFloat(R.styleable.CarouselPicker_unselected_item_opacity, 1f)
+            textMaxLines = array.getInt(R.styleable.CarouselPicker_text_max_lines, 0)
+
+            if (array.hasValue(R.styleable.CarouselPicker_selected_item_text_color)) {
+                selectedItemTextColor =
+                    array.getColor(R.styleable.CarouselPicker_selected_item_text_color, Color.BLACK)
+            }
+            if (array.hasValue(R.styleable.CarouselPicker_selected_item_tint_color)) {
+                selectedItemTintColor =
+                    array.getColor(R.styleable.CarouselPicker_selected_item_tint_color, Color.BLACK)
+            }
+            if (array.hasValue(R.styleable.CarouselPicker_tint_color)) {
+                tintColor =
+                    array.getColor(R.styleable.CarouselPicker_tint_color, Color.BLACK)
+            }
+
+            array.recycle()
+        }
+        if (mode == Mode.VERTICAL) {
+            setOverScrollMode(OVER_SCROLL_NEVER)
+        }
+    }
+
+    private fun init() {
+        this.setPageTransformer(false, CustomPageTransformer(mode))
+        setClipChildren(false)
+        setFadingEdgeLength(0)
+    }
+
+    override fun setCurrentItem(position: Int) {
+        super.setCurrentItem(position)
+        (adapter as CarouselViewAdapter?)!!.applyOpacity(position)
+    }
+
+    override fun setCurrentItem(position: Int, smoothScroll: Boolean) {
+        super.setCurrentItem(position, smoothScroll)
+        (adapter as CarouselViewAdapter?)!!.applyOpacity(position)
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        var mHeightMeasureSpec = heightMeasureSpec
+        if (mode == Mode.HORIZONTAL || MeasureSpec.getMode(mHeightMeasureSpec) == MeasureSpec.AT_MOST) {
+            // Wrap the height
+            var height = 0
+            for (i in 0 until childCount) {
+                val child = getChildAt(i)
+                child.measure(
+                    widthMeasureSpec,
+                    MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+                )
+                val h = child.measuredHeight
+                if (h > height) height = h
+            }
+            mHeightMeasureSpec = if (mode == Mode.HORIZONTAL) {
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+            } else {
+                MeasureSpec.makeMeasureSpec(height * itemsVisible, MeasureSpec.EXACTLY)
+            }
+        }
+        super.onMeasure(widthMeasureSpec, mHeightMeasureSpec)
+        val w = measuredWidth
+        pageMargin = (-w / divisor).toInt()
+    }
+
+    override fun setAdapter(adapter: PagerAdapter?) {
+        super.setAdapter(adapter)
+        this.offscreenPageLimit = adapter!!.count
+        val carouselAdapter = adapter as CarouselViewAdapter?
+        carouselAdapter!!.setOpacity(opacity)
+        carouselAdapter.setTextMaxLines(textMaxLines)
+        if (selectedItemTextColor != null) {
+            carouselAdapter.selectedItemTextColor = selectedItemTextColor
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (tintColor != null) carouselAdapter.tintColor = tintColor
+            if (selectedItemTintColor != null) carouselAdapter.selectedItemTintColor = selectedItemTintColor
+        }
+
+        carouselAdapter.setOnPageClickedListener(object :
+            CarouselViewAdapter.OnPageClickedListener {
+            override fun onPageClicked(position: Int) {
+                setCurrentItem(position)
+            }
+        })
+    }
+
+    class CarouselViewAdapter(
+        private val items: List<PickerItem>,
+        private var drawable: Int = R.layout.page
+    ) : PagerAdapter() {
+
+        @JvmField
+        var textColor = NOT_SPECIFIED
+        private var lastSelected = 0
+        private var opacity = 1f
+        private var onPageClickedListener: OnPageClickedListener? = null
+        private var textMaxLines = 0
+
+        var selectedIndex: Int = 0
+            set(value) {
+                field = value
+                onPageClickedListener!!.onPageClicked(field)
+            }
+            get() {
+                return lastSelected
+            }
+
+        @ColorInt
+        var selectedItemTextColor: Int? = null
+
+        @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+        @ColorInt
+        var selectedItemTintColor: Int? = null
+
+        @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+        @ColorInt
+        var tintColor: Int? = null
+
+        init {
+            if (drawable == 0) {
+                drawable = R.layout.page
+            }
+        }
+        override fun getCount(): Int {
+            return items.size
+        }
+
+        override fun instantiateItem(container: ViewGroup, position: Int): Any {
+            val view = LayoutInflater.from(container.context).inflate(drawable, null)
+            val iv = view.findViewById<ImageView>(R.id.iv)
+            val tv = view.findViewById<TextView>(R.id.tv)
+            val pickerItem = items[position]
+            pickerItem.view = view
+            if (position != lastSelected) {
+                view.setAlpha(opacity)
+            }
+            if (pickerItem.hasDrawable()) {
+                iv.setVisibility(VISIBLE)
+                tv.visibility = GONE
+                iv.setImageResource(pickerItem.drawable)
+                if (pickerItem.color != NOT_SPECIFIED) {
+                    iv.setColorFilter(pickerItem.color)
+                }
+                iv.setOnClickListener {
+                    if (onPageClickedListener != null) {
+                        onPageClickedListener!!.onPageClicked(position)
+                    }
+                }
+            } else if (pickerItem.text != null) {
+                iv.setVisibility(GONE)
+                tv.visibility = VISIBLE
+                val textItem = pickerItem as TextItem
+                tv.text = textItem.text
+                if (textMaxLines > 0) {
+                    tv.setMaxLines(textMaxLines)
+                    tv.ellipsize = TextUtils.TruncateAt.END
+                }
+                var color = textColor
+                if (textItem.color != NOT_SPECIFIED) {
+                    color = textItem.color
+                }
+                if (color != NOT_SPECIFIED) {
+                    tv.setTextColor(color)
+                }
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    if (tintColor != null) {
+                        iv.drawable.setTint(tintColor!!)
+                    }
+                }
+
+                if (textItem.textSize != 0) {
+                    tv.textSize = textItem.textSize.toFloat()
+                }
+                if (textItem.font != null && textItem.fontStyle != null) {
+                    tv.setTypeface(textItem.font, textItem.fontStyle!!.ordinal)
+                }
+                tv.setOnClickListener {
+                    if (onPageClickedListener != null) {
+                        onPageClickedListener!!.onPageClicked(position)
+                    }
+                }
+            }
+            view.tag = position
+            container.addView(view)
+
+            if (selectedIndex == position) {
+                onPageClickedListener!!.onPageClicked(position)
+            }
+
+            return view
+        }
+
+        override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+            container.removeView(`object` as View)
+        }
+
+        override fun isViewFromObject(view: View, `object`: Any): Boolean {
+            return view === `object`
+        }
+
+        fun setOpacity(opacity: Float) {
+            var modifiedOpacity = opacity
+            modifiedOpacity = max(modifiedOpacity.toDouble(), 0.0).toFloat()
+            modifiedOpacity = min(modifiedOpacity.toDouble(), 1.0).toFloat()
+
+            this.opacity = modifiedOpacity
+        }
+
+        fun applyOpacity(position: Int) {
+            if (lastSelected < items.size) {
+                val previous = items[lastSelected]
+                val view = previous.view
+
+                if (view != null) {
+                    view.setAlpha(opacity)
+
+                    if (selectedItemTextColor != null) {
+                        val tv = view.findViewById<TextView>(R.id.tv)
+                        if (previous.color != NOT_SPECIFIED) {
+                            tv?.setTextColor(previous.color)
+                        } else {
+                            tv?.setTextColor(textColor)
+                        }
+                    }
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        val iv = view.findViewById<ImageView>(R.id.iv)
+                        if (tintColor != null) {
+                            iv?.imageTintList = ColorStateList.valueOf(tintColor!!)
+                        } else {
+                            iv?.imageTintList = null
+                        }
+                    }
+                }
+            }
+            val current = items[position]
+            val view = current.view
+
+            if (view != null) {
+                view.setAlpha(1f)
+
+                if (selectedItemTextColor != null) {
+                    val tv = view.findViewById<TextView>(R.id.tv)
+                    tv?.setTextColor(selectedItemTextColor!!)
+                }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    if (selectedItemTintColor != null) {
+                        val iv = view.findViewById<ImageView>(R.id.iv)
+                        iv?.drawable?.setTint(selectedItemTintColor!!)
+                    }
+                }
+            }
+            lastSelected = position
+        }
+
+        fun setOnPageClickedListener(listener: OnPageClickedListener?) {
+            onPageClickedListener = listener
+        }
+
+        fun setTextMaxLines(textMaxLines: Int) {
+            this.textMaxLines = textMaxLines
+        }
+
+        interface OnPageClickedListener {
+            fun onPageClicked(position: Int)
+        }
+    }
+
+    /**
+     * An interface which should be implemented by all the Item classes.
+     * The picker only accepts items in the form of PickerItem.
+     */
+    interface PickerItem {
+        fun hasDrawable(): Boolean
+        val text: String?
+
+        val selected: Boolean
+
+        @get:DrawableRes
+        val drawable: Int
+
+        @get:ColorInt
+        val color: Int
+        var view: View?
+    }
+
+    /**
+     * A PickerItem which supports text.
+     */
+    class TextItem(override val text: String, val textSize: Int) : PickerItem {
+        @Suppress("unused")
+        enum class FontStyle {
+            NORMAL,
+            BOLD,
+            ITALIC,
+            BOLD_ITALIC
+        }
+
+        override var color = NOT_SPECIFIED
+            private set
+        var font: Typeface? = null
+            private set
+        var fontStyle: FontStyle? = null
+            private set
+        override var view: View? = null
+
+        constructor(text: String, textSize: Int, @ColorInt color: Int) : this(text, textSize) {
+            this.color = color
+        }
+
+        constructor(text: String, textSize: Int, font: Typeface?, style: FontStyle?) : this(
+            text,
+            textSize
+        ) {
+            this.font = font
+            fontStyle = style
+        }
+
+        constructor(
+            text: String,
+            textSize: Int,
+            @ColorInt color: Int,
+            font: Typeface?,
+            style: FontStyle?
+        ) : this(text, textSize, color) {
+            this.font = font
+            fontStyle = style
+        }
+
+        override fun hasDrawable(): Boolean {
+            return false
+        }
+
+        override val drawable: Int
+            get() = 0
+
+        override val selected: Boolean
+            get() = false
+    }
+
+    /**
+     * A PickerItem which supports drawables.
+     */
+    class DrawableItem(
+        @field:DrawableRes @get:DrawableRes
+        @param:DrawableRes override val drawable: Int,
+    ) : PickerItem {
+        override var color = NOT_SPECIFIED
+            private set
+        override var view: View? = null
+
+        constructor(@DrawableRes drawable: Int, @ColorInt color: Int) : this(drawable) {
+            this.color = color
+        }
+
+        override val text: String?
+            get() = null
+
+        override val selected: Boolean
+            get() = false
+
+        override fun hasDrawable(): Boolean {
+            return true
+        }
+    }
+
+    private fun swapXY(ev: MotionEvent): MotionEvent {
+        val width = width.toFloat()
+        val height = height.toFloat()
+        val newX = ev.y / height * width
+        val newY = ev.x / width * height
+        ev.setLocation(newX, newY)
+        return ev
+    }
+
+    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+        val intercepted: Boolean
+        if (mode == Mode.VERTICAL) {
+            intercepted = super.onInterceptTouchEvent(swapXY(ev))
+            swapXY(ev) // return touch coordinates to original reference frame for any child views
+        } else {
+            intercepted = super.onInterceptTouchEvent(ev)
+        }
+        return intercepted
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouchEvent(ev: MotionEvent): Boolean {
+        val handled = if (mode == Mode.VERTICAL) {
+            super.onTouchEvent(swapXY(ev))
+        } else {
+            super.onTouchEvent(ev)
+        }
+        return handled
+    }
+
+    companion object {
+        var NOT_SPECIFIED = 0
+    }
+}
diff --git a/carouselpicker/src/main/java/com/goodiebag/carouselpicker/CustomPageTransformer.kt b/carouselpicker/src/main/java/com/goodiebag/carouselpicker/CustomPageTransformer.kt
new file mode 100644
index 0000000..7646854
--- /dev/null
+++ b/carouselpicker/src/main/java/com/goodiebag/carouselpicker/CustomPageTransformer.kt
@@ -0,0 +1,29 @@
+package com.goodiebag.carouselpicker
+
+import kotlin.math.abs
+import android.view.View
+import androidx.viewpager.widget.ViewPager
+import androidx.viewpager.widget.ViewPager.PageTransformer
+
+/**
+ * Created by pavan on 25/04/17.
+ */
+class CustomPageTransformer(private val mode: CarouselPicker.Mode) :
+    PageTransformer {
+    private var viewPager: ViewPager? = null
+    override fun transformPage(view: View, position: Float) {
+        if (viewPager == null) {
+            viewPager = view.parent as ViewPager
+        }
+        view.scaleY = (1 - abs(position.toDouble())).toFloat()
+        view.scaleX = (1 - abs(position.toDouble())).toFloat()
+        if (mode === CarouselPicker.Mode.VERTICAL) {
+            // Counteract the default slide transition
+            view.translationX = view.width * -position
+
+            //set Y position to swipe in from top
+            val yPosition = position * view.height
+            view.translationY = yPosition
+        }
+    }
+}
diff --git a/carouselpicker/src/main/java/in/goodiebag/carouselpicker/CarouselPicker.java b/carouselpicker/src/main/java/in/goodiebag/carouselpicker/CarouselPicker.java
deleted file mode 100644
index 80d7a74..0000000
--- a/carouselpicker/src/main/java/in/goodiebag/carouselpicker/CarouselPicker.java
+++ /dev/null
@@ -1,465 +0,0 @@
-package in.goodiebag.carouselpicker;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Typeface;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-
-import java.util.List;
-
-/**
- * Created by pavan on 25/04/17.
- */
-
-public class CarouselPicker extends ViewPager {
-    public static int NOT_SPECIFIED;
-
-    public enum Mode {
-        HORIZONTAL,
-        VERTICAL
-    }
-
-    private int itemsVisible = 3;
-    private float divisor;
-    private float opacity;
-    private int textMaxLines;
-    private Mode mode = Mode.HORIZONTAL;
-
-    public CarouselPicker(Context context) {
-        this(context, null);
-    }
-
-    public CarouselPicker(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initAttributes(context, attrs);
-        init();
-
-        addOnPageChangeListener(new OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
-
-            @Override
-            public void onPageSelected(int position) {
-                ((CarouselViewAdapter)getAdapter()).applyOpacity(position);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {}
-        });
-    }
-
-    private void initAttributes(Context context, AttributeSet attrs) {
-        if (attrs != null) {
-            final TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.CarouselPicker);
-            itemsVisible = array.getInteger(R.styleable.CarouselPicker_items_visible, itemsVisible);
-            divisor = 1 + ((float) 1 / (itemsVisible - 1));
-            mode = Mode.values()[array.getInteger(R.styleable.CarouselPicker_orientation, 0)];
-            opacity = array.getFloat(R.styleable.CarouselPicker_unselected_item_opacity, 1);
-            textMaxLines = array.getInt(R.styleable.CarouselPicker_text_max_lines, 0);
-            array.recycle();
-        }
-
-        if (mode == Mode.VERTICAL) {
-            setOverScrollMode(OVER_SCROLL_NEVER);
-        }
-    }
-
-    private void init() {
-        this.setPageTransformer(false, new CustomPageTransformer(getContext(), mode));
-        this.setClipChildren(false);
-        this.setFadingEdgeLength(0);
-    }
-
-    @Override
-    public void setCurrentItem(int position) {
-        super.setCurrentItem(position);
-        ((CarouselViewAdapter)getAdapter()).applyOpacity(position);
-    }
-
-    @Override
-    public void setCurrentItem(int position, boolean smoothScroll) {
-        super.setCurrentItem(position, smoothScroll);
-        ((CarouselViewAdapter)getAdapter()).applyOpacity(position);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if (mode == Mode.HORIZONTAL || MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
-            // Wrap the height
-            int height = 0;
-            for (int i = 0; i < getChildCount(); i++) {
-                View child = getChildAt(i);
-                child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-                int h = child.getMeasuredHeight();
-                if (h > height) height = h;
-            }
-
-            if (mode == Mode.HORIZONTAL) {
-                heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
-            } else {
-                heightMeasureSpec = MeasureSpec.makeMeasureSpec(height * itemsVisible, MeasureSpec.EXACTLY);
-            }
-        }
-
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        int w = getMeasuredWidth();
-        setPageMargin((int) (-w / divisor));
-    }
-
-    @Override
-    public void setAdapter(PagerAdapter adapter) {
-        super.setAdapter(adapter);
-        this.setOffscreenPageLimit(adapter.getCount());
-
-        CarouselViewAdapter carouselAdapter = ((CarouselViewAdapter)adapter);
-        carouselAdapter.setOpactiy(opacity);
-        carouselAdapter.setTextMaxLines(textMaxLines);
-        carouselAdapter.setOnPageClickedListener(new CarouselViewAdapter.OnPageClickedListener() {
-            @Override
-            public void onPageClicked(int position) {
-                setCurrentItem(position);
-            }
-        });
-    }
-
-    public static class CarouselViewAdapter extends PagerAdapter {
-        private List<PickerItem> items;
-        private Context context;
-        private int drawable;
-        private int textColor = NOT_SPECIFIED;
-        private int lastSelected = 0;
-        private float opacity = 1;
-        private OnPageClickedListener onPageClickedListener;
-        private int textMaxLines;
-
-        public CarouselViewAdapter(Context context, List<PickerItem> items, int drawable) {
-            this.context = context;
-            this.drawable = drawable;
-            this.items = items;
-            if (this.drawable == 0) {
-                this.drawable = R.layout.page;
-            }
-        }
-
-        @Override
-        public int getCount() {
-            return items.size();
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup container, final int position) {
-            View view = LayoutInflater.from(context).inflate(this.drawable, null);
-            ImageView iv = view.findViewById(R.id.iv);
-            TextView tv = view.findViewById(R.id.tv);
-
-            PickerItem pickerItem = items.get(position);
-
-            pickerItem.setView(view);
-            if (position != lastSelected) {
-                view.setAlpha(opacity);
-            }
-
-            if (pickerItem.hasDrawable()) {
-                iv.setVisibility(VISIBLE);
-                tv.setVisibility(GONE);
-
-                iv.setImageResource(pickerItem.getDrawable());
-
-                if (pickerItem.getColor() != NOT_SPECIFIED) {
-                    iv.setColorFilter(pickerItem.getColor());
-                }
-
-                iv.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (onPageClickedListener != null) {
-                            onPageClickedListener.onPageClicked(position);
-                        }
-                    }
-                });
-            } else if (pickerItem.getText() != null) {
-                iv.setVisibility(GONE);
-                tv.setVisibility(VISIBLE);
-
-                TextItem textItem = (TextItem) pickerItem;
-                tv.setText(textItem.getText());
-
-                if (textMaxLines > 0) {
-                    tv.setMaxLines(textMaxLines);
-                    tv.setEllipsize(TextUtils.TruncateAt.END);
-                }
-
-                int color = textColor;
-
-                if (textItem.getColor() != NOT_SPECIFIED) {
-                    color = textItem.getColor();
-                }
-
-                if (color != NOT_SPECIFIED) {
-                    tv.setTextColor(color);
-                }
-
-                if (textItem.getTextSize() != 0) {
-                    tv.setTextSize(dpToPx(textItem.getTextSize()));
-                }
-
-                if (textItem.getFont() != null && textItem.getFontStyle() != null) {
-                    tv.setTypeface(textItem.getFont(), textItem.getFontStyle().ordinal());
-                }
-
-                tv.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (onPageClickedListener != null) {
-                            onPageClickedListener.onPageClicked(position);
-                        }
-                    }
-                });
-            }
-
-            view.setTag(position);
-            container.addView(view);
-            return view;
-        }
-
-        public int getTextColor() {
-            return textColor;
-        }
-
-        public void setTextColor(@ColorInt int textColor) {
-            this.textColor = textColor;
-        }
-
-        @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
-            container.removeView((View) object);
-        }
-
-        @Override
-        public boolean isViewFromObject(View view, Object object) {
-            return (view == object);
-        }
-
-        private void setOpactiy(float opactiy) {
-            opactiy = Math.max(opactiy, 0);
-            opactiy = Math.min(opactiy, 1);
-            this.opacity = opactiy;
-        }
-
-        private void applyOpacity(int position) {
-            if (lastSelected < items.size()) {
-                PickerItem previous = items.get(lastSelected);
-
-                if (previous.getView() != null) {
-                    previous.getView().setAlpha(opacity);
-                }
-            }
-
-            PickerItem current = items.get(position);
-
-            if (current.getView() != null) {
-                current.getView().setAlpha(1);
-            }
-
-            lastSelected = position;
-        }
-
-        public void setOnPageClickedListener(OnPageClickedListener listener) {
-            this.onPageClickedListener = listener;
-        }
-
-        private int dpToPx(int dp) {
-            DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-            return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, metrics));
-        }
-
-        public void setTextMaxLines(int textMaxLines) {
-            this.textMaxLines = textMaxLines;
-        }
-
-        interface OnPageClickedListener {
-            void onPageClicked(int position);
-        }
-    }
-
-    /**
-     * An interface which should be implemented by all the Item classes.
-     * The picker only accepts items in the form of PickerItem.
-     */
-    public interface PickerItem {
-        boolean hasDrawable();
-
-        String getText();
-
-        @DrawableRes
-        int getDrawable();
-
-        @ColorInt
-        int getColor();
-
-        void setView(View view);
-
-        View getView();
-    }
-
-    /**
-     * A PickerItem which supports text.
-     */
-    public static class TextItem implements PickerItem {
-        public enum FontStyle {
-            NORMAL,
-            BOLD,
-            ITALIC,
-            BOLD_ITALIC
-        }
-
-        private String text;
-        private int textSize;
-        private int color = NOT_SPECIFIED;
-        private Typeface font;
-        private FontStyle fontStyle;
-        private View view;
-
-        public TextItem(String text, int textSize) {
-            this.text = text;
-            this.textSize = textSize;
-        }
-
-        public TextItem(String text, int textSize, @ColorInt int color) {
-            this(text, textSize);
-            this.color = color;
-        }
-
-        public TextItem(String text, int textSize, Typeface font, FontStyle style) {
-            this(text, textSize);
-            this.font = font;
-            this.fontStyle = style;
-        }
-
-        public TextItem(String text, int textSize, @ColorInt int color, Typeface font, FontStyle style) {
-            this(text, textSize, color);
-            this.font = font;
-            this.fontStyle = style;
-        }
-
-        public String getText() { return text; }
-        public int getTextSize() { return textSize; }
-        public Typeface getFont() { return font; }
-        public FontStyle getFontStyle() { return fontStyle; }
-
-        @Override
-        public boolean hasDrawable() {
-            return false;
-        }
-
-        @Override
-        public int getDrawable() {
-            return 0;
-        }
-
-        @Override
-        public int getColor() { return color; }
-
-        @Override
-        public void setView(View view) { this.view = view; }
-
-        @Override
-        public View getView() { return this.view; }
-    }
-
-    /**
-     * A PickerItem which supports drawables.
-     */
-    public static class DrawableItem implements PickerItem {
-        @DrawableRes
-        private int drawable;
-        private int color = NOT_SPECIFIED;
-        private View view;
-
-        public DrawableItem(@DrawableRes int drawable) {
-            this.drawable = drawable;
-        }
-
-        public DrawableItem(@DrawableRes int drawable, @ColorInt int color) {
-            this(drawable);
-            this.color = color;
-        }
-
-        @Override
-        public String getText() {
-            return null;
-        }
-
-        @DrawableRes
-        public int getDrawable() {
-            return drawable;
-        }
-
-        @Override
-        public int getColor() { return color; }
-
-        @Override
-        public boolean hasDrawable() {
-            return true;
-        }
-
-        @Override
-        public void setView(View view) { this.view = view; }
-
-        @Override
-        public View getView() { return this.view; }
-    }
-
-    private MotionEvent swapXY(MotionEvent ev) {
-        float width = getWidth();
-        float height = getHeight();
-
-        float newX = (ev.getY() / height) * width;
-        float newY = (ev.getX() / width) * height;
-
-        ev.setLocation(newX, newY);
-
-        return ev;
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev){
-        boolean intercepted;
-
-        if (mode == Mode.VERTICAL) {
-            intercepted = super.onInterceptTouchEvent(swapXY(ev));
-            swapXY(ev); // return touch coordinates to original reference frame for any child views
-        } else {
-            intercepted = super.onInterceptTouchEvent(ev);
-        }
-
-        return intercepted;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        boolean handled;
-
-        if (mode == Mode.VERTICAL) {
-            handled = super.onTouchEvent(swapXY(ev));
-        } else {
-            handled = super.onTouchEvent(ev);
-        }
-
-        return handled;
-    }
-}
diff --git a/carouselpicker/src/main/java/in/goodiebag/carouselpicker/CustomPageTransformer.java b/carouselpicker/src/main/java/in/goodiebag/carouselpicker/CustomPageTransformer.java
deleted file mode 100644
index e35e51e..0000000
--- a/carouselpicker/src/main/java/in/goodiebag/carouselpicker/CustomPageTransformer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package in.goodiebag.carouselpicker;
-
-import android.content.Context;
-import android.view.View;
-
-import androidx.viewpager.widget.ViewPager;
-
-/**
- * Created by pavan on 25/04/17.
- */
-
-public class CustomPageTransformer implements ViewPager.PageTransformer {
-    private ViewPager viewPager;
-    private CarouselPicker.Mode mode;
-
-    public CustomPageTransformer(Context context, CarouselPicker.Mode mode) {
-        this.mode = mode;
-    }
-
-    public void transformPage(View view, float position) {
-        if (viewPager == null) {
-            viewPager = (ViewPager) view.getParent();
-        }
-
-        view.setScaleY(1-Math.abs(position));
-        view.setScaleX(1-Math.abs(position));
-
-        if (mode == CarouselPicker.Mode.VERTICAL) {
-            // Counteract the default slide transition
-            view.setTranslationX(view.getWidth() * -position);
-
-            //set Y position to swipe in from top
-            float yPosition = position * view.getHeight();
-            view.setTranslationY(yPosition);
-        }
-    }
-}
diff --git a/carouselpicker/src/main/res/values/attrs.xml b/carouselpicker/src/main/res/values/attrs.xml
index 28b0ebf..5a00585 100644
--- a/carouselpicker/src/main/res/values/attrs.xml
+++ b/carouselpicker/src/main/res/values/attrs.xml
@@ -5,6 +5,9 @@
         <attr name="orientation" />
         <attr name="unselected_item_opacity" />
         <attr name="text_max_lines" />
+        <attr name="selected_item_text_color" />
+        <attr name="selected_item_tint_color" />
+        <attr name="tint_color" />
     </declare-styleable>
     <attr name="items_visible" format="enum">
         <enum name="three" value="3" />
@@ -20,4 +23,7 @@
     </attr>
     <attr name="unselected_item_opacity" format="float" />
     <attr name="text_max_lines" format="integer" />
+    <attr name="selected_item_text_color" format="color|reference" />
+    <attr name="selected_item_tint_color" format="color|reference" />
+    <attr name="tint_color" format="color|reference" />
 </resources>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372ae..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c3a506f..784e551 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 02 11:49:25 IST 2018
+#Wed Nov 15 14:50:09 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/gradlew b/gradlew
index 9d82f78..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,74 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -85,76 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell