diff --git a/app/src/main/res/drawable-night-hdpi/round_aspect_ratio_24.png b/app/src/main/res/drawable-night-hdpi/round_aspect_ratio_24.png
new file mode 100644
index 0000000..549755d
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_aspect_ratio_24.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/round_font_download_24.png b/app/src/main/res/drawable-night-hdpi/round_font_download_24.png
new file mode 100644
index 0000000..b069898
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_font_download_24.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/round_format_line_spacing.png b/app/src/main/res/drawable-night-hdpi/round_format_line_spacing.png
new file mode 100644
index 0000000..dc1785a
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_format_line_spacing.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/round_text_fields_24.png b/app/src/main/res/drawable-night-hdpi/round_text_fields_24.png
new file mode 100644
index 0000000..72d8a7f
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_text_fields_24.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/round_text_format_24.png b/app/src/main/res/drawable-night-hdpi/round_text_format_24.png
new file mode 100644
index 0000000..cf89fd4
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_text_format_24.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/round_texture_24.png b/app/src/main/res/drawable-night-hdpi/round_texture_24.png
new file mode 100644
index 0000000..c16342e
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_texture_24.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/round_vertical_align_center_24.png b/app/src/main/res/drawable-night-hdpi/round_vertical_align_center_24.png
new file mode 100644
index 0000000..79c5849
Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/round_vertical_align_center_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_aspect_ratio_24.png b/app/src/main/res/drawable-night-mdpi/round_aspect_ratio_24.png
new file mode 100644
index 0000000..e2cec67
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_aspect_ratio_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_font_download_24.png b/app/src/main/res/drawable-night-mdpi/round_font_download_24.png
new file mode 100644
index 0000000..ed0a955
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_font_download_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_format_line_spacing.png b/app/src/main/res/drawable-night-mdpi/round_format_line_spacing.png
new file mode 100644
index 0000000..7654510
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_format_line_spacing.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_text_fields_24.png b/app/src/main/res/drawable-night-mdpi/round_text_fields_24.png
new file mode 100644
index 0000000..1bd7778
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_text_fields_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_text_format_24.png b/app/src/main/res/drawable-night-mdpi/round_text_format_24.png
new file mode 100644
index 0000000..cf70544
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_text_format_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_texture_24.png b/app/src/main/res/drawable-night-mdpi/round_texture_24.png
new file mode 100644
index 0000000..5361f90
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_texture_24.png differ
diff --git a/app/src/main/res/drawable-night-mdpi/round_vertical_align_center_24.png b/app/src/main/res/drawable-night-mdpi/round_vertical_align_center_24.png
new file mode 100644
index 0000000..a052781
Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/round_vertical_align_center_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_aspect_ratio_24.png b/app/src/main/res/drawable-night-xhdpi/round_aspect_ratio_24.png
new file mode 100644
index 0000000..652380f
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_aspect_ratio_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_font_download_24.png b/app/src/main/res/drawable-night-xhdpi/round_font_download_24.png
new file mode 100644
index 0000000..48f9838
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_font_download_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_format_line_spacing.png b/app/src/main/res/drawable-night-xhdpi/round_format_line_spacing.png
new file mode 100644
index 0000000..d10398c
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_format_line_spacing.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_text_fields_24.png b/app/src/main/res/drawable-night-xhdpi/round_text_fields_24.png
new file mode 100644
index 0000000..314d52a
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_text_fields_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_text_format_24.png b/app/src/main/res/drawable-night-xhdpi/round_text_format_24.png
new file mode 100644
index 0000000..a7faec0
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_text_format_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_texture_24.png b/app/src/main/res/drawable-night-xhdpi/round_texture_24.png
new file mode 100644
index 0000000..8ae0928
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_texture_24.png differ
diff --git a/app/src/main/res/drawable-night-xhdpi/round_vertical_align_center_24.png b/app/src/main/res/drawable-night-xhdpi/round_vertical_align_center_24.png
new file mode 100644
index 0000000..9df1658
Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/round_vertical_align_center_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_aspect_ratio_24.png b/app/src/main/res/drawable-night-xxhdpi/round_aspect_ratio_24.png
new file mode 100644
index 0000000..cd03602
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_aspect_ratio_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_font_download_24.png b/app/src/main/res/drawable-night-xxhdpi/round_font_download_24.png
new file mode 100644
index 0000000..9b93cf5
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_font_download_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_format_line_spacing.png b/app/src/main/res/drawable-night-xxhdpi/round_format_line_spacing.png
new file mode 100644
index 0000000..603d020
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_format_line_spacing.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_text_fields_24.png b/app/src/main/res/drawable-night-xxhdpi/round_text_fields_24.png
new file mode 100644
index 0000000..ab7a9b1
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_text_fields_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_text_format_24.png b/app/src/main/res/drawable-night-xxhdpi/round_text_format_24.png
new file mode 100644
index 0000000..ad4b149
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_text_format_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_texture_24.png b/app/src/main/res/drawable-night-xxhdpi/round_texture_24.png
new file mode 100644
index 0000000..60b3661
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_texture_24.png differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/round_vertical_align_center_24.png b/app/src/main/res/drawable-night-xxhdpi/round_vertical_align_center_24.png
new file mode 100644
index 0000000..72f17ea
Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/round_vertical_align_center_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_aspect_ratio_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_aspect_ratio_24.png
new file mode 100644
index 0000000..2ff310f
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_aspect_ratio_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_font_download_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_font_download_24.png
new file mode 100644
index 0000000..21ffd51
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_font_download_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_format_line_spacing.png b/app/src/main/res/drawable-night-xxxhdpi/round_format_line_spacing.png
new file mode 100644
index 0000000..13624ad
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_format_line_spacing.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_text_fields_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_text_fields_24.png
new file mode 100644
index 0000000..4b8ac15
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_text_fields_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_text_format_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_text_format_24.png
new file mode 100644
index 0000000..92a54cc
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_text_format_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_texture_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_texture_24.png
new file mode 100644
index 0000000..ceabdb2
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_texture_24.png differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/round_vertical_align_center_24.png b/app/src/main/res/drawable-night-xxxhdpi/round_vertical_align_center_24.png
new file mode 100644
index 0000000..ffd3d43
Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/round_vertical_align_center_24.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9c58a91..bf6c9a0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,6 +10,7 @@
         android:id="@+id/content_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         app:defaultNavHost="true"
