diff --git a/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt b/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt
new file mode 100644
index 0000000..97c4219
--- /dev/null
+++ b/app/src/main/java/com/denizd/textbasic/fragment/SettingsNewFragment.kt
@@ -0,0 +1,10 @@
+package com.denizd.textbasic.fragment
+
+import com.denizd.textbasic.R
+import com.denizd.textbasic.databinding.FragmentSettingsNewBinding
+import com.denizd.textbasic.util.viewBinding
+
+class SettingsNewFragment : BaseFragment(R.layout.fragment_settings_new) {
+
+    private val binding: FragmentSettingsNewBinding by viewBinding(FragmentSettingsNewBinding::bind)
+}
\ No newline at end of file
diff --git a/app/src/main/res/color/list_group_button.xml b/app/src/main/res/color/list_group_button.xml
new file mode 100644
index 0000000..6ef7a9d
--- /dev/null
+++ b/app/src/main/res/color/list_group_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorOnSecondaryContainer" android:state_checked="true"/>
+    <item android:color="?attr/colorText"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/minus.xml b/app/src/main/res/drawable/minus.xml
new file mode 100644
index 0000000..3e0b776
--- /dev/null
+++ b/app/src/main/res/drawable/minus.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,13H5v-2h14v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/plus.xml b/app/src/main/res/drawable/plus.xml
new file mode 100644
index 0000000..89633bb
--- /dev/null
+++ b/app/src/main/res/drawable/plus.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_guide.xml b/app/src/main/res/layout/fragment_guide.xml
index 98073a9..756ea7c 100644
--- a/app/src/main/res/layout/fragment_guide.xml
+++ b/app/src/main/res/layout/fragment_guide.xml
@@ -1,22 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scrollbars="vertical">
+    tools:context=".fragment.GuideFragment">
 
-    <LinearLayout
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginVertical="8dp"
-        android:layout_marginHorizontal="16dp">
+        android:fitsSystemWindows="true">
 
         <TextView
+            android:id="@+id/app_title_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/guide_fragment_title"
+            android:textSize="28sp"
+            android:fontFamily="@font/mono_bold_italic"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/guide1"
-            android:textSize="18sp"/>
+            android:orientation="vertical"
+            android:layout_marginVertical="8dp"
+            android:layout_marginHorizontal="16dp">
 
