diff --git a/appinfo.json b/appinfo.json
index 45286fc..232a265 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -15,10 +15,15 @@
         "configurable"
     ],
     "companyName": "dartcatcher@gmail.com",
-    "longName": "Neale's Watch",
+    "longName": "Twatch \u03b5",
     "projectType": "native",
     "resources": {
         "media": [
+            {
+                "file": "images/menu.png",
+                "name": "MENU_IMAGE",
+                "type": "png"
+            },
             {
                 "characterRegex": "[\uf10b]",
                 "file": "fonts/fontawesome-webfont.ttf",
@@ -34,14 +39,14 @@
         ]
     },
     "sdkVersion": "3",
-    "shortName": "Twatch",
+    "shortName": "Twatch \u03b5",
     "targetPlatforms": [
         "aplite",
         "basalt",
         "chalk"
     ],
     "uuid": "8287a53c-1b7e-4f4b-9104-608de13b9f77",
-    "versionLabel": "1.0",
+    "versionLabel": "1.1",
     "watchapp": {
         "watchface": true
     }
diff --git a/resources/images/menu.png b/resources/images/menu.png
new file mode 100644
index 0000000..2071856
Binary files /dev/null and b/resources/images/menu.png differ
diff --git a/src/main.c b/src/main.c
index 15cdc76..8ba0e1c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -292,6 +292,11 @@ static void in_received_handler(DictionaryIterator *rec, void *context) {
   for (i = 0; i < KEY_LAST; i += 1) {
     Tuple *cur = dict_find(rec, i);
     
+    if (! cur) {
+      APP_LOG(APP_LOG_LEVEL_DEBUG, "Holy crap! Key %i isn't around!", i);
+      continue;
+    }
+    
     switch (i) {
     case KEY_COLOR_FACE:
     case KEY_COLOR_TIC:
@@ -323,10 +328,10 @@ static void init() {
   int i;
   
   for (i = 0; i < KEY_LAST; i += 1) {
-    colors[i] = GColorBlack;
+    colors[i] = GColorWhite;
   }
-  colors[KEY_COLOR_FACE] = GColorWhite;
-  colors[KEY_COLOR_SEC] = COLOR_FALLBACK(GColorWindsorTan, GColorBlack);
+  colors[KEY_COLOR_FACE] = GColorBlack;
+  colors[KEY_COLOR_SEC] = COLOR_FALLBACK(GColorWindsorTan, GColorWhite);
   
   window = window_create();
   window_set_window_handlers(window, (WindowHandlers) {