diff --git a/app/src/main/res/drawable/custom_theme.jpg b/app/src/main/res/drawable/custom_theme.jpg
new file mode 100644
index 0000000..fd0e7ca
Binary files /dev/null and b/app/src/main/res/drawable/custom_theme.jpg differ
diff --git a/app/src/main/res/drawable/dark_theme.jpg b/app/src/main/res/drawable/dark_theme.jpg
new file mode 100644
index 0000000..df2414a
Binary files /dev/null and b/app/src/main/res/drawable/dark_theme.jpg differ
diff --git a/app/src/main/res/drawable/finnmglas_theme.jpg b/app/src/main/res/drawable/finnmglas_theme.jpg
new file mode 100644
index 0000000..97996e1
Binary files /dev/null and b/app/src/main/res/drawable/finnmglas_theme.jpg differ
diff --git a/app/src/main/res/layout/fragment_settings_theme.xml b/app/src/main/res/layout/fragment_settings_theme.xml
index 829c5d9..e0de1f4 100644
--- a/app/src/main/res/layout/fragment_settings_theme.xml
+++ b/app/src/main/res/layout/fragment_settings_theme.xml
@@ -6,57 +6,106 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorPrimary"
-    android:gravity="center|top"
+    android:gravity="center"
     android:orientation="vertical"
-    android:padding="32sp"
+    android:paddingLeft="32sp"
+    android:paddingTop="32sp"
+    android:paddingRight="32sp"
     tools:context=".SettingsActivity">
 
-    <!--Button
-        style="@style/Widget.AppCompat.Button"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:onClick="setLauncher"
-        android:text="@string/settings_select_launcher"
-        android:textAllCaps="false" /-->
+        android:layout_height="match_parent">
 
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10sp"
-        android:theme="@style/finnmglasTheme">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorAccent">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <Button
-                android:layout_width="wrap_content"
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Activate"
-                app:layout_constraintEnd_toEndOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                android:layout_marginBottom="10sp"
+                app:cardCornerRadius="8dp">
 
-    </androidx.cardview.widget.CardView>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10sp"
-        android:theme="@style/darkTheme">
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/dark_theme" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorAccent">
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="select"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <Button
-                android:layout_width="wrap_content"
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Activate"
-                app:layout_constraintEnd_toEndOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                android:layout_marginBottom="10sp"
+                app:cardCornerRadius="8dp">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/colorAccent">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/finnmglas_theme" />
+
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="select"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10sp"
+                app:cardCornerRadius="8dp">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:adjustViewBounds="true"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/custom_theme" />
+
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="select"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+    </ScrollView>
 
-    </androidx.cardview.widget.CardView>
 </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 82f3cae..1cd75f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,8 +17,8 @@
     <string name="settings_title">Settings</string>
 
     <string name="settings_tab_app" translatable="false">Apps</string>
-    <string name="settings_tab_theme" translatable="false">Theme</string>
-    <string name="settings_tab_launcher" translatable="false">Launcher</string>
+    <string name="settings_tab_theme" translatable="false">Themes</string>
+    <string name="settings_tab_launcher" translatable="false">Meta</string>
 
     <string name="settings_feedback">Give some feedback</string>
     <string name="settings_show_tutorial">View Launcher Tutorial</string>