-    </LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/guide1"
+                android:textSize="18sp"/>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 15308dc..0b1d898 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,14 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    tools:context=".fragment.SettingsFragment">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <TextView
+            android:id="@+id/app_title_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fragment_title"
+            android:textSize="28sp"
+            android:fontFamily="@font/mono_bold_italic"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"/>
+
+        <LinearLayout
+            android:id="@+id/text_preview_background_light"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:background="@color/md_theme_light_background"
+            app:layout_scrollFlags="scroll|snap">
+
+            <LinearLayout
+                android:id="@+id/text_preview_background_dark"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/md_theme_dark_background">
+
+                <ImageView
+                    android:id="@+id/text_preview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/widget_preview_content_desc"
+                    android:paddingHorizontal="4dp"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/settings_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbars="vertical">
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:id="@+id/animation_ll"
@@ -368,30 +417,6 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <LinearLayout
-                android:id="@+id/text_preview_background_light"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:background="@color/md_theme_light_background">
-
-                <LinearLayout
-                    android:id="@+id/text_preview_background_dark"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@color/md_theme_dark_background">
-
-                    <ImageView
-                        android:id="@+id/text_preview"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:contentDescription="@string/widget_preview_content_desc"
-                        android:paddingHorizontal="4dp"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -541,4 +566,4 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings_new.xml b/app/src/main/res/layout/fragment_settings_new.xml
new file mode 100644
index 0000000..b08cb10
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings_new.xml
@@ -0,0 +1,615 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".fragment.SettingsFragment">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <TextView
+            android:id="@+id/app_title_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_fragment_title"
+            android:textSize="28sp"
+            android:fontFamily="@font/mono_bold_italic"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="8dp"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"/>
+
+        <LinearLayout
+            android:id="@+id/text_preview_background_light"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:background="@color/md_theme_light_background"
+            app:layout_scrollFlags="scroll|snap">
+
+            <LinearLayout
+                android:id="@+id/text_preview_background_dark"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/md_theme_dark_background">
+
+                <ImageView
+                    android:id="@+id/text_preview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/widget_preview_content_desc"
+                    android:paddingHorizontal="4dp"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="8dp">
+
+            <!-- Text style settings -->
+            <com.google.android.material.card.MaterialCardView
+                style="@style/Widget.Material3.CardView.Outlined"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:layout_marginVertical="4dp">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="16dp"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="8dp"
+                        android:fontFamily="@font/mono_bold_italic"
+                        android:text="@string/settings_text_header"
+                        android:textSize="22sp" />
+
+                    <com.google.android.material.divider.MaterialDivider
+                        style="@style/DividerTheme"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="16dp" />
+
+                    <!-- Font -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_text_font_header"
+                            android:textSize="16sp" />
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/text_layout_font"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/settings_text_font_hint"
+                            app:boxStrokeColor="@color/selector_text_input"
+                            app:hintTextColor="@color/selector_text_input">
+
+                            <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                                android:id="@+id/auto_complete_font"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:textColor="?attr/colorOnSurfaceVariant"
+                                android:inputType="none"/>
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- Font style -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_text_style_header"
+                            android:textSize="16sp" />
+
+                        <com.google.android.material.button.MaterialButtonToggleGroup
+                            android:id="@+id/toggle_group_font"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            app:singleSelection="true"
+                            app:selectionRequired="true">
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_font_default"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_text_style_button_default"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_font_bold"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_text_style_button_bold"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_font_italic"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_text_style_button_italic"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_font_bolditalic"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_text_style_button_bolditalic"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- Text size -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_text_size_header"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:gravity="center">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_size_decrease"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/minus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                            <TextView
+                                android:id="@+id/text_size"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/mono_semibold"
+                                android:layout_marginHorizontal="8dp"
+                                android:textSize="28sp"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_size_increase"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/plus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- Text transparency -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_text_transparency_header"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:gravity="center">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_text_transparency_decrease"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/minus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                            <TextView
+                                android:id="@+id/text_transparency"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/mono_semibold"
+                                android:layout_marginHorizontal="8dp"
+                                android:textSize="28sp"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_text_transparency_increase"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/plus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <!-- Highlight style settings -->
+            <com.google.android.material.card.MaterialCardView
+                style="@style/Widget.Material3.CardView.Outlined"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:layout_marginVertical="4dp">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="16dp"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="8dp"
+                        android:fontFamily="@font/mono_bold_italic"
+                        android:text="@string/settings_highlight_header"
+                        android:textSize="22sp" />
+
+                    <com.google.android.material.divider.MaterialDivider
+                        style="@style/DividerTheme"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="16dp" />
+
+                    <!-- Highlight style -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_highlight_header"
+                            android:textSize="16sp" />
+
+                        <com.google.android.material.button.MaterialButtonToggleGroup
+                            android:id="@+id/toggle_group_highlight_style"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            app:singleSelection="true"
+                            app:selectionRequired="true">
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_highlight_none"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_highlight_style_button_none"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_highlight_background"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_highlight_style_button_background"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_highlight_stroke"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_highlight_style_button_stroke"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_highlight_shadow"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:padding="1dp"
+                                android:text="@string/settings_highlight_style_button_shadow"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- Highlight intensity -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_highlight_intensity_header"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:gravity="center">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_intensity_decrease"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/minus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                            <TextView
+                                android:id="@+id/text_intensity"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/mono_semibold"
+                                android:layout_marginHorizontal="8dp"
+                                android:textSize="28sp"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_intensity_increase"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/plus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- Highlight transparency -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_highlight_transparency_header"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:gravity="center">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_highlight_transparency_decrease"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/minus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                            <TextView
+                                android:id="@+id/text_highlight_transparency"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/mono_semibold"
+                                android:layout_marginHorizontal="8dp"
+                                android:textSize="28sp"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/button_highlight_transparency_increase"
+                                style="@style/Widget.Material3.Button.IconButton.Outlined"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                app:icon="@drawable/plus"
+                                android:minWidth="0dp"
+                                app:iconPadding="0dp"/>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <!-- Widget settings -->
+            <com.google.android.material.card.MaterialCardView
+                style="@style/Widget.Material3.CardView.Outlined"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="8dp"
+                android:layout_marginVertical="4dp">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="16dp"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="8dp"
+                        android:fontFamily="@font/mono_bold_italic"
+                        android:text="@string/settings_widget_header"
+                        android:textSize="22sp" />
+
+                    <com.google.android.material.divider.MaterialDivider
+                        style="@style/DividerTheme"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="16dp" />
+
+                    <!-- Order entries -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_widget_order_title"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_widget_order_subtitle"
+                            android:textSize="16sp" />
+
+                        <com.google.android.material.button.MaterialButtonToggleGroup
+                            android:id="@+id/toggle_group_order"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            app:singleSelection="true"
+                            app:selectionRequired="true">
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_order_default"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:text="@string/settings_widget_order_default"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Widget.Material3.Button.OutlinedButton"
+                                android:id="@+id/toggle_button_order_random"
+                                android:layout_width="0dp"
+                                android:layout_weight="1"
+                                android:layout_height="wrap_content"
+                                android:text="@string/settings_widget_order_random"
+                                android:textColor="@color/list_group_button"
+                                app:strokeColor="?attr/colorOutlineVariant"/>
+
+                        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/nav_items.xml b/app/src/main/res/menu/nav_items.xml
index 35c2f14..90c8c96 100644
--- a/app/src/main/res/menu/nav_items.xml
+++ b/app/src/main/res/menu/nav_items.xml
@@ -11,7 +11,12 @@
         android:title="@string/guide"
         android:enabled="true"/>
     <item
