diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11a4c66..9a49e5b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,11 +7,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!--Kiosk Mode-->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REORDER_TASKS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.GET_TASKS"/>
-
-    <service android:name=".KioskService" android:exported="false"/>
 
     <application
         android:name=".AppContext"
@@ -23,6 +20,8 @@
         android:theme="@style/AppTheme"
         android:keepScreenOn="true"
         tools:replace="android:allowBackup,android:label">
+
+
         <activity
             android:name=".GamingActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -40,8 +39,11 @@
             android:theme="@style/FullscreenTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
index 8b52ae9..31c1e4c 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
@@ -1,5 +1,7 @@
 package com.rubenvandeven.emotionhero;
 
+import android.app.ActivityManager;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.net.Uri;
@@ -94,4 +96,15 @@ public class CreditsActivity extends AppCompatActivity {
             sendBroadcast(closeDialog);
         }
     }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
 }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/EndingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/EndingActivity.java
index 322e99e..e691bf7 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/EndingActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/EndingActivity.java
@@ -1,5 +1,7 @@
 package com.rubenvandeven.emotionhero;
 
+import android.app.ActivityManager;
+import android.content.Context;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -103,4 +105,15 @@ public class EndingActivity extends AppCompatActivity {
             sendBroadcast(closeDialog);
         }
     }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
 }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
index 7670a6a..b7ce971 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
@@ -2,7 +2,9 @@ package com.rubenvandeven.emotionhero;
 
 import android.Manifest;
 import android.annotation.TargetApi;
+import android.app.ActivityManager;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -188,6 +190,11 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
         super.onPause();
         stopDetector();
         currentScenario.pause();
+
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
     }
 
     void startDetector() {
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java
index fb88b26..cb64f98 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/HighscoreActivity.java
@@ -1,6 +1,8 @@
 package com.rubenvandeven.emotionhero;
 
+import android.app.ActivityManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -437,4 +439,15 @@ public class HighscoreActivity extends AppCompatActivity {
             sendBroadcast(closeDialog);
         }
     }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
 }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
index c38ab99..ee82ad0 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/IntroActivity.java
@@ -2,6 +2,8 @@ package com.rubenvandeven.emotionhero;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.app.ActivityManager;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -91,7 +93,7 @@ public class IntroActivity extends AppCompatActivity {
     public void continueToMenu() {
         continueHandler.removeCallbacks(continueRunnable);
         Intent intent = new Intent(this, MirrorMenuActivity.class);
-        finish();
+//        finish();
         startActivity(intent);
         //disable distracting transition when going to menu
         IntroActivity.this.overridePendingTransition(0, 0);
@@ -110,4 +112,14 @@ public class IntroActivity extends AppCompatActivity {
             sendBroadcast(closeDialog);
         }
     }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
 }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java
index 8746b32..bd622de 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/MirrorMenuActivity.java
@@ -3,7 +3,9 @@ package com.rubenvandeven.emotionhero;
 import android.Manifest;
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
+import android.app.ActivityManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -72,6 +74,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); // kiosk mode
         if(getSupportActionBar() != null) {
             getSupportActionBar().hide();
         }
@@ -197,6 +200,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
                 public void onClick(View v) {
                     Intent intent = new Intent(MirrorMenuActivity.this, ProgressActivity.class);
                     startActivity(intent);
+                    stopDetector();
                 }
             });
         }
@@ -206,6 +210,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
             public void onClick(View v) {
                 Intent intent = new Intent(MirrorMenuActivity.this, CreditsActivity.class);
                 startActivity(intent);
+                stopDetector();
             }
         });
 
@@ -242,6 +247,7 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
                 Intent intent = new Intent(MirrorMenuActivity.this, ProgressActivity.class);
                 finish();
                 startActivity(intent);
+                stopDetector();
             }
         });
 
@@ -286,7 +292,12 @@ public class MirrorMenuActivity extends AppCompatActivity implements Detector.Im
     @Override
     protected void onPause() {
         super.onPause();
-        stopDetector();
+//        stopDetector(); // kiosk mode should never pause ...
+
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
     }
 
     void startDetector() {
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/OnScreenOffReceiver.java b/app/src/main/java/com/rubenvandeven/emotionhero/OnScreenOffReceiver.java
index 4eca8b1..2ce741f 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/OnScreenOffReceiver.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/OnScreenOffReceiver.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
+import android.util.Log;
 
 /**
  * For kioskmode only!
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java
index 42b4b49..85e430c 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ProgressActivity.java
@@ -1,6 +1,8 @@
 package com.rubenvandeven.emotionhero;
 
+import android.app.ActivityManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.support.v7.app.AppCompatActivity;
@@ -189,6 +191,16 @@ public class ProgressActivity extends AppCompatActivity {
         levelsLayout.addView(outroText);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
+
     /**
      * For kioskmode
      * @param hasFocus
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java
index a6816ac..7a0f49c 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewAchievementsActivity.java
@@ -1,5 +1,7 @@
 package com.rubenvandeven.emotionhero;
 
+import android.app.ActivityManager;
+import android.content.Context;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -108,4 +110,14 @@ public class ReviewAchievementsActivity extends AppCompatActivity {
             sendBroadcast(closeDialog);
         }
     }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
 }
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java
index 2903a70..fb659f7 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/ReviewActivity.java
@@ -1,6 +1,8 @@
 package com.rubenvandeven.emotionhero;
 
+import android.app.ActivityManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Handler;
@@ -367,4 +369,15 @@ public class ReviewActivity extends AppCompatActivity {
             sendBroadcast(closeDialog);
         }
     }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        ActivityManager activityManager = (ActivityManager) getApplicationContext()
+                .getSystemService(Context.ACTIVITY_SERVICE);
+
+        activityManager.moveTaskToFront(getTaskId(), 0);
+    }
+
 }