diff --git a/app/build.gradle b/app/build.gradle
index d537aea..5d4b5a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 21
-        versionName "1.5.2"
+        versionCode 22
+        versionName "1.6.0-beta-1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -132,10 +132,8 @@ dependencies {
     implementation "io.github.kobakei:ratethisapp:1.2.0"
     implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5'
     implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0'
-    implementation "ss.anoop:awesome-textinput-layout:1.0.3"
 
     implementation "androidx.work:work-runtime:2.4.0"
     implementation "androidx.work:work-runtime-ktx:2.4.0"
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3f884a6..9a51ee8 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -56,12 +56,11 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="20dp"
         android:paddingStart="50dp"
         android:paddingEnd="50dp">
 
-
-
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:id="@+id/login_instance_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -69,24 +68,22 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp">
+            app:labelText="@string/title_instance_login"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent">
 
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/login_instance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/title_instance_login"
                 android:paddingTop="2dp"
                 android:inputType="textWebEmailAddress"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
 
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:id="@+id/login_uid_container"
             android:layout_width="0dp"
             android:layout_marginTop="10dp"
@@ -94,22 +91,20 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/login_instance_container"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp">
-
-            <EditText
+            app:labelText="@string/email_address"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            >
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/login_uid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/email_address"
                 android:inputType="textEmailAddress"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:id="@+id/login_passwd_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -118,19 +113,18 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/login_uid_container"
             app:passwordToggleEnabled="true"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp">
-            <EditText
+            app:labelText="@string/password"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            >
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/login_passwd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/password"
                 android:inputType="textPassword"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
         <Button
             android:id="@+id/login_button"
diff --git a/app/src/main/res/layout/activity_my_account_settings.xml b/app/src/main/res/layout/activity_my_account_settings.xml
index f4bd469..6c24de5 100644
--- a/app/src/main/res/layout/activity_my_account_settings.xml
+++ b/app/src/main/res/layout/activity_my_account_settings.xml
@@ -29,49 +29,45 @@
             app:layout_constraintStart_toEndOf="@+id/profile_picture"
             app:layout_constraintBottom_toBottomOf="@id/profile_picture" />
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:id="@+id/displayname_container"
             android:layout_width="match_parent"
             android:layout_marginTop="20dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            app:labelText="@string/display_name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/profile_picture">
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/displayname"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/display_name"
                 android:inputType="text"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:id="@+id/description_container"
             android:layout_marginTop="30dp"
             android:layout_width="match_parent"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            app:labelText="@string/description"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/displayname_container">
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/description"
                 android:inputType="textMultiLine"
                 android:gravity="top"
                 android:lines="4"
@@ -79,7 +75,7 @@
                 android:maxLines="6"
                 android:singleLine="false"
                 android:importantForAutofill="no" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
         <TextView
             android:layout_marginStart="20dp"
diff --git a/app/src/main/res/layout/activity_register_peertube.xml b/app/src/main/res/layout/activity_register_peertube.xml
index 4adf90c..5d974ac 100644
--- a/app/src/main/res/layout/activity_register_peertube.xml
+++ b/app/src/main/res/layout/activity_register_peertube.xml
@@ -69,27 +69,25 @@
             android:layout_marginTop="20dp"
             android:orientation="horizontal">
 
-            <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+            <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
                 android:id="@+id/login_instance_container"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                app:borderColor="?attr/colorAccent"
-                app:borderWidth="1dp"
-                app:cornerRadius="8dp"
-                android:padding="16dp"
+                app:secondaryColor="?attr/colorAccent"
+                app:primaryColor="?attr/colorAccent"
+                app:labelText="@string/title_instance_login"
                 app:layout_constraintEnd_toEndOf="parent">
 
-                <EditText
+                <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                     android:id="@+id/login_instance"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textWebEditText"
-                    android:hint="@string/title_instance_login"
                     android:singleLine="true"
                     android:importantForAutofill="no" />
 
-            </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+            </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
             <Button
                 android:id="@+id/instance_help"
@@ -102,96 +100,94 @@
         </LinearLayout>
 
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+            android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            app:labelText="@string/username"
             app:errorEnabled="true">
 
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/username"
                 android:maxLength="50"
                 android:importantForAutofill="no"
                 android:inputType="text" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
 
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+            android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            app:labelText="@string/email"
             app:errorEnabled="true">
 
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/email"
-                android:hint="@string/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:importantForAutofill="no"
                 android:inputType="textEmailAddress" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
         <TextView
+            android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/email_indicator"
             android:textSize="12sp" />
 
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            app:labelText="@string/password"
             app:errorEnabled="true">
 
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textPassword"
                 android:hint="@string/password"
                 android:importantForAutofill="no" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
 
         <TextView
+            android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/password_indicator"
             android:textSize="12sp" />
 
-        <ss.anoop.awesometextinputlayout.AwesomeTextInputLayout
+        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:borderColor="?attr/colorAccent"
-            app:borderWidth="1dp"
-            app:cornerRadius="8dp"
-            android:padding="16dp"
+            app:secondaryColor="?attr/colorAccent"
+            app:primaryColor="?attr/colorAccent"
+            app:labelText="@string/password_confirm"
             app:errorEnabled="true">
 
-            <EditText
+            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
                 android:id="@+id/password_confirm"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textPassword"
-                android:hint="@string/password_confirm"
                 android:importantForAutofill="no" />
-        </ss.anoop.awesometextinputlayout.AwesomeTextInputLayout>
+        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
         <LinearLayout
+            android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -210,6 +206,7 @@
         </LinearLayout>
 
         <Button
+            android:layout_marginTop="10dp"
             android:id="@+id/signup"
             style="@style/Base.Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"