-        android:id="@+id/settings"
+        android:id="@+id/settings_old"
+        android:icon="@drawable/settings_outlined"
+        android:title="old settings"
+        android:enabled="true"/>
+    <item
+        android:id="@+id/settings_new"
         android:icon="@drawable/settings_outlined"
         android:title="@string/settings"
         android:enabled="true"/>
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
index 6e1a744..0da6f7b 100644
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ b/app/src/main/res/navigation/main_nav_graph.xml
@@ -16,8 +16,13 @@
         tools:layout="@layout/fragment_guide"
         android:label="GuideFragment"/>
     <fragment
-        android:id="@+id/settings"
+        android:id="@+id/settings_old"
         android:name="com.denizd.textbasic.fragment.SettingsFragment"
         android:label="SettingsFragment"
         tools:layout="@layout/fragment_settings"/>
+    <fragment
+        android:id="@+id/settings_new"
+        android:name="com.denizd.textbasic.fragment.SettingsNewFragment"
+        android:label="SettingsNewFragment"
+        tools:layout="@layout/fragment_settings_new"/>
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 05f452f..3d6b98e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -21,6 +21,37 @@
     <string name="quote_fragment_snack_text">Eintrag wurde gelöscht</string>
     <string name="quote_fragment_snack_undo">Rückgängig</string>
 