+        android:background="@color/colorPrimary"
         app:navGraph="@navigation/nav_graph"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/fragment_app_main.xml b/app/src/main/res/layout/fragment_app_main.xml
index 736700b..339dd81 100644
--- a/app/src/main/res/layout/fragment_app_main.xml
+++ b/app/src/main/res/layout/fragment_app_main.xml
@@ -124,7 +124,7 @@
         app:cardElevation="0dp"
         app:cardPreventCornerOverlap="true"
         app:cardCornerRadius="0dp"
-        app:cardBackgroundColor="@color/colorPrimaryDark"
+        app:cardBackgroundColor="@color/colorPrimary"
         android:orientation="vertical">
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/settings_fragment"
diff --git a/app/src/main/res/layout/fragment_tab_selector.xml b/app/src/main/res/layout/fragment_tab_selector.xml
index 02e5f88..cf0bdca 100644
--- a/app/src/main/res/layout/fragment_tab_selector.xml
+++ b/app/src/main/res/layout/fragment_tab_selector.xml
@@ -23,7 +23,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/scrollView"
-        android:background="@color/colorPrimary"
         android:scrollbarThumbVertical="@color/colorPrimaryDark">
         <LinearLayout
             android:layout_width="match_parent"
@@ -42,112 +41,94 @@
                 android:textColor="@color/colorAccent"
                 android:textAppearance="@style/AnotherWidget.Settings.Header"
                 app:textAllCaps="false" />
