diff --git a/app/build.gradle b/app/build.gradle
index 48a4f0f..d5e99d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,7 +130,6 @@ dependencies {
     implementation "com.github.TorrentStream:TorrentStream-Android:2.7.0"
 
     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 "androidx.work:work-runtime:2.4.0"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 9a51ee8..7d860d0 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -60,51 +60,47 @@
         android:paddingStart="50dp"
         android:paddingEnd="50dp">
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/login_instance_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:labelText="@string/title_instance_login"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent">
+            app:layout_constraintTop_toTopOf="parent">
 
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/login_instance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="2dp"
+                android:hint="@string/title_instance_login"
                 android:inputType="textWebEmailAddress"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
 
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/login_uid_container"
             android:layout_width="0dp"
             android:layout_marginTop="10dp"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/login_instance_container"
-            app:labelText="@string/email_address"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent"
-            >
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            app:layout_constraintTop_toBottomOf="@id/login_instance_container">
+
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/login_uid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textEmailAddress"
+                android:hint="@string/email_address"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/login_passwd_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -112,19 +108,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/login_uid_container"
-            app:passwordToggleEnabled="true"
-            app:labelText="@string/password"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent"
-            >
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            app:passwordToggleEnabled="true">
+
+            <com.google.android.material.textfield.TextInputEditText
                 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" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <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 6c24de5..4f5132a 100644
--- a/app/src/main/res/layout/activity_my_account_settings.xml
+++ b/app/src/main/res/layout/activity_my_account_settings.xml
@@ -29,53 +29,51 @@
             app:layout_constraintStart_toEndOf="@+id/profile_picture"
             app:layout_constraintBottom_toBottomOf="@id/profile_picture" />
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             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: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">
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/displayname"
+                android:hint="@string/display_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="text"
                 android:singleLine="true"
                 android:importantForAutofill="no" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/description_container"
             android:layout_marginTop="30dp"
             android:layout_width="match_parent"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            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">
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textMultiLine"
+                android:hint="@string/description"
                 android:gravity="top"
                 android:lines="4"
                 android:minLines="4"
                 android:maxLines="6"
                 android:singleLine="false"
                 android:importantForAutofill="no" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
             android:layout_marginStart="20dp"
diff --git a/app/src/main/res/layout/activity_peertube.xml b/app/src/main/res/layout/activity_peertube.xml
index 3726c61..68e6d82 100644
--- a/app/src/main/res/layout/activity_peertube.xml
+++ b/app/src/main/res/layout/activity_peertube.xml
@@ -430,29 +430,24 @@
                                 android:layout_width="30dp"
                                 android:layout_height="30dp"
                                 android:contentDescription="@string/profile_picture" />
-                            <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/text_field_boxes"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintStart_toEndOf="@+id/my_pp"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:labelText="@string/add_public_reply"
-                                app:secondaryColor="?attr/colorAccent"
-                                app:primaryColor="?attr/colorAccent"
-                                >
-                                <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+                                app:layout_constraintEnd_toEndOf="parent">
+
+                                <com.google.android.material.textfield.TextInputEditText
                                     android:id="@+id/add_comment_write"
-                                    app:alwaysShowHint="false"
-                                    app:useDenseSpacing="false"
                                     android:gravity="top"
                                     android:inputType="textMultiLine"
+                                    android:hint="@string/add_public_reply"
                                     android:minLines="4"
                                     android:maxLines="8"
                                     android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    />
-                            </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+                                    android:layout_height="match_parent" />
+                            </com.google.android.material.textfield.TextInputLayout>
                             <Button
                                 app:layout_constraintTop_toBottomOf="@+id/text_field_boxes"
                                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_register_peertube.xml b/app/src/main/res/layout/activity_register_peertube.xml
index 5d974ac..83d73d3 100644
--- a/app/src/main/res/layout/activity_register_peertube.xml
+++ b/app/src/main/res/layout/activity_register_peertube.xml
@@ -69,25 +69,23 @@
             android:layout_marginTop="20dp"
             android:orientation="horizontal">
 
-            <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/login_instance_container"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                app:secondaryColor="?attr/colorAccent"
-                app:primaryColor="?attr/colorAccent"
-                app:labelText="@string/title_instance_login"
                 app:layout_constraintEnd_toEndOf="parent">
 
-                <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+                <com.google.android.material.textfield.TextInputEditText
                     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" />
 
-            </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/instance_help"
@@ -100,42 +98,37 @@
         </LinearLayout>
 
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent"
-            app:labelText="@string/username"
             app:errorEnabled="true">
 
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            <com.google.android.material.textfield.TextInputEditText
                 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" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent"
-            app:labelText="@string/email"
             app:errorEnabled="true">
 
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/email"
                 android:importantForAutofill="no"
                 android:inputType="textEmailAddress" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
             android:layout_marginTop="10dp"
@@ -145,22 +138,19 @@
             android:textSize="12sp" />
 
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent"
-            app:labelText="@string/password"
             app:errorEnabled="true">
 
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textPassword"
                 android:hint="@string/password"
                 android:importantForAutofill="no" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
         <TextView
@@ -170,21 +160,19 @@
             android:text="@string/password_indicator"
             android:textSize="12sp" />
 
-        <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:secondaryColor="?attr/colorAccent"
-            app:primaryColor="?attr/colorAccent"
-            app:labelText="@string/password_confirm"
             app:errorEnabled="true">
 
-            <studio.carbonylgroup.textfieldboxes.ExtendedEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/password_confirm"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:hint="@string/password_confirm"
                 android:inputType="textPassword"
                 android:importantForAutofill="no" />
-        </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
             android:layout_marginTop="10dp"