+    <string name="guide_fragment_title">Anleitung</string>
+
+    <string name="settings_fragment_title">Einstellungen</string>
+
+    <string name="settings_text_header">Textstil</string>
+    <string name="settings_text_font_header">Textschrift</string>
+    <string name="settings_text_font_hint">Schrift</string>
+    <string name="settings_text_style_header">Schriftstil</string>
+    <string name="settings_text_style_button_default">Standard</string>
+    <string name="settings_text_style_button_bold">Fett</string>
+    <string name="settings_text_style_button_italic">Kursiv</string>
+    <string name="settings_text_style_button_bolditalic">Fett &amp; Kursiv</string>
+    <string name="settings_text_size_header">Textgröße</string>
+    <string name="settings_text_transparency_header">Texttransparenz</string>
+
+    <string name="settings_highlight_header">Highlight-Stil</string>
+    <string name="settings_highlight_style_header">Stil</string>
+    <string name="settings_highlight_style_button_none">Keiner</string>
+    <string name="settings_highlight_style_button_background">Hintergrund</string>
+    <string name="settings_highlight_style_button_stroke">Umrandet</string>
+    <string name="settings_highlight_style_button_shadow">Schatten</string>
+    <string name="settings_highlight_intensity_header">Stärke</string>
+    <string name="settings_highlight_transparency_header">Highlight-Transparenz</string>
+
+    <string name="settings_widget_header">Widget</string>
+    <string name="settings_widget_order_title">Stelle Reihenfolge ein</string>
+    <string name="settings_widget_order_subtitle">Dies ist die Reihenfolge, in welcher deine Einträge angezeigt werden, wenn du auf das Widget klickst</string>
+    <string name="settings_widget_order_default">Standard</string>
+    <string name="settings_widget_order_random">Zufall</string>
+    <string name="settings_widget_position_title">Setze Position des Texts</string>
+
     <string name="edit">Text bearbeiten</string>
     <string name="nav_items_entries">Einträge</string>
     <string name="guide">Anleitung</string>
@@ -29,15 +60,15 @@
     <string name="position">Position</string>
 
     <string name="widget_preview_content_desc">Vorschau für das Widget</string>
