diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
index ee5692e..a8a22dc 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -123,7 +123,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
         setButtonColor(settings_theme_finn_button_select, vibrantColor)
         setButtonColor(settings_theme_dark_button_select, vibrantColor)
         setButtonColor(settings_theme_custom_button_select, vibrantColor)
-        setButtonColor(settings_theme_custom_button_examples, vibrantColor)
     }
 
     override fun setOnClicks() {
@@ -152,14 +151,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
             }
             else letUserPickImage()
         }
-        settings_theme_custom_button_examples.setOnClickListener {
-            intendedSettingsPause = true
-            // Show example usage
-            openNewTabWindow(
-                "https://github.com/finnmglas/Launcher/blob/master/docs/README.md",
-                context!!
-            )
-        }
         settings_launcher_switch_screen_timeout.setOnClickListener { // Toggle screen timeout
             launcherPreferences.edit()
                 .putBoolean(PREF_SCREEN_TIMEOUT_DISABLED,
diff --git a/app/src/main/res/drawable-de/custom_theme.jpg b/app/src/main/res/drawable-de/custom_theme.jpg
deleted file mode 100644
index af575d0..0000000
Binary files a/app/src/main/res/drawable-de/custom_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable-de/dark_theme.jpg b/app/src/main/res/drawable-de/dark_theme.jpg
deleted file mode 100644
index 60018be..0000000
Binary files a/app/src/main/res/drawable-de/dark_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable-de/finnmglas_theme.jpg b/app/src/main/res/drawable-de/finnmglas_theme.jpg
deleted file mode 100644
index 1b65f60..0000000
Binary files a/app/src/main/res/drawable-de/finnmglas_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable-fr/custom_theme.jpg b/app/src/main/res/drawable-fr/custom_theme.jpg
deleted file mode 100644
index 54e79b4..0000000
Binary files a/app/src/main/res/drawable-fr/custom_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable-fr/dark_theme.jpg b/app/src/main/res/drawable-fr/dark_theme.jpg
deleted file mode 100644
index 19e8861..0000000
Binary files a/app/src/main/res/drawable-fr/dark_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable-fr/finnmglas_theme.jpg b/app/src/main/res/drawable-fr/finnmglas_theme.jpg
deleted file mode 100644
index 2f0b6f7..0000000
Binary files a/app/src/main/res/drawable-fr/finnmglas_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/custom_theme.jpg b/app/src/main/res/drawable/custom_theme.jpg
deleted file mode 100644
index d695828..0000000
Binary files a/app/src/main/res/drawable/custom_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/dark_theme.jpg b/app/src/main/res/drawable/dark_theme.jpg
deleted file mode 100644
index df2414a..0000000
Binary files a/app/src/main/res/drawable/dark_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/finnmglas_theme.jpg b/app/src/main/res/drawable/finnmglas_theme.jpg
deleted file mode 100644
index 97996e1..0000000
Binary files a/app/src/main/res/drawable/finnmglas_theme.jpg and /dev/null differ
diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml
index 4e9b595..4d105a7 100644
--- a/app/src/main/res/layout/settings_launcher.xml
+++ b/app/src/main/res/layout/settings_launcher.xml
@@ -1,182 +1,183 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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/settings_launcher_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorPrimary"
-    android:gravity="center"
+    android:gravity="center|top"
     android:orientation="vertical"
     android:paddingLeft="32sp"
     android:paddingTop="16sp"
     android:paddingRight="32sp"
     tools:context=".settings.meta.SettingsFragmentMeta">
 
-    <ScrollView
-        android:id="@+id/settings_theme_scroller"
+    <LinearLayout
+        android:id="@+id/settings_launcher_section_appearance"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_time_format"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/settings_launcher_section_appearance_title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:text="Appearance"
+            android:textColor="#ccc"
+            android:textSize="18sp"
+            tools:layout_editor_absoluteX="32dp"
+            tools:layout_editor_absoluteY="16dp" />
+    </LinearLayout>
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/settings_theme_finn"
-                android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16sp"
+        android:layout_marginBottom="16sp"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_time_format"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_time_format"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_screen_timeout"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Spinner
+            android:id="@+id/settings_launcher_format_spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:entries="@array/settings_launcher_time_formats"
+            android:spinnerMode="dropdown" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_theme_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Theme"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_screen_timeout"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Spinner
+            android:id="@+id/settings_launcher_theme_spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:entries="@array/settings_launcher_time_formats"
+            android:spinnerMode="dropdown" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/settings_launcher_section_options"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/settings_launcher_section_options_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Options"
+            android:textColor="#ccc"
+            android:textSize="18sp"
+            tools:layout_editor_absoluteX="32dp"
+            tools:layout_editor_absoluteY="16dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16sp"
+        android:layout_marginBottom="16sp"
+        android:gravity="top"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_screen_timeout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8sp"
+            android:text="@string/settings_launcher_disable_timeout"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/settings_launcher_text_time_format" />
+
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Switch
+            android:id="@+id/settings_launcher_switch_screen_timeout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:textSize="18sp"
+            app:layout_constraintBottom_toBottomOf="@id/settings_launcher_text_screen_timeout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/settings_launcher_text_screen_timeout" />
+
+    </LinearLayout>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/settings_theme_dark"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/settings_launcher_switch_screen_timeout"
+        tools:layout_editor_absoluteX="32dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <Button
+                android:id="@+id/settings_theme_dark_button_select"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10sp"
-                app:cardCornerRadius="8dp">
+                android:text="Dark"
+                android:textAllCaps="false"
+                app:layout_constraintStart_toEndOf="@+id/settings_theme_finn_button_select" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/settings_theme_finn_img"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:adjustViewBounds="true"
-                        android:scaleType="fitXY"
-                        app:srcCompat="@drawable/finnmglas_theme"
-                        tools:ignore="ContentDescription" />
-
-                    <Button
-                        android:id="@+id/settings_theme_finn_button_select"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_select_theme"
-                        android:textAllCaps="false"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </androidx.cardview.widget.CardView>
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/settings_theme_dark"
-                android:layout_width="match_parent"
+            <Button
+                android:id="@+id/settings_theme_finn_button_select"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10sp"
-                app:cardCornerRadius="8dp">
+                android:text="Default"
+                android:textAllCaps="false"
+                app:layout_constraintStart_toStartOf="parent" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/settings_theme_dark_img"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:adjustViewBounds="true"
-                        android:scaleType="fitXY"
-                        app:srcCompat="@drawable/dark_theme"
-                        tools:ignore="ContentDescription" />
-
-                    <Button
-                        android:id="@+id/settings_theme_dark_button_select"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_select_theme"
-                        android:textAllCaps="false"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </androidx.cardview.widget.CardView>
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/settings_theme_custom"
-                android:layout_width="match_parent"
+            <Button
+                android:id="@+id/settings_theme_custom_button_select"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10sp"
-                app:cardCornerRadius="8dp">
+                android:text="Wallpaper"
+                android:textAllCaps="false"
+                app:layout_constraintEnd_toEndOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+    </androidx.cardview.widget.CardView>
 
-                    <ImageView
-                        android:id="@+id/settings_theme_custom_img"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:adjustViewBounds="true"
-                        android:scaleType="fitXY"
-                        app:srcCompat="@drawable/custom_theme"
-                        tools:ignore="ContentDescription" />
-
-                    <Button
-                        android:id="@+id/settings_theme_custom_button_select"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_select_theme"
-                        android:textAllCaps="false"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
-
-                    <Button
-                        android:id="@+id/settings_theme_custom_button_examples"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_theme_examples"
-                        android:textAllCaps="false"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/settings_theme_custom_button_select" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </androidx.cardview.widget.CardView>
-
-        </LinearLayout>
-    </ScrollView>
-
-    <TextView
-        android:id="@+id/settings_launcher_text_time_format"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
-        android:text="@string/settings_launcher_time_format"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toTopOf="@id/settings_launcher_text_screen_timeout"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Spinner
-        android:id="@+id/settings_launcher_format_spinner"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:entries="@array/settings_launcher_time_formats"
-        android:spinnerMode="dropdown"
-        app:layout_constraintBottom_toBottomOf="@id/settings_launcher_text_time_format"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/settings_launcher_text_time_format" />
-
-    <TextView
-        android:id="@+id/settings_launcher_text_screen_timeout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
-        android:text="@string/settings_launcher_disable_timeout"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Switch
-        android:id="@+id/settings_launcher_switch_screen_timeout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checked="false"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="@id/settings_launcher_text_screen_timeout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/settings_launcher_text_screen_timeout" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file