diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..3d21ecd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 48bfe44..2124db2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Stoofnogaan.iml" filepath="$PROJECT_DIR$/Stoofnogaan.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/stoofnogaan.iml" filepath="$PROJECT_DIR$/stoofnogaan.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/androidTest/java/be/mathsaey/stoofnogaan/ExampleInstrumentedTest.java b/app/src/androidTest/java/be/mathsaey/stoofnogaan/ExampleInstrumentedTest.java
deleted file mode 100644
index 1e40355..0000000
--- a/app/src/androidTest/java/be/mathsaey/stoofnogaan/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package be.mathsaey.stoofnogaan;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("be.mathsaey.stoofnogaan", appContext.getPackageName());
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe4e954..912de46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,9 +4,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/stoofinbrand_icon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/stoofinbrand_icon"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
diff --git a/app/src/main/assets/fonts/Oswald.ttf b/app/src/main/assets/fonts/Oswald.ttf
new file mode 100644
index 0000000..c749cfa
Binary files /dev/null and b/app/src/main/assets/fonts/Oswald.ttf differ
diff --git a/app/src/main/java/be/mathsaey/stoofnogaan/MainActivity.java b/app/src/main/java/be/mathsaey/stoofnogaan/MainActivity.java
index d97f453..9e91521 100644
--- a/app/src/main/java/be/mathsaey/stoofnogaan/MainActivity.java
+++ b/app/src/main/java/be/mathsaey/stoofnogaan/MainActivity.java
@@ -2,11 +2,13 @@ package be.mathsaey.stoofnogaan;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/be/mathsaey/stoofnogaan/TaskView.java b/app/src/main/java/be/mathsaey/stoofnogaan/TaskView.java
index b0fb84e..1489875 100644
--- a/app/src/main/java/be/mathsaey/stoofnogaan/TaskView.java
+++ b/app/src/main/java/be/mathsaey/stoofnogaan/TaskView.java
@@ -1,13 +1,16 @@
 package be.mathsaey.stoofnogaan;
 
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
-class TaskView extends  LinearLayout {
+class TaskView extends LinearLayout {
     private MainActivity parent;
 
     protected CheckBox checkBox;
@@ -50,16 +53,17 @@ class TaskView extends  LinearLayout {
     private void addTextListeners() {
         // When done is clicked...
         // Or not because that is when things start to go boom
-//        textView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-//            @Override
-//            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
-//                if (i == EditorInfo.IME_ACTION_DONE && TaskView.this.isEmpty()) {
-//                    parent.deleteTask(TaskView.this);
-//                    return true;
-//                }
-//                return false;
-//            }
-//        });
+        textView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                if (i == EditorInfo.IME_ACTION_DONE && TaskView.this.isEmpty()) {
+                    parent.deleteTask(TaskView.this);
+                    return true;
+                }
+                return false;
+            }
+        });
+
         // Or when we lose focus
         textView.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
new file mode 100644
index 0000000..75571bf
--- /dev/null
+++ b/app/src/main/res/drawable/button.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <item>
+        <shape>
+            <!-- set the shadow color here -->
+            <stroke
+                android:width="2dp"
+                android:color="#3e1a01" />
+
+            <padding
+                android:bottom="2dp"
+                android:left="0dp"
+                android:right="0dp"
+                android:top="0dp" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <!-- Background -->
+
+    <item>
+        <shape>
+            <solid android:color="@color/colorBrown" />
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/drop_shadow.xml b/app/src/main/res/drawable/drop_shadow.xml
new file mode 100644
index 0000000..71aa36a
--- /dev/null
+++ b/app/src/main/res/drawable/drop_shadow.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <item>
+        <shape>
+            <!-- set the shadow color here -->
+            <stroke
+                android:width="2dp"
+                android:color="@color/colorDropShadow" />
+
+            <padding
+                android:bottom="2dp"
+                android:left="0dp"
+                android:right="2dp"
+                android:top="0dp" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <!-- Background -->
+
+    <item>
+        <shape>
+            <solid android:color="@color/colorWhite" />
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b3eeaba..9649b94 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,20 +5,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/colorLight"
+    android:padding="52dp"
+    android:paddingTop="102dp"
     tools:context="be.mathsaey.stoofnogaan.MainActivity">
 
-    <LinearLayout
-        android:id="@+id/tasks"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/drop_shadow"
+        android:paddingBottom="16dp"
         android:orientation="vertical">
-    </LinearLayout>
 
-    <Button
-        android:id="@+id/addButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/task_new"
-        android:onClick="onNewTaskButtonClick"/>
-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/tasks"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="16dp"
+            android:layout_above="@+id/addButton">
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/addButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="onNewTaskButtonClick"
+            android:text="@string/task_new"
+            android:background="@drawable/button"
+            android:layout_alignParentBottom="true"
+            android:paddingLeft="52dp"
+            android:paddingRight="52dp"
+            android:layout_centerHorizontal="true">
+        </Button>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/task.xml b/app/src/main/res/layout/task.xml
index 2728266..3c10a44 100644
--- a/app/src/main/res/layout/task.xml
+++ b/app/src/main/res/layout/task.xml
@@ -9,12 +9,15 @@
         android:id="@+id/checkBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@null"/>
+        android:text="@null">
+    </CheckBox>
 
     <EditText
         android:id="@+id/textView"
         android:inputType="text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/task_hint"/>
+        android:hint="@string/task_hint">
+    </EditText>
+
 </LinearLayout>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index d3e13c5..b57525f 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"/>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:title="@string/settings_text"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="always"/>
+        android:icon="@mipmap/stoofinbrand_icon"
+        android:showAsAction="always">
+    </item>
 </menu>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 9a078e3..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/stoofinbrand_icon.png b/app/src/main/res/mipmap-hdpi/stoofinbrand_icon.png
new file mode 100644
index 0000000..41b4d8d
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/stoofinbrand_icon.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index efc028a..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/stoofinbrand_icon.png b/app/src/main/res/mipmap-mdpi/stoofinbrand_icon.png
new file mode 100644
index 0000000..1f3060c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/stoofinbrand_icon.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 3af2608..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/stoofinbrand_icon.png b/app/src/main/res/mipmap-xhdpi/stoofinbrand_icon.png
new file mode 100644
index 0000000..7d064d5
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/stoofinbrand_icon.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 9bec2e6..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/stoofinbrand_icon.png b/app/src/main/res/mipmap-xxhdpi/stoofinbrand_icon.png
new file mode 100644
index 0000000..1338308
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/stoofinbrand_icon.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 34947cd..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/stoofinbrand_icon.png b/app/src/main/res/mipmap-xxxhdpi/stoofinbrand_icon.png
new file mode 100644
index 0000000..a47536d
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/stoofinbrand_icon.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..cef5b63 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorWhite">#FFF</color>
+    <color name="colorLight">#FFF8E1</color>
+    <color name="colorOrange">#FF7F2A</color>
+    <color name="colorTeak">#5FD3BC</color>
+    <color name="colorDropShadow">#E6DDBF</color>
+    <color name="colorBrown">#552200</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9785e0c..78a96f2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
+    <style name="AppTheme" parent="android:Theme.Holo.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 
diff --git a/app/src/main/stoofinbrand_icon-web.png b/app/src/main/stoofinbrand_icon-web.png
new file mode 100644
index 0000000..37c36e0
Binary files /dev/null and b/app/src/main/stoofinbrand_icon-web.png differ
diff --git a/app/src/test/java/be/mathsaey/stoofnogaan/ExampleUnitTest.java b/app/src/test/java/be/mathsaey/stoofnogaan/ExampleUnitTest.java
deleted file mode 100644
index 9de5c17..0000000
--- a/app/src/test/java/be/mathsaey/stoofnogaan/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package be.mathsaey.stoofnogaan;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file