-            <com.google.android.material.card.MaterialCardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:cardElevation="0dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
-                app:strokeColor="@color/cardBorder"
-                app:strokeWidth="1dp"
-                app:cardBackgroundColor="@color/colorPrimary"
-                app:cardCornerRadius="8dp">
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_typography"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:padding="8dp"
+                    android:src="@drawable/round_text_fields_24"
+                    app:tint="@color/colorPrimaryText"/>
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
                     android:orientation="vertical">
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="0dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_typography"
-                        android:orientation="horizontal">
-                        <ImageView
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:padding="8dp"
-                            android:src="@drawable/round_text_fields_24"
-                            app:tint="@color/colorPrimaryText"/>
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:paddingLeft="8dp"
-                            android:paddingRight="8dp"
-                            android:orientation="vertical">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                style="@style/AnotherWidget.Settings.Title"
-                                android:text="Typography"/>
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="Change the text design"
-                                style="@style/AnotherWidget.Settings.Subtitle"/>
-                        </LinearLayout>
-                        <ImageView
-                            android:layout_width="48dp"
-                            android:layout_height="48dp"
-                            android:padding="8dp"
-                            android:src="@drawable/round_chevron_right_24"
-                            app:tint="@color/colorPrimaryText"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="Typography"/>
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp"
-                        android:paddingStart="10dp"
-                        android:paddingEnd="0dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_general_settings"
-                        android:orientation="horizontal">
-                        <ImageView
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:padding="8dp"
-                            android:src="@drawable/round_palette_24"
-                            app:tint="@color/colorPrimaryText"/>
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:paddingLeft="8dp"
-                            android:paddingRight="8dp"
-                            android:orientation="vertical">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                style="@style/AnotherWidget.Settings.Title"
-                                android:text="@string/appearance_header"/>
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="Change the widget design"
-                                style="@style/AnotherWidget.Settings.Subtitle"/>
-                        </LinearLayout>
-                        <ImageView
-                            android:layout_width="48dp"
-                            android:layout_height="48dp"
-                            android:padding="8dp"
-                            android:src="@drawable/round_chevron_right_24"
-                            app:tint="@color/colorPrimaryText"/>
-                    </LinearLayout>
+                        android:text="Change the text design"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="8dp"
+                    android:src="@drawable/round_chevron_right_24"
+                    app:tint="@color/colorPrimaryText"/>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:id="@+id/action_general_settings"
+                android:orientation="horizontal">
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:padding="8dp"
+                    android:src="@drawable/round_palette_24"
+                    app:tint="@color/colorPrimaryText"/>
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/appearance_header"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Change the widget design"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
+                </LinearLayout>
+                <ImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="8dp"
+                    android:src="@drawable/round_chevron_right_24"
+                    app:tint="@color/colorPrimaryText"/>
+            </LinearLayout>
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -159,281 +140,263 @@
                 android:paddingRight="20dp"
                 android:textAppearance="@style/AnotherWidget.Settings.Header"
                 app:textAllCaps="false" />