-    <string name="position_button_content_desc_tl">Positioniere Widget oben links</string>
-    <string name="position_button_content_desc_tc">Positioniere Widget oben zentriert</string>
-    <string name="position_button_content_desc_tr">Positioniere Widget oben rechts</string>
-    <string name="position_button_content_desc_cl">Positioniere Widget zentriert links</string>
-    <string name="position_button_content_desc_cc">Positioniere Widget zentriert</string>
-    <string name="position_button_content_desc_cr">Positioniere Widget zentriert rechts</string>
-    <string name="position_button_content_desc_bl">Positioniere Widget unten links</string>
-    <string name="position_button_content_desc_bc">Positioniere Widget unten zentriert</string>
-    <string name="position_button_content_desc_br">Positioniere Widget unten rechts</string>
+    <string name="position_button_content_desc_tl">Positioniere Text oben links</string>
+    <string name="position_button_content_desc_tc">Positioniere Text oben zentriert</string>
+    <string name="position_button_content_desc_tr">Positioniere Text oben rechts</string>
+    <string name="position_button_content_desc_cl">Positioniere Text zentriert links</string>
+    <string name="position_button_content_desc_cc">Positioniere Text zentriert</string>
+    <string name="position_button_content_desc_cr">Positioniere Text zentriert rechts</string>
+    <string name="position_button_content_desc_bl">Positioniere Text unten links</string>
+    <string name="position_button_content_desc_bc">Positioniere Text unten zentriert</string>
+    <string name="position_button_content_desc_br">Positioniere Text unten rechts</string>
 
     <string name="text_colour_input_hint">Textfarbe (hex, ohne #)</string>
     <string name="bg_colour_input_hint">Hintergrundfarbe (hex, ohne #)</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index f9f2754..b79cc51 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -41,4 +41,8 @@
         <item name="android:scrollbarThumbVertical">@color/md_theme_dark_primary</item>
         <item name="colorOutlineVariant">@color/md_theme_dark_outlineVariant</item>
     </style>
+
+    <style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
+        <item name="dividerColor">@color/md_theme_dark_outlineVariant</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 83b4fce..5bba7a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,37 @@
     <string name="quote_fragment_snack_text">Entry has been deleted</string>
     <string name="quote_fragment_snack_undo">Undo</string>
 
+    <string name="guide_fragment_title">Guide</string>
+
+    <string name="settings_fragment_title">Settings</string>
+
+    <string name="settings_text_header">Text Style</string>
+    <string name="settings_text_font_header">Text font</string>
+    <string name="settings_text_font_hint">Font</string>
+    <string name="settings_text_style_header">Font style</string>
+    <string name="settings_text_style_button_default">Default</string>
+    <string name="settings_text_style_button_bold">Bold</string>
+    <string name="settings_text_style_button_italic">Italic</string>
+    <string name="settings_text_style_button_bolditalic">Bold &amp; Italic</string>
+    <string name="settings_text_size_header">Text size</string>
+    <string name="settings_text_transparency_header">Text transparency</string>
+
+    <string name="settings_highlight_header">Highlight Style</string>
+    <string name="settings_highlight_style_header">Style</string>
+    <string name="settings_highlight_style_button_none">None</string>
+    <string name="settings_highlight_style_button_background">Background</string>
+    <string name="settings_highlight_style_button_stroke">Stroke</string>
+    <string name="settings_highlight_style_button_shadow">Shadow</string>
+    <string name="settings_highlight_intensity_header">Intensity</string>
+    <string name="settings_highlight_transparency_header">Transparency</string>
+
+    <string name="settings_widget_header">Widget</string>
+    <string name="settings_widget_order_title">Set entry order</string>
+    <string name="settings_widget_order_subtitle">This is the order in which your entries will be shown when you click on the widget</string>
+    <string name="settings_widget_order_default">Default</string>
+    <string name="settings_widget_order_random">Random</string>
+    <string name="settings_widget_position_title">Set position of the text</string>
+
     <string name="edit">Edit Text</string>
     <string name="nav_items_entries">Entries</string>
     <string name="guide">Guide</string>
@@ -28,15 +59,15 @@
     <string name="position">position</string>
 
     <string name="widget_preview_content_desc">Preview for the widget</string>
-    <string name="position_button_content_desc_tl">Position widget at top left</string>
-    <string name="position_button_content_desc_tc">Position widget at top center</string>
-    <string name="position_button_content_desc_tr">Position widget at top right</string>
-    <string name="position_button_content_desc_cl">Position widget at center left</string>
-    <string name="position_button_content_desc_cc">Position widget at center</string>
-    <string name="position_button_content_desc_cr">Position widget at center right</string>
-    <string name="position_button_content_desc_bl">Position widget at bottom left</string>
-    <string name="position_button_content_desc_bc">Position widget at bottom center</string>
-    <string name="position_button_content_desc_br">Position widget at bottom right</string>
+    <string name="position_button_content_desc_tl">Position text at top left</string>
+    <string name="position_button_content_desc_tc">Position text at top center</string>
+    <string name="position_button_content_desc_tr">Position text at top right</string>
+    <string name="position_button_content_desc_cl">Position text at center left</string>
+    <string name="position_button_content_desc_cc">Position text at center</string>
+    <string name="position_button_content_desc_cr">Position text at center right</string>
+    <string name="position_button_content_desc_bl">Position text at bottom left</string>
+    <string name="position_button_content_desc_bc">Position text at bottom center</string>
+    <string name="position_button_content_desc_br">Position text at bottom right</string>
 
     <string name="text_colour_input_hint">Text colour (hex, no #)</string>
     <string name="bg_colour_input_hint">Background colour (hex, no #)</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index adfed29..c9b82f2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -43,4 +43,8 @@
         <item name="android:scrollbarThumbVertical">@color/md_theme_light_primary</item>
         <item name="colorOutlineVariant">@color/md_theme_light_outlineVariant</item>
     </style>
+
+    <style name="DividerTheme" parent="Widget.Material3.MaterialDivider">
+        <item name="dividerColor">@color/md_theme_light_outlineVariant</item>
+    </style>
 </resources>