diff --git a/art/icon.png b/art/icon.png
index 61313c7d..82611522 100644
Binary files a/art/icon.png and b/art/icon.png differ
diff --git a/art/screen1.png b/art/screen1.png
index cd066c70..72deb7c8 100644
Binary files a/art/screen1.png and b/art/screen1.png differ
diff --git a/art/screen2.png b/art/screen2.png
index 5502595e..c0ae2a54 100644
Binary files a/art/screen2.png and b/art/screen2.png differ
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java
index dc49771a..6a10a20a 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java
@@ -37,14 +37,16 @@ public class CameraOptions {
         Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
         for (int i = 0, count = Camera.getNumberOfCameras(); i < count; i++) {
             Camera.getCameraInfo(i, cameraInfo);
-            supportedFacing.add(mapper.unmapFacing(cameraInfo.facing));
+            Integer value = mapper.unmapFacing(cameraInfo.facing);
+            if (value != null) supportedFacing.add(value);
         }
 
         // WB
         strings = params.getSupportedWhiteBalance();
         if (strings != null) {
             for (String string : strings) {
-                supportedWhiteBalance.add(mapper.unmapWhiteBalance(string));
+                Integer value = mapper.unmapWhiteBalance(string);
+                if (value != null) supportedWhiteBalance.add(value);
             }
         }
 
@@ -52,14 +54,16 @@ public class CameraOptions {
         strings = params.getSupportedFlashModes();
         if (strings != null) {
             for (String string : strings) {
-                supportedFlash.add(mapper.unmapFlash(string));
+                Integer value = mapper.unmapFlash(string);
+                if (value != null) supportedFlash.add(value);
             }
         }
 
         // Focus
         strings = params.getSupportedFocusModes(); // Never null.
         for (String string : strings) {
-            supportedFocus.add(mapper.unmapFocus(string));
+            Integer value = mapper.unmapFocus(string);
+            if (value != null) supportedFocus.add(value);
         }
 
         zoomSupported = params.isZoomSupported();
diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java
index ab5f93a7..78447cd4 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Mapper.java
@@ -3,22 +3,24 @@ package com.otaliastudios.cameraview;
 import android.hardware.Camera;
 import android.util.SparseArray;
 
+import java.util.HashMap;
+
 abstract class Mapper {
 
     abstract <T> T mapFlash(@Flash int internalConstant);
     abstract <T> T mapFacing(@Facing int internalConstant);
     abstract <T> T mapWhiteBalance(@WhiteBalance int internalConstant);
     abstract <T> T mapFocus(@Focus int internalConstant);
-    @Flash abstract <T> int unmapFlash(T cameraConstant);
-    @Facing abstract <T> int unmapFacing(T cameraConstant);
-    @WhiteBalance abstract <T> int unmapWhiteBalance(T cameraConstant);
-    @Focus abstract <T> int unmapFocus(T cameraConstant);
+    @Flash abstract <T> Integer unmapFlash(T cameraConstant);
+    @Facing abstract <T> Integer unmapFacing(T cameraConstant);
+    @WhiteBalance abstract <T> Integer unmapWhiteBalance(T cameraConstant);
+    @Focus abstract <T> Integer unmapFocus(T cameraConstant);
 
     static class Mapper1 extends Mapper {
-        private static final SparseArray<String> FLASH = new SparseArray<>();
-        private static final SparseArray<String> WB = new SparseArray<>();
-        private static final SparseArray<Integer> FACING = new SparseArray<>();
-        private static final SparseArray<String> FOCUS = new SparseArray<>();
+        private static final HashMap<Integer, String> FLASH = new HashMap<>();
+        private static final HashMap<Integer, String> WB = new HashMap<>();
+        private static final HashMap<Integer, Integer> FACING = new HashMap<>();
+        private static final HashMap<Integer, String> FOCUS = new HashMap<>();
 
         static {
             FLASH.put(CameraConstants.FLASH_OFF, Camera.Parameters.FLASH_MODE_OFF);
@@ -40,43 +42,52 @@ abstract class Mapper {
 
         @Override
         <T> T mapFlash(int internalConstant) {
-            return (T) FLASH.get(internalConstant, null);
+            return (T) FLASH.get(internalConstant);
         }
 
         @Override
         <T> T mapFacing(int internalConstant) {
-            return (T) FACING.get(internalConstant, null);
+            return (T) FACING.get(internalConstant);
         }
 
         @Override
         <T> T mapWhiteBalance(int internalConstant) {
-            return (T) WB.get(internalConstant, null);
+            return (T) WB.get(internalConstant);
         }
 
         @Override
         <T> T mapFocus(@Focus int internalConstant) {
-            return (T) FOCUS.get(internalConstant, null);
+            return (T) FOCUS.get(internalConstant);
+        }
+
+        private Integer reverseLookup(HashMap<Integer, ?> map, Object object) {
+            for (int value : map.keySet()) {
+                if (map.get(value).equals(object)) {
+                    return value;
+                }
+            }
+            return null;
         }
 
         @Override
-        <T> int unmapFlash(T cameraConstant) {
-            return FLASH.keyAt(FLASH.indexOfValue((String) cameraConstant));
+        <T> Integer unmapFlash(T cameraConstant) {
+            return reverseLookup(FLASH, cameraConstant);
         }
 
         @Override
-        <T> int unmapFacing(T cameraConstant) {
-            return FACING.keyAt(FACING.indexOfValue((Integer) cameraConstant));
+        <T> Integer unmapFacing(T cameraConstant) {
+            return reverseLookup(FACING, cameraConstant);
         }
 
         @Override
-        <T> int unmapWhiteBalance(T cameraConstant) {
-            return WB.keyAt(WB.indexOfValue((String) cameraConstant));
+        <T> Integer unmapWhiteBalance(T cameraConstant) {
+            return reverseLookup(WB, cameraConstant);
         }
 
         // This will ignore FOCUS_TAP_WITH_MARKER but it's fine
         @Override
-        <T> int unmapFocus(T cameraConstant) {
-            return FOCUS.keyAt(FOCUS.indexOfValue((String) cameraConstant));
+        <T> Integer unmapFocus(T cameraConstant) {
+            return reverseLookup(FOCUS, cameraConstant);
         }
     }
 
@@ -98,17 +109,17 @@ abstract class Mapper {
         }
 
         @Override
-        <T> int unmapFlash(T cameraConstant) {
+        <T> Integer unmapFlash(T cameraConstant) {
             return 0;
         }
 
         @Override
-        <T> int unmapFacing(T cameraConstant) {
+        <T> Integer unmapFacing(T cameraConstant) {
             return 0;
         }
 
         @Override
-        <T> int unmapWhiteBalance(T cameraConstant) {
+        <T> Integer unmapWhiteBalance(T cameraConstant) {
             return 0;
         }
 
@@ -118,7 +129,7 @@ abstract class Mapper {
         }
 
         @Override
-        <T> int unmapFocus(T cameraConstant) {
+        <T> Integer unmapFocus(T cameraConstant) {
             return 0;
         }
     }
diff --git a/demo/src/main/res/mipmap-hdpi/cameraview.png b/demo/src/main/res/mipmap-hdpi/cameraview.png
index ac2ab7c7..fdeb9c33 100644
Binary files a/demo/src/main/res/mipmap-hdpi/cameraview.png and b/demo/src/main/res/mipmap-hdpi/cameraview.png differ
diff --git a/demo/src/main/res/mipmap-mdpi/cameraview.png b/demo/src/main/res/mipmap-mdpi/cameraview.png
index 0b1bb674..35cb3934 100644
Binary files a/demo/src/main/res/mipmap-mdpi/cameraview.png and b/demo/src/main/res/mipmap-mdpi/cameraview.png differ
diff --git a/demo/src/main/res/mipmap-xhdpi/cameraview.png b/demo/src/main/res/mipmap-xhdpi/cameraview.png
index 31cf7797..afd729b1 100644
Binary files a/demo/src/main/res/mipmap-xhdpi/cameraview.png and b/demo/src/main/res/mipmap-xhdpi/cameraview.png differ
diff --git a/demo/src/main/res/mipmap-xxhdpi/cameraview.png b/demo/src/main/res/mipmap-xxhdpi/cameraview.png
index d0db7f6e..f32577b6 100644
Binary files a/demo/src/main/res/mipmap-xxhdpi/cameraview.png and b/demo/src/main/res/mipmap-xxhdpi/cameraview.png differ
diff --git a/demo/src/main/res/mipmap-xxxhdpi/cameraview.png b/demo/src/main/res/mipmap-xxxhdpi/cameraview.png
index b0fad551..ab08529e 100644
Binary files a/demo/src/main/res/mipmap-xxxhdpi/cameraview.png and b/demo/src/main/res/mipmap-xxxhdpi/cameraview.png differ
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index 575c6206..755f50b0 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#29aaca</color>
-    <color name="colorPrimaryDark">#1f8199</color>
-    <color name="colorAccent">#4ed728</color>
+    <color name="colorPrimary">#009966</color>
+    <color name="colorPrimaryDark">#00734d</color>
+    <color name="colorAccent">#65FF2D</color>
 </resources>