-            <com.google.android.material.card.MaterialCardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:cardElevation="0dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
-                app:strokeColor="@color/cardBorder"
-                app:strokeWidth="1dp"
-                app:cardBackgroundColor="@color/colorPrimary"
-                app:cardCornerRadius="8dp">
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:id="@+id/action_show_events">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        app:tint="@color/colorPrimaryText"
+                        android:src="@drawable/round_today_24"/>
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:paddingTop="12dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:id="@+id/action_show_events">
-                            <ImageView
-                                android:layout_width="48dp"
-                                android:layout_height="48dp"
-                                android:padding="12dp"
-                                app:tint="@color/colorPrimaryText"
-                                android:src="@drawable/round_today_24"/>
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_weight="1"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="8dp"
-                                android:paddingRight="8dp"
-                                android:orientation="vertical">
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/AnotherWidget.Settings.Title"
-                                    android:text="Calendar"/>
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Change the widget design"
-                                    style="@style/AnotherWidget.Settings.Subtitle"/>
-                            </LinearLayout>
-                            <LinearLayout
-                                android:layout_width="1dp"
-                                android:layout_height="match_parent"
-                                android:background="@color/cardBorder"
-                                android:layout_marginTop="4dp"
-                                android:layout_marginBottom="4dp"
-                                android:alpha="0.6" />
-                        </LinearLayout>
-                        <com.kyleduo.switchbutton.SwitchButton
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginStart="16dp"
-                            app:kswThumbWidth="16sp"
-                            app:kswThumbHeight="16sp"
-                            android:checked="@{isCalendarEnabled}"
-                            app:kswBackRadius="16dp"
-                            app:kswTintColor="@color/colorAccent"
-                            android:id="@+id/show_events_switch"
-                            android:buttonTint="@color/colorAccent" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:paddingTop="12dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:id="@+id/action_show_weather">
-                            <ImageView
-                                android:layout_width="48dp"
-                                android:layout_height="48dp"
-                                android:padding="12dp"
-                                android:id="@+id/weather_icon_pack"
-                                app:tint="@color/colorPrimaryText"
-                                android:src="@drawable/round_brightness_5_24"/>
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_weight="1"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="8dp"
-                                android:paddingRight="8dp"
-                                android:orientation="vertical">
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/AnotherWidget.Settings.Title"
-                                    android:text="Weather"/>
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Change the widget design"
-                                    style="@style/AnotherWidget.Settings.Subtitle"/>
-                            </LinearLayout>
-                            <LinearLayout
-                                android:layout_width="1dp"
-                                android:layout_height="match_parent"
-                                android:background="@color/cardBorder"
-                                android:layout_marginTop="4dp"
-                                android:layout_marginBottom="4dp"
-                                android:alpha="0.6" />
-                        </LinearLayout>
-                        <com.kyleduo.switchbutton.SwitchButton
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="Calendar"/>
+                        <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginStart="16dp"
-                            app:kswThumbWidth="16sp"
-                            app:kswThumbHeight="16sp"
-                            app:kswBackRadius="16dp"
-                            app:kswTintColor="@color/colorAccent"
-                            android:checked="@{isWeatherVisible}"
-                            android:id="@+id/show_weather_switch"
-                            android:buttonTint="@color/colorAccent" />
+                            android:text="Change the widget design"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                     <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:paddingTop="12dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:id="@+id/action_show_clock">
-                            <ImageView
-                                android:layout_width="48dp"
-                                android:layout_height="48dp"
-                                android:padding="12dp"
-                                app:tint="@color/colorPrimaryText"
-                                android:src="@drawable/round_schedule_24"/>
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_weight="1"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="8dp"
-                                android:paddingRight="8dp"
-                                android:orientation="vertical">
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/AnotherWidget.Settings.Title"
-                                    android:text="Clock"/>
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Change the clock "
-                                    style="@style/AnotherWidget.Settings.Subtitle"/>
-                            </LinearLayout>
-                            <LinearLayout
-                                android:layout_width="1dp"
-                                android:layout_height="match_parent"
-                                android:background="@color/cardBorder"
-                                android:layout_marginTop="4dp"
-                                android:layout_marginBottom="4dp"
-                                android:alpha="0.6" />
-                        </LinearLayout>
-                        <com.kyleduo.switchbutton.SwitchButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginStart="16dp"
-                            app:kswThumbWidth="16sp"
-                            app:kswThumbHeight="16sp"
-                            app:kswBackRadius="16dp"
-                            app:kswTintColor="@color/colorAccent"
-                            android:checked="@{isClockVisible}"
-                            android:id="@+id/show_clock_switch"
-                            android:buttonTint="@color/colorAccent" />
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:layout_height="wrap_content"
-                            android:paddingTop="12dp"
-                            android:paddingBottom="12dp"
-                            android:paddingStart="10dp"
-                            android:paddingEnd="0dp"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:background="?android:attr/selectableItemBackground"
-                            android:id="@+id/action_show_glance">
-                            <ImageView
-                                android:layout_width="48dp"
-                                android:layout_height="48dp"
-                                android:padding="10dp"
-                                app:tint="@color/colorPrimaryText"
-                                android:src="@drawable/round_pageview"/>
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_weight="1"
-                                android:layout_height="wrap_content"
-                                android:paddingLeft="8dp"
-                                android:paddingRight="8dp"
-                                android:orientation="vertical">
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    style="@style/AnotherWidget.Settings.Title"
-                                    android:text="Glance"/>
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Change glace info"
-                                    style="@style/AnotherWidget.Settings.Subtitle"/>
-                            </LinearLayout>
-                            <LinearLayout
-                                android:layout_width="1dp"
-                                android:layout_height="match_parent"
-                                android:background="@color/cardBorder"
-                                android:layout_marginTop="4dp"
-                                android:layout_marginBottom="4dp"
-                                android:alpha="0.6" />
-                        </LinearLayout>
-                        <com.kyleduo.switchbutton.SwitchButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginStart="16dp"
-                            app:kswThumbWidth="16sp"
-                            app:kswThumbHeight="16sp"
-                            app:kswBackRadius="16dp"
-                            app:kswTintColor="@color/colorAccent"
-                            android:checked="@{isGlanceVisible}"
-                            android:id="@+id/show_glance_switch"
-                            android:buttonTint="@color/colorAccent" />
-                    </LinearLayout>
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/cardBorder"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:alpha="0.6" />
                 </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
+                <com.kyleduo.switchbutton.SwitchButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
+                    app:kswThumbWidth="16sp"
+                    app:kswThumbHeight="16sp"
+                    android:checked="@{isCalendarEnabled}"
+                    app:kswBackRadius="16dp"
+                    app:kswTintColor="@color/colorAccent"
+                    android:id="@+id/show_events_switch"
+                    android:buttonTint="@color/colorAccent" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:id="@+id/action_show_weather">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:id="@+id/weather_icon_pack"
+                        app:tint="@color/colorPrimaryText"
+                        android:src="@drawable/round_brightness_5_24"/>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="Weather"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Change the widget design"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/cardBorder"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:alpha="0.6" />
+                </LinearLayout>
+                <com.kyleduo.switchbutton.SwitchButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
+                    app:kswThumbWidth="16sp"
+                    app:kswThumbHeight="16sp"
+                    app:kswBackRadius="16dp"
+                    app:kswTintColor="@color/colorAccent"
+                    android:checked="@{isWeatherVisible}"
+                    android:id="@+id/show_weather_switch"
+                    android:buttonTint="@color/colorAccent" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:id="@+id/action_show_clock">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        app:tint="@color/colorPrimaryText"
+                        android:src="@drawable/round_schedule_24"/>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="Clock"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Change the clock "
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/cardBorder"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:alpha="0.6" />
+                </LinearLayout>
+                <com.kyleduo.switchbutton.SwitchButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
+                    app:kswThumbWidth="16sp"
+                    app:kswThumbHeight="16sp"
+                    app:kswBackRadius="16dp"
+                    app:kswTintColor="@color/colorAccent"
+                    android:checked="@{isClockVisible}"
+                    android:id="@+id/show_clock_switch"
+                    android:buttonTint="@color/colorAccent" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:id="@+id/action_show_glance">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="10dp"
+                        app:tint="@color/colorPrimaryText"
+                        android:src="@drawable/round_pageview"/>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="Glance"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Change glace info"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="1dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/cardBorder"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginBottom="4dp"
+                        android:alpha="0.6" />
+                </LinearLayout>
+                <com.kyleduo.switchbutton.SwitchButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
+                    app:kswThumbWidth="16sp"
+                    app:kswThumbHeight="16sp"
+                    app:kswBackRadius="16dp"
+                    app:kswTintColor="@color/colorAccent"
+                    android:checked="@{isGlanceVisible}"
+                    android:id="@+id/show_glance_switch"
+                    android:buttonTint="@color/colorAccent" />
+            </LinearLayout>
         </LinearLayout>
     </com.tommasoberlose.anotherwidget.components.FixedFocusScrollView>
 </layout>
\ No newline at end of file