diff --git a/app/src/main/res/layout/activity_database_load.xml b/app/src/main/res/layout/activity_database_load.xml
index a9bc4f2..5c12977 100644
--- a/app/src/main/res/layout/activity_database_load.xml
+++ b/app/src/main/res/layout/activity_database_load.xml
@@ -52,7 +52,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnNext"
-        style="@style/Widget.PalmPay.Button"
+        style="@style/Widget.Bitsy.Button"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/activity_import_brainkey.xml b/app/src/main/res/layout/activity_import_brainkey.xml
index 1c47f05..87d1449 100644
--- a/app/src/main/res/layout/activity_import_brainkey.xml
+++ b/app/src/main/res/layout/activity_import_brainkey.xml
@@ -71,7 +71,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnImport"
-        style="@style/Widget.PalmPay.Button"
+        style="@style/Widget.Bitsy.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/spacing_different_topic"
@@ -89,7 +89,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnCreate"
-        style="@style/Widget.PalmPay.Button"
+        style="@style/Widget.Bitsy.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/spacing_different_topic"
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 8ccd9cb..3f1dc54 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -18,7 +18,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnAgree"
-            style="@style/Widget.PalmPay.Button"
+            style="@style/Widget.Bitsy.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
@@ -29,7 +29,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnDisagree"
-            style="@style/Widget.PalmPay.Button.TextButton"
+            style="@style/Widget.Bitsy.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index b4afa4d..d014e87 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -11,12 +11,70 @@
     android:paddingBottom="32dp"
     tools:context=".activities.SettingsActivity">
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/title__general"
+        android:textAppearance="@style/TextAppearance.Bitsy.Subtitle1"
+        android:textStyle="bold"/>
+
+    <Switch
+        android:id="@+id/switchCloseTimer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_different_topic"
+        android:switchPadding="12dp"
+        android:text="@string/msg__close_timer"
+        android:textAppearance="@style/TextAppearance.Bitsy.Body1"
+        android:textColor="?android:textColorPrimary"/>
+
     <Switch
         android:id="@+id/switchNightMode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/night_mode"
+        android:layout_marginTop="@dimen/spacing_same_topic"
+        android:text="@string/msg__night_mode"
         android:textAppearance="@style/TextAppearance.Bitsy.Body1"
         android:textColor="?android:textColorPrimary"/>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_different_section"
+        android:text="@string/title__backup"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+        android:textStyle="bold"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_different_topic"
+        android:text="@string/msg__brainkey_description"
+        android:textAppearance="@style/TextAppearance.Bitsy.Body1"/>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnViewBrainKey"
+        style="@style/Widget.Bitsy.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_same_topic"
+        android:text="@string/btn__view_and_copy"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_different_section"
+        android:text="@string/title__bugs_or_ideas"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+        android:textStyle="bold"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_same_topic"
+        android:autoLink="all"
+        android:lineSpacingExtra="8dp"
+        android:text="@string/msg__bugs_or_ideas"
+        android:textAppearance="@style/TextAppearance.Bitsy.Body1"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ee74fea..0d8816d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -52,7 +52,13 @@
 
     <!-- Settings -->
     <string name="title_settings">Settings</string>
-    <string name="night_mode">Night mode</string>
-
+    <string name="title__general">General</string>
+    <string name="msg__close_timer">Automatically close BiTSy after 3 minutes of inactivity</string>
+    <string name="msg__night_mode">Night mode</string>
+    <string name="title__backup">Backup</string>
+    <string name="msg__brainkey_description">BrainKey. Account recovery words that can be captured or copied, but not edited.</string>
+    <string name="btn__view_and_copy"><![CDATA[View & Copy]]></string>
+    <string name="title__bugs_or_ideas">Bugs or Ideas?</string>
+    <string name="msg__bugs_or_ideas">Telegram chat: http://t.me/Agorise\nEmail: Agorise@protonmail.ch\nOpen Source: https://github.com/Agorise</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bbe5796..c8b8039 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,12 +32,12 @@
 
     <style name="Widget.Bitsy.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
 
-    <style name="Widget.PalmPay.Button" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Bitsy.Button" parent="Widget.MaterialComponents.Button">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:stateListAnimator">@animator/button_state_list_anim</item>
     </style>
 
-    <style name="Widget.PalmPay.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Widget.Bitsy.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:textColor">?android:attr/colorPrimary</item>